Datasets:

code-philia

/

CoEdPilot-generator

like 0

Omit<BackgroundProps, 'bgColor' | 'background' | 'bg' | 'backgroundColor'>,

<mask> BorderProps, <mask> ExtraProps, <mask> OutlineProps, <mask> ShadowProps, <mask> BackgroundProps, <mask> SafeAreaProps, <mask> TransformProps, <mask> PlatformProps { <mask> /** <mask> * Renders components as Box children. Accepts a JSX.Element or an array of JSX.Element. */ </s> linear grad without uni-modules (#3713) * feat: linear gradient dynamic dependency * feat: updated type and RNExample package </s> remove <Box>hello world</Box> </s> add <Center flex={1}> <Box bg={{ linearGradient: { colors: ['lightBlue.300', 'violet.800'], start: [0, 0], end: [1, 0], }, }} p={12} rounded="lg" _text={{fontSize: 'md', fontWeight: 'bold', color: 'white'}}> This is a Box with Linear Gradient </Box> </Center> </s> remove import { LinearGradient } from 'expo-linear-gradient'; </s> add import { LinearGradient } from './LinearGradiant'; </s> remove if (!bg) { </s> add if (typeof bg !== 'string') {

https://github.com/GeekyAnts/NativeBase/commit/ec8478c68ea1e5884d16a82b32a4cc187418f88a

src/components/primitives/Box/types.ts

if (typeof bg !== 'string') {

<mask> ]); <mask> <mask> let [accessibleColors] = useAccessibleColors(); <mask> <mask> if (!bg) { <mask> return; <mask> } <mask> <mask> const [bgThemeColorVariant, bgShade] = bg.split('.'); <mask> </s> linear grad without uni-modules (#3713) * feat: linear gradient dynamic dependency * feat: updated type and RNExample package </s> remove let gradColors: any = null; </s> add </s> remove import {useColorScheme} from 'react-native'; import {Colors} from 'react-native/Libraries/NewAppScreen'; import {Box, NativeBaseProvider} from 'native-base'; </s> add import {NativeBaseProvider, Box, Center} from 'native-base'; </s> remove const isDarkMode = useColorScheme() === 'dark'; const backgroundStyle = { backgroundColor: isDarkMode ? Colors.darker : Colors.lighter, }; </s> add

https://github.com/GeekyAnts/NativeBase/commit/ec8478c68ea1e5884d16a82b32a4cc187418f88a

src/hooks/useContrastText.ts

<mask> const platformSpecificProps = usePlatformProps(componentThemeIntegratedProps); <mask> <mask> // NOTE: sperating removing props while should be translated <mask> let ignore: any = []; <mask> let gradColors: any = null; <mask> <mask> if ( <mask> platformSpecificProps.bg?.linearGradient || <mask> platformSpecificProps.background?.linearGradient || <mask> platformSpecificProps.backgroundColor?.linearGradient <mask> ) { </s> linear grad without uni-modules (#3713) * feat: linear gradient dynamic dependency * feat: updated type and RNExample package </s> remove if (!bg) { </s> add if (typeof bg !== 'string') { </s> remove ignore = ['bg', 'background', 'backgroundColor']; </s> add ignore = ['bg', 'background', 'backgroundColor', 'bgColor']; </s> remove const isDarkMode = useColorScheme() === 'dark'; const backgroundStyle = { backgroundColor: isDarkMode ? Colors.darker : Colors.lighter, }; </s> add

https://github.com/GeekyAnts/NativeBase/commit/ec8478c68ea1e5884d16a82b32a4cc187418f88a

src/hooks/useThemeProps/usePropsResolution.tsx

platformSpecificProps.bgColor?.linearGradient ||

<mask> let ignore: any = []; <mask> if ( <mask> platformSpecificProps.bg?.linearGradient || <mask> platformSpecificProps.background?.linearGradient || <mask> platformSpecificProps.backgroundColor?.linearGradient <mask> ) { <mask> let bgProp = 'bg'; <mask> if (platformSpecificProps.background?.linearGradient) { <mask> bgProp = 'background'; </s> linear grad without uni-modules (#3713) * feat: linear gradient dynamic dependency * feat: updated type and RNExample package </s> remove let gradColors: any = null; </s> add </s> remove if (!bg) { </s> add if (typeof bg !== 'string') { </s> remove ignore = ['bg', 'background', 'backgroundColor']; </s> add ignore = ['bg', 'background', 'backgroundColor', 'bgColor']; </s> remove const isDarkMode = useColorScheme() === 'dark'; const backgroundStyle = { backgroundColor: isDarkMode ? Colors.darker : Colors.lighter, }; </s> add

https://github.com/GeekyAnts/NativeBase/commit/ec8478c68ea1e5884d16a82b32a4cc187418f88a

src/hooks/useThemeProps/usePropsResolution.tsx

} else if (platformSpecificProps.bgColor?.linearGradient) { bgProp = 'bgColor';

<mask> let bgProp = 'bg'; <mask> if (platformSpecificProps.background?.linearGradient) { <mask> bgProp = 'background'; <mask> } else if (platformSpecificProps.backgroundColor?.linearGradient) { <mask> bgProp = 'backgroundColor'; <mask> } <mask> platformSpecificProps[bgProp].linearGradient.colors = platformSpecificProps[ <mask> bgProp <mask> ].linearGradient.colors.map((color: string) => { </s> linear grad without uni-modules (#3713) * feat: linear gradient dynamic dependency * feat: updated type and RNExample package </s> remove ignore = ['bg', 'background', 'backgroundColor']; </s> add ignore = ['bg', 'background', 'backgroundColor', 'bgColor']; </s> remove if (!bg) { </s> add if (typeof bg !== 'string') { </s> remove let gradColors: any = null; </s> add </s> remove import { LinearGradient } from 'expo-linear-gradient'; </s> add import { LinearGradient } from './LinearGradiant';

https://github.com/GeekyAnts/NativeBase/commit/ec8478c68ea1e5884d16a82b32a4cc187418f88a

src/hooks/useThemeProps/usePropsResolution.tsx

ignore = ['bg', 'background', 'backgroundColor', 'bgColor'];

<mask> bgProp <mask> ].linearGradient.colors.map((color: string) => { <mask> return get(theme.colors, color); <mask> }); <mask> ignore = ['bg', 'background', 'backgroundColor']; <mask> } <mask> // NOTE: seprating bg props when linearGardiant is available <mask> const [gradientProps, nonGradientProps] = extractInObject( <mask> platformSpecificProps, <mask> ignore </s> linear grad without uni-modules (#3713) * feat: linear gradient dynamic dependency * feat: updated type and RNExample package </s> remove gradientProps.colors = gradColors; </s> add </s> remove let gradColors: any = null; </s> add </s> remove if (!bg) { </s> add if (typeof bg !== 'string') { </s> remove const isDarkMode = useColorScheme() === 'dark'; const backgroundStyle = { backgroundColor: isDarkMode ? Colors.darker : Colors.lighter, }; </s> add

https://github.com/GeekyAnts/NativeBase/commit/ec8478c68ea1e5884d16a82b32a4cc187418f88a

src/hooks/useThemeProps/usePropsResolution.tsx

<mask> const [gradientProps, nonGradientProps] = extractInObject( <mask> platformSpecificProps, <mask> ignore <mask> ); <mask> gradientProps.colors = gradColors; <mask> <mask> const translatedProps = propTranslator({ <mask> props: nonGradientProps, <mask> theme: notComponentTheme, <mask> colorModeProps, </s> linear grad without uni-modules (#3713) * feat: linear gradient dynamic dependency * feat: updated type and RNExample package </s> remove ignore = ['bg', 'background', 'backgroundColor']; </s> add ignore = ['bg', 'background', 'backgroundColor', 'bgColor']; </s> remove const isDarkMode = useColorScheme() === 'dark'; const backgroundStyle = { backgroundColor: isDarkMode ? Colors.darker : Colors.lighter, }; </s> add </s> remove import {useColorScheme} from 'react-native'; import {Colors} from 'react-native/Libraries/NewAppScreen'; import {Box, NativeBaseProvider} from 'native-base'; </s> add import {NativeBaseProvider, Box, Center} from 'native-base'; </s> remove if (!bg) { </s> add if (typeof bg !== 'string') { </s> remove let gradColors: any = null; </s> add

https://github.com/GeekyAnts/NativeBase/commit/ec8478c68ea1e5884d16a82b32a4cc187418f88a

src/hooks/useThemeProps/usePropsResolution.tsx

export * from './theme/Custom'; export * from './theme/Mode'; export * from './theme/Responsive';

<mask> export * from './hooks/useContrastText'; <mask> export * from './hooks/useAccessibleColors'; <mask> <mask> // // Theme <mask> // export * from './theme/Custom'; <mask> // export * from './theme/Mode'; <mask> // export * from './theme/Responsive'; <mask> <mask> // // Community integrations <mask> // export * from './community-integrations/Formik'; <mask> // export * from './community-integrations/ReactHookForm'; <mask> </s> feat: new responsive demo example </s> remove import { Box, Text, Image, Heading, Stack } from 'native-base'; </s> add import { Box, HStack, Image, Text, Center, Stack, Heading } from 'native-base'; </s> remove <Box flexDirection={{ base: 'column', md: 'row' }} shadow={4} rounded="xl" </s> add <Stack direction={['column', 'column', 'row']} rounded="lg" </s> remove </Box> </s> add </Stack> </s> remove <Text fontSize="md" fontWeight="semibold" color="blueGray.600"> $ 150 </s> add <Text fontWeight="400"> Bengaluru (also called Bangalore) is the center of India's high-tech industry. The city is also known for its parks and nightlife.

https://github.com/GeekyAnts/NativeBase/commit/ece91003b16a24fc1b86fef966b6f06f226de909

example/storybook/stories/index.ts

import { Box, HStack, Image, Text, Center, Stack, Heading } from 'native-base';

<mask> import React from 'react'; <mask> import { Box, Text, Image, Heading, Stack } from 'native-base'; <mask> export const Example = () => { <mask> return ( <mask> <Box <mask> flexDirection={{ base: 'column', md: 'row' }} <mask> shadow={4} </s> feat: new responsive demo example </s> remove <Box flexDirection={{ base: 'column', md: 'row' }} shadow={4} rounded="xl" </s> add <Stack direction={['column', 'column', 'row']} rounded="lg" </s> remove // export * from './theme/Custom'; // export * from './theme/Mode'; // export * from './theme/Responsive'; </s> add export * from './theme/Custom'; export * from './theme/Mode'; export * from './theme/Responsive'; </s> remove <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}> </s> add <Box> </s> remove 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg', </s> add 'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',

https://github.com/GeekyAnts/NativeBase/commit/ece91003b16a24fc1b86fef966b6f06f226de909

example/storybook/stories/theme/Responsive/Demo.tsx

<Stack direction={['column', 'column', 'row']} rounded="lg"

<mask> import React from 'react'; <mask> import { Box, Text, Image, Heading, Stack } from 'native-base'; <mask> export const Example = () => { <mask> return ( <mask> <Box <mask> flexDirection={{ base: 'column', md: 'row' }} <mask> shadow={4} <mask> rounded="xl" <mask> overflow="hidden" <mask> > <mask> <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}> <mask> <Image <mask> source={{ </s> feat: new responsive demo example </s> remove import { Box, Text, Image, Heading, Stack } from 'native-base'; </s> add import { Box, HStack, Image, Text, Center, Stack, Heading } from 'native-base'; </s> remove <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}> </s> add <Box> </s> remove 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg', </s> add 'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg', </s> remove // export * from './theme/Custom'; // export * from './theme/Mode'; // export * from './theme/Responsive'; </s> add export * from './theme/Custom'; export * from './theme/Mode'; export * from './theme/Responsive';

https://github.com/GeekyAnts/NativeBase/commit/ece91003b16a24fc1b86fef966b6f06f226de909

example/storybook/stories/theme/Responsive/Demo.tsx

width={['72', '72', '4/6']} shadow={1} _light={{ backgroundColor: 'gray.50' }} _dark={{ backgroundColor: 'gray.700' }}

<mask> direction={['column', 'column', 'row']} <mask> rounded="lg" <mask> overflow="hidden" <mask> > <mask> <Box> <mask> <Image <mask> w={['100%', '100%', '40']} <mask> h="40" <mask> source={{ </s> feat: new responsive demo example </s> remove <Box flexDirection={{ base: 'column', md: 'row' }} shadow={4} rounded="xl" </s> add <Stack direction={['column', 'column', 'row']} rounded="lg" </s> remove <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}> </s> add <Box> </s> remove import { Box, Text, Image, Heading, Stack } from 'native-base'; </s> add import { Box, HStack, Image, Text, Center, Stack, Heading } from 'native-base'; </s> remove 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg', </s> add 'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',

https://github.com/GeekyAnts/NativeBase/commit/ece91003b16a24fc1b86fef966b6f06f226de909

example/storybook/stories/theme/Responsive/Demo.tsx

<Box>

<mask> shadow={4} <mask> rounded="xl" <mask> overflow="hidden" <mask> > <mask> <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}> <mask> <Image <mask> source={{ <mask> uri: <mask> 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg', <mask> }} </s> feat: new responsive demo example </s> remove 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg', </s> add 'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg', </s> remove <Box flexDirection={{ base: 'column', md: 'row' }} shadow={4} rounded="xl" </s> add <Stack direction={['column', 'column', 'row']} rounded="lg" </s> remove import { Box, Text, Image, Heading, Stack } from 'native-base'; </s> add import { Box, HStack, Image, Text, Center, Stack, Heading } from 'native-base'; </s> remove alt="Shoes" </s> add alt="image"

https://github.com/GeekyAnts/NativeBase/commit/ece91003b16a24fc1b86fef966b6f06f226de909

example/storybook/stories/theme/Responsive/Demo.tsx

w={['100%', '100%', '40']} h="40"

<mask> _dark={{ backgroundColor: 'gray.700' }} <mask> > <mask> <Box> <mask> <Image <mask> source={{ <mask> uri: <mask> 'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg', <mask> }} <mask> alt="image" </s> feat: new responsive demo example </s> remove <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}> </s> add <Box> </s> remove 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg', </s> add 'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg', </s> remove alt="Shoes" </s> add alt="image"

https://github.com/GeekyAnts/NativeBase/commit/ece91003b16a24fc1b86fef966b6f06f226de909

example/storybook/stories/theme/Responsive/Demo.tsx

'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',

<mask> <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}> <mask> <Image <mask> source={{ <mask> uri: <mask> 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg', <mask> }} <mask> alt="Shoes" <mask> /> <mask> </Box> <mask> <Stack p={3} space={2} minW={32}> </s> feat: new responsive demo example </s> remove <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}> </s> add <Box> </s> remove <Box flexDirection={{ base: 'column', md: 'row' }} shadow={4} rounded="xl" </s> add <Stack direction={['column', 'column', 'row']} rounded="lg" </s> remove alt="Shoes" </s> add alt="image" </s> remove <Stack p={3} space={2} minW={32}> <Text fontSize="xs" color="red.400" fontWeight="semibold"> Just In </Text> <Stack space={1}> <Heading size="sm">Jordan MA2</Heading> <Text fontWeight="medium" color="blueGray.600"> Older Kids' Shoe </Text> <Text fontWeight="medium" color="blueGray.600"> 2 colors </s> add <Stack flex="1" p="4" space={[3, 3, 1.5]}> <Stack space={2}> <Heading size="md" ml="-1"> The Garden City </Heading> <Text fontSize="xs" _light={{ color: 'violet.500' }} _dark={{ color: 'violet.300' }} fontWeight="500" ml="-0.5" mt="-1" > The Silicon Valley of India. </s> remove import { Box, Text, Image, Heading, Stack } from 'native-base'; </s> add import { Box, HStack, Image, Text, Center, Stack, Heading } from 'native-base';

https://github.com/GeekyAnts/NativeBase/commit/ece91003b16a24fc1b86fef966b6f06f226de909

example/storybook/stories/theme/Responsive/Demo.tsx

alt="image"

<mask> source={{ <mask> uri: <mask> 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg', <mask> }} <mask> alt="Shoes" <mask> /> <mask> </Box> <mask> <Stack p={3} space={2} minW={32}> <mask> <Text fontSize="xs" color="red.400" fontWeight="semibold"> <mask> Just In </s> feat: new responsive demo example </s> remove <Stack p={3} space={2} minW={32}> <Text fontSize="xs" color="red.400" fontWeight="semibold"> Just In </Text> <Stack space={1}> <Heading size="sm">Jordan MA2</Heading> <Text fontWeight="medium" color="blueGray.600"> Older Kids' Shoe </Text> <Text fontWeight="medium" color="blueGray.600"> 2 colors </s> add <Stack flex="1" p="4" space={[3, 3, 1.5]}> <Stack space={2}> <Heading size="md" ml="-1"> The Garden City </Heading> <Text fontSize="xs" _light={{ color: 'violet.500' }} _dark={{ color: 'violet.300' }} fontWeight="500" ml="-0.5" mt="-1" > The Silicon Valley of India. </s> remove 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg', </s> add 'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg', </s> remove <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}> </s> add <Box>

https://github.com/GeekyAnts/NativeBase/commit/ece91003b16a24fc1b86fef966b6f06f226de909

example/storybook/stories/theme/Responsive/Demo.tsx

<Center bg="violet.500" _text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }} position="absolute" bottom={0} px="3" py="1.5" > PHOTOS </Center>

<mask> 'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg', <mask> }} <mask> alt="image" <mask> /> <mask> </Box> <mask> <Stack flex="1" p="4" space={[3, 3, 1.5]}> <mask> <Stack space={2}> <mask> <Heading size="md" ml="-1"> </s> feat: new responsive demo example </s> remove <Stack p={3} space={2} minW={32}> <Text fontSize="xs" color="red.400" fontWeight="semibold"> Just In </Text> <Stack space={1}> <Heading size="sm">Jordan MA2</Heading> <Text fontWeight="medium" color="blueGray.600"> Older Kids' Shoe </Text> <Text fontWeight="medium" color="blueGray.600"> 2 colors </s> add <Stack flex="1" p="4" space={[3, 3, 1.5]}> <Stack space={2}> <Heading size="md" ml="-1"> The Garden City </Heading> <Text fontSize="xs" _light={{ color: 'violet.500' }} _dark={{ color: 'violet.300' }} fontWeight="500" ml="-0.5" mt="-1" > The Silicon Valley of India. </s> remove alt="Shoes" </s> add alt="image" </s> remove 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg', </s> add 'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg', </s> remove <Box flexDirection={{ base: 'column', md: 'row' }} shadow={4} rounded="xl" </s> add <Stack direction={['column', 'column', 'row']} rounded="lg"

https://github.com/GeekyAnts/NativeBase/commit/ece91003b16a24fc1b86fef966b6f06f226de909

example/storybook/stories/theme/Responsive/Demo.tsx

<Stack flex="1" p="4" space={[3, 3, 1.5]}> <Stack space={2}> <Heading size="md" ml="-1"> The Garden City </Heading> <Text fontSize="xs" _light={{ color: 'violet.500' }} _dark={{ color: 'violet.300' }} fontWeight="500" ml="-0.5" mt="-1" > The Silicon Valley of India.

<mask> }} <mask> alt="Shoes" <mask> /> <mask> </Box> <mask> <Stack p={3} space={2} minW={32}> <mask> <Text fontSize="xs" color="red.400" fontWeight="semibold"> <mask> Just In <mask> </Text> <mask> <Stack space={1}> <mask> <Heading size="sm">Jordan MA2</Heading> <mask> <Text fontWeight="medium" color="blueGray.600"> <mask> Older Kids' Shoe <mask> </Text> <mask> <Text fontWeight="medium" color="blueGray.600"> <mask> 2 colors <mask> </Text> <mask> </Stack> <mask> <Text fontSize="md" fontWeight="semibold" color="blueGray.600"> <mask> $ 150 <mask> </Text> </s> feat: new responsive demo example </s> remove <Text fontSize="md" fontWeight="semibold" color="blueGray.600"> $ 150 </s> add <Text fontWeight="400"> Bengaluru (also called Bangalore) is the center of India's high-tech industry. The city is also known for its parks and nightlife. </s> remove alt="Shoes" </s> add alt="image" </s> remove </Box> </s> add </Stack> </s> remove 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg', </s> add 'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',

https://github.com/GeekyAnts/NativeBase/commit/ece91003b16a24fc1b86fef966b6f06f226de909

example/storybook/stories/theme/Responsive/Demo.tsx

<Text fontWeight="400"> Bengaluru (also called Bangalore) is the center of India's high-tech industry. The city is also known for its parks and nightlife.

<mask> <Text fontWeight="medium" color="blueGray.600"> <mask> 2 colors <mask> </Text> <mask> </Stack> <mask> <Text fontSize="md" fontWeight="semibold" color="blueGray.600"> <mask> $ 150 <mask> </Text> <mask> </Stack> <mask> </Box> <mask> ); <mask> }; </s> feat: new responsive demo example </s> remove </Box> </s> add </Stack> </s> remove <Stack p={3} space={2} minW={32}> <Text fontSize="xs" color="red.400" fontWeight="semibold"> Just In </Text> <Stack space={1}> <Heading size="sm">Jordan MA2</Heading> <Text fontWeight="medium" color="blueGray.600"> Older Kids' Shoe </Text> <Text fontWeight="medium" color="blueGray.600"> 2 colors </s> add <Stack flex="1" p="4" space={[3, 3, 1.5]}> <Stack space={2}> <Heading size="md" ml="-1"> The Garden City </Heading> <Text fontSize="xs" _light={{ color: 'violet.500' }} _dark={{ color: 'violet.300' }} fontWeight="500" ml="-0.5" mt="-1" > The Silicon Valley of India. </s> remove alt="Shoes" </s> add alt="image" </s> remove 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg', </s> add 'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',

https://github.com/GeekyAnts/NativeBase/commit/ece91003b16a24fc1b86fef966b6f06f226de909

example/storybook/stories/theme/Responsive/Demo.tsx

<HStack alignItems="center" space={4} justifyContent="space-between"> <HStack alignItems="center"> <Text color="gray.500" fontWeight="400"> 6 mins ago </Text> </HStack> </HStack>

<mask> Bengaluru (also called Bangalore) is the center of India's high-tech <mask> industry. The city is also known for its parks and nightlife. <mask> </Text> <mask> </Stack> <mask> </Stack> <mask> ); <mask> }; </s> feat: new responsive demo example </s> remove <Text fontSize="md" fontWeight="semibold" color="blueGray.600"> $ 150 </s> add <Text fontWeight="400"> Bengaluru (also called Bangalore) is the center of India's high-tech industry. The city is also known for its parks and nightlife. </s> remove </Box> </s> add </Stack> </s> remove <Stack p={3} space={2} minW={32}> <Text fontSize="xs" color="red.400" fontWeight="semibold"> Just In </Text> <Stack space={1}> <Heading size="sm">Jordan MA2</Heading> <Text fontWeight="medium" color="blueGray.600"> Older Kids' Shoe </Text> <Text fontWeight="medium" color="blueGray.600"> 2 colors </s> add <Stack flex="1" p="4" space={[3, 3, 1.5]}> <Stack space={2}> <Heading size="md" ml="-1"> The Garden City </Heading> <Text fontSize="xs" _light={{ color: 'violet.500' }} _dark={{ color: 'violet.300' }} fontWeight="500" ml="-0.5" mt="-1" > The Silicon Valley of India. </s> remove alt="Shoes" </s> add alt="image"

https://github.com/GeekyAnts/NativeBase/commit/ece91003b16a24fc1b86fef966b6f06f226de909

example/storybook/stories/theme/Responsive/Demo.tsx

</Stack>

<mask> <Text fontSize="md" fontWeight="semibold" color="blueGray.600"> <mask> $ 150 <mask> </Text> <mask> </Stack> <mask> </Box> <mask> ); <mask> }; </s> feat: new responsive demo example </s> remove <Text fontSize="md" fontWeight="semibold" color="blueGray.600"> $ 150 </s> add <Text fontWeight="400"> Bengaluru (also called Bangalore) is the center of India's high-tech industry. The city is also known for its parks and nightlife. </s> remove <Stack p={3} space={2} minW={32}> <Text fontSize="xs" color="red.400" fontWeight="semibold"> Just In </Text> <Stack space={1}> <Heading size="sm">Jordan MA2</Heading> <Text fontWeight="medium" color="blueGray.600"> Older Kids' Shoe </Text> <Text fontWeight="medium" color="blueGray.600"> 2 colors </s> add <Stack flex="1" p="4" space={[3, 3, 1.5]}> <Stack space={2}> <Heading size="md" ml="-1"> The Garden City </Heading> <Text fontSize="xs" _light={{ color: 'violet.500' }} _dark={{ color: 'violet.300' }} fontWeight="500" ml="-0.5" mt="-1" > The Silicon Valley of India. </s> remove alt="Shoes" </s> add alt="image" </s> remove 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg', </s> add 'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',

https://github.com/GeekyAnts/NativeBase/commit/ece91003b16a24fc1b86fef966b6f06f226de909

example/storybook/stories/theme/Responsive/Demo.tsx

<Accordion.Item> <Accordion.Summary>

<mask> export default function () { <mask> return ( <mask> <Box m={3}> <mask> <Accordion allowMultiple defaultIndex={[1]}> <mask> <Accordion.AccordionItem> <mask> <Accordion.AccordionSummary> <mask> <Box textAlign="left">Section 1 title</Box> <mask> <Accordion.AccordionIcon /> <mask> </Accordion.AccordionSummary> <mask> <Accordion.AccordionDetails> <mask> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do </s> fix: simlified sub components name </s> remove <Accordion.AccordionItem> <Accordion.AccordionSummary _expanded={{ backgroundColor: 'orange.300' }} > </s> add <Accordion.Item> <Accordion.Summary _expanded={{ backgroundColor: 'orange.300' }}> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary>

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

example/storybook/stories/components/composites/Accordion/AccessingInternalState.tsx

<Accordion.Icon /> </Accordion.Summary> <Accordion.Details>

<mask> <Accordion allowMultiple defaultIndex={[1]}> <mask> <Accordion.AccordionItem> <mask> <Accordion.AccordionSummary> <mask> <Box textAlign="left">Section 1 title</Box> <mask> <Accordion.AccordionIcon /> <mask> </Accordion.AccordionSummary> <mask> <Accordion.AccordionDetails> <mask> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do <mask> eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim <mask> ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut <mask> aliquip ex ea commodo consequat. <mask> </Accordion.AccordionDetails> </s> fix: simlified sub components name </s> remove <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add <Accordion.Item> <Accordion.Summary> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details>

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

example/storybook/stories/components/composites/Accordion/AccessingInternalState.tsx

<Accordion.Item> <Accordion.Summary _expanded={{ backgroundColor: 'orange.300' }}>

<mask> export default function () { <mask> return ( <mask> <Box m={3}> <mask> <Accordion allowMultiple> <mask> <Accordion.AccordionItem> <mask> <Accordion.AccordionSummary <mask> _expanded={{ backgroundColor: 'orange.300' }} <mask> > <mask> <Box>Click me to see a different style</Box> <mask> <Accordion.AccordionIcon /> <mask> </Accordion.AccordionSummary> <mask> <Accordion.AccordionDetails> <mask> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do </s> fix: simlified sub components name </s> remove <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add <Accordion.Item> <Accordion.Summary> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details>

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

example/storybook/stories/components/composites/Accordion/ExpandedStyle.tsx

<Accordion.Icon /> </Accordion.Summary> <Accordion.Details>

<mask> <Accordion allowToggle defaultIndex={[2]}> <mask> <Accordion.AccordionItem> <mask> <Accordion.AccordionSummary> <mask> <Box>Section 1 title</Box> <mask> <Accordion.AccordionIcon /> <mask> </Accordion.AccordionSummary> <mask> <Accordion.AccordionDetails> <mask> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do <mask> eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim <mask> ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut <mask> aliquip ex ea commodo consequat. <mask> </Accordion.AccordionDetails> </s> fix: simlified sub components name </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details>

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

example/storybook/stories/components/composites/Accordion/Toggle.tsx

</Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary>

<mask> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do <mask> eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim <mask> ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut <mask> aliquip ex ea commodo consequat. <mask> </Accordion.AccordionDetails> <mask> </Accordion.AccordionItem> <mask> <Accordion.AccordionItem> <mask> <Accordion.AccordionSummary> <mask> <Box>Section 2 title</Box> <mask> <Accordion.AccordionIcon /> <mask> </Accordion.AccordionSummary> <mask> <Accordion.AccordionDetails> <mask> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do </s> fix: simlified sub components name </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> </s> add </Accordion.Details> </Accordion.Item> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details>

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

example/storybook/stories/components/composites/Accordion/Toggle.tsx

<Accordion.Icon /> </Accordion.Summary> <Accordion.Details>

<mask> </Accordion.AccordionItem> <mask> <Accordion.AccordionItem> <mask> <Accordion.AccordionSummary> <mask> <Box>Section 2 title</Box> <mask> <Accordion.AccordionIcon /> <mask> </Accordion.AccordionSummary> <mask> <Accordion.AccordionDetails> <mask> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do <mask> eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim <mask> ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut <mask> aliquip ex ea commodo consequat. <mask> </Accordion.AccordionDetails> </s> fix: simlified sub components name </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> </s> add </Accordion.Details> </Accordion.Item> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details>

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

example/storybook/stories/components/composites/Accordion/Toggle.tsx

</Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary>

<mask> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do <mask> eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim <mask> ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut <mask> aliquip ex ea commodo consequat. <mask> </Accordion.AccordionDetails> <mask> </Accordion.AccordionItem> <mask> <Accordion.AccordionItem> <mask> <Accordion.AccordionSummary> <mask> <Box>Section 3 title</Box> <mask> <Accordion.AccordionIcon /> <mask> </Accordion.AccordionSummary> <mask> <Accordion.AccordionDetails> <mask> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do </s> fix: simlified sub components name </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> </s> add </Accordion.Details> </Accordion.Item> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details>

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

example/storybook/stories/components/composites/Accordion/Toggle.tsx

<Accordion.Icon /> </Accordion.Summary> <Accordion.Details>

<mask> </Accordion.AccordionItem> <mask> <Accordion.AccordionItem> <mask> <Accordion.AccordionSummary> <mask> <Box>Section 3 title</Box> <mask> <Accordion.AccordionIcon /> <mask> </Accordion.AccordionSummary> <mask> <Accordion.AccordionDetails> <mask> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do <mask> eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim <mask> ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut <mask> aliquip ex ea commodo consequat. <mask> </Accordion.AccordionDetails> </s> fix: simlified sub components name </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> </s> add </Accordion.Details> </Accordion.Item> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details>

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

example/storybook/stories/components/composites/Accordion/Toggle.tsx

</Accordion.Details> </Accordion.Item>

<mask> Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do <mask> eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim <mask> ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut <mask> aliquip ex ea commodo consequat. <mask> </Accordion.AccordionDetails> <mask> </Accordion.AccordionItem> <mask> </Accordion> <mask> </Box> <mask> ); <mask> } </s> fix: simlified sub components name </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add </Accordion.Details> </Accordion.Item> <Accordion.Item> <Accordion.Summary> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details> </s> remove <Accordion.AccordionIcon /> </Accordion.AccordionSummary> <Accordion.AccordionDetails> </s> add <Accordion.Icon /> </Accordion.Summary> <Accordion.Details>

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

example/storybook/stories/components/composites/Accordion/Toggle.tsx

Accordion.Item = AccordionItem; Accordion.Summary = AccordionSummary; Accordion.Details = AccordionDetails; Accordion.Icon = AccordionIcon;

<mask> </AccordionContext.Provider> <mask> ); <mask> }; <mask> <mask> Accordion.AccordionItem = AccordionItem; <mask> Accordion.AccordionSummary = AccordionSummary; <mask> Accordion.AccordionDetails = AccordionDetails; <mask> Accordion.AccordionIcon = AccordionIcon; <mask> <mask> export default Accordion; </s> fix: simlified sub components name </s> remove <Accordion.AccordionItem> <Accordion.AccordionSummary> </s> add <Accordion.Item> <Accordion.Summary> </s> remove </Accordion.AccordionDetails> </Accordion.AccordionItem> </s> add </Accordion.Details> </Accordion.Item> </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove <Accordion.AccordionItem> <Accordion.AccordionSummary _expanded={{ backgroundColor: 'orange.300' }} > </s> add <Accordion.Item> <Accordion.Summary _expanded={{ backgroundColor: 'orange.300' }}>

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

src/components/composites/Accordion/Accordion.tsx

<mask> import type { IBoxProps, IIconProps } from '../../primitives'; <mask> import type { ITextProps } from '../../primitives/Text/types'; <mask> <mask> export type IAccordionProps = IBoxProps & { <mask> allowMultiple?: boolean; <mask> allowToggle?: boolean; <mask> index?: number[]; </s> fix: simlified sub components name </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

src/components/composites/Accordion/types.ts

<mask> allowToggle?: boolean; <mask> index?: number[]; <mask> defaultIndex?: number[]; <mask> onChange?: (index?: number[]) => void; <mask> _text?: ITextProps; <mask> }; <mask> export type IAccordionItemProps = IBoxProps & { <mask> index?: number; <mask> defaultIsOpen?: boolean; <mask> isDisabled?: boolean; </s> fix: simlified sub components name </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove import type { ITextProps } from '../../primitives/Text/types'; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

src/components/composites/Accordion/types.ts

<mask> index?: number; <mask> defaultIsOpen?: boolean; <mask> isDisabled?: boolean; <mask> id?: number; <mask> _text?: ITextProps; <mask> }; <mask> export type IAccordionSummaryProps = IBoxProps & { <mask> style?: any; <mask> _expanded?: any; <mask> _disabled?: any; </s> fix: simlified sub components name </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

src/components/composites/Accordion/types.ts

<mask> style?: any; <mask> _expanded?: any; <mask> _disabled?: any; <mask> _hover?: any; <mask> _text?: ITextProps; <mask> }; <mask> export type IAccordionDetailsProps = IBoxProps & {}; <mask> export type IAccordionContextProps = { <mask> index?: number[]; <mask> changeHandler?: (isOpening: boolean, id: number) => void; </s> fix: simlified sub components name </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

src/components/composites/Accordion/types.ts

<mask> export type IAccordionDetailsProps = IBoxProps & {}; <mask> export type IAccordionContextProps = { <mask> index?: number[]; <mask> changeHandler?: (isOpening: boolean, id: number) => void; <mask> _text?: ITextProps; <mask> }; <mask> export type IAccordionItemContextProps = { <mask> index?: number; <mask> isOpen?: boolean; <mask> isDisabled?: boolean; </s> fix: simlified sub components name </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove import type { ITextProps } from '../../primitives/Text/types'; </s> add

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

src/components/composites/Accordion/types.ts

<mask> isOpen?: boolean; <mask> isDisabled?: boolean; <mask> onClose?: () => void; <mask> onOpen?: () => void; <mask> _text?: ITextProps; <mask> }; <mask> export type IAccordionIconProps = IIconProps & { <mask> style?: any; <mask> _text?: ITextProps; <mask> }; </s> fix: simlified sub components name </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

src/components/composites/Accordion/types.ts

<mask> _text?: ITextProps; <mask> }; <mask> export type IAccordionIconProps = IIconProps & { <mask> style?: any; <mask> _text?: ITextProps; <mask> }; </s> fix: simlified sub components name </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add </s> remove _text?: ITextProps; </s> add

https://github.com/GeekyAnts/NativeBase/commit/ed7b5774763adc03a1f7b982b2b278eaf928a469

src/components/composites/Accordion/types.ts

<mask> import React from 'react'; <mask> import { Checkbox, CheckboxGroup, Text } from 'native-base'; <mask> import type { ICheckboxValue } from 'src/components/primitives/Checkbox/props'; <mask> <mask> export default function ControlledCheckbox() { <mask> const [groupValues, setGroupValues] = React.useState<Array<ICheckboxValue>>( <mask> [] <mask> ); </s> fix: changed hooks to react stately </s> remove const [groupValues, setGroupValues] = React.useState<Array<ICheckboxValue>>( [] ); </s> add const [groupValues, setGroupValues] = React.useState<Array<string>>([]); </s> remove import React from 'react'; </s> add import React, { useContext } from 'react'; </s> remove export type ICheckboxValue = string | number; </s> add export type ICheckboxValue = string; </s> remove import { useCheckboxGroup } from './useCheckboxGroup'; </s> add import { useCheckboxGroupState } from '@react-stately/checkbox'; // import type { ICheckboxContext } from './props'; import { useCheckboxGroup } from '@react-aria/checkbox'; // import { useCheckboxGroup } from './useCheckboxGroup'; </s> remove import type { ICheckboxContext, ICheckboxProps } from './props'; import { useCheckbox } from './useCheckbox'; </s> add import type { ICheckboxProps } from './props'; import { AriaInputWrapper, useFocusRing } from 'react-native-aria'; import { useCheckbox, useCheckboxGroupItem } from '@react-aria/checkbox'; import { useToggleState } from '@react-stately/toggle'; import mergeRefs from '../../../utils/mergeRefs';

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

example/storybook/stories/components/primitives/Checkbox/controlledCheckbox.tsx

const [groupValues, setGroupValues] = React.useState<Array<string>>([]);

<mask> import { Checkbox, CheckboxGroup, Text } from 'native-base'; <mask> import type { ICheckboxValue } from 'src/components/primitives/Checkbox/props'; <mask> <mask> export default function ControlledCheckbox() { <mask> const [groupValues, setGroupValues] = React.useState<Array<ICheckboxValue>>( <mask> [] <mask> ); <mask> <mask> return ( <mask> <CheckboxGroup onChange={setGroupValues} value={groupValues}> <mask> <Checkbox value="one"> <mask> <Text>One</Text> </s> fix: changed hooks to react stately </s> remove import type { ICheckboxValue } from 'src/components/primitives/Checkbox/props'; </s> add </s> remove export type ICheckboxValue = string | number; </s> add export type ICheckboxValue = string; </s> remove import { useCheckboxGroup } from './useCheckboxGroup'; </s> add import { useCheckboxGroupState } from '@react-stately/checkbox'; // import type { ICheckboxContext } from './props'; import { useCheckboxGroup } from '@react-aria/checkbox'; // import { useCheckboxGroup } from './useCheckboxGroup'; </s> remove import type { ICheckboxContext, ICheckboxProps } from './props'; import { useCheckbox } from './useCheckbox'; </s> add import type { ICheckboxProps } from './props'; import { AriaInputWrapper, useFocusRing } from 'react-native-aria'; import { useCheckbox, useCheckboxGroupItem } from '@react-aria/checkbox'; import { useToggleState } from '@react-stately/toggle'; import mergeRefs from '../../../utils/mergeRefs'; </s> remove export const CheckboxContext = React.createContext({}); </s> add export const CheckboxContext = React.createContext<any>(null);

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

example/storybook/stories/components/primitives/Checkbox/controlledCheckbox.tsx

"@react-aria/checkbox": "^3.2.1", "@react-aria/focus": "^3.2.3", "@react-stately/checkbox": "^3.0.1", "@react-stately/toggle": "^3.2.1",

<mask> ] <mask> }, <mask> "dependencies": { <mask> "babel-eslint": "^10.1.0", <mask> "deepmerge": "^4.2.2", <mask> "expo-constants": "^9.3.5", <mask> "expo-font": "^8.3.0", <mask> "hoist-non-react-statics": "^3.3.2", </s> fix: changed hooks to react stately </s> remove const { inputProps } = useCheckbox(props, checkboxGroupContext, null); </s> add let state = useToggleState(props); let groupState = useContext(checkboxGroupContext); let { inputProps } = groupState ? useCheckboxGroupItem( { ...props, value: props.value, }, groupState, mergeRefs([ref, ref1]) ) : useCheckbox(props, state, mergeRefs([ref, ref1])); let { isFocusVisible, focusProps } = useFocusRing(); </s> remove import React from 'react'; </s> add import React, { useContext } from 'react'; </s> remove import type { ICheckboxContext, ICheckboxProps } from './props'; import { useCheckbox } from './useCheckbox'; </s> add import type { ICheckboxProps } from './props'; import { AriaInputWrapper, useFocusRing } from 'react-native-aria'; import { useCheckbox, useCheckboxGroupItem } from '@react-aria/checkbox'; import { useToggleState } from '@react-stately/toggle'; import mergeRefs from '../../../utils/mergeRefs'; </s> remove import { useCheckboxGroup } from './useCheckboxGroup'; </s> add import { useCheckboxGroupState } from '@react-stately/checkbox'; // import type { ICheckboxContext } from './props'; import { useCheckboxGroup } from '@react-aria/checkbox'; // import { useCheckboxGroup } from './useCheckboxGroup';

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

package.json

import React, { useContext } from 'react';

<mask> import React from 'react'; <mask> import { TouchableOpacity, Platform } from 'react-native'; <mask> import { Hoverable } from './../../../utils'; <mask> import { useThemeProps } from '../../../hooks'; <mask> import { Center } from '../../composites/Center'; <mask> import { </s> fix: changed hooks to react stately </s> remove import type { ICheckboxValue } from 'src/components/primitives/Checkbox/props'; </s> add </s> remove import { useCheckboxGroup } from './useCheckboxGroup'; </s> add import { useCheckboxGroupState } from '@react-stately/checkbox'; // import type { ICheckboxContext } from './props'; import { useCheckboxGroup } from '@react-aria/checkbox'; // import { useCheckboxGroup } from './useCheckboxGroup'; </s> remove import type { ICheckboxContext, ICheckboxProps } from './props'; import { useCheckbox } from './useCheckbox'; </s> add import type { ICheckboxProps } from './props'; import { AriaInputWrapper, useFocusRing } from 'react-native-aria'; import { useCheckbox, useCheckboxGroupItem } from '@react-aria/checkbox'; import { useToggleState } from '@react-stately/toggle'; import mergeRefs from '../../../utils/mergeRefs'; </s> remove export type ICheckboxValue = string | number; </s> add export type ICheckboxValue = string;

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/Checkbox.tsx

import type { ICheckboxProps } from './props'; import { AriaInputWrapper, useFocusRing } from 'react-native-aria'; import { useCheckbox, useCheckboxGroupItem } from '@react-aria/checkbox'; import { useToggleState } from '@react-stately/toggle'; import mergeRefs from '../../../utils/mergeRefs';

<mask> } from '../../composites/FormControl'; <mask> import Box from '../Box'; <mask> import Icon from '../Icon'; <mask> import { CheckboxContext } from './CheckboxGroup'; <mask> import type { ICheckboxContext, ICheckboxProps } from './props'; <mask> import { useCheckbox } from './useCheckbox'; <mask> <mask> const Checkbox = ({ icon, ...props }: ICheckboxProps, ref: any) => { <mask> const formControlContext: IFormControlContext = React.useContext( <mask> FormControlContext <mask> ); </s> fix: changed hooks to react stately </s> remove import { useCheckboxGroup } from './useCheckboxGroup'; </s> add import { useCheckboxGroupState } from '@react-stately/checkbox'; // import type { ICheckboxContext } from './props'; import { useCheckboxGroup } from '@react-aria/checkbox'; // import { useCheckboxGroup } from './useCheckboxGroup'; </s> remove export const CheckboxContext = React.createContext({}); </s> add export const CheckboxContext = React.createContext<any>(null); </s> remove export type ICheckboxValue = string | number; </s> add export type ICheckboxValue = string; </s> remove import React from 'react'; </s> add import React, { useContext } from 'react'; </s> remove import type { ICheckboxValue } from 'src/components/primitives/Checkbox/props'; </s> add

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/Checkbox.tsx

const checkboxGroupContext: any = React.useContext(CheckboxContext);

<mask> const formControlContext: IFormControlContext = React.useContext( <mask> FormControlContext <mask> ); <mask> <mask> const checkboxGroupContext: ICheckboxContext = React.useContext( <mask> CheckboxContext <mask> ); <mask> const { <mask> activeColor, <mask> borderColor, <mask> iconColor, <mask> size, </s> fix: changed hooks to react stately </s> remove const { checkboxGroupProps } = useCheckboxGroup(props, null, null); const { onChange, values, ...restCheckboxGroupProps } = checkboxGroupProps; </s> add let state = useCheckboxGroupState(props); let { groupProps } = useCheckboxGroup(props, state); </s> remove import type { ICheckboxContext, ICheckboxProps } from './props'; import { useCheckbox } from './useCheckbox'; </s> add import type { ICheckboxProps } from './props'; import { AriaInputWrapper, useFocusRing } from 'react-native-aria'; import { useCheckbox, useCheckboxGroupItem } from '@react-aria/checkbox'; import { useToggleState } from '@react-stately/toggle'; import mergeRefs from '../../../utils/mergeRefs'; </s> remove export const CheckboxContext = React.createContext({}); </s> add export const CheckboxContext = React.createContext<any>(null); </s> remove import { useCheckboxGroup } from './useCheckboxGroup'; </s> add import { useCheckboxGroupState } from '@react-stately/checkbox'; // import type { ICheckboxContext } from './props'; import { useCheckboxGroup } from '@react-aria/checkbox'; // import { useCheckboxGroup } from './useCheckboxGroup'; </s> remove <CheckboxContext.Provider value={{ ...formControlContext, size, colorScheme, onChange, value: values, }} > <Box alignItems="flex-start" {...restCheckboxGroupProps} {...props}> {children} </Box> </CheckboxContext.Provider> </s> add <div {...groupProps}> <CheckboxContext.Provider value={{ ...formControlContext, size, colorScheme, state, name, }} > <Box alignItems="flex-start" accessibilityRole="checkbox" {...props}> {children} </Box> </CheckboxContext.Provider> </div>

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/Checkbox.tsx

let ref1 = React.useRef();

<mask> ...formControlContext, <mask> ...props, <mask> }); <mask> <mask> let state = useToggleState(props); <mask> let groupState = useContext(checkboxGroupContext); <mask> let { inputProps } = groupState </s> fix: changed hooks to react stately </s> remove const { inputProps } = useCheckbox(props, checkboxGroupContext, null); </s> add let state = useToggleState(props); let groupState = useContext(checkboxGroupContext); let { inputProps } = groupState ? useCheckboxGroupItem( { ...props, value: props.value, }, groupState, mergeRefs([ref, ref1]) ) : useCheckbox(props, state, mergeRefs([ref, ref1])); let { isFocusVisible, focusProps } = useFocusRing(); </s> remove const { checkboxGroupProps } = useCheckboxGroup(props, null, null); const { onChange, values, ...restCheckboxGroupProps } = checkboxGroupProps; </s> add let state = useCheckboxGroupState(props); let { groupProps } = useCheckboxGroup(props, state); </s> remove <CheckboxContext.Provider value={{ ...formControlContext, size, colorScheme, onChange, value: values, }} > <Box alignItems="flex-start" {...restCheckboxGroupProps} {...props}> {children} </Box> </CheckboxContext.Provider> </s> add <div {...groupProps}> <CheckboxContext.Provider value={{ ...formControlContext, size, colorScheme, state, name, }} > <Box alignItems="flex-start" accessibilityRole="checkbox" {...props}> {children} </Box> </CheckboxContext.Provider> </div> </s> remove export const CheckboxContext = React.createContext({}); </s> add export const CheckboxContext = React.createContext<any>(null); </s> remove export type ICheckboxValue = string | number; </s> add export type ICheckboxValue = string;

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/Checkbox.tsx

let state = useToggleState(props); let groupState = useContext(checkboxGroupContext); let { inputProps } = groupState ? useCheckboxGroupItem( { ...props, value: props.value, }, groupState, mergeRefs([ref, ref1]) ) : useCheckbox(props, state, mergeRefs([ref, ref1])); let { isFocusVisible, focusProps } = useFocusRing();

<mask> ...formControlContext, <mask> ...props, <mask> }); <mask> <mask> const { inputProps } = useCheckbox(props, checkboxGroupContext, null); <mask> <mask> const isChecked = inputProps.checked; <mask> const isDisabled = inputProps.disabled; <mask> <mask> const sizedIcon = icon <mask> ? () => </s> fix: changed hooks to react stately </s> remove const { checkboxGroupProps } = useCheckboxGroup(props, null, null); const { onChange, values, ...restCheckboxGroupProps } = checkboxGroupProps; </s> add let state = useCheckboxGroupState(props); let { groupProps } = useCheckboxGroup(props, state); </s> remove <CheckboxContext.Provider value={{ ...formControlContext, size, colorScheme, onChange, value: values, }} > <Box alignItems="flex-start" {...restCheckboxGroupProps} {...props}> {children} </Box> </CheckboxContext.Provider> </s> add <div {...groupProps}> <CheckboxContext.Provider value={{ ...formControlContext, size, colorScheme, state, name, }} > <Box alignItems="flex-start" accessibilityRole="checkbox" {...props}> {children} </Box> </CheckboxContext.Provider> </div> </s> remove <TouchableOpacity activeOpacity={1} ref={ref} {...inputProps}> </s> add <AriaInputWrapper {...inputProps} activeOpacity={1} ref={mergeRefs([ref, ref1])} {...focusProps} > </s> remove export const CheckboxContext = React.createContext({}); </s> add export const CheckboxContext = React.createContext<any>(null);

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/Checkbox.tsx

<AriaInputWrapper {...inputProps} activeOpacity={1} ref={mergeRefs([ref, ref1])} {...focusProps} >

<mask> ) <mask> : null; <mask> <mask> return ( <mask> <TouchableOpacity activeOpacity={1} ref={ref} {...inputProps}> <mask> <Hoverable> <mask> {(isHovered: boolean) => { <mask> const outlineColor = <mask> isHovered && !isDisabled <mask> ? activeColor </s> fix: changed hooks to react stately </s> remove const { inputProps } = useCheckbox(props, checkboxGroupContext, null); </s> add let state = useToggleState(props); let groupState = useContext(checkboxGroupContext); let { inputProps } = groupState ? useCheckboxGroupItem( { ...props, value: props.value, }, groupState, mergeRefs([ref, ref1]) ) : useCheckbox(props, state, mergeRefs([ref, ref1])); let { isFocusVisible, focusProps } = useFocusRing(); </s> remove const { checkboxGroupProps } = useCheckboxGroup(props, null, null); const { onChange, values, ...restCheckboxGroupProps } = checkboxGroupProps; </s> add let state = useCheckboxGroupState(props); let { groupProps } = useCheckboxGroup(props, state); </s> remove const [groupValues, setGroupValues] = React.useState<Array<ICheckboxValue>>( [] ); </s> add const [groupValues, setGroupValues] = React.useState<Array<string>>([]); </s> remove onChange?: (value: ICheckboxValue, currentState: boolean) => void; </s> add style?: any; state: CheckboxGroupState;

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/Checkbox.tsx

borderWidth={isFocusVisible ? 1 : 0} borderColor="blue.500" borderRadius={4}

<mask> : activeColor <mask> : borderColor; <mask> return ( <mask> <Box <mask> flexDirection="row" <mask> alignItems="center" <mask> {...newProps} <mask> opacity={isDisabled ? 0.4 : 1} <mask> {...(Platform.OS === 'web' <mask> ? { </s> fix: changed hooks to react stately </s> remove <TouchableOpacity activeOpacity={1} ref={ref} {...inputProps}> </s> add <AriaInputWrapper {...inputProps} activeOpacity={1} ref={mergeRefs([ref, ref1])} {...focusProps} > </s> remove const { inputProps } = useCheckbox(props, checkboxGroupContext, null); </s> add let state = useToggleState(props); let groupState = useContext(checkboxGroupContext); let { inputProps } = groupState ? useCheckboxGroupItem( { ...props, value: props.value, }, groupState, mergeRefs([ref, ref1]) ) : useCheckbox(props, state, mergeRefs([ref, ref1])); let { isFocusVisible, focusProps } = useFocusRing(); </s> remove <CheckboxContext.Provider value={{ ...formControlContext, size, colorScheme, onChange, value: values, }} > <Box alignItems="flex-start" {...restCheckboxGroupProps} {...props}> {children} </Box> </CheckboxContext.Provider> </s> add <div {...groupProps}> <CheckboxContext.Provider value={{ ...formControlContext, size, colorScheme, state, name, }} > <Box alignItems="flex-start" accessibilityRole="checkbox" {...props}> {children} </Box> </CheckboxContext.Provider> </div> </s> remove const { checkboxGroupProps } = useCheckboxGroup(props, null, null); const { onChange, values, ...restCheckboxGroupProps } = checkboxGroupProps; </s> add let state = useCheckboxGroupState(props); let { groupProps } = useCheckboxGroup(props, state); </s> remove const [groupValues, setGroupValues] = React.useState<Array<ICheckboxValue>>( [] ); </s> add const [groupValues, setGroupValues] = React.useState<Array<string>>([]);

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/Checkbox.tsx

</AriaInputWrapper>

<mask> </Box> <mask> ); <mask> }} <mask> </Hoverable> <mask> </TouchableOpacity> <mask> ); <mask> }; <mask> <mask> export default React.memo( <mask> React.forwardRef<TouchableOpacity, ICheckboxProps>(Checkbox) </s> fix: changed hooks to react stately </s> remove <CheckboxContext.Provider value={{ ...formControlContext, size, colorScheme, onChange, value: values, }} > <Box alignItems="flex-start" {...restCheckboxGroupProps} {...props}> {children} </Box> </CheckboxContext.Provider> </s> add <div {...groupProps}> <CheckboxContext.Provider value={{ ...formControlContext, size, colorScheme, state, name, }} > <Box alignItems="flex-start" accessibilityRole="checkbox" {...props}> {children} </Box> </CheckboxContext.Provider> </div> </s> remove import type { ICheckboxValue } from 'src/components/primitives/Checkbox/props'; </s> add </s> remove const [groupValues, setGroupValues] = React.useState<Array<ICheckboxValue>>( [] ); </s> add const [groupValues, setGroupValues] = React.useState<Array<string>>([]); </s> remove value?: Array<any>; </s> add name: string;

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/Checkbox.tsx

import { useCheckboxGroupState } from '@react-stately/checkbox'; // import type { ICheckboxContext } from './props'; import { useCheckboxGroup } from '@react-aria/checkbox'; // import { useCheckboxGroup } from './useCheckboxGroup';

<mask> IFormControlContext, <mask> } from '../../composites/FormControl'; <mask> import Box from '../Box'; <mask> import type { ICheckboxGroupProps } from './props'; <mask> import { useCheckboxGroup } from './useCheckboxGroup'; <mask> <mask> export const CheckboxContext = React.createContext({}); <mask> <mask> const CheckboxGroup = ({ <mask> size, </s> fix: changed hooks to react stately </s> remove export const CheckboxContext = React.createContext({}); </s> add export const CheckboxContext = React.createContext<any>(null); </s> remove import type { ICheckboxContext, ICheckboxProps } from './props'; import { useCheckbox } from './useCheckbox'; </s> add import type { ICheckboxProps } from './props'; import { AriaInputWrapper, useFocusRing } from 'react-native-aria'; import { useCheckbox, useCheckboxGroupItem } from '@react-aria/checkbox'; import { useToggleState } from '@react-stately/toggle'; import mergeRefs from '../../../utils/mergeRefs'; </s> remove export type ICheckboxValue = string | number; </s> add export type ICheckboxValue = string; </s> remove import type { ICheckboxValue } from 'src/components/primitives/Checkbox/props'; </s> add </s> remove import React from 'react'; </s> add import React, { useContext } from 'react';

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/CheckboxGroup.tsx

export const CheckboxContext = React.createContext<any>(null);

<mask> import Box from '../Box'; <mask> import type { ICheckboxGroupProps } from './props'; <mask> import { useCheckboxGroup } from './useCheckboxGroup'; <mask> <mask> export const CheckboxContext = React.createContext({}); <mask> <mask> const CheckboxGroup = ({ <mask> size, <mask> children, <mask> colorScheme, </s> fix: changed hooks to react stately </s> remove import { useCheckboxGroup } from './useCheckboxGroup'; </s> add import { useCheckboxGroupState } from '@react-stately/checkbox'; // import type { ICheckboxContext } from './props'; import { useCheckboxGroup } from '@react-aria/checkbox'; // import { useCheckboxGroup } from './useCheckboxGroup'; </s> remove import type { ICheckboxContext, ICheckboxProps } from './props'; import { useCheckbox } from './useCheckbox'; </s> add import type { ICheckboxProps } from './props'; import { AriaInputWrapper, useFocusRing } from 'react-native-aria'; import { useCheckbox, useCheckboxGroupItem } from '@react-aria/checkbox'; import { useToggleState } from '@react-stately/toggle'; import mergeRefs from '../../../utils/mergeRefs'; </s> remove export type ICheckboxValue = string | number; </s> add export type ICheckboxValue = string; </s> remove import type { ICheckboxValue } from 'src/components/primitives/Checkbox/props'; </s> add </s> remove const [groupValues, setGroupValues] = React.useState<Array<ICheckboxValue>>( [] ); </s> add const [groupValues, setGroupValues] = React.useState<Array<string>>([]);

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/CheckboxGroup.tsx

let state = useCheckboxGroupState(props); let { groupProps } = useCheckboxGroup(props, state);

<mask> const formControlContext: IFormControlContext = React.useContext( <mask> FormControlContext <mask> ); <mask> <mask> const { checkboxGroupProps } = useCheckboxGroup(props, null, null); <mask> const { onChange, values, ...restCheckboxGroupProps } = checkboxGroupProps; <mask> <mask> return ( <mask> <CheckboxContext.Provider <mask> value={{ <mask> ...formControlContext, </s> fix: changed hooks to react stately </s> remove <CheckboxContext.Provider value={{ ...formControlContext, size, colorScheme, onChange, value: values, }} > <Box alignItems="flex-start" {...restCheckboxGroupProps} {...props}> {children} </Box> </CheckboxContext.Provider> </s> add <div {...groupProps}> <CheckboxContext.Provider value={{ ...formControlContext, size, colorScheme, state, name, }} > <Box alignItems="flex-start" accessibilityRole="checkbox" {...props}> {children} </Box> </CheckboxContext.Provider> </div> </s> remove const checkboxGroupContext: ICheckboxContext = React.useContext( CheckboxContext ); </s> add const checkboxGroupContext: any = React.useContext(CheckboxContext); </s> remove import type { ICheckboxContext, ICheckboxProps } from './props'; import { useCheckbox } from './useCheckbox'; </s> add import type { ICheckboxProps } from './props'; import { AriaInputWrapper, useFocusRing } from 'react-native-aria'; import { useCheckbox, useCheckboxGroupItem } from '@react-aria/checkbox'; import { useToggleState } from '@react-stately/toggle'; import mergeRefs from '../../../utils/mergeRefs'; </s> remove const { inputProps } = useCheckbox(props, checkboxGroupContext, null); </s> add let state = useToggleState(props); let groupState = useContext(checkboxGroupContext); let { inputProps } = groupState ? useCheckboxGroupItem( { ...props, value: props.value, }, groupState, mergeRefs([ref, ref1]) ) : useCheckbox(props, state, mergeRefs([ref, ref1])); let { isFocusVisible, focusProps } = useFocusRing(); </s> remove const [groupValues, setGroupValues] = React.useState<Array<ICheckboxValue>>( [] ); </s> add const [groupValues, setGroupValues] = React.useState<Array<string>>([]);

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/CheckboxGroup.tsx

<div {...groupProps}> <CheckboxContext.Provider value={{ ...formControlContext, size, colorScheme, state, name, }} > <Box alignItems="flex-start" accessibilityRole="checkbox" {...props}> {children} </Box> </CheckboxContext.Provider> </div>

<mask> const { checkboxGroupProps } = useCheckboxGroup(props, null, null); <mask> const { onChange, values, ...restCheckboxGroupProps } = checkboxGroupProps; <mask> <mask> return ( <mask> <CheckboxContext.Provider <mask> value={{ <mask> ...formControlContext, <mask> size, <mask> colorScheme, <mask> onChange, <mask> value: values, <mask> }} <mask> > <mask> <Box alignItems="flex-start" {...restCheckboxGroupProps} {...props}> <mask> {children} <mask> </Box> <mask> </CheckboxContext.Provider> <mask> ); <mask> }; <mask> <mask> export default React.memo(CheckboxGroup); </s> fix: changed hooks to react stately </s> remove const { checkboxGroupProps } = useCheckboxGroup(props, null, null); const { onChange, values, ...restCheckboxGroupProps } = checkboxGroupProps; </s> add let state = useCheckboxGroupState(props); let { groupProps } = useCheckboxGroup(props, state); </s> remove </TouchableOpacity> </s> add </AriaInputWrapper> </s> remove export const CheckboxContext = React.createContext({}); </s> add export const CheckboxContext = React.createContext<any>(null); </s> remove const [groupValues, setGroupValues] = React.useState<Array<ICheckboxValue>>( [] ); </s> add const [groupValues, setGroupValues] = React.useState<Array<string>>([]); </s> remove const { inputProps } = useCheckbox(props, checkboxGroupContext, null); </s> add let state = useToggleState(props); let groupState = useContext(checkboxGroupContext); let { inputProps } = groupState ? useCheckboxGroupItem( { ...props, value: props.value, }, groupState, mergeRefs([ref, ref1]) ) : useCheckbox(props, state, mergeRefs([ref, ref1])); let { isFocusVisible, focusProps } = useFocusRing();

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/CheckboxGroup.tsx

export type ICheckboxValue = string;

<mask> import type { TouchableOpacityProps } from 'react-native'; <mask> import type { IFormControlContext } from '../../composites/FormControl'; <mask> import type { IBoxProps } from '../Box'; <mask> <mask> export type ICheckboxValue = string | number; <mask> <mask> export type ICheckboxProps = IBoxProps & { <mask> id?: string; <mask> name?: string; <mask> value: ICheckboxValue; </s> fix: changed hooks to react stately </s> remove import type { ICheckboxContext, ICheckboxProps } from './props'; import { useCheckbox } from './useCheckbox'; </s> add import type { ICheckboxProps } from './props'; import { AriaInputWrapper, useFocusRing } from 'react-native-aria'; import { useCheckbox, useCheckboxGroupItem } from '@react-aria/checkbox'; import { useToggleState } from '@react-stately/toggle'; import mergeRefs from '../../../utils/mergeRefs'; </s> remove import { useCheckboxGroup } from './useCheckboxGroup'; </s> add import { useCheckboxGroupState } from '@react-stately/checkbox'; // import type { ICheckboxContext } from './props'; import { useCheckboxGroup } from '@react-aria/checkbox'; // import { useCheckboxGroup } from './useCheckboxGroup'; </s> remove import type { ICheckboxValue } from 'src/components/primitives/Checkbox/props'; </s> add </s> remove onChange?: (value: ICheckboxValue, currentState: boolean) => void; </s> add style?: any; state: CheckboxGroupState; </s> remove export const CheckboxContext = React.createContext({}); </s> add export const CheckboxContext = React.createContext<any>(null);

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/props.tsx

onChange?: (isSelected: boolean) => void;

<mask> isDisabled?: boolean; <mask> isInvalid?: boolean; <mask> size?: 'sm' | 'md' | 'lg'; <mask> icon?: JSX.Element; <mask> onChange?: (value: ICheckboxValue, currentState: boolean) => void; <mask> // onBlur?: (event: any) => void; <mask> // onFocus?: (event: any) => void; <mask> // ariaLabelledby?: string; <mask> // Custom Props <mask> style?: any; </s> fix: changed hooks to react stately </s> remove value?: Array<any>; </s> add name: string; </s> remove onChange?: (value: ICheckboxValue, currentState: boolean) => void; </s> add style?: any; state: CheckboxGroupState; </s> remove import { useCheckboxGroup } from './useCheckboxGroup'; </s> add import { useCheckboxGroupState } from '@react-stately/checkbox'; // import type { ICheckboxContext } from './props'; import { useCheckboxGroup } from '@react-aria/checkbox'; // import { useCheckboxGroup } from './useCheckboxGroup'; </s> remove export type ICheckboxValue = string | number; </s> add export type ICheckboxValue = string; </s> remove import type { ICheckboxContext, ICheckboxProps } from './props'; import { useCheckbox } from './useCheckbox'; </s> add import type { ICheckboxProps } from './props'; import { AriaInputWrapper, useFocusRing } from 'react-native-aria'; import { useCheckbox, useCheckboxGroupItem } from '@react-aria/checkbox'; import { useToggleState } from '@react-stately/toggle'; import mergeRefs from '../../../utils/mergeRefs';

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/props.tsx

name: string;

<mask> // Custom props <mask> style?: any; <mask> }; <mask> export type ICheckboxContext = IFormControlContext & { <mask> value?: Array<any>; <mask> colorScheme?: string; <mask> size?: 'sm' | 'md' | 'lg'; <mask> onChange?: (value: ICheckboxValue, currentState: boolean) => void; <mask> }; <mask> </s> fix: changed hooks to react stately </s> remove onChange?: (value: ICheckboxValue, currentState: boolean) => void; </s> add style?: any; state: CheckboxGroupState; </s> remove onChange?: (value: ICheckboxValue, currentState: boolean) => void; </s> add onChange?: (isSelected: boolean) => void; </s> remove export type ICheckboxValue = string | number; </s> add export type ICheckboxValue = string; </s> remove import { useCheckboxGroup } from './useCheckboxGroup'; </s> add import { useCheckboxGroupState } from '@react-stately/checkbox'; // import type { ICheckboxContext } from './props'; import { useCheckboxGroup } from '@react-aria/checkbox'; // import { useCheckboxGroup } from './useCheckboxGroup';

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/props.tsx

style?: any; state: CheckboxGroupState;

<mask> export type ICheckboxContext = IFormControlContext & { <mask> value?: Array<any>; <mask> colorScheme?: string; <mask> size?: 'sm' | 'md' | 'lg'; <mask> onChange?: (value: ICheckboxValue, currentState: boolean) => void; <mask> }; <mask> <mask> export type IUseCheckboxReturnType = { <mask> inputProps: { <mask> checked: boolean; </s> fix: changed hooks to react stately </s> remove value?: Array<any>; </s> add name: string; </s> remove onChange?: (value: ICheckboxValue, currentState: boolean) => void; </s> add onChange?: (isSelected: boolean) => void; </s> remove export type ICheckboxValue = string | number; </s> add export type ICheckboxValue = string; </s> remove import { useCheckboxGroup } from './useCheckboxGroup'; </s> add import { useCheckboxGroupState } from '@react-stately/checkbox'; // import type { ICheckboxContext } from './props'; import { useCheckboxGroup } from '@react-aria/checkbox'; // import { useCheckboxGroup } from './useCheckboxGroup';

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/components/primitives/Checkbox/props.tsx

import mergeRefs from './mergeRefs';

<mask> import getAbsoluteChildren from './getAbsoluteChildren'; <mask> import getAttachedChildren from './getAttachedChildren'; <mask> import { addTextAndPropsToStrings } from './addTextAndPropsToStrings'; <mask> import { canUseDom } from './canUseDom'; <mask> export { <mask> getSpacedChildren, <mask> getAbsoluteChildren, <mask> getAttachedChildren, </s> fix: changed hooks to react stately </s> remove import React from 'react'; </s> add import React, { useContext } from 'react'; </s> remove import { useCheckboxGroup } from './useCheckboxGroup'; </s> add import { useCheckboxGroupState } from '@react-stately/checkbox'; // import type { ICheckboxContext } from './props'; import { useCheckboxGroup } from '@react-aria/checkbox'; // import { useCheckboxGroup } from './useCheckboxGroup'; </s> remove import type { ICheckboxContext, ICheckboxProps } from './props'; import { useCheckbox } from './useCheckbox'; </s> add import type { ICheckboxProps } from './props'; import { AriaInputWrapper, useFocusRing } from 'react-native-aria'; import { useCheckbox, useCheckboxGroupItem } from '@react-aria/checkbox'; import { useToggleState } from '@react-stately/toggle'; import mergeRefs from '../../../utils/mergeRefs'; </s> remove import type { ICheckboxValue } from 'src/components/primitives/Checkbox/props'; </s> add </s> remove export type ICheckboxValue = string | number; </s> add export type ICheckboxValue = string;

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/utils/index.ts

mergeRefs

<mask> addTextAndPropsToStrings, <mask> canUseDom, <mask> }; <mask> <mask> export type { IAccessibilityProps } from './accessibilityTypes'; <mask> <mask> export { default as Hoverable } from './Hoverable'; <mask> export type { HoverableProps } from './Hoverable'; </s> fix: changed hooks to react stately </s> remove export type ICheckboxValue = string | number; </s> add export type ICheckboxValue = string; </s> remove import type { ICheckboxValue } from 'src/components/primitives/Checkbox/props'; </s> add </s> remove import React from 'react'; </s> add import React, { useContext } from 'react'; </s> remove import { useCheckboxGroup } from './useCheckboxGroup'; </s> add import { useCheckboxGroupState } from '@react-stately/checkbox'; // import type { ICheckboxContext } from './props'; import { useCheckboxGroup } from '@react-aria/checkbox'; // import { useCheckboxGroup } from './useCheckboxGroup'; </s> remove const [groupValues, setGroupValues] = React.useState<Array<ICheckboxValue>>( [] ); </s> add const [groupValues, setGroupValues] = React.useState<Array<string>>([]);

https://github.com/GeekyAnts/NativeBase/commit/eda21fed9d0cd557c64ebcf2c81ee94640c8f140

src/utils/index.ts

<CircularProgress mt={6} value={75} />

<mask> export default function () { <mask> return ( <mask> <Center> <mask> <Heading>Default CircularProgress</Heading> <mask> <CircularProgress mt={6} value={80} /> <mask> </Center> <mask> ); <mask> } </s> feat: circular default redesign and size correction </s> remove thickness={10} </s> add </s> remove borderTopColor={trackColor ? trackColor : 'gray.200'} borderRightColor={trackColor ? trackColor : 'gray.200'} </s> add borderTopColor={trackColor ? trackColor : 'blueGray.200'} borderRightColor={trackColor ? trackColor : 'blueGray.200'} </s> remove height: 100, width: 100, }, '3xl': { height: 120, width: 120, }, '4xl': { height: 140, width: 140, </s> add height: 32, width: 32, </s> remove rounded={100} </s> add rounded={viewHeight / 2} </s> remove type sizes = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl'; </s> add type sizes = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl';

https://github.com/GeekyAnts/NativeBase/commit/edd8ac1e2a7f23b77b945e5c9064ee579f5da25d

example/storybook/stories/components/composites/CircularProgress/Basic.tsx

<mask> <Heading>Changing the TrackColor</Heading> <mask> <CircularProgress <mask> mt={6} <mask> size={80} <mask> thickness={10} <mask> value={20} <mask> trackColor={text('Track Color', 'blue.100')} <mask> /> <mask> </Center> <mask> ); </s> feat: circular default redesign and size correction </s> remove <CircularProgress mt={6} value={80} /> </s> add <CircularProgress mt={6} value={75} /> </s> remove borderTopColor={trackColor ? trackColor : 'gray.200'} borderRightColor={trackColor ? trackColor : 'gray.200'} </s> add borderTopColor={trackColor ? trackColor : 'blueGray.200'} borderRightColor={trackColor ? trackColor : 'blueGray.200'} </s> remove height: 100, width: 100, }, '3xl': { height: 120, width: 120, }, '4xl': { height: 140, width: 140, </s> add height: 32, width: 32, </s> remove height: 90, width: 90, </s> add height: 24, width: 24, </s> remove height: 70, width: 70, </s> add height: 20, width: 20,

https://github.com/GeekyAnts/NativeBase/commit/edd8ac1e2a7f23b77b945e5c9064ee579f5da25d

example/storybook/stories/components/composites/CircularProgress/TrackColor.tsx

type sizes = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl';

<mask> import { useThemeProps, useTheme } from '../../../hooks'; <mask> import { canUseDom } from '../../../utils'; <mask> import get from 'lodash/get'; <mask> <mask> type sizes = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl'; <mask> <mask> export type ICircularProgressProps = IBoxProps & { <mask> style?: ViewStyle; <mask> children?: JSX.Element | JSX.Element[]; <mask> value: number; </s> feat: circular default redesign and size correction </s> remove height: get(theme, 'space.' + newProps.height).toString() || newProps.height, width: get(theme, 'space.' + newProps.width).toString() || newProps.width, </s> add height: themeHeight ? parseInt(themeHeight.slice(themeHeight.Length, -2)) : sizeProps.height, width: themeWidth ? parseInt(themeWidth.slice(themeWidth.Length, -2)) : sizeProps.width, </s> remove height: 20, width: 20, </s> add height: 4, width: 4, </s> remove height: 100, width: 100, }, '3xl': { height: 120, width: 120, }, '4xl': { height: 140, width: 140, </s> add height: 32, width: 32, </s> remove size = 'xs'; </s> add size = 'lg';

https://github.com/GeekyAnts/NativeBase/commit/edd8ac1e2a7f23b77b945e5c9064ee579f5da25d

src/components/composites/CircularProgress/index.tsx

size = 'lg';

<mask> if (min) { <mask> value = value - min; <mask> } <mask> if (!size) { <mask> size = 'xs'; <mask> } <mask> let sizeProps; <mask> let newProps = useThemeProps('CircularProgress', { size: size }); <mask> if (typeof size === 'string') { <mask> sizeProps = { </s> feat: circular default redesign and size correction </s> remove height: get(theme, 'space.' + newProps.height).toString() || newProps.height, width: get(theme, 'space.' + newProps.width).toString() || newProps.width, </s> add height: themeHeight ? parseInt(themeHeight.slice(themeHeight.Length, -2)) : sizeProps.height, width: themeWidth ? parseInt(themeWidth.slice(themeWidth.Length, -2)) : sizeProps.width, </s> remove let defaultThickness = 4; </s> add let defaultThickness = 8; </s> remove height: 20, width: 20, </s> add height: 4, width: 4, </s> remove type sizes = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl'; </s> add type sizes = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl';

https://github.com/GeekyAnts/NativeBase/commit/edd8ac1e2a7f23b77b945e5c9064ee579f5da25d

src/components/composites/CircularProgress/index.tsx

const themeHeight = get(theme, 'space.' + sizeProps.height); const themeWidth = get(theme, 'space.' + sizeProps.width);

<mask> } <mask> // fetching size from theme for passing into style prop <mask> const styleSize = { <mask> height: themeHeight <mask> ? parseInt(themeHeight.slice(themeHeight.Length, -2)) <mask> : sizeProps.height, </s> feat: circular default redesign and size correction </s> remove height: get(theme, 'space.' + newProps.height).toString() || newProps.height, width: get(theme, 'space.' + newProps.width).toString() || newProps.width, </s> add height: themeHeight ? parseInt(themeHeight.slice(themeHeight.Length, -2)) : sizeProps.height, width: themeWidth ? parseInt(themeWidth.slice(themeWidth.Length, -2)) : sizeProps.width, </s> remove borderTopColor={trackColor ? trackColor : 'gray.200'} borderRightColor={trackColor ? trackColor : 'gray.200'} </s> add borderTopColor={trackColor ? trackColor : 'blueGray.200'} borderRightColor={trackColor ? trackColor : 'blueGray.200'} </s> remove size = 'xs'; </s> add size = 'lg'; </s> remove height: 20, width: 20, </s> add height: 4, width: 4, </s> remove type sizes = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl'; </s> add type sizes = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl';

https://github.com/GeekyAnts/NativeBase/commit/edd8ac1e2a7f23b77b945e5c9064ee579f5da25d

src/components/composites/CircularProgress/index.tsx

height: themeHeight ? parseInt(themeHeight.slice(themeHeight.Length, -2)) : sizeProps.height, width: themeWidth ? parseInt(themeWidth.slice(themeWidth.Length, -2)) : sizeProps.width,

<mask> sizeProps = { height: size, width: size }; <mask> } <mask> // fetching size from theme for passing into style prop <mask> const styleSize = { <mask> height: <mask> get(theme, 'space.' + newProps.height).toString() || newProps.height, <mask> width: get(theme, 'space.' + newProps.width).toString() || newProps.width, <mask> }; <mask> let defaultThickness = 4; <mask> if (thickness) { <mask> defaultThickness = thickness; <mask> } </s> feat: circular default redesign and size correction </s> remove let defaultThickness = 4; </s> add let defaultThickness = 8; </s> remove size = 'xs'; </s> add size = 'lg'; </s> remove height: 20, width: 20, </s> add height: 4, width: 4, </s> remove height: 100, width: 100, }, '3xl': { height: 120, width: 120, }, '4xl': { height: 140, width: 140, </s> add height: 32, width: 32,

https://github.com/GeekyAnts/NativeBase/commit/edd8ac1e2a7f23b77b945e5c9064ee579f5da25d

src/components/composites/CircularProgress/index.tsx

let defaultThickness = 8;

<mask> height: <mask> get(theme, 'space.' + newProps.height).toString() || newProps.height, <mask> width: get(theme, 'space.' + newProps.width).toString() || newProps.width, <mask> }; <mask> let defaultThickness = 4; <mask> if (thickness) { <mask> defaultThickness = thickness; <mask> } <mask> const degree: any = new Animated.Value(0); <mask> if (isIndeterminate) { </s> feat: circular default redesign and size correction </s> remove height: get(theme, 'space.' + newProps.height).toString() || newProps.height, width: get(theme, 'space.' + newProps.width).toString() || newProps.width, </s> add height: themeHeight ? parseInt(themeHeight.slice(themeHeight.Length, -2)) : sizeProps.height, width: themeWidth ? parseInt(themeWidth.slice(themeWidth.Length, -2)) : sizeProps.width, </s> remove size = 'xs'; </s> add size = 'lg'; </s> remove height: 20, width: 20, </s> add height: 4, width: 4, </s> remove height: 100, width: 100, }, '3xl': { height: 120, width: 120, }, '4xl': { height: 140, width: 140, </s> add height: 32, width: 32,

https://github.com/GeekyAnts/NativeBase/commit/edd8ac1e2a7f23b77b945e5c9064ee579f5da25d

src/components/composites/CircularProgress/index.tsx

borderTopColor={trackColor ? trackColor : 'blueGray.200'} borderRightColor={trackColor ? trackColor : 'blueGray.200'}

<mask> ); <mask> } else { <mask> return ( <mask> <Box <mask> borderTopColor={trackColor ? trackColor : 'gray.200'} <mask> borderRightColor={trackColor ? trackColor : 'gray.200'} <mask> style={styles.offsetLayer} <mask> /> <mask> ); <mask> } <mask> }; </s> feat: circular default redesign and size correction </s> remove rounded={100} </s> add rounded={viewHeight / 2} </s> remove <CircularProgress mt={6} value={80} /> </s> add <CircularProgress mt={6} value={75} /> </s> remove height: get(theme, 'space.' + newProps.height).toString() || newProps.height, width: get(theme, 'space.' + newProps.width).toString() || newProps.width, </s> add height: themeHeight ? parseInt(themeHeight.slice(themeHeight.Length, -2)) : sizeProps.height, width: themeWidth ? parseInt(themeWidth.slice(themeWidth.Length, -2)) : sizeProps.width, </s> remove thickness={10} </s> add

https://github.com/GeekyAnts/NativeBase/commit/edd8ac1e2a7f23b77b945e5c9064ee579f5da25d

src/components/composites/CircularProgress/index.tsx

rounded={viewHeight / 2}

<mask> <mask> return ( <mask> <Box <mask> {...sizeProps} <mask> rounded={100} <mask> borderWidth={defaultThickness} <mask> borderColor={trackColor ? trackColor : 'blueGray.200'} <mask> justifyContent="center" <mask> alignItems="center" <mask> {...props} </s> feat: circular default redesign and size correction </s> remove borderTopColor={trackColor ? trackColor : 'gray.200'} borderRightColor={trackColor ? trackColor : 'gray.200'} </s> add borderTopColor={trackColor ? trackColor : 'blueGray.200'} borderRightColor={trackColor ? trackColor : 'blueGray.200'} </s> remove <CircularProgress mt={6} value={80} /> </s> add <CircularProgress mt={6} value={75} /> </s> remove height: get(theme, 'space.' + newProps.height).toString() || newProps.height, width: get(theme, 'space.' + newProps.width).toString() || newProps.width, </s> add height: themeHeight ? parseInt(themeHeight.slice(themeHeight.Length, -2)) : sizeProps.height, width: themeWidth ? parseInt(themeWidth.slice(themeWidth.Length, -2)) : sizeProps.width, </s> remove height: 100, width: 100, }, '3xl': { height: 120, width: 120, }, '4xl': { height: 140, width: 140, </s> add height: 32, width: 32,

https://github.com/GeekyAnts/NativeBase/commit/edd8ac1e2a7f23b77b945e5c9064ee579f5da25d

src/components/composites/CircularProgress/index.tsx

height: 4, width: 4,

<mask> const sizes = { <mask> 'xs': { <mask> height: 20, <mask> width: 20, <mask> }, <mask> 'sm': { <mask> height: 33, <mask> width: 33, <mask> }, </s> feat: circular default redesign and size correction </s> remove height: 33, width: 33, </s> add height: 8, width: 8, </s> remove height: 70, width: 70, </s> add height: 20, width: 20, </s> remove height: 50, width: 50, </s> add height: 16, width: 16, </s> remove height: 100, width: 100, }, '3xl': { height: 120, width: 120, }, '4xl': { height: 140, width: 140, </s> add height: 32, width: 32, </s> remove height: 90, width: 90, </s> add height: 24, width: 24,

https://github.com/GeekyAnts/NativeBase/commit/edd8ac1e2a7f23b77b945e5c9064ee579f5da25d

src/theme/components/circular-progress.ts

height: 8, width: 8,

<mask> height: 20, <mask> width: 20, <mask> }, <mask> 'sm': { <mask> height: 33, <mask> width: 33, <mask> }, <mask> 'md': { <mask> height: 50, <mask> width: 50, <mask> }, </s> feat: circular default redesign and size correction </s> remove height: 50, width: 50, </s> add height: 16, width: 16, </s> remove height: 20, width: 20, </s> add height: 4, width: 4, </s> remove height: 70, width: 70, </s> add height: 20, width: 20, </s> remove height: 100, width: 100, }, '3xl': { height: 120, width: 120, }, '4xl': { height: 140, width: 140, </s> add height: 32, width: 32, </s> remove height: 90, width: 90, </s> add height: 24, width: 24,

https://github.com/GeekyAnts/NativeBase/commit/edd8ac1e2a7f23b77b945e5c9064ee579f5da25d

src/theme/components/circular-progress.ts

height: 16, width: 16,

<mask> height: 33, <mask> width: 33, <mask> }, <mask> 'md': { <mask> height: 50, <mask> width: 50, <mask> }, <mask> 'lg': { <mask> height: 70, <mask> width: 70, <mask> }, </s> feat: circular default redesign and size correction </s> remove height: 70, width: 70, </s> add height: 20, width: 20, </s> remove height: 33, width: 33, </s> add height: 8, width: 8, </s> remove height: 90, width: 90, </s> add height: 24, width: 24, </s> remove height: 20, width: 20, </s> add height: 4, width: 4, </s> remove height: 100, width: 100, }, '3xl': { height: 120, width: 120, }, '4xl': { height: 140, width: 140, </s> add height: 32, width: 32,

https://github.com/GeekyAnts/NativeBase/commit/edd8ac1e2a7f23b77b945e5c9064ee579f5da25d

src/theme/components/circular-progress.ts

height: 20, width: 20,

<mask> height: 50, <mask> width: 50, <mask> }, <mask> 'lg': { <mask> height: 70, <mask> width: 70, <mask> }, <mask> 'xl': { <mask> height: 90, <mask> width: 90, <mask> }, </s> feat: circular default redesign and size correction </s> remove height: 90, width: 90, </s> add height: 24, width: 24, </s> remove height: 50, width: 50, </s> add height: 16, width: 16, </s> remove height: 33, width: 33, </s> add height: 8, width: 8, </s> remove height: 100, width: 100, }, '3xl': { height: 120, width: 120, }, '4xl': { height: 140, width: 140, </s> add height: 32, width: 32, </s> remove height: 20, width: 20, </s> add height: 4, width: 4,

https://github.com/GeekyAnts/NativeBase/commit/edd8ac1e2a7f23b77b945e5c9064ee579f5da25d

src/theme/components/circular-progress.ts

height: 24, width: 24,

<mask> height: 70, <mask> width: 70, <mask> }, <mask> 'xl': { <mask> height: 90, <mask> width: 90, <mask> }, <mask> '2xl': { <mask> height: 100, <mask> width: 100, <mask> }, </s> feat: circular default redesign and size correction </s> remove height: 70, width: 70, </s> add height: 20, width: 20, </s> remove height: 100, width: 100, }, '3xl': { height: 120, width: 120, }, '4xl': { height: 140, width: 140, </s> add height: 32, width: 32, </s> remove height: 50, width: 50, </s> add height: 16, width: 16, </s> remove height: 33, width: 33, </s> add height: 8, width: 8, </s> remove height: 20, width: 20, </s> add height: 4, width: 4,

https://github.com/GeekyAnts/NativeBase/commit/edd8ac1e2a7f23b77b945e5c9064ee579f5da25d

src/theme/components/circular-progress.ts

height: 32, width: 32,

<mask> height: 90, <mask> width: 90, <mask> }, <mask> '2xl': { <mask> height: 100, <mask> width: 100, <mask> }, <mask> '3xl': { <mask> height: 120, <mask> width: 120, <mask> }, <mask> '4xl': { <mask> height: 140, <mask> width: 140, <mask> }, <mask> }; <mask> <mask> export default { sizes }; </s> feat: circular default redesign and size correction </s> remove height: 90, width: 90, </s> add height: 24, width: 24, </s> remove height: 70, width: 70, </s> add height: 20, width: 20, </s> remove height: 20, width: 20, </s> add height: 4, width: 4, </s> remove height: 50, width: 50, </s> add height: 16, width: 16, </s> remove height: 33, width: 33, </s> add height: 8, width: 8,

https://github.com/GeekyAnts/NativeBase/commit/edd8ac1e2a7f23b77b945e5c9064ee579f5da25d

src/theme/components/circular-progress.ts

import Box from '../../primitives/Box';

<mask> import React from 'react'; <mask> import Center from './Center'; <mask> import type { ISquareProps } from './types'; <mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps'; <mask> <mask> const Square = ({ style, size, ...props }: ISquareProps) => { <mask> //TODO: refactor for responsive prop </s> fix: add box , decoupled theme </s> remove return ( <Center size={size} {...props} height={props.height ? props.height : undefined} width={props.width ? props.width : undefined} style={style} /> ); </s> add return <Box {...resolvedProps} />; </s> remove const Square = ({ style, size, ...props }: ISquareProps) => { </s> add

https://github.com/GeekyAnts/NativeBase/commit/eea50c884be16a2c41388aae5f5069dc4ac6baff

src/components/composites/Center/Square.tsx

import { usePropsResolution } from '../../../hooks/useThemeProps'; const Square = ({ ...props }: ISquareProps) => { const { ...resolvedProps } = usePropsResolution('Square', props);

<mask> import Box from '../../primitives/Box'; <mask> import type { ISquareProps } from './types'; <mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps'; <mask> <mask> //TODO: refactor for responsive prop <mask> if (useHasResponsiveProps(props)) { <mask> return null; <mask> } <mask> return <Box {...resolvedProps} />; </s> fix: add box , decoupled theme </s> remove return ( <Center size={size} {...props} height={props.height ? props.height : undefined} width={props.width ? props.width : undefined} style={style} /> ); </s> add return <Box {...resolvedProps} />; </s> remove import Center from './Center'; </s> add import Box from '../../primitives/Box'; </s> remove const Square = ({ style, size, ...props }: ISquareProps) => { </s> add

https://github.com/GeekyAnts/NativeBase/commit/eea50c884be16a2c41388aae5f5069dc4ac6baff

src/components/composites/Center/Square.tsx

<mask> import Center from './Center'; <mask> import type { ISquareProps } from './types'; <mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps'; <mask> <mask> const Square = ({ style, size, ...props }: ISquareProps) => { <mask> //TODO: refactor for responsive prop <mask> if (useHasResponsiveProps(props)) { <mask> return null; <mask> } <mask> return ( </s> fix: add box , decoupled theme </s> remove return ( <Center size={size} {...props} height={props.height ? props.height : undefined} width={props.width ? props.width : undefined} style={style} /> ); </s> add return <Box {...resolvedProps} />; </s> remove import Center from './Center'; </s> add import Box from '../../primitives/Box';

https://github.com/GeekyAnts/NativeBase/commit/eea50c884be16a2c41388aae5f5069dc4ac6baff

src/components/composites/Center/Square.tsx

return <Box {...resolvedProps} />;

<mask> //TODO: refactor for responsive prop <mask> if (useHasResponsiveProps(props)) { <mask> return null; <mask> } <mask> return ( <mask> <Center <mask> size={size} <mask> {...props} <mask> height={props.height ? props.height : undefined} <mask> width={props.width ? props.width : undefined} <mask> style={style} <mask> /> <mask> ); <mask> }; <mask> <mask> export default React.memo(Square); </s> fix: add box , decoupled theme </s> remove import Center from './Center'; </s> add import Box from '../../primitives/Box'; </s> remove const Square = ({ style, size, ...props }: ISquareProps) => { </s> add

https://github.com/GeekyAnts/NativeBase/commit/eea50c884be16a2c41388aae5f5069dc4ac6baff

src/components/composites/Center/Square.tsx

const { contentSize, _backdrop, ...resolvedProps } = usePropsResolution(

<mask> }: IModalProps, <mask> ref: any <mask> ) => { <mask> const bottomInset = useKeyboardBottomInset(); <mask> const { contentSize, _backdrop, ...restThemeProps } = usePropsResolution( <mask> 'Modal', <mask> rest <mask> ); <mask> <mask> const [visible, setVisible] = useControllableState({ </s> feat: new prop resolution cheanges in modal </s> remove const newProps = usePropsResolution('ModalCloseButton', props); const { _icon, ...rest } = newProps; </s> add const { _icon, ...resolvedProps } = usePropsResolution( 'ModalCloseButton', props ); </s> remove const { ...newProps } = usePropsResolution('ModalContent', props); </s> add const resolvedProps = usePropsResolution('ModalContent', props); </s> remove const ModalBody = (props: IBoxProps, ref?: any) => { const newProps = usePropsResolution('ModalBody', props); </s> add const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => { const resolvedProps = usePropsResolution('ModalBody', props); </s> remove const newProps = usePropsResolution('ModalHeader', props); return <Box {...newProps} ref={ref} />; </s> add const resolvedProps = usePropsResolution('ModalHeader', props); return <Box {...resolvedProps} ref={ref} />; </s> remove const newProps = usePropsResolution('ModalFooter', props); return <Box {...newProps} ref={ref} />; </s> add const resolvedProps = usePropsResolution('ModalFooter', props); return <Box {...resolvedProps} ref={ref} />;

https://github.com/GeekyAnts/NativeBase/commit/ef653f234d7f2c47607f7bc78632420c169764b3

src/components/composites/Modal/Modal.tsx

const child = (

<mask> }); <mask> <mask> const handleClose = () => setVisible(false); <mask> <mask> let child = ( <mask> <Box <mask> bottom={avoidKeyboard ? bottomInset + 'px' : undefined} <mask> {...restThemeProps} <mask> ref={ref} <mask> pointerEvents="box-none" </s> feat: new prop resolution cheanges in modal </s> remove {...restThemeProps} </s> add {...resolvedProps} </s> remove let finalRefVal = finalFocusRef ? finalFocusRef.current : null; </s> add const finalRefVal = finalFocusRef ? finalFocusRef.current : null; </s> remove const { contentSize, _backdrop, ...restThemeProps } = usePropsResolution( </s> add const { contentSize, _backdrop, ...resolvedProps } = usePropsResolution( </s> remove const newProps = usePropsResolution('ModalCloseButton', props); const { _icon, ...rest } = newProps; </s> add const { _icon, ...resolvedProps } = usePropsResolution( 'ModalCloseButton', props ); </s> remove {...rest} </s> add {...resolvedProps}

https://github.com/GeekyAnts/NativeBase/commit/ef653f234d7f2c47607f7bc78632420c169764b3

src/components/composites/Modal/Modal.tsx

{...resolvedProps}

<mask> <mask> let child = ( <mask> <Box <mask> bottom={avoidKeyboard ? bottomInset + 'px' : undefined} <mask> {...restThemeProps} <mask> ref={ref} <mask> pointerEvents="box-none" <mask> > <mask> {children} <mask> </Box> </s> feat: new prop resolution cheanges in modal </s> remove let child = ( </s> add const child = ( </s> remove <Box {...newProps} ref={ref}> {props.children} </s> add <Box {...resolvedProps} ref={ref}> {children} </s> remove let finalRefVal = finalFocusRef ? finalFocusRef.current : null; </s> add const finalRefVal = finalFocusRef ? finalFocusRef.current : null; </s> remove {...rest} </s> add {...resolvedProps} </s> remove const { contentSize, _backdrop, ...restThemeProps } = usePropsResolution( </s> add const { contentSize, _backdrop, ...resolvedProps } = usePropsResolution(

https://github.com/GeekyAnts/NativeBase/commit/ef653f234d7f2c47607f7bc78632420c169764b3

src/components/composites/Modal/Modal.tsx

const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => { const resolvedProps = usePropsResolution('ModalBody', props);

<mask> import Box, { IBoxProps } from '../../primitives/Box'; <mask> import { usePropsResolution } from '../../../hooks'; <mask> import { ScrollView } from 'react-native'; <mask> <mask> const ModalBody = (props: IBoxProps, ref?: any) => { <mask> const newProps = usePropsResolution('ModalBody', props); <mask> <mask> return ( <mask> <ScrollView> <mask> <Box {...newProps} ref={ref}> <mask> {props.children} </s> feat: new prop resolution cheanges in modal </s> remove const newProps = usePropsResolution('ModalHeader', props); return <Box {...newProps} ref={ref} />; </s> add const resolvedProps = usePropsResolution('ModalHeader', props); return <Box {...resolvedProps} ref={ref} />; </s> remove const newProps = usePropsResolution('ModalFooter', props); return <Box {...newProps} ref={ref} />; </s> add const resolvedProps = usePropsResolution('ModalFooter', props); return <Box {...resolvedProps} ref={ref} />; </s> remove const { ...newProps } = usePropsResolution('ModalContent', props); </s> add const resolvedProps = usePropsResolution('ModalContent', props); </s> remove <Box {...newProps} ref={ref}> {props.children} </s> add <Box {...resolvedProps} ref={ref}> {children} </s> remove const newProps = usePropsResolution('ModalCloseButton', props); const { _icon, ...rest } = newProps; </s> add const { _icon, ...resolvedProps } = usePropsResolution( 'ModalCloseButton', props );

https://github.com/GeekyAnts/NativeBase/commit/ef653f234d7f2c47607f7bc78632420c169764b3

src/components/composites/Modal/ModalBody.tsx

<Box {...resolvedProps} ref={ref}> {children}

<mask> const newProps = usePropsResolution('ModalBody', props); <mask> <mask> return ( <mask> <ScrollView> <mask> <Box {...newProps} ref={ref}> <mask> {props.children} <mask> </Box> <mask> </ScrollView> <mask> ); <mask> }; <mask> </s> feat: new prop resolution cheanges in modal </s> remove const ModalBody = (props: IBoxProps, ref?: any) => { const newProps = usePropsResolution('ModalBody', props); </s> add const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => { const resolvedProps = usePropsResolution('ModalBody', props); </s> remove const newProps = usePropsResolution('ModalHeader', props); return <Box {...newProps} ref={ref} />; </s> add const resolvedProps = usePropsResolution('ModalHeader', props); return <Box {...resolvedProps} ref={ref} />; </s> remove const newProps = usePropsResolution('ModalFooter', props); return <Box {...newProps} ref={ref} />; </s> add const resolvedProps = usePropsResolution('ModalFooter', props); return <Box {...resolvedProps} ref={ref} />; </s> remove {...restThemeProps} </s> add {...resolvedProps} </s> remove const newProps = usePropsResolution('ModalCloseButton', props); const { _icon, ...rest } = newProps; </s> add const { _icon, ...resolvedProps } = usePropsResolution( 'ModalCloseButton', props );

https://github.com/GeekyAnts/NativeBase/commit/ef653f234d7f2c47607f7bc78632420c169764b3

src/components/composites/Modal/ModalBody.tsx

const { _icon, ...resolvedProps } = usePropsResolution( 'ModalCloseButton', props );

<mask> import { CloseIcon } from '../../primitives/Icon/Icons'; <mask> import type { IButtonProps } from '../../primitives/Button'; <mask> <mask> const ModalCloseButton = (props: IButtonProps, ref?: any) => { <mask> const newProps = usePropsResolution('ModalCloseButton', props); <mask> const { _icon, ...rest } = newProps; <mask> const { handleClose } = React.useContext(ModalContext); <mask> return ( <mask> <Button <mask> variant="ghost" <mask> {...rest} </s> feat: new prop resolution cheanges in modal </s> remove {...rest} </s> add {...resolvedProps} </s> remove const ModalBody = (props: IBoxProps, ref?: any) => { const newProps = usePropsResolution('ModalBody', props); </s> add const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => { const resolvedProps = usePropsResolution('ModalBody', props); </s> remove const { ...newProps } = usePropsResolution('ModalContent', props); </s> add const resolvedProps = usePropsResolution('ModalContent', props); </s> remove const newProps = usePropsResolution('ModalHeader', props); return <Box {...newProps} ref={ref} />; </s> add const resolvedProps = usePropsResolution('ModalHeader', props); return <Box {...resolvedProps} ref={ref} />; </s> remove const newProps = usePropsResolution('ModalFooter', props); return <Box {...newProps} ref={ref} />; </s> add const resolvedProps = usePropsResolution('ModalFooter', props); return <Box {...resolvedProps} ref={ref} />;

https://github.com/GeekyAnts/NativeBase/commit/ef653f234d7f2c47607f7bc78632420c169764b3

src/components/composites/Modal/ModalCloseButton.tsx

{...resolvedProps}

<mask> const { handleClose } = React.useContext(ModalContext); <mask> return ( <mask> <Button <mask> variant="ghost" <mask> {...rest} <mask> onPress={handleClose} <mask> accessibilityLabel="Close dialog" <mask> ref={ref} <mask> > <mask> <CloseIcon {..._icon} /> </s> feat: new prop resolution cheanges in modal </s> remove const newProps = usePropsResolution('ModalCloseButton', props); const { _icon, ...rest } = newProps; </s> add const { _icon, ...resolvedProps } = usePropsResolution( 'ModalCloseButton', props ); </s> remove let finalRefVal = finalFocusRef ? finalFocusRef.current : null; </s> add const finalRefVal = finalFocusRef ? finalFocusRef.current : null; </s> remove let child = ( </s> add const child = ( </s> remove const ModalBody = (props: IBoxProps, ref?: any) => { const newProps = usePropsResolution('ModalBody', props); </s> add const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => { const resolvedProps = usePropsResolution('ModalBody', props); </s> remove {...restThemeProps} </s> add {...resolvedProps}

https://github.com/GeekyAnts/NativeBase/commit/ef653f234d7f2c47607f7bc78632420c169764b3

src/components/composites/Modal/ModalCloseButton.tsx

const resolvedProps = usePropsResolution('ModalContent', props);

<mask> import { ModalContext } from './Context'; <mask> import { Platform } from 'react-native'; <mask> <mask> const ModalContent = (props: IBoxProps, ref?: any) => { <mask> const { ...newProps } = usePropsResolution('ModalContent', props); <mask> const { <mask> contentSize, <mask> initialFocusRef, <mask> finalFocusRef, <mask> handleClose, </s> feat: new prop resolution cheanges in modal </s> remove const ModalBody = (props: IBoxProps, ref?: any) => { const newProps = usePropsResolution('ModalBody', props); </s> add const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => { const resolvedProps = usePropsResolution('ModalBody', props); </s> remove const newProps = usePropsResolution('ModalCloseButton', props); const { _icon, ...rest } = newProps; </s> add const { _icon, ...resolvedProps } = usePropsResolution( 'ModalCloseButton', props ); </s> remove const { contentSize, _backdrop, ...restThemeProps } = usePropsResolution( </s> add const { contentSize, _backdrop, ...resolvedProps } = usePropsResolution( </s> remove const newProps = usePropsResolution('ModalHeader', props); return <Box {...newProps} ref={ref} />; </s> add const resolvedProps = usePropsResolution('ModalHeader', props); return <Box {...resolvedProps} ref={ref} />; </s> remove const newProps = usePropsResolution('ModalFooter', props); return <Box {...newProps} ref={ref} />; </s> add const resolvedProps = usePropsResolution('ModalFooter', props); return <Box {...resolvedProps} ref={ref} />;

https://github.com/GeekyAnts/NativeBase/commit/ef653f234d7f2c47607f7bc78632420c169764b3

src/components/composites/Modal/ModalContent.tsx

const finalRefVal = finalFocusRef ? finalFocusRef.current : null;

<mask> finalFocusRef, <mask> handleClose, <mask> } = React.useContext(ModalContext); <mask> React.useEffect(() => { <mask> let finalRefVal = finalFocusRef ? finalFocusRef.current : null; <mask> if (initialFocusRef && initialFocusRef.current) { <mask> //@ts-ignore <mask> initialFocusRef.current.focus(); <mask> } <mask> </s> feat: new prop resolution cheanges in modal </s> remove const { ...newProps } = usePropsResolution('ModalContent', props); </s> add const resolvedProps = usePropsResolution('ModalContent', props); </s> remove let child = ( </s> add const child = ( </s> remove const newProps = usePropsResolution('ModalCloseButton', props); const { _icon, ...rest } = newProps; </s> add const { _icon, ...resolvedProps } = usePropsResolution( 'ModalCloseButton', props ); </s> remove {...restThemeProps} </s> add {...resolvedProps} </s> remove const { contentSize, _backdrop, ...restThemeProps } = usePropsResolution( </s> add const { contentSize, _backdrop, ...resolvedProps } = usePropsResolution(

https://github.com/GeekyAnts/NativeBase/commit/ef653f234d7f2c47607f7bc78632420c169764b3

src/components/composites/Modal/ModalContent.tsx

{...resolvedProps}

<mask> <mask> return ( <mask> <Box <mask> {...contentSize} <mask> {...newProps} <mask> ref={ref} <mask> onAccessibilityEscape={handleClose} <mask> //@ts-ignore - web only <mask> aria-modal="true" <mask> //@ts-ignore - web only </s> feat: new prop resolution cheanges in modal </s> remove let finalRefVal = finalFocusRef ? finalFocusRef.current : null; </s> add const finalRefVal = finalFocusRef ? finalFocusRef.current : null; </s> remove <Box {...newProps} ref={ref}> {props.children} </s> add <Box {...resolvedProps} ref={ref}> {children} </s> remove const newProps = usePropsResolution('ModalHeader', props); return <Box {...newProps} ref={ref} />; </s> add const resolvedProps = usePropsResolution('ModalHeader', props); return <Box {...resolvedProps} ref={ref} />; </s> remove const newProps = usePropsResolution('ModalFooter', props); return <Box {...newProps} ref={ref} />; </s> add const resolvedProps = usePropsResolution('ModalFooter', props); return <Box {...resolvedProps} ref={ref} />; </s> remove const ModalBody = (props: IBoxProps, ref?: any) => { const newProps = usePropsResolution('ModalBody', props); </s> add const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => { const resolvedProps = usePropsResolution('ModalBody', props);

https://github.com/GeekyAnts/NativeBase/commit/ef653f234d7f2c47607f7bc78632420c169764b3

src/components/composites/Modal/ModalContent.tsx

const resolvedProps = usePropsResolution('ModalFooter', props); return <Box {...resolvedProps} ref={ref} />;

<mask> import Box, { IBoxProps } from '../../primitives/Box'; <mask> import { usePropsResolution } from '../../../hooks'; <mask> <mask> const ModalFooter = (props: IBoxProps, ref?: any) => { <mask> const newProps = usePropsResolution('ModalFooter', props); <mask> return <Box {...newProps} ref={ref} />; <mask> }; <mask> <mask> export default memo(forwardRef(ModalFooter)); </s> feat: new prop resolution cheanges in modal </s> remove const newProps = usePropsResolution('ModalHeader', props); return <Box {...newProps} ref={ref} />; </s> add const resolvedProps = usePropsResolution('ModalHeader', props); return <Box {...resolvedProps} ref={ref} />; </s> remove const ModalBody = (props: IBoxProps, ref?: any) => { const newProps = usePropsResolution('ModalBody', props); </s> add const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => { const resolvedProps = usePropsResolution('ModalBody', props); </s> remove const { ...newProps } = usePropsResolution('ModalContent', props); </s> add const resolvedProps = usePropsResolution('ModalContent', props); </s> remove const newProps = usePropsResolution('ModalCloseButton', props); const { _icon, ...rest } = newProps; </s> add const { _icon, ...resolvedProps } = usePropsResolution( 'ModalCloseButton', props ); </s> remove const { contentSize, _backdrop, ...restThemeProps } = usePropsResolution( </s> add const { contentSize, _backdrop, ...resolvedProps } = usePropsResolution(

https://github.com/GeekyAnts/NativeBase/commit/ef653f234d7f2c47607f7bc78632420c169764b3

src/components/composites/Modal/ModalFooter.tsx

const resolvedProps = usePropsResolution('ModalHeader', props); return <Box {...resolvedProps} ref={ref} />;

<mask> import Box, { IBoxProps } from '../../primitives/Box'; <mask> import { usePropsResolution } from '../../../hooks'; <mask> <mask> const ModalHeader = (props: IBoxProps, ref?: any) => { <mask> const newProps = usePropsResolution('ModalHeader', props); <mask> return <Box {...newProps} ref={ref} />; <mask> }; <mask> <mask> export default memo(forwardRef(ModalHeader)); </s> feat: new prop resolution cheanges in modal </s> remove const newProps = usePropsResolution('ModalFooter', props); return <Box {...newProps} ref={ref} />; </s> add const resolvedProps = usePropsResolution('ModalFooter', props); return <Box {...resolvedProps} ref={ref} />; </s> remove const ModalBody = (props: IBoxProps, ref?: any) => { const newProps = usePropsResolution('ModalBody', props); </s> add const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => { const resolvedProps = usePropsResolution('ModalBody', props); </s> remove const { ...newProps } = usePropsResolution('ModalContent', props); </s> add const resolvedProps = usePropsResolution('ModalContent', props); </s> remove const newProps = usePropsResolution('ModalCloseButton', props); const { _icon, ...rest } = newProps; </s> add const { _icon, ...resolvedProps } = usePropsResolution( 'ModalCloseButton', props ); </s> remove const { contentSize, _backdrop, ...restThemeProps } = usePropsResolution( </s> add const { contentSize, _backdrop, ...resolvedProps } = usePropsResolution(

https://github.com/GeekyAnts/NativeBase/commit/ef653f234d7f2c47607f7bc78632420c169764b3

src/components/composites/Modal/ModalHeader.tsx

import type { ITheme } from '../theme';

<mask> import { useTheme } from './useTheme'; <mask> <mask> /** <mask> * <mask> * @param props <mask> * @returns resolved fontFamily <mask> * @description Combination of fontWeight, fontStyle and font family is fully supported on web but on Android we need to pass the exact font family. </s> fix: typing issue fontstyle and tooltip </s> remove fontFamily?: ('heading' | 'body' | 'mono') & string; </s> add fontFamily?: keyof ITheme['fonts']; </s> remove fontWeight?: ( | 'hairline' | 'thin' | 'light' | 'normal' | 'medium' | 'semibold' | 'bold' | 'extrabold' | 'black' | 'extraBlack' ) & (string | number); </s> add fontWeight?: keyof ITheme['fontWeights'];

https://github.com/GeekyAnts/NativeBase/commit/efe36d9d3f986a2dcd9a50f109e4f04cfc1e2396

src/hooks/useResolvedFontFamily.ts

fontFamily?: keyof ITheme['fonts'];

<mask> * So this function's purpose is to intake styles like fontFamily: Roboto, fontWeight: 300, fontStyle: Italic and return fontFamily: Roboto-Light-Italic depending upon the fontConfig token in typography theme. <mask> * This function depends upon fontConfig token in typography for mapping. <mask> */ <mask> export function useResolvedFontFamily(props: { <mask> fontFamily?: ('heading' | 'body' | 'mono') & string; <mask> fontStyle?: string; <mask> fontWeight?: ( <mask> | 'hairline' <mask> | 'thin' <mask> | 'light' </s> fix: typing issue fontstyle and tooltip </s> remove fontWeight?: ( | 'hairline' | 'thin' | 'light' | 'normal' | 'medium' | 'semibold' | 'bold' | 'extrabold' | 'black' | 'extraBlack' ) & (string | number); </s> add fontWeight?: keyof ITheme['fontWeights']; </s> remove </s> add import type { ITheme } from '../theme';

https://github.com/GeekyAnts/NativeBase/commit/efe36d9d3f986a2dcd9a50f109e4f04cfc1e2396

src/hooks/useResolvedFontFamily.ts

fontWeight?: keyof ITheme['fontWeights'];

<mask> */ <mask> export function useResolvedFontFamily(props: { <mask> fontFamily?: ('heading' | 'body' | 'mono') & string; <mask> fontStyle?: string; <mask> fontWeight?: ( <mask> | 'hairline' <mask> | 'thin' <mask> | 'light' <mask> | 'normal' <mask> | 'medium' <mask> | 'semibold' <mask> | 'bold' <mask> | 'extrabold' <mask> | 'black' <mask> | 'extraBlack' <mask> ) & <mask> (string | number); <mask> }) { <mask> const { fontFamily, fontStyle, fontWeight } = props; <mask> let newFontFamily = fontFamily; <mask> let newFontStyle = fontStyle; <mask> let newFontWeight = fontWeight; </s> fix: typing issue fontstyle and tooltip </s> remove fontFamily?: ('heading' | 'body' | 'mono') & string; </s> add fontFamily?: keyof ITheme['fonts']; </s> remove </s> add import type { ITheme } from '../theme';

https://github.com/GeekyAnts/NativeBase/commit/efe36d9d3f986a2dcd9a50f109e4f04cfc1e2396

src/hooks/useResolvedFontFamily.ts

import { Button, Center, Fade } from 'native-base';

<mask> import React from 'react'; <mask> import { Button, Center, PresenceTransition } from 'native-base'; <mask> <mask> export const Example = () => { <mask> const [isOpen, setIsOpen] = React.useState(false); <mask> <mask> return ( </s> feat: decoupling of fade transition </s> remove import { useThemeProps } from '../../../hooks/useThemeProps'; </s> add </s> remove <PresenceTransition visible={isOpen} initial={{ opacity: 0 }} animate={{ opacity: 1, transition: { duration: 250 } }} > </s> add <Fade in={isOpen}> </s> remove </PresenceTransition> </s> add </Fade>

https://github.com/GeekyAnts/NativeBase/commit/f0426ce94332a1bb7f8f4d0afdbb7fecca89857b

example/storybook/stories/components/composites/Transitions/Fade.tsx

<Fade in={isOpen}>

<mask> <Center> <mask> <Button onPress={() => setIsOpen(!isOpen)}> <mask> {isOpen ? 'Hide' : 'Show'} <mask> </Button> <mask> <PresenceTransition <mask> visible={isOpen} <mask> initial={{ opacity: 0 }} <mask> animate={{ opacity: 1, transition: { duration: 250 } }} <mask> > <mask> <Center <mask> mt="7" <mask> bg="teal.500" <mask> rounded="md" <mask> w="200" </s> feat: decoupling of fade transition </s> remove import { useThemeProps } from '../../../hooks/useThemeProps'; </s> add </s> remove import { Button, Center, PresenceTransition } from 'native-base'; </s> add import { Button, Center, Fade } from 'native-base'; </s> remove </PresenceTransition> </s> add </Fade>

https://github.com/GeekyAnts/NativeBase/commit/f0426ce94332a1bb7f8f4d0afdbb7fecca89857b

example/storybook/stories/components/composites/Transitions/Fade.tsx

</Fade>

<mask> _text={{ color: 'white' }} <mask> > <mask> Fade <mask> </Center> <mask> </PresenceTransition> <mask> </Center> <mask> ); <mask> }; </s> feat: decoupling of fade transition </s> remove import { Button, Center, PresenceTransition } from 'native-base'; </s> add import { Button, Center, Fade } from 'native-base'; </s> remove import { useThemeProps } from '../../../hooks/useThemeProps'; </s> add </s> remove <PresenceTransition visible={isOpen} initial={{ opacity: 0 }} animate={{ opacity: 1, transition: { duration: 250 } }} > </s> add <Fade in={isOpen}>

https://github.com/GeekyAnts/NativeBase/commit/f0426ce94332a1bb7f8f4d0afdbb7fecca89857b

example/storybook/stories/components/composites/Transitions/Fade.tsx

<mask> import React from 'react'; <mask> import { useThemeProps } from '../../../hooks/useThemeProps'; <mask> import PresenceTransition from '../Transitions/PresenceTransition'; <mask> import type { IFadeProps } from './types'; <mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps'; <mask> <mask> const Fade = ({ children, style, ...props }: IFadeProps, ref?: any) => { </s> feat: decoupling of fade transition </s> remove import { Button, Center, PresenceTransition } from 'native-base'; </s> add import { Button, Center, Fade } from 'native-base'; </s> remove <PresenceTransition visible={isOpen} initial={{ opacity: 0 }} animate={{ opacity: 1, transition: { duration: 250 } }} > </s> add <Fade in={isOpen}> </s> remove </PresenceTransition> </s> add </Fade>

https://github.com/GeekyAnts/NativeBase/commit/f0426ce94332a1bb7f8f4d0afdbb7fecca89857b

src/components/composites/Transitions/Fade.tsx

import { ViewPropTypes } from "../../Utils";

<mask> import { TabHeading, Text, TabContainer } from "./../../index"; <mask> import _ from "lodash"; <mask> <mask> const { StyleSheet, View, Animated, Platform } = ReactNative; <mask> import { ViewPropTypes } from '../../Utils'; <mask> const Button = require("./Button"); <mask> <mask> const DefaultTabBar = createReactClass({ <mask> propTypes: { <mask> goToPage: PropTypes.func, </s> Added style support for tabs. Style name - tabContainerStyle </s> remove const { Dimensions, View, Animated, ScrollView, StyleSheet, InteractionManager, Platform } = ReactNative; import { ViewPropTypes } from '../../Utils'; </s> add const { Dimensions, View, Animated, ScrollView, StyleSheet, InteractionManager, Platform, } = ReactNative; import { ViewPropTypes } from "../../Utils"; </s> remove propTypes: { goToPage: PropTypes.func, activeTab: PropTypes.number, tabs: PropTypes.array, backgroundColor: PropTypes.string, activeTextColor: PropTypes.string, inactiveTextColor: PropTypes.string, tabStyle: ViewPropTypes.style, renderTab: PropTypes.func, underlineStyle: ViewPropTypes.style, }, contextTypes: { theme: PropTypes.object, }, </s> add propTypes: { goToPage: PropTypes.func, activeTab: PropTypes.number, tabs: PropTypes.array, backgroundColor: PropTypes.string, activeTextColor: PropTypes.string, inactiveTextColor: PropTypes.string, tabStyle: ViewPropTypes.style, renderTab: PropTypes.func, underlineStyle: ViewPropTypes.style, tabContainerStyle: ViewPropTypes.style, }, contextTypes: { theme: PropTypes.object, }, </s> remove mixins: [TimerMixin], statics: { DefaultTabBar, ScrollableTabBar, }, </s> add mixins: [TimerMixin], statics: { DefaultTabBar, ScrollableTabBar, }, </s> remove _handleLayout(e) { const { width } = e.nativeEvent.layout; </s> add _handleLayout(e) { const { width } = e.nativeEvent.layout; </s> remove goToPage(pageNumber) { const offset = pageNumber * this.state.containerWidth; if (this.scrollView) { this.scrollView.scrollTo({ x: offset, y: 0, animated: !this.props.scrollWithoutAnimation, }); } </s> add goToPage(pageNumber) { const offset = pageNumber * this.state.containerWidth; if (this.scrollView) { this.scrollView.scrollTo({ x: offset, y: 0, animated: !this.props.scrollWithoutAnimation, }); }

https://github.com/GeekyAnts/NativeBase/commit/f0427ca03dc38fdd2e9f04a2754fe748307b6d46

src/basic/Tabs/DefaultTabBar.js

propTypes: { goToPage: PropTypes.func, activeTab: PropTypes.number, tabs: PropTypes.array, backgroundColor: PropTypes.string, activeTextColor: PropTypes.string, inactiveTextColor: PropTypes.string, tabStyle: ViewPropTypes.style, renderTab: PropTypes.func, underlineStyle: ViewPropTypes.style, tabContainerStyle: ViewPropTypes.style, }, contextTypes: { theme: PropTypes.object, },

<mask> import { ViewPropTypes } from '../../Utils'; <mask> const Button = require("./Button"); <mask> <mask> const DefaultTabBar = createReactClass({ <mask> propTypes: { <mask> goToPage: PropTypes.func, <mask> activeTab: PropTypes.number, <mask> tabs: PropTypes.array, <mask> backgroundColor: PropTypes.string, <mask> activeTextColor: PropTypes.string, <mask> inactiveTextColor: PropTypes.string, <mask> tabStyle: ViewPropTypes.style, <mask> renderTab: PropTypes.func, <mask> underlineStyle: ViewPropTypes.style, <mask> }, <mask> contextTypes: { <mask> theme: PropTypes.object, <mask> }, <mask> <mask> getDefaultProps() { <mask> return { <mask> activeTextColor: variable.topTabBarActiveTextColor, <mask> inactiveTextColor: variable.topTabBarTextColor, </s> Added style support for tabs. Style name - tabContainerStyle </s> remove getDefaultProps() { return { activeTextColor: variable.topTabBarActiveTextColor, inactiveTextColor: variable.topTabBarTextColor, backgroundColor: null, }; }, </s> add getDefaultProps() { return { activeTextColor: variable.topTabBarActiveTextColor, inactiveTextColor: variable.topTabBarTextColor, backgroundColor: null, }; }, </s> remove import { ViewPropTypes } from '../../Utils'; </s> add import { ViewPropTypes } from "../../Utils"; </s> remove propTypes: { tabBarPosition: PropTypes.oneOf(["top", "bottom", "overlayTop", "overlayBottom"]), initialPage: PropTypes.number, page: PropTypes.number, onChangeTab: PropTypes.func, onScroll: PropTypes.func, renderTabBar: PropTypes.any, style: ViewPropTypes.style, contentProps: PropTypes.object, scrollWithoutAnimation: PropTypes.bool, locked: PropTypes.bool, prerenderingSiblingsNumber: PropTypes.number, }, </s> add propTypes: { tabBarPosition: PropTypes.oneOf(["top", "bottom", "overlayTop", "overlayBottom"]), initialPage: PropTypes.number, page: PropTypes.number, onChangeTab: PropTypes.func, onScroll: PropTypes.func, renderTabBar: PropTypes.any, style: ViewPropTypes.style, contentProps: PropTypes.object, scrollWithoutAnimation: PropTypes.bool, locked: PropTypes.bool, prerenderingSiblingsNumber: PropTypes.number, }, </s> remove const { Dimensions, View, Animated, ScrollView, StyleSheet, InteractionManager, Platform } = ReactNative; import { ViewPropTypes } from '../../Utils'; </s> add const { Dimensions, View, Animated, ScrollView, StyleSheet, InteractionManager, Platform, } = ReactNative; import { ViewPropTypes } from "../../Utils"; </s> remove mixins: [TimerMixin], statics: { DefaultTabBar, ScrollableTabBar, }, </s> add mixins: [TimerMixin], statics: { DefaultTabBar, ScrollableTabBar, },

https://github.com/GeekyAnts/NativeBase/commit/f0427ca03dc38fdd2e9f04a2754fe748307b6d46

src/basic/Tabs/DefaultTabBar.js

getDefaultProps() { return { activeTextColor: variable.topTabBarActiveTextColor, inactiveTextColor: variable.topTabBarTextColor, backgroundColor: null, }; },

<mask> contextTypes: { <mask> theme: PropTypes.object, <mask> }, <mask> <mask> getDefaultProps() { <mask> return { <mask> activeTextColor: variable.topTabBarActiveTextColor, <mask> inactiveTextColor: variable.topTabBarTextColor, <mask> backgroundColor: null, <mask> }; <mask> }, <mask> <mask> renderTabOption(name, page) {}, <mask> <mask> renderTab( <mask> name, </s> Added style support for tabs. Style name - tabContainerStyle </s> remove propTypes: { goToPage: PropTypes.func, activeTab: PropTypes.number, tabs: PropTypes.array, backgroundColor: PropTypes.string, activeTextColor: PropTypes.string, inactiveTextColor: PropTypes.string, tabStyle: ViewPropTypes.style, renderTab: PropTypes.func, underlineStyle: ViewPropTypes.style, }, contextTypes: { theme: PropTypes.object, }, </s> add propTypes: { goToPage: PropTypes.func, activeTab: PropTypes.number, tabs: PropTypes.array, backgroundColor: PropTypes.string, activeTextColor: PropTypes.string, inactiveTextColor: PropTypes.string, tabStyle: ViewPropTypes.style, renderTab: PropTypes.func, underlineStyle: ViewPropTypes.style, tabContainerStyle: ViewPropTypes.style, }, contextTypes: { theme: PropTypes.object, }, </s> remove renderTabOption(name, page) {}, </s> add renderTabOption(name, page) {}, </s> remove const left = this.props.scrollValue.interpolate({ inputRange: [0, 1], outputRange: [0, containerWidth / numberOfTabs], }); return ( <TabContainer> {this.props.tabs.map((name, page) => { const isTabActive = this.props.activeTab === page; const renderTab = this.props.renderTab || this.renderTab; return renderTab( name, page, isTabActive, this.props.goToPage, this.props.tabStyle[page], this.props.activeTabStyle[page], this.props.textStyle[page], this.props.activeTextStyle[page], this.props.tabHeaderStyle[page] ); })} <Animated.View style={[tabUnderlineStyle, { left }, this.props.underlineStyle]} /> </TabContainer> ); }, </s> add const left = this.props.scrollValue.interpolate({ inputRange: [0, 1], outputRange: [0, containerWidth / numberOfTabs], }); return ( <TabContainer style={this.props.tabContainerStyle ? this.props.tabContainerStyle : {}}> {this.props.tabs.map((name, page) => { const isTabActive = this.props.activeTab === page; const renderTab = this.props.renderTab || this.renderTab; return renderTab( name, page, isTabActive, this.props.goToPage, this.props.tabStyle[page], this.props.activeTabStyle[page], this.props.textStyle[page], this.props.activeTextStyle[page], this.props.tabHeaderStyle[page] ); })} <Animated.View style={[tabUnderlineStyle, { left }, this.props.underlineStyle]} /> </TabContainer> ); }, </s> remove getDefaultProps() { return { tabBarPosition: "top", initialPage: 0, page: -1, onChangeTab: () => {}, onScroll: () => {}, contentProps: {}, scrollWithoutAnimation: false, locked: false, prerenderingSiblingsNumber: 0, }; }, </s> add getDefaultProps() { return { tabBarPosition: "top", initialPage: 0, page: -1, onChangeTab: () => {}, onScroll: () => {}, contentProps: {}, scrollWithoutAnimation: false, locked: false, prerenderingSiblingsNumber: 0, }; }, </s> remove propTypes: { tabBarPosition: PropTypes.oneOf(["top", "bottom", "overlayTop", "overlayBottom"]), initialPage: PropTypes.number, page: PropTypes.number, onChangeTab: PropTypes.func, onScroll: PropTypes.func, renderTabBar: PropTypes.any, style: ViewPropTypes.style, contentProps: PropTypes.object, scrollWithoutAnimation: PropTypes.bool, locked: PropTypes.bool, prerenderingSiblingsNumber: PropTypes.number, }, </s> add propTypes: { tabBarPosition: PropTypes.oneOf(["top", "bottom", "overlayTop", "overlayBottom"]), initialPage: PropTypes.number, page: PropTypes.number, onChangeTab: PropTypes.func, onScroll: PropTypes.func, renderTabBar: PropTypes.any, style: ViewPropTypes.style, contentProps: PropTypes.object, scrollWithoutAnimation: PropTypes.bool, locked: PropTypes.bool, prerenderingSiblingsNumber: PropTypes.number, },

https://github.com/GeekyAnts/NativeBase/commit/f0427ca03dc38fdd2e9f04a2754fe748307b6d46

src/basic/Tabs/DefaultTabBar.js

renderTabOption(name, page) {},

<mask> backgroundColor: null, <mask> }; <mask> }, <mask> <mask> renderTabOption(name, page) {}, <mask> <mask> renderTab( <mask> name, <mask> page, <mask> isTabActive, </s> Added style support for tabs. Style name - tabContainerStyle </s> remove getDefaultProps() { return { activeTextColor: variable.topTabBarActiveTextColor, inactiveTextColor: variable.topTabBarTextColor, backgroundColor: null, }; }, </s> add getDefaultProps() { return { activeTextColor: variable.topTabBarActiveTextColor, inactiveTextColor: variable.topTabBarTextColor, backgroundColor: null, }; }, </s> remove const left = this.props.scrollValue.interpolate({ inputRange: [0, 1], outputRange: [0, containerWidth / numberOfTabs], }); return ( <TabContainer> {this.props.tabs.map((name, page) => { const isTabActive = this.props.activeTab === page; const renderTab = this.props.renderTab || this.renderTab; return renderTab( name, page, isTabActive, this.props.goToPage, this.props.tabStyle[page], this.props.activeTabStyle[page], this.props.textStyle[page], this.props.activeTextStyle[page], this.props.tabHeaderStyle[page] ); })} <Animated.View style={[tabUnderlineStyle, { left }, this.props.underlineStyle]} /> </TabContainer> ); }, </s> add const left = this.props.scrollValue.interpolate({ inputRange: [0, 1], outputRange: [0, containerWidth / numberOfTabs], }); return ( <TabContainer style={this.props.tabContainerStyle ? this.props.tabContainerStyle : {}}> {this.props.tabs.map((name, page) => { const isTabActive = this.props.activeTab === page; const renderTab = this.props.renderTab || this.renderTab; return renderTab( name, page, isTabActive, this.props.goToPage, this.props.tabStyle[page], this.props.activeTabStyle[page], this.props.textStyle[page], this.props.activeTextStyle[page], this.props.tabHeaderStyle[page] ); })} <Animated.View style={[tabUnderlineStyle, { left }, this.props.underlineStyle]} /> </TabContainer> ); }, </s> remove renderTab( name, page, isTabActive, onPressHandler, tabStyle, activeTabStyle, textStyle, activeTextStyle, tabHeaderStyle ) { const headerContent = typeof name !== "string" ? name.props.children : undefined; const { activeTextColor, inactiveTextColor } = this.props; const textColor = isTabActive ? activeTextColor : inactiveTextColor; const fontWeight = isTabActive ? "bold" : "normal"; if (typeof name === "string") { return ( <Button style={{ flex: 1 }} key={name} onPress={() => onPressHandler(page)}> <TabHeading style={isTabActive ? activeTabStyle : tabStyle} active={isTabActive}> <Text style={isTabActive ? activeTextStyle : textStyle}> {name} </Text> </TabHeading> </Button> ); } else { return ( <Button style={{ flex: 1 }} key={_.random(1.2, 5.2)} onPress={() => onPressHandler(page)}> <TabHeading style={tabHeaderStyle} active={isTabActive}> {headerContent} </TabHeading> </Button> ); } }, </s> add renderTab( name, page, isTabActive, onPressHandler, tabStyle, activeTabStyle, textStyle, activeTextStyle, tabHeaderStyle ) { const headerContent = typeof name !== "string" ? name.props.children : undefined; const { activeTextColor, inactiveTextColor } = this.props; const textColor = isTabActive ? activeTextColor : inactiveTextColor; const fontWeight = isTabActive ? "bold" : "normal"; if (typeof name === "string") { return ( <Button style={{ flex: 1 }} key={name} onPress={() => onPressHandler(page)}> <TabHeading style={isTabActive ? activeTabStyle : tabStyle} active={isTabActive}> <Text style={isTabActive ? activeTextStyle : textStyle}>{name}</Text> </TabHeading> </Button> ); } else { return ( <Button style={{ flex: 1 }} key={_.random(1.2, 5.2)} onPress={() => onPressHandler(page)}> <TabHeading style={tabHeaderStyle} active={isTabActive}> {headerContent} </TabHeading> </Button> ); } }, </s> remove getDefaultProps() { return { tabBarPosition: "top", initialPage: 0, page: -1, onChangeTab: () => {}, onScroll: () => {}, contentProps: {}, scrollWithoutAnimation: false, locked: false, prerenderingSiblingsNumber: 0, }; }, </s> add getDefaultProps() { return { tabBarPosition: "top", initialPage: 0, page: -1, onChangeTab: () => {}, onScroll: () => {}, contentProps: {}, scrollWithoutAnimation: false, locked: false, prerenderingSiblingsNumber: 0, }; }, </s> remove updateSceneKeys({ page, children = this.props.children, callback = () => {} }) { let newKeys = this.newSceneKeys({ previousKeys: this.state.sceneKeys, currentPage: page, children, }); this.setState({ currentPage: page, sceneKeys: newKeys }, callback); }, </s> add updateSceneKeys({ page, children = this.props.children, callback = () => {} }) { let newKeys = this.newSceneKeys({ previousKeys: this.state.sceneKeys, currentPage: page, children, }); this.setState({ currentPage: page, sceneKeys: newKeys }, callback); },

https://github.com/GeekyAnts/NativeBase/commit/f0427ca03dc38fdd2e9f04a2754fe748307b6d46

src/basic/Tabs/DefaultTabBar.js