Skip to content

Commit 77ae92e

Browse files
committed
Merge branch 'master' into release
2 parents 5459ab2 + 8948e3a commit 77ae92e

File tree

158 files changed

+4392
-2643
lines changed

Some content is hidden

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

158 files changed

+4392
-2643
lines changed

.eslintrc.js

Lines changed: 73 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,15 @@
1-
// const validColors = require('./src/style/colorsPalette').colorsPalette;
2-
// const extraFixColorsMap = require('./src/style/colorsPalette').extraFixColorsMap;
3-
// const assetsDepJson = require('./eslint-rules/tests/assets_deprecation.json');
4-
// const deprecationsJson = require('./eslint-rules/tests/component_deprecation.json');
5-
61
module.exports = {
2+
extends: 'wix/react-native',
73
parser: 'babel-eslint',
8-
plugins: ['react', 'react-native', 'uilib'],
9-
// extends: ['airbnb'],
104
rules: {
11-
'arrow-body-style': 'off',
125
'arrow-parens': 'off',
136
// TODO: remove after migration of legacy lifecycle methods
14-
'camelcase': 'off',
15-
'class-methods-use-this': 'off',
16-
'consistent-return': 'off',
17-
'comma-dangle': 'off',
18-
'global-require': 'off',
19-
'max-len': [2, 130, 4, {ignoreUrls: true}],
20-
'no-nested-ternary': 'off',
21-
'no-else-return': 'off',
7+
camelcase: 'off',
8+
'comma-dangle': ['error', 'never'],
229
'no-mixed-operators': ['off'],
23-
'no-param-reassign': ['warn'],
24-
'no-plusplus': 'off',
25-
'no-return-assign': 'off',
2610
'no-trailing-spaces': 'off',
27-
'no-use-before-define': 'off',
28-
'no-unneeded-ternary': 'off',
29-
'no-mixed-operators': 'off',
30-
'no-underscore-dangle': ['error', {'allowAfterThis': true}],
31-
'object-curly-spacing': 'off',
3211
'operator-linebreak': 'off',
33-
'react/forbid-prop-types': 'off',
34-
'react/jsx-filename-extension': 'off',
35-
'react/jsx-space-before-closing': 'off',
36-
'react/jsx-tag-spacing': 'off',
37-
// 'react/no-did-mount-set-state': 'warn',
38-
'react/prefer-stateless-function': 'off',
39-
'react/prop-types': ['error', {ignore: ['children', 'style', 'testID']}],
40-
'react/require-default-props': 'off',
41-
"react/sort-comp": ['warn'],
12+
'max-len': ['warn', {code: 120}],
4213
'react/jsx-no-bind': [
4314
'warn',
4415
{
@@ -47,27 +18,74 @@ module.exports = {
4718
allowBind: false,
4819
},
4920
],
50-
// 'import/no-extraneous-dependencies': [
51-
// 'warn',
52-
// {devDependencies: true, optionalDependencies: false, peerDependencies: true},
53-
// ],
54-
'import/prefer-default-export': 'off',
55-
// 'uilib/assets-deprecation': ['error', {deprecations: assetsDepJson, source: '../../assets', dueDate: '2 November, Friday'}],
56-
// 'uilib/component-deprecation': ['error', {deprecations: deprecationsJson, dueDate: 'Friday 21 December'}],
57-
// 'uilib/no-direct-import': ['error', {origin: 'react-native-ui-lib', destination: 'some-other-source'}],
58-
// 'uilib/no-hard-coded-color': ['error', validColors, extraFixColorsMap],
59-
// 'uilib/no-hard-coded-font': 'error'
60-
},
61-
env: {
62-
browser: true,
63-
node: true,
64-
jest: true,
65-
},
66-
settings: {
67-
'import/resolver': {
68-
node: {
69-
extensions: ['.js', '.ios.js', '.android.js'],
70-
},
71-
},
21+
'function-paren-newline': ['warn', 'never'],
22+
'new-cap': ['off'], // TODO: fix this in colors.js and remove this
23+
'default-case': ['off']
7224
},
7325
};
26+
27+
// OLD ESlint configuration
28+
// const validColors = require('./src/style/colorsPalette').colorsPalette;
29+
// const extraFixColorsMap = require('./src/style/colorsPalette').extraFixColorsMap;
30+
// const assetsDepJson = require('./eslint-rules/tests/assets_deprecation.json');
31+
// const deprecationsJson = require('./eslint-rules/tests/component_deprecation.json');
32+
33+
// module.exports = {
34+
// parser: 'babel-eslint',
35+
// extends: 'wix/react-native',
36+
// // plugins: ['react', 'react-native', 'uilib'],
37+
// // extends: ['airbnb'],
38+
// rules: {
39+
// 'arrow-body-style': 'off',
40+
// 'arrow-parens': 'off',
41+
// // TODO: remove after migration of legacy lifecycle methods
42+
// 'camelcase': 'off',
43+
// 'class-methods-use-this': 'off',
44+
// 'consistent-return': 'off',
45+
// 'comma-dangle': 'off',
46+
// 'global-require': 'off',
47+
// 'max-len': [2, 130, 4, {ignoreUrls: true}],
48+
// 'no-nested-ternary': 'off',
49+
// 'no-else-return': 'off',
50+
// 'no-mixed-operators': ['off'],
51+
// 'no-param-reassign': ['warn'],
52+
// 'no-plusplus': 'off',
53+
// 'no-return-assign': 'off',
54+
// 'no-trailing-spaces': 'off',
55+
// 'no-use-before-define': 'off',
56+
// 'no-unneeded-ternary': 'off',
57+
// 'no-mixed-operators': 'off',
58+
// 'no-underscore-dangle': ['error', {'allowAfterThis': true}],
59+
// 'object-curly-spacing': 'off',
60+
// 'operator-linebreak': 'off',
61+
// 'react/forbid-prop-types': 'off',
62+
// 'react/jsx-filename-extension': 'off',
63+
// 'react/jsx-space-before-closing': 'off',
64+
// 'react/jsx-tag-spacing': 'off',
65+
// 'react/prefer-stateless-function': 'off',
66+
// 'react/prop-types': ['error', {ignore: ['children', 'style', 'testID']}],
67+
// 'react/require-default-props': 'off',
68+
// "react/sort-comp": ['warn'],
69+
// 'react/jsx-no-bind': [
70+
// 'warn',
71+
// {
72+
// ignoreRefs: true,
73+
// allowArrowFunctions: false,
74+
// allowBind: false,
75+
// },
76+
// ],
77+
// 'import/prefer-default-export': 'off'
78+
// },
79+
// env: {
80+
// browser: true,
81+
// node: true,
82+
// jest: true,
83+
// },
84+
// settings: {
85+
// 'import/resolver': {
86+
// node: {
87+
// extensions: ['.js', '.ios.js', '.android.js'],
88+
// },
89+
// },
90+
// },
91+
// };

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ UI Toolset & Components Library for React Native
1111

1212

1313
Read more in our [Uncyclo](https://github.com/wix/react-native-ui-lib/wiki). <br>
14-
Check out our [Docs](https://z448401921.github.io/react-native-ui-lib/uilib-docs/public/).
14+
Check out our [Docs](https://wix.github.io/react-native-ui-lib/).

demo/src/screens/MenuStructure.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ export const navigationData = {
3535
{title: 'Overlays', tags: 'overlay image', screen: 'unicorn.components.OverlaysScreen'},
3636
{title: 'Page Control', tags: 'page', screen: 'unicorn.components.PageControlScreen'},
3737
{title: 'Pan Listener', tags: 'pan swipe drag listener', screen: 'unicorn.components.PanListenerScreen'},
38+
{title: 'Pan Responder', tags: 'pan swipe drag responder', screen: 'unicorn.components.PanResponderScreen'},
3839
{title: 'Shared Transition', tags: 'shared transition element', screen: 'unicorn.components.SharedTransitionScreen'},
3940
{title: 'TabBar', tags: 'tab bar', screen: 'unicorn.components.TabBarScreen'},
4041
{title: 'Toast', tags: 'toast top bottom snackbar', screen: 'unicorn.components.ToastsScreen'},

demo/src/screens/componentScreens/CheckboxScreen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class CheckboxScreen extends Component {
88
value2: false,
99
value3: true,
1010
value4: true,
11-
value5: false,
11+
value5: false
1212
};
1313

1414
render() {

0 commit comments

Comments
 (0)