Skip to content

Commit c0cbd28

Browse files
surajahmedsurajahmed
authored
Merge pull request #4851 from GeekyAnts/release/3.4.0-rc.0
Release/3.4.0 rc.0
2 parents 2d42ff6 + 313cdae commit c0cbd28

File tree

260 files changed

+8738
-2092
lines changed

Some content is hidden

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

260 files changed

+8738
-2092
lines changed

‎example/storybook/stories/components/Wrapper.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ function MyWrapper({ children }: any) {
103103
zIndex={4}
104104
onPress={toggleColorMode}
105105
icon={colorMode === 'dark' ? <SunIcon /> : <MoonIcon />}
106+
size="lg"
106107
/>
107108
</Tooltip>
108109
{children}
@@ -126,7 +127,7 @@ export default ({ children, theme }: any) => {
126127
const colorModeManager: StorageManager = {
127128
get: async () => {
128129
try {
129-
let val = await AsyncStorage.getItem('@example-wrapper-mode');
130+
const val = await AsyncStorage.getItem('@example-wrapper-mode');
130131
return val === 'dark' ? 'dark' : 'light';
131132
} catch (e) {
132133
console.log(e);

‎example/storybook/stories/components/composites/Alert/action.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ export function Example() {
3636
</HStack>
3737
<IconButton
3838
variant="unstyled"
39+
_focus={{ borderWidth: 0 }}
3940
icon={<CloseIcon size="3" color="coolGray.600" />}
4041
onPress={() => setShow(false)}
4142
/>

‎example/storybook/stories/components/composites/Alert/basic.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export const Example = () => {
2929
</HStack>
3030
<IconButton
3131
variant="unstyled"
32+
_focus={{ borderWidth: 0 }}
3233
icon={<CloseIcon size="3" color="coolGray.600" />}
3334
/>
3435
</HStack>

‎example/storybook/stories/components/composites/Alert/colorScheme.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export function Example() {
3030
</HStack>
3131
<IconButton
3232
variant="unstyled"
33+
_focus={{ borderWidth: 0 }}
3334
icon={<CloseIcon size="3" color="coolGray.600" />}
3435
/>
3536
</HStack>

‎example/storybook/stories/components/composites/Alert/composition.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export function Example() {
3434
</HStack>
3535
<IconButton
3636
variant="unstyled"
37+
_focus={{ borderWidth: 0 }}
3738
icon={<CloseIcon size="3" color="coolGray.600" />}
3839
/>
3940
</HStack>

‎example/storybook/stories/components/composites/Alert/status.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ export function Example() {
4545
</HStack>
4646
<IconButton
4747
variant="unstyled"
48+
_focus={{ borderWidth: 0 }}
4849
icon={<CloseIcon size="3" color="coolGray.600" />}
4950
/>
5051
</HStack>

‎example/storybook/stories/components/composites/Alert/usage.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export function Example() {
2828
</HStack>
2929
<IconButton
3030
variant="unstyled"
31+
_focus={{ borderWidth: 0 }}
3132
icon={<CloseIcon size="3" color="coolGray.600" />}
3233
/>
3334
</HStack>

‎example/storybook/stories/components/composites/Avatar/AvatarBadge.tsx‎

Lines changed: 49 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
import React from 'react';
2-
import { Avatar, HStack } from 'native-base';
2+
import { Avatar, VStack } from 'native-base';
33

44
export const Example = () => {
55
return (
6-
<HStack justifyContent="center" mx={{ base: 'auto', md: '0' }} space={2}>
6+
<VStack space={2} alignItems="center">
77
<Avatar
88
bg="lightBlue.400"
99
source={{
1010
uri:
1111
'https://images.unsplash.com/photo-1603415526960-f7e0328c63b1?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1470&q=80',
1212
}}
13+
size="xs"
1314
>
1415
NB
1516
<Avatar.Badge bg="green.500" />
@@ -20,10 +21,55 @@ export const Example = () => {
2021
uri:
2122
'https://images.unsplash.com/photo-1614289371518-722f2615943d?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=687&q=80',
2223
}}
24+
size="sm"
2325
>
2426
NB
2527
<Avatar.Badge bg="green.500" />
2628
</Avatar>
27-
</HStack>
29+
<Avatar
30+
bg="amber.500"
31+
source={{
32+
uri:
33+
'https://images.unsplash.com/photo-1614289371518-722f2615943d?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=687&q=80',
34+
}}
35+
size="md"
36+
>
37+
NB
38+
<Avatar.Badge bg="green.500" />
39+
</Avatar>
40+
<Avatar
41+
bg="amber.500"
42+
source={{
43+
uri:
44+
'https://images.unsplash.com/photo-1614289371518-722f2615943d?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=687&q=80',
45+
}}
46+
size="lg"
47+
>
48+
NB
49+
<Avatar.Badge bg="green.500" />
50+
</Avatar>
51+
<Avatar
52+
bg="amber.500"
53+
source={{
54+
uri:
55+
'https://images.unsplash.com/photo-1614289371518-722f2615943d?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=687&q=80',
56+
}}
57+
size="xl"
58+
>
59+
NB
60+
<Avatar.Badge bg="green.500" />
61+
</Avatar>
62+
<Avatar
63+
bg="amber.500"
64+
source={{
65+
uri:
66+
'https://images.unsplash.com/photo-1614289371518-722f2615943d?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=687&q=80',
67+
}}
68+
size="2xl"
69+
>
70+
NB
71+
<Avatar.Badge bg="green.500" />
72+
</Avatar>
73+
</VStack>
2874
);
2975
};

‎example/storybook/stories/components/composites/Avatar/AvatarGroup.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Avatar, Center } from 'native-base';
44
export const Example = () => {
55
return (
66
<Center>
7-
<Avatar.Group size="lg" max={3}>
7+
<Avatar.Group _avatar={{ size: 'lg' }} max={3}>
88
<Avatar
99
bg="green.500"
1010
source={{

‎example/storybook/stories/components/composites/Badge/icons.tsx‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import React from 'react';
2+
import { Badge, Stack, AddIcon } from 'native-base';
3+
4+
export const Example = () => {
5+
return (
6+
<Stack direction={{ base: 'column', md: 'row' }} space={4}>
7+
<Badge colorScheme="success" endIcon={<AddIcon size="2xs" />}>
8+
SUCCESS
9+
</Badge>
10+
<Badge
11+
colorScheme="warning"
12+
variant="outline"
13+
startIcon={<AddIcon size="2xs" />}
14+
>
15+
SUCCESS
16+
</Badge>
17+
</Stack>
18+
);
19+
};

0 commit comments

Comments
 (0)