Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit eb99803

Browse files
surajahmedsurajahmed
committed
fix: merge conflict resolved
2 parents 24c8c8c + 2d42ff6 commit eb99803

80 files changed

Lines changed: 1080 additions & 296 deletions

File tree

Some content is hidden

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

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

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,47 @@ const myTheme = extendTheme({
2121
space: {
2222
mySpace: '29px',
2323
},
24+
2425
components: {
26+
Link: {
27+
sizes: {
28+
mysize: 10,
29+
},
30+
},
2531
Button: {
32+
variants: {
33+
myBtn: {
34+
padding: 10,
35+
},
36+
myNewButton: ({ myPaddingX }: { myPaddingX: number }) => {
37+
return {
38+
padding: myPaddingX,
39+
};
40+
},
41+
},
42+
sizes: {
43+
newsize: ({ mySize }: { mySize: number }) => {
44+
return {
45+
padding: mySize,
46+
};
47+
},
48+
},
49+
},
50+
51+
Checkbox: {
52+
sizes: {
53+
myBtn: {
54+
padding: 10,
55+
},
56+
myNewButton: ({ myPadding }: { myPadding: any }) => {
57+
return {
58+
padding: myPadding,
59+
};
60+
},
61+
},
62+
},
63+
64+
Box: {
2665
variants: {
2766
myBtn: {
2867
padding: 10,
@@ -75,8 +114,12 @@ function MyWrapper({ children }: any) {
75114
export function RenderTestButton() {
76115
const [state, setState] = React.useState(1);
77116
return (
78-
<Box style={{ position: 'absolute', top: 10, left: 20 }}>
79-
<Button title={state.toString()} onPress={() => setState(state + 1)} />
117+
<Box style={{ position: 'absolute', top: 10, left: 20 }} m={2} bg="red.100">
118+
<Button
119+
variant={'myNewButton'}
120+
// title={state.toString()}
121+
onPress={() => setState(state + 1)}
122+
/>
80123
</Box>
81124
);
82125
}

‎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)