Skip to content

Commit 47998eb

Browse files
committed
Merge branch 'master' into feat/WheelPicker
2 parents 1e9cc8e + 9533453 commit 47998eb

Some content is hidden

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

68 files changed

+1872
-590
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
extends: ['plugin:@typescript-eslint/recommended', 'wix/react-native'],
2+
extends: ['plugin:@typescript-eslint/recommended', 'wix/react-native', 'plugin:react-hooks/recommended'],
33
parser: '@typescript-eslint/parser',
44
rules: {
55
'arrow-parens': 'off',

demo/src/assets/icons/check-small.png

164 Bytes
Loading
184 Bytes
Loading
182 Bytes
Loading
245 Bytes
Loading
274 Bytes
Loading

demo/src/configurations.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import {Assets, Typography, Spacings} from 'react-native-ui-lib'; // eslint-disable-line
2+
3+
Assets.loadAssetsGroup('icons.demo', {
4+
refresh: require('./assets/icons/refresh.png'),
5+
search: require('./assets/icons/search.png')
6+
});
7+
8+
Typography.loadTypographies({
9+
h1: {...Typography.text40},
10+
h2: {...Typography.text50},
11+
h3: {...Typography.text60}
12+
});
13+
14+
Spacings.loadSpacings({
15+
page: Spacings.s5
16+
});

demo/src/demoApp.js

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,11 @@ import {
55
AnimatableManager,
66
ThemeManager,
77
Constants,
8-
Assets,
98
Colors,
10-
Typography,
11-
Spacings
9+
Typography
1210
} from 'react-native-ui-lib'; // eslint-disable-line
1311
import {registerScreens} from './screens';
1412

15-
Assets.loadAssetsGroup('icons.demo', {
16-
refresh: require('./assets/icons/refresh.png'),
17-
search: require('./assets/icons/search.png')
18-
});
19-
20-
Typography.loadTypographies({
21-
h1: {...Typography.text40},
22-
h2: {...Typography.text50},
23-
h3: {...Typography.text60}
24-
});
25-
26-
Spacings.loadSpacings({
27-
page: Spacings.s5
28-
});
29-
3013
/** Examples - uncomment when needed */
3114
// Typography.loadTypographies({
3215
// h1: {fontSize: 58, fontWeight: '300', lineHeight: 80},

demo/src/screens/MenuStructure.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export const navigationData = {
3030
{title: 'Badges', tags: 'badge', screen: 'unicorn.components.BadgesScreen'},
3131
{title: 'Cards', tags: 'cards feed', screen: 'unicorn.components.CardsScreen'},
3232
{title: 'Connection Status Bar', tags: 'connection status bar', screen: 'unicorn.components.ConnectionStatusBar'},
33+
{title: 'Chip', tags: 'chip', screen: 'unicorn.components.ChipScreen'},
3334
// {title: 'Overlays', tags: 'overlay image', screen: 'unicorn.components.OverlaysScreen'},
3435
{title: 'Page Control', tags: 'page', screen: 'unicorn.components.PageControlScreen'},
3536
{title: 'ProgressBar', tags: 'progress bar animated', screen: 'unicorn.animations.ProgressBarScreen'},
@@ -89,6 +90,11 @@ export const navigationData = {
8990
{title: 'StateScreen', tags: 'empty state screen', screen: 'unicorn.screens.EmptyStateScreen'},
9091
{title: 'TabController', tags: 'tabbar controller native', screen: 'unicorn.components.TabControllerScreen'},
9192
{title: 'TabBar', tags: 'tab bar', screen: 'unicorn.components.TabBarScreen'},
93+
{
94+
title: 'withScrollEnabler',
95+
tags: 'scroll enabled withScrollEnabler',
96+
screen: 'unicorn.components.WithScrollEnablerScreen'
97+
},
9298
{title: 'Wizard', tags: 'wizard', screen: 'unicorn.components.WizardScreen'}
9399
]
94100
},

0 commit comments

Comments
 (0)