Skip to content

Commit 0c7dcda

Browse files
author
Jeremy Hamilton
committed
Merge remote-tracking branch 'upstream/next' into next
2 parents f0c0576 + 59be43b commit 0c7dcda

File tree

9 files changed

+1720
-266
lines changed

9 files changed

+1720
-266
lines changed

CHANGELOG.md

Lines changed: 1438 additions & 0 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"postinstall": "opencollective-postinstall || exit 0",
2323
"lint": "eslint --ext js,ts .",
2424
"prettify": "prettier --single-quote --trailing-comma=es5 --write './**/*.md'",
25-
"clean-install": "rimraf node_modules && yarn"
25+
"clean-install": "rimraf node_modules && yarn",
26+
"changelog": "auto-changelog -p"
2627
},
2728
"author": "Nader Dabit & Monte Thakkar",
2829
"license": "MIT",
@@ -37,6 +38,7 @@
3738
},
3839
"dependencies": {
3940
"@types/react-native-vector-icons": "^6.4.5",
41+
"auto-changelog": "^2.2.1",
4042
"color": "^3.1.2",
4143
"deepmerge": "^4.2.2",
4244
"hoist-non-react-statics": "^3.3.2",

website/docs/listitem.md

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -259,16 +259,16 @@ import LinearGradient from 'react-native-linear-gradient'; // Only if no expo
259259
> [TouchableHighlight](https://facebook.github.io/react-native/docs/touchablehighlight#props)
260260
> props
261261
262+
- [`bottomDivider`](#bottomdivider)
262263
- [`Component`](#Component)
263264
- [`containerStyle`](#containerstyle)
264-
- [`onPress`](#onpress)
265-
- [`onLongPress`](#onlongpress)
266265
- [`disabled`](#disabled)
267266
- [`disabledStyle`](#disabledstyle)
267+
- [`onLongPress`](#onlongpress)
268+
- [`onPress`](#onpress)
269+
- [`pad`](#pad)
268270
- [`topDivider`](#topdivider)
269-
- [`bottomDivider`](#bottomdivider)
270271
- [`ViewComponent`](#viewcomponent)
271-
- [`pad`](#pad)
272272

273273
---
274274

@@ -306,6 +306,16 @@ import LinearGradient from 'react-native-linear-gradient'; // Only if no expo
306306

307307
## Reference
308308

309+
### `bottomDivider`
310+
311+
Add divider at the bottom of the list item
312+
313+
| Type | Default |
314+
| :-----: | :-----: |
315+
| boolean | false |
316+
317+
---
318+
309319
### `Component`
310320

311321
replace element with custom element (optional)
@@ -326,16 +336,27 @@ additional main container styling (optional)
326336

327337
---
328338

329-
### `onPress`
339+
### `disabled`
330340

331-
onPress method for link (optional)
341+
If true the user won't be able to perform any action on the list item.
332342

333-
| Type | Default |
334-
| :------: | :-----: |
335-
| function | none |
343+
| Type | Default |
344+
| :-----: | :-----: |
345+
| boolean | none |
346+
347+
---
348+
349+
### `disabledStyle`
350+
351+
Specific styling to be used when list item is disabled.
352+
353+
| Type | Default |
354+
| :------------: | :-----: |
355+
| object (style) | none |
336356

337357
---
338358

359+
339360
### `onLongPress`
340361

341362
onLongPress method for link (optional)
@@ -346,23 +367,23 @@ onLongPress method for link (optional)
346367

347368
---
348369

349-
### `disabled`
370+
### `onPress`
350371

351-
If true the user won't be able to perform any action on the list item.
372+
onPress method for link (optional)
352373

353-
| Type | Default |
354-
| :-----: | :-----: |
355-
| boolean | none |
374+
| Type | Default |
375+
| :------: | :-----: |
376+
| function | none |
356377

357378
---
358379

359-
### `disabledStyle`
380+
### `pad`
360381

361-
Specific styling to be used when list item is disabled.
382+
adds spacing between the leftComponent, the title component & right component
362383

363-
| Type | Default |
364-
| :------------: | :-----: |
365-
| object (style) | none |
384+
| Type | Default |
385+
| :----: | :-----: |
386+
| number | `16` |
366387

367388
---
368389

@@ -376,15 +397,7 @@ Add divider at the top of the list item
376397

377398
---
378399

379-
### `bottomDivider`
380-
381-
Add divider at the bottom of the list item
382-
383-
| Type | Default |
384-
| :-----: | :-----: |
385-
| boolean | false |
386400

387-
---
388401

389402
### `ViewComponent`
390403

@@ -396,10 +409,3 @@ Container for linear gradient (for non-expo user)
396409

397410
---
398411

399-
### `pad`
400-
401-
adds spacing between the leftComponent, the title component & right component
402-
403-
| Type | Default |
404-
| :----: | :-----: |
405-
| number | `16` |

website/docs/pricing.md

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -28,80 +28,70 @@ import { PricingCard } from 'react-native-elements';
2828

2929
## Props
3030

31-
- [`containerStyle`](#containerstyle)
31+
- [`button`](#button)
3232
- [`buttonFont`](#buttonfont)
33+
- [`color`](#color)
34+
- [`containerStyle`](#containerstyle)
35+
- [`info`](#info)
3336
- [`infoFont`](#infofont)
37+
- [`onButtonPress`](#onbuttonpress)
38+
- [`price`](#price)
3439
- [`pricingFont`](#pricingfont)
40+
- [`title`](#title)
3541
- [`titleFont`](#titlefont)
3642
- [`wrapperStyle`](#wrapperstyle)
37-
- [`price`](#price)
38-
- [`onButtonPress`](#onbuttonpress)
39-
- [`button`](#button)
40-
- [`info`](#info)
41-
- [`color`](#color)
42-
- [`title`](#title)
4343

4444
---
4545

4646
## Reference
4747

48-
### `containerStyle`
49-
50-
outer component styling (optional)
51-
52-
| Type | Default |
53-
| :------------: | :---------------: |
54-
| object (style) | inherited styling |
55-
56-
---
57-
58-
### `infoStyle`
48+
### `button`
5949

60-
specify pricing information style
50+
button information (required)
6151

62-
| Type | Default |
63-
| :------------: | :-----: |
64-
| style (object) | none |
52+
| Type | Default |
53+
| :------------------------------------------------------------: | :-----: |
54+
| {[...Button props](button.md#props)}<br/>**OR**<br/> component | none |
6555

6656
---
6757

68-
### `pricingStyle`
58+
### `color`
6959

70-
specify pricing text style
60+
color scheme for button & title
7161

72-
| Type | Default |
73-
| :------------: | :-----: |
74-
| style (object) | none |
62+
| Type | Default |
63+
| :----: | :-----: |
64+
| string | none |
7565

7666
---
7767

78-
### `titleStyle`
68+
### `containerStyle`
7969

80-
specify title text style
70+
outer component styling (optional)
8171

82-
| Type | Default |
83-
| :------------: | :-----: |
84-
| style (object) | none |
72+
| Type | Default |
73+
| :------------: | :---------------: |
74+
| object (style) | inherited styling |
8575

8676
---
8777

88-
### `wrapperStyle`
78+
### `info`
8979

90-
inner wrapper component styling (optional)
80+
pricing information (optional)
9181

92-
| Type | Default |
93-
| :------------: | :---------------: |
94-
| object (style) | inherited styling |
82+
| Type | Default |
83+
| :--------------: | :-----: |
84+
| array of strings | none |
9585

9686
---
9787

98-
### `price`
88+
### `infoStyle`
9989

100-
price (required)
90+
specify pricing information style
10191

102-
| Type | Default |
103-
| :----: | :-----: |
104-
| string | none |
92+
| Type | Default |
93+
| :------------: | :-----: |
94+
| style (object) | none |
10595

10696
---
10797

@@ -115,40 +105,50 @@ function to be run when button is pressed
115105

116106
---
117107

118-
### `button`
108+
### `price`
119109

120-
button information (required)
110+
price (required)
121111

122-
| Type | Default |
123-
| :------------------------------------------------------------: | :-----: |
124-
| {[...Button props](button.md#props)}<br/>**OR**<br/> component | none |
112+
| Type | Default |
113+
| :----: | :-----: |
114+
| string | none |
125115

126116
---
127117

128-
### `info`
118+
### `pricingStyle`
129119

130-
pricing information (optional)
120+
specify pricing text style
131121

132-
| Type | Default |
133-
| :--------------: | :-----: |
134-
| array of strings | none |
122+
| Type | Default |
123+
| :------------: | :-----: |
124+
| style (object) | none |
135125

136126
---
137127

138-
### `color`
128+
### `title`
139129

140-
color scheme for button & title
130+
title (required)
141131

142132
| Type | Default |
143133
| :----: | :-----: |
144134
| string | none |
145135

146136
---
147137

148-
### `title`
138+
### `titleStyle`
149139

150-
title (required)
140+
specify title text style
151141

152-
| Type | Default |
153-
| :----: | :-----: |
154-
| string | none |
142+
| Type | Default |
143+
| :------------: | :-----: |
144+
| style (object) | none |
145+
146+
---
147+
148+
### `wrapperStyle`
149+
150+
inner wrapper component styling (optional)
151+
152+
| Type | Default |
153+
| :------------: | :---------------: |
154+
| object (style) | inherited styling |

0 commit comments

Comments
 (0)