Skip to content

Commit 5e76fac

Browse files
Inbal-TishInbal-Tish
committed
Merge branch 'master' of https://github.com/wix/react-native-ui-lib into release
2 parents fd3d314 + 9e1185b commit 5e76fac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1352
-923
lines changed

‎README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@
1515
[![NPM Downloads](https://img.shields.io/npm/dm/react-native-ui-lib.svg?style=flat)](https://www.npmjs.com/package/react-native-ui-lib)
1616
<a href="https://twitter.com/rnuilib"><img src="https://img.shields.io/twitter/follow/rnuilib.svg?style=flat&colorA=1DA1F2&colorB=20303C&label=Follow%20us%20on%20Twitter" alt="Follow on Twitter"></a>
1717

18-
Check out our [Docs](https://wix.github.io/react-native-ui-lib/). <br>
19-
Our [Discord Channel](https://discord.gg/2eW4g6Z)
18+
19+
## Links
20+
- [Docs](https://wix.github.io/react-native-ui-lib/)
21+
- [Figma library](https://www.figma.com/community/file/1379775092983284111/rnui-library)
22+
- [Discord Channel](https://discord.gg/2eW4g6Z)
23+
2024

2125
Download our Expo demo app <br>
2226
<img height="120" src="https://qr.expo.dev/expo-go?owner=vn.chemgio&slug=rnuilib&releaseChannel=default&host=exp.host"> <br>
@@ -130,4 +134,4 @@ class MyScreen extends Component {
130134

131135
## Contributing
132136
See [Contribution Guide](https://github.com/wix/react-native-ui-lib/blob/master/CONTRIBUTING.md)
133-
137+

‎demo/src/screens/__tests__/__snapshots__/TextFieldScreen.spec.js.snap

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1899,6 +1899,8 @@ exports[`TextField Screen renders screen 1`] = `
18991899
}
19001900
>
19011901
<Image
1902+
accessibilityRole="image"
1903+
accessible={false}
19021904
source={
19031905
{
19041906
"testUri": "../../../demo/src/assets/icons/info.png",
@@ -2695,6 +2697,7 @@ exports[`TextField Screen renders screen 1`] = `
26952697
],
26962698
]
26972699
}
2700+
testID="undefined.clearButton.container"
26982701
>
26992702
<View
27002703
accessibilityLabel="clear"
@@ -2753,25 +2756,13 @@ exports[`TextField Screen renders screen 1`] = `
27532756
<Image
27542757
accessibilityRole="image"
27552758
accessible={false}
2756-
assetGroup="icons"
2757-
onError={[Function]}
27582759
source={
27592760
{
27602761
"testUri": "../../../src/assets/icons/xFlat.png",
27612762
}
27622763
}
27632764
style={
27642765
[
2765-
undefined,
2766-
undefined,
2767-
undefined,
2768-
undefined,
2769-
undefined,
2770-
undefined,
2771-
undefined,
2772-
undefined,
2773-
undefined,
2774-
false,
27752766
[
27762767
{
27772768
"tintColor": "#5A48F5",
@@ -2780,14 +2771,21 @@ exports[`TextField Screen renders screen 1`] = `
27802771
"tintColor": "#A6ACB1",
27812772
},
27822773
],
2783-
false,
2774+
undefined,
2775+
undefined,
2776+
undefined,
2777+
{
2778+
"tintColor": "#5A48F5",
2779+
},
27842780
]
27852781
}
27862782
testID="undefined.clearButton.icon"
27872783
/>
27882784
</View>
27892785
</View>
27902786
<Image
2787+
accessibilityRole="image"
2788+
accessible={false}
27912789
source={
27922790
{
27932791
"testUri": "../../../demo/src/assets/icons/search.png",
@@ -3427,32 +3425,25 @@ exports[`TextField Screen renders screen 1`] = `
34273425
<Image
34283426
accessibilityRole="image"
34293427
accessible={false}
3430-
assetGroup="icons"
3431-
onError={[Function]}
34323428
source={
34333429
{
34343430
"testUri": "../../../demo/src/assets/icons/search.png",
34353431
}
34363432
}
34373433
style={
34383434
[
3439-
undefined,
3440-
undefined,
3441-
undefined,
3442-
undefined,
3443-
undefined,
3444-
undefined,
3445-
undefined,
3446-
undefined,
3447-
undefined,
3448-
false,
34493435
[
34503436
{
34513437
"tintColor": "#20303C",
34523438
},
34533439
undefined,
34543440
],
3455-
false,
3441+
undefined,
3442+
undefined,
3443+
undefined,
3444+
{
3445+
"tintColor": "#20303C",
3446+
},
34563447
]
34573448
}
34583449
testID="undefined.icon"
@@ -5398,6 +5389,8 @@ exports[`TextField Screen renders screen 1`] = `
53985389
}
53995390
>
54005391
<Image
5392+
accessibilityRole="image"
5393+
accessible={false}
54015394
marginL-s1={true}
54025395
source={
54035396
{

‎demo/src/screens/componentScreens/PickerScreen.tsx

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ const dialogOptions = [
8282
{label: 'Option 7', value: 6},
8383
{label: 'Option 8', value: 6}
8484
];
85+
8586
export default class PickerScreen extends Component {
8687
picker = React.createRef<PickerMethods>();
8788
state = {
@@ -99,7 +100,7 @@ export default class PickerScreen extends Component {
99100
contact: 0
100101
};
101102

102-
renderDialog: PickerProps['renderCustomModal'] = (modalProps: RenderCustomModalProps) => {
103+
renderDialog: PickerProps['renderOverlay'] = (modalProps: RenderCustomModalProps) => {
103104
const {visible, children, toggleModal, onDone} = modalProps;
104105
return (
105106
<Incubator.Dialog
@@ -128,6 +129,7 @@ export default class PickerScreen extends Component {
128129
<Text text40 $textDefault>
129130
Picker
130131
</Text>
132+
131133
<Picker
132134
placeholder="Favorite Language"
133135
floatingPlaceholder
@@ -170,7 +172,7 @@ export default class PickerScreen extends Component {
170172
onChange={items => this.setState({customModalValues: items})}
171173
mode={Picker.modes.MULTI}
172174
trailingAccessory={dropdownIcon}
173-
renderCustomModal={this.renderDialog}
175+
renderOverlay={this.renderDialog}
174176
items={options}
175177
/>
176178

@@ -183,7 +185,7 @@ export default class PickerScreen extends Component {
183185
onChange={item => this.setState({option: item})}
184186
topBarProps={{title: 'Languages'}}
185187
useDialog
186-
renderCustomDialogHeader={({onDone, onCancel}) => (
188+
renderHeader={({onDone, onCancel}) => (
187189
<View padding-s5 row spread>
188190
<Button link label="Cancel" onPress={onCancel}/>
189191
<Button link label="Done" onPress={onDone}/>
@@ -194,13 +196,14 @@ export default class PickerScreen extends Component {
194196
searchPlaceholder={'Search a language'}
195197
items={dialogOptions}
196198
/>
199+
197200
<Text marginB-10 text70 $textDefault>
198201
Custom Picker:
199202
</Text>
200203
<Picker
201204
value={this.state.filter}
202205
onChange={filter => this.setState({filter})}
203-
renderPicker={(_value?: any, label?: string) => {
206+
renderInput={(_value?: any, label?: string) => {
204207
return (
205208
<View row>
206209
<Icon
@@ -216,6 +219,7 @@ export default class PickerScreen extends Component {
216219
}}
217220
items={filters}
218221
/>
222+
219223
<Text marginT-20 marginB-10 text70 $textDefault>
220224
Custom Picker Items:
221225
</Text>
@@ -225,7 +229,7 @@ export default class PickerScreen extends Component {
225229
onChange={contact => {
226230
this.setState({contact});
227231
}}
228-
renderPicker={(contactValue?: number) => {
232+
renderInput={(contactValue?: number) => {
229233
const contact = contacts[contactValue!] ?? undefined;
230234
return (
231235
<View row>
@@ -252,6 +256,7 @@ export default class PickerScreen extends Component {
252256
style={{alignSelf: 'flex-start'}}
253257
onPress={() => this.picker.current?.openExpandable?.()}
254258
/>
259+
255260
<Text text60 marginT-s5>
256261
Different Field Types
257262
</Text>

‎src/assets/emojis/index.js renamed to ‎src/assets/emojis/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1342,5 +1342,5 @@ export const emojis = {
13421342
"woman-woman-girl-girl": "👩‍👩‍👧‍👧",
13431343
"woman-heart-woman": "👩‍❤️‍👩",
13441344
"woman-kiss-woman": "👩‍❤️‍💋‍👩"
1345-
}
1345+
} as const;
13461346

‎src/components/button/Button.driver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {ButtonProps} from './ButtonTypes';
1+
import {ButtonProps} from './types';
22
import {ImageDriver} from '../image/Image.driver';
33
import {ComponentDriver, ComponentDriverArgs} from '../../testkit/Component.driver';
44
import {TextDriver} from '../text/Text.driver';

‎src/components/button/ButtonConstants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {ButtonSize} from './ButtonTypes';
1+
import {ButtonSize} from './types';
22

33

44
export const PADDINGS = {

0 commit comments

Comments
 (0)