Skip to content

Commit db4dfba

Browse files
authored
Merge pull request #4771 from GeekyAnts/release/3.3.8-alpha.5
Release/3.3.8 alpha.5
2 parents 049822b + b280033 commit db4dfba

File tree

16 files changed

+2248
-3062
lines changed

16 files changed

+2248
-3062
lines changed

example/package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@
1616
"update-test": "yarn test -u"
1717
},
1818
"dependencies": {
19-
"@expo/vector-icons": "^12.0.2",
19+
"@expo/vector-icons": "^12.0.0",
2020
"@react-native-aria/overlays": "^0.2.9",
21-
"@react-native-async-storage/async-storage": "^1.15.7",
22-
"expo": "~40.0.0",
23-
"expo-font": "~8.4.0",
24-
"expo-linear-gradient": "^9.1.0",
25-
"expo-splash-screen": "^0.8.1",
26-
"expo-status-bar": "~1.0.3",
21+
"@react-native-async-storage/async-storage": "~1.15.0",
22+
"expo": "^44.0.0",
23+
"expo-font": "~10.0.4",
24+
"expo-linear-gradient": "~11.0.3",
25+
"expo-splash-screen": "~0.14.1",
26+
"expo-status-bar": "~1.2.0",
2727
"formik": "^2.2.6",
28-
"react": "16.13.1",
28+
"react": "17.0.1",
2929
"react-hook-form": "^6.14.0",
30-
"react-native": "https://github.com/expo/react-native/archive/sdk-40.0.1.tar.gz",
30+
"react-native": "https://github.com/expo/react-native/archive/sdk-44.0.0.tar.gz",
3131
"react-native-keyboard-aware-scroll-view": "^0.9.4",
32-
"react-native-safe-area-context": "^3.1.9",
33-
"react-native-svg": "^12.1.0",
34-
"react-native-web": "^0.16.5"
32+
"react-native-safe-area-context": "3.3.2",
33+
"react-native-svg": "12.1.1",
34+
"react-native-web": "0.17.1"
3535
},
3636
"devDependencies": {
37-
"@babel/core": "~7.9.0",
37+
"@babel/core": "^7.12.9",
3838
"@babel/runtime": "^7.12.5",
39-
"@expo/webpack-config": "^0.12.51",
39+
"@expo/webpack-config": "~0.16.2",
4040
"@storybook/addon-actions": "^5.3",
4141
"@storybook/addon-knobs": "^5.3",
4242
"@storybook/addon-links": "^5.3",
@@ -45,20 +45,20 @@
4545
"@storybook/addon-storyshots": "^6.3.4",
4646
"@storybook/react-native": "^5.3.23",
4747
"@storybook/react-native-server": "^5.3.23",
48-
"@types/react": "~16.9.35",
49-
"@types/react-dom": "~16.9.8",
50-
"@types/react-native": "~0.63.2",
48+
"@types/react": "~17.0.21",
49+
"@types/react-dom": "~17.0.9",
50+
"@types/react-native": "~0.64.12",
5151
"babel-loader": "^8.2.2",
5252
"babel-plugin-module-resolver": "^4.0.0",
5353
"core-js": "3.6.5",
54-
"jest": "^27.0.6",
55-
"jest-expo": "^42.0.1",
54+
"jest": "^26.6.3",
55+
"jest-expo": "^44.0.0",
5656
"metro-react-native-babel-preset": "^0.64.0",
5757
"patch-package": "^6.2.2",
5858
"postinstall-postinstall": "^2.1.0",
59-
"react-dom": "^17.0.2",
59+
"react-dom": "17.0.1",
6060
"react-test-renderer": "^17.0.2",
61-
"typescript": "4.2.4"
61+
"typescript": "~4.3.5"
6262
},
6363
"private": false
6464
}

example/storybook/stories/components/composites/Badge/color.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Badge, HStack } from 'native-base';
33

44
export function Example() {
55
return (
6-
<HStack space={4} mx={{ base: 'auto', md: 0 }}>
6+
<HStack space={{ base: 2, sm: 4 }} mx={{ base: 'auto', md: 0 }}>
77
<Badge colorScheme="success">SUCCESS</Badge>
88
<Badge colorScheme="danger">DANGER</Badge>
99
<Badge colorScheme="info">INFO</Badge>

example/storybook/stories/components/composites/FormControl/CustomStyle.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@ import {
77
Divider,
88
Box,
99
WarningOutlineIcon,
10+
ScrollView,
1011
} from 'native-base';
11-
import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
1212

1313
export const Example = () => {
1414
return (
15-
// eslint-disable-next-line react-native/no-inline-styles
16-
<KeyboardAwareScrollView style={{ width: '100%' }}>
15+
<ScrollView w="100%">
1716
<Stack
1817
space={2.5}
1918
alignSelf="center"
@@ -72,6 +71,6 @@ export const Example = () => {
7271
</FormControl>
7372
</Box>
7473
</Stack>
75-
</KeyboardAwareScrollView>
74+
</ScrollView>
7675
);
7776
};

0 commit comments

Comments
 (0)