Skip to content

Commit ec6adc3

Browse files
committed
Merge branch 'master' into release
2 parents f4f4ba0 + f3c7caa commit ec6adc3

File tree

184 files changed

+5393
-2526
lines changed

Some content is hidden

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

184 files changed

+5393
-2526
lines changed

.eslintrc.js

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
2-
extends: 'wix/react-native',
3-
parser: 'babel-eslint',
2+
extends: ['plugin:@typescript-eslint/recommended', 'wix/react-native'],
3+
parser: '@typescript-eslint/parser',
44
rules: {
55
'arrow-parens': 'off',
66
// TODO: remove after migration of legacy lifecycle methods
@@ -20,8 +20,23 @@ module.exports = {
2020
],
2121
'function-paren-newline': ['warn', 'never'],
2222
'new-cap': ['off'], // TODO: fix this in colors.js and remove this
23-
'default-case': ['off']
23+
'default-case': ['off'],
24+
"@typescript-eslint/no-use-before-define": 0,
25+
"@typescript-eslint/explicit-function-return-type": 0,
26+
"@typescript-eslint/no-var-requires": 0,
27+
"@typescript-eslint/no-explicit-any": 0,
28+
"@typescript-eslint/member-delimiter-style": 0,
29+
// "@typescript-eslint/no-unused-vars": [2, {"args": "all", "argsIgnorePattern": "^_"}],
30+
"@typescript-eslint/no-unused-vars": 0, //todo: uncomment this line and use the the better unused rule above ^
31+
"@typescript-eslint/no-non-null-assertion": 0,
32+
"@typescript-eslint/explicit-member-accessibility": 0,
33+
"@typescript-eslint/prefer-optional-chain": "error",
34+
"@typescript-eslint/ban-ts-ignore": 0,
35+
"@typescript-eslint/no-empty-function": 0,
36+
"@typescript-eslint/camelcase": 0,
37+
"@typescript-eslint/indent": 0
2438
},
39+
plugins: ['@typescript-eslint'],
2540
};
2641

2742
// OLD ESlint configuration

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,5 @@ package-lock.json
6363

6464
# CocoaPods
6565
/ios/Pods/
66+
/ios/Podfile.lock
6667
expoDemo/ios/Pods

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ See setup instructions [here](https://github.com/wix/react-native-ui-lib/wiki/SE
4141
See [breaking changes](https://github.com/wix/react-native-ui-lib/wiki/V5-%5BBreaking-Change%5D)
4242

4343
#### For React Native >= 0.60.0
44-
please use `react-native-ui-lib@^4.0.0`
44+
please use `react-native-ui-lib`
4545

4646
#### For React Native < 0.60.0
4747
please use `react-native-ui-lib@^3.0.0`

demo/src/demoApp.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,6 @@ async function getDefaultScreenAndStartApp() {
158158
}
159159

160160
Navigation.events().registerAppLaunchedListener(() => {
161-
registerScreens();
161+
registerScreens(Navigation.registerComponent.bind(Navigation));
162162
getDefaultScreenAndStartApp();
163163
});

demo/src/index.js

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ module.exports = {
9191
get ToastsScreen() {
9292
return require('./screens/componentScreens/ToastsScreen').default;
9393
},
94+
get TabControllerScreen() {
95+
return require('./screens/componentScreens/TabControllerScreen').default;
96+
},
9497
get TabBarScreen() {
9598
return require('./screens/componentScreens/TabBarScreen').default;
9699
},
@@ -128,6 +131,9 @@ module.exports = {
128131
get DateTimePickerScreen() {
129132
return require('./screens/componentScreens/DateTimePickerScreen').default;
130133
},
134+
get ViewScreen() {
135+
return require('./screens/componentScreens/ViewScreen').default;
136+
},
131137
get WizardScreen() {
132138
return require('./screens/componentScreens/WizardScreen').default;
133139
},
@@ -141,46 +147,46 @@ module.exports = {
141147
get WheelPickerViewScreen() {
142148
return require('./screens/nativeComponentScreens/WheelPickerViewScreen').default;
143149
},
144-
// componentScreenScreens
150+
// Full Screen components
145151
get EmptyStateScreen() {
146-
return require('./screens/componentScreenScreens/EmptyStateScreen').default;
152+
return require('./screens/componentScreens/EmptyStateScreen').default;
147153
},
148154
get LoadingScreen() {
149-
return require('./screens/componentScreenScreens/LoadingScreen').default;
155+
return require('./screens/componentScreens/LoadingScreen').default;
150156
},
151157
// TODO: fix Expo issues (navigation) before un-commenting
152158
// get ModalScreen() {
153-
// return require('./screens/componentScreenScreens/ModalScreen').default;
159+
// return require('./screens/componentScreens/ModalScreen').default;
154160
// },
155161
// listScreens
156162
get BasicListScreen() {
157-
return require('./screens/listScreens/BasicListScreen').default;
163+
return require('./screens/componentScreens/BasicListScreen').default;
158164
},
159165
get ContactsListScreen() {
160-
return require('./screens/listScreens/ContactsListScreen').default;
166+
return require('./screens/componentScreens/ContactsListScreen').default;
161167
},
162168
get ConversationListScreen() {
163-
return require('./screens/listScreens/ConversationListScreen').default;
169+
return require('./screens/componentScreens/ConversationListScreen').default;
164170
},
165171
// styleScreens
166172
get BorderRadiusesScreen() {
167-
return require('./screens/styleScreens/BorderRadiusesScreen').default;
173+
return require('./screens/foundationScreens/BorderRadiusesScreen').default;
168174
},
169175
get ColorsScreen() {
170-
return require('./screens/styleScreens/ColorsScreen').default;
176+
return require('./screens/foundationScreens/ColorsScreen').default;
171177
},
172178
get TypographyScreen() {
173-
return require('./screens/styleScreens/TypographyScreen').default;
179+
return require('./screens/foundationScreens/TypographyScreen').default;
174180
},
175181
get ShadowsScreen() {
176-
return require('./screens/styleScreens/ShadowsScreen').default;
182+
return require('./screens/foundationScreens/ShadowsScreen').default;
177183
},
178184
get SpacingsScreen() {
179-
return require('./screens/styleScreens/SpacingsScreen').default;
185+
return require('./screens/foundationScreens/SpacingsScreen').default;
180186
},
181187
// animationScreens
182188
get CardScannerScreen() {
183-
return require('./screens/animationScreens/CardScannerScreen').default;
189+
return require('./screens/componentScreens/CardScannerScreen').default;
184190
},
185191
get CardAnimationsScreen() {
186192
return require('./screens/animationScreens/CardAnimationsScreen').default;
@@ -189,7 +195,7 @@ module.exports = {
189195
return require('./screens/animationScreens/ListAnimationsScreen').default;
190196
},
191197
get ProgressBarScreen() {
192-
return require('./screens/animationScreens/ProgressBarScreen').default;
198+
return require('./screens/componentScreens/ProgressBarScreen').default;
193199
},
194200
// realExamples
195201
get AppleMusic() {
@@ -203,7 +209,7 @@ module.exports = {
203209
},
204210
// wrapperScreens
205211
get TouchableOpacityScreen() {
206-
return require('./screens/wrapperScreens/TouchableOpacityScreen').default;
212+
return require('./screens/componentScreens/TouchableOpacityScreen').default;
207213
}
208214
};
209215
},

0 commit comments

Comments
 (0)