docstring_tokens
stringlengths
0
76.5k
code_tokens
stringlengths
75
1.81M
label_window
listlengths
4
2.12k
html_url
stringlengths
74
116
file_name
stringlengths
3
311
<Button onPress={toggleColorMode} h={10}> Toggle </Button>
<mask> <Text bold fontSize="18px"> <mask> {useColorModeValue('Light', 'Dark')} <mask> </Text> <mask> </Text> <mask> <Button onPress={toggleColorMode}>Toggle</Button> <mask> </Box> <mask> </Center> <mask> ); <mask> } <mask> </s> Revert "Revert "Feat/unit testing jest"" </s> remove <Button onPress={toggleColorMode}>Toggle</Button> </s> add <Button onPress={toggleColorMode} h={10}> Toggle </Button> </s> remove return <StatusBar />; </s> add const [hidden, setHidden] = useState(false); const changeStatusBarVisibility = () => setHidden(!hidden); return ( <Box flex={1} justifyContent="center" safeArea> <StatusBar animated={true} backgroundColor="#61dafb" barStyle="default" showHideTransition="fade" hidden={hidden} /> <Text textAlign="center" mb={3}> StatusBar Visibility:{'\n'} {hidden ? 'Hidden' : 'Visible'} </Text> <Box p={10}> <Button onPress={changeStatusBarVisibility}>Toggle StatusBar</Button> </Box> </Box> ); </s> remove <Alert justifyContent="center" status="error"> </s> add <Alert justifyContent="center" status="error" safeAreaTop={8}>
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
example/storybook/stories/hooks/useColorModeValue/Basic.tsx
"react": "17.0.1", "react-dom": "17.0.1",
<mask> "metro-react-native-babel-preset": "^0.64.0", <mask> "pod-install": "^0.1.0", <mask> "postinstall-postinstall": "^2.1.0", <mask> "prettier": "^2.0.5", <mask> "react": "16.11.0", <mask> "react-dom": "^17.0.2", <mask> "react-native": "0.63.2", <mask> "react-native-safe-area-context": "^3.1.9", <mask> "react-native-svg": "^12.1.0", <mask> "react-native-web": "^0.17.7", <mask> "react-test-renderer": "^16.9.0", </s> Revert "Revert "Feat/unit testing jest"" </s> remove "react-test-renderer": "^17.0.2", </s> add "react-test-renderer": "17.0.1", </s> remove testID="test" </s> add _input={{ testID: 'test' }} </s> remove <Breadcrumb.Link>Home (This is currently active)</Breadcrumb.Link> </s> add <Breadcrumb.Link> <Breadcrumb.Text _current={{ color: 'red.500' }}> Home (This is currently active) </Breadcrumb.Text> </Breadcrumb.Link> </s> remove <List.Icon as={<SearchIcon />} /> </s> add <List.Icon as={Ionicons} name="stats-chart-outline" /> </s> remove <List.Icon as={<SearchIcon />} /> </s> add <List.Icon as={SimpleLineIcons} name="docs" />
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
package.json
"node_modules/(?!(@react-native|react-native|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|react-native-vector-icons|@react-native-aria/checkbox|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils|@react-native-aria/*))"
<mask> "<rootDir>/example/*", <mask> "<rootDir>/lib/" <mask> ], <mask> "transformIgnorePatterns": [ <mask> "node_modules/(?!(react-native|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|react-native-vector-icons|@react-native-aria/checkbox|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils|@react-native-aria/*))" <mask> ], <mask> "setupFiles": [ <mask> "<rootDir>/src/jest/mock.ts" <mask> ] <mask> }, </s> Revert "Revert "Feat/unit testing jest"" </s> remove presets: ['babel-preset-expo'], </s> add presets: [['babel-preset-expo', { jsxRuntime: 'classic' }]], </s> remove "react-test-renderer": "^17.0.2", </s> add "react-test-renderer": "17.0.1", </s> remove "@react-native-async-storage/async-storage": "~1.15.0", </s> add "@react-native-async-storage/async-storage": "^1.17.3", </s> remove it('inDeterminant on checkBox', () => { const { getAllByRole } = render( <NativeBaseProvider initialWindowMetrics={{ frame: { x: 0, y: 0, width: 0, height: 0 }, insets: { top: 0, left: 0, right: 0, bottom: 0 }, }} > <CheckBox group={false} /> </NativeBaseProvider> ); const checkbox = getAllByRole('checkbox'); expect(checkbox.length).toBe(2); fireEvent.press(checkbox[1]); expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); }); </s> add // it('inDeterminant on checkBoxGroup', () => { // const { getAllByRole } = render( // <NativeBaseProvider // initialWindowMetrics={{ // frame: { x: 0, y: 0, width: 0, height: 0 }, // insets: { top: 0, left: 0, right: 0, bottom: 0 }, // }} // > // <CheckBox group={true} /> // </NativeBaseProvider> // ); // const checkbox = getAllByRole('checkbox'); // expect(checkbox.length).toBe(2); // expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); // }); // it('inDeterminant on checkBox', () => { // const { getAllByRole } = render( // <NativeBaseProvider // initialWindowMetrics={{ // frame: { x: 0, y: 0, width: 0, height: 0 }, // insets: { top: 0, left: 0, right: 0, bottom: 0 }, // }} // > // <CheckBox group={false} /> // </NativeBaseProvider> // ); // const checkbox = getAllByRole('checkbox'); // expect(checkbox.length).toBe(2); // fireEvent.press(checkbox[1]); // expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); // }); </s> remove it('inDeterminant on checkBoxGroup', () => { const { getAllByRole } = render( <NativeBaseProvider initialWindowMetrics={{ frame: { x: 0, y: 0, width: 0, height: 0 }, insets: { top: 0, left: 0, right: 0, bottom: 0 }, }} > <CheckBox group={true} /> </NativeBaseProvider> ); const checkbox = getAllByRole('checkbox'); expect(checkbox.length).toBe(2); expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); }); </s> add /**** inDeterminant is not yet implemented in checkbox ****/
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
package.json
/**** inDeterminant is not yet implemented in checkbox ****/
<mask> expect(checkbox.length).toBe(4); <mask> expect(checkbox[0].props.accessibilityState.checked).toBe(true); <mask> }); <mask> <mask> it('inDeterminant on checkBoxGroup', () => { <mask> const { getAllByRole } = render( <mask> <NativeBaseProvider <mask> initialWindowMetrics={{ <mask> frame: { x: 0, y: 0, width: 0, height: 0 }, <mask> insets: { top: 0, left: 0, right: 0, bottom: 0 }, <mask> }} <mask> > <mask> <CheckBox group={true} /> <mask> </NativeBaseProvider> <mask> ); <mask> const checkbox = getAllByRole('checkbox'); <mask> expect(checkbox.length).toBe(2); <mask> expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); <mask> }); <mask> <mask> it('inDeterminant on checkBox', () => { <mask> const { getAllByRole } = render( <mask> <NativeBaseProvider <mask> initialWindowMetrics={{ </s> Revert "Revert "Feat/unit testing jest"" </s> remove it('inDeterminant on checkBox', () => { const { getAllByRole } = render( <NativeBaseProvider initialWindowMetrics={{ frame: { x: 0, y: 0, width: 0, height: 0 }, insets: { top: 0, left: 0, right: 0, bottom: 0 }, }} > <CheckBox group={false} /> </NativeBaseProvider> ); const checkbox = getAllByRole('checkbox'); expect(checkbox.length).toBe(2); fireEvent.press(checkbox[1]); expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); }); </s> add // it('inDeterminant on checkBoxGroup', () => { // const { getAllByRole } = render( // <NativeBaseProvider // initialWindowMetrics={{ // frame: { x: 0, y: 0, width: 0, height: 0 }, // insets: { top: 0, left: 0, right: 0, bottom: 0 }, // }} // > // <CheckBox group={true} /> // </NativeBaseProvider> // ); // const checkbox = getAllByRole('checkbox'); // expect(checkbox.length).toBe(2); // expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); // }); // it('inDeterminant on checkBox', () => { // const { getAllByRole } = render( // <NativeBaseProvider // initialWindowMetrics={{ // frame: { x: 0, y: 0, width: 0, height: 0 }, // insets: { top: 0, left: 0, right: 0, bottom: 0 }, // }} // > // <CheckBox group={false} /> // </NativeBaseProvider> // ); // const checkbox = getAllByRole('checkbox'); // expect(checkbox.length).toBe(2); // fireEvent.press(checkbox[1]); // expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); // }); </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.sm ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.sm); </s> remove <Input testID="test" variant="underlined" /> </s> add <Input _stack={{ testID: 'test' }} variant="underlined" /> </s> remove expect(inputElement.props.style[0].borderBottomWidth).toBe(1); </s> add expect(inputElement.props.style.borderBottomWidth).toBe(1);
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/components/primitives/Checkbox/test/checkbox.test.tsx
// it('inDeterminant on checkBoxGroup', () => { // const { getAllByRole } = render( // <NativeBaseProvider // initialWindowMetrics={{ // frame: { x: 0, y: 0, width: 0, height: 0 }, // insets: { top: 0, left: 0, right: 0, bottom: 0 }, // }} // > // <CheckBox group={true} /> // </NativeBaseProvider> // ); // const checkbox = getAllByRole('checkbox'); // expect(checkbox.length).toBe(2); // expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); // }); // it('inDeterminant on checkBox', () => { // const { getAllByRole } = render( // <NativeBaseProvider // initialWindowMetrics={{ // frame: { x: 0, y: 0, width: 0, height: 0 }, // insets: { top: 0, left: 0, right: 0, bottom: 0 }, // }} // > // <CheckBox group={false} /> // </NativeBaseProvider> // ); // const checkbox = getAllByRole('checkbox'); // expect(checkbox.length).toBe(2); // fireEvent.press(checkbox[1]); // expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); // });
<mask> expect(checkbox.length).toBe(2); <mask> expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); <mask> }); <mask> <mask> it('inDeterminant on checkBox', () => { <mask> const { getAllByRole } = render( <mask> <NativeBaseProvider <mask> initialWindowMetrics={{ <mask> frame: { x: 0, y: 0, width: 0, height: 0 }, <mask> insets: { top: 0, left: 0, right: 0, bottom: 0 }, <mask> }} <mask> > <mask> <CheckBox group={false} /> <mask> </NativeBaseProvider> <mask> ); <mask> const checkbox = getAllByRole('checkbox'); <mask> expect(checkbox.length).toBe(2); <mask> fireEvent.press(checkbox[1]); <mask> expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); <mask> }); <mask> <mask> it('onChange on checkBox', () => { <mask> const { getAllByRole } = render( <mask> <NativeBaseProvider <mask> initialWindowMetrics={{ </s> Revert "Revert "Feat/unit testing jest"" </s> remove it('inDeterminant on checkBoxGroup', () => { const { getAllByRole } = render( <NativeBaseProvider initialWindowMetrics={{ frame: { x: 0, y: 0, width: 0, height: 0 }, insets: { top: 0, left: 0, right: 0, bottom: 0 }, }} > <CheckBox group={true} /> </NativeBaseProvider> ); const checkbox = getAllByRole('checkbox'); expect(checkbox.length).toBe(2); expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); }); </s> add /**** inDeterminant is not yet implemented in checkbox ****/ </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.sm ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.sm); </s> remove <Input testID="test" variant="underlined" /> </s> add <Input _stack={{ testID: 'test' }} variant="underlined" /> </s> remove expect(inputElement.props.style[0].borderBottomWidth).toBe(1); </s> add expect(inputElement.props.style.borderBottomWidth).toBe(1);
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/components/primitives/Checkbox/test/checkbox.test.tsx
const { color, size, style, testID, ...resolvedProps } = usePropsResolution(
<mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps'; <mask> import { useTheme } from '../../../hooks'; <mask> <mask> const Spinner = (props: ISpinnerProps, ref: any) => { <mask> const { color, size, style, ...resolvedProps } = usePropsResolution( <mask> 'Spinner', <mask> props <mask> ); <mask> const resolvedColor = getColor(color, useTheme().colors, useTheme()); <mask> const resolvedStyle = useStyledSystemPropsResolver(resolvedProps); </s> Revert "Revert "Feat/unit testing jest"" </s> remove import React from 'react'; import { StatusBar } from 'native-base'; </s> add import React, { useState } from 'react'; import { StatusBar, Box, Text, Button } from 'native-base'; </s> remove import { List, SearchIcon } from 'native-base'; </s> add import { List } from 'native-base'; import { SimpleLineIcons, Ionicons } from '@expo/vector-icons'; </s> remove return <StatusBar />; </s> add const [hidden, setHidden] = useState(false); const changeStatusBarVisibility = () => setHidden(!hidden); return ( <Box flex={1} justifyContent="center" safeArea> <StatusBar animated={true} backgroundColor="#61dafb" barStyle="default" showHideTransition="fade" hidden={hidden} /> <Text textAlign="center" mb={3}> StatusBar Visibility:{'\n'} {hidden ? 'Hidden' : 'Visible'} </Text> <Box p={10}> <Button onPress={changeStatusBarVisibility}>Toggle StatusBar</Button> </Box> </Box> ); </s> remove <List mt={2} my={2}> </s> add <List mt={2} my={2} width={80}> </s> remove Center, </s> add ScrollView,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/components/primitives/Spinner/index.tsx
testID={testID}
<mask> } <mask> <mask> return ( <mask> <ActivityIndicator <mask> accessible <mask> accessibilityLabel="loading" <mask> color={resolvedColor} <mask> ref={ref} </s> Revert "Revert "Feat/unit testing jest"" </s> remove <Center> <Stack space={3} w="90%" maxW="400"> </s> add <ScrollView mt={5}> <Stack space={3} w="90%" maxW="400" mr={5} flexDirection="column" justifyContent="center" alignItems="center" > </s> remove <List mt={2} my={2}> </s> add <List mt={2} my={2} width={80}> </s> remove <Alert justifyContent="center" status="error"> </s> add <Alert justifyContent="center" status="error" safeAreaTop={8}> </s> remove import { List, SearchIcon } from 'native-base'; </s> add import { List } from 'native-base'; import { SimpleLineIcons, Ionicons } from '@expo/vector-icons'; </s> remove return <StatusBar />; </s> add const [hidden, setHidden] = useState(false); const changeStatusBarVisibility = () => setHidden(!hidden); return ( <Box flex={1} justifyContent="center" safeArea> <StatusBar animated={true} backgroundColor="#61dafb" barStyle="default" showHideTransition="fade" hidden={hidden} /> <Text textAlign="center" mb={3}> StatusBar Visibility:{'\n'} {hidden ? 'Hidden' : 'Visible'} </Text> <Box p={10}> <Button onPress={changeStatusBarVisibility}>Toggle StatusBar</Button> </Box> </Box> );
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/components/primitives/Spinner/index.tsx
expect(spinner.props.style).toEqual([[{}, { dataSet: {} }], undefined]);
<mask> maxWidth: '100%', <mask> width: defaultTheme.space['20'], <mask> }); <mask> <mask> expect(spinner.props.style).toEqual(undefined); <mask> }); <mask> <mask> it('resolves base style and variants, sizes and default props with props', () => { <mask> const newTheme = extendTheme({ <mask> components: { </s> Revert "Revert "Feat/unit testing jest"" </s> remove it('inDeterminant on checkBoxGroup', () => { const { getAllByRole } = render( <NativeBaseProvider initialWindowMetrics={{ frame: { x: 0, y: 0, width: 0, height: 0 }, insets: { top: 0, left: 0, right: 0, bottom: 0 }, }} > <CheckBox group={true} /> </NativeBaseProvider> ); const checkbox = getAllByRole('checkbox'); expect(checkbox.length).toBe(2); expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); }); </s> add /**** inDeterminant is not yet implemented in checkbox ****/ </s> remove it('inDeterminant on checkBox', () => { const { getAllByRole } = render( <NativeBaseProvider initialWindowMetrics={{ frame: { x: 0, y: 0, width: 0, height: 0 }, insets: { top: 0, left: 0, right: 0, bottom: 0 }, }} > <CheckBox group={false} /> </NativeBaseProvider> ); const checkbox = getAllByRole('checkbox'); expect(checkbox.length).toBe(2); fireEvent.press(checkbox[1]); expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); }); </s> add // it('inDeterminant on checkBoxGroup', () => { // const { getAllByRole } = render( // <NativeBaseProvider // initialWindowMetrics={{ // frame: { x: 0, y: 0, width: 0, height: 0 }, // insets: { top: 0, left: 0, right: 0, bottom: 0 }, // }} // > // <CheckBox group={true} /> // </NativeBaseProvider> // ); // const checkbox = getAllByRole('checkbox'); // expect(checkbox.length).toBe(2); // expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); // }); // it('inDeterminant on checkBox', () => { // const { getAllByRole } = render( // <NativeBaseProvider // initialWindowMetrics={{ // frame: { x: 0, y: 0, width: 0, height: 0 }, // insets: { top: 0, left: 0, right: 0, bottom: 0 }, // }} // > // <CheckBox group={false} /> // </NativeBaseProvider> // ); // const checkbox = getAllByRole('checkbox'); // expect(checkbox.length).toBe(2); // fireEvent.press(checkbox[1]); // expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); // }); </s> remove expect(inputElement.props.style[0].marginRight).toBe( </s> add expect(inputElementStack.props.style.marginRight).toBe( </s> remove <List.Icon as={<SearchIcon />} /> </s> add <List.Icon as={Ionicons} name="attach" /> </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.sm ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.sm);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/hooks/useThemeProps/usePropsResolution.test.tsx
_stack={{ testID: 'StackTest' }} _input={{ testID: 'test' }}
<mask> it('Input: Basic check', () => { <mask> const { getByTestId } = render( <mask> <Provider> <mask> <Input <mask> testID="test" <mask> w="100%" <mask> mx={3} <mask> placeholder="Default Input" <mask> placeholderTextColor="blueGray.400" <mask> /> </s> Revert "Revert "Feat/unit testing jest"" </s> remove testID="test" </s> add _input={{ testID: 'test' }} </s> remove <Input testID="test" variant="underlined" /> </s> add <Input _stack={{ testID: 'test' }} variant="underlined" /> </s> remove expect(inputElement.props.style[0].borderBottomWidth).toBe(1); </s> add expect(inputElement.props.style.borderBottomWidth).toBe(1); </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.sm ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.sm); </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.xs ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.xs);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/hooks/useThemeProps/usePropsResolution.test.tsx
const inputElementStack = getByTestId('StackTest'); expect(inputElement.props.style.width).toBe('100%');
<mask> /> <mask> </Provider> <mask> ); <mask> const inputElement = getByTestId('test'); <mask> expect(inputElement.props.style[0].width).toBe('100%'); <mask> <mask> expect(inputElement.props.placeholderTextColor).toBe( <mask> defaultTheme.colors.blueGray['400'] <mask> ); <mask> expect(inputElement.props.style[0].marginLeft).toBe( <mask> defaultTheme.space['3'] </s> Revert "Revert "Feat/unit testing jest"" </s> remove expect(inputElement.props.style[0].marginLeft).toBe( </s> add expect(inputElementStack.props.style.marginLeft).toBe( </s> remove expect(inputElement.props.style[0].marginRight).toBe( </s> add expect(inputElementStack.props.style.marginRight).toBe( </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.sm ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.sm); </s> remove expect(inputElement.props.style[0].borderBottomWidth).toBe(1); </s> add const inputElementStack = getByTestId('stackTest'); expect(inputElementStack.props.style.borderBottomWidth).toBe(1); </s> remove expect(inputElement.props.style[0].borderBottomWidth).toBe(1); </s> add expect(inputElement.props.style.borderBottomWidth).toBe(1);
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/hooks/useThemeProps/usePropsResolution.test.tsx
expect(inputElementStack.props.style.marginLeft).toBe(
<mask> <mask> expect(inputElement.props.placeholderTextColor).toBe( <mask> defaultTheme.colors.blueGray['400'] <mask> ); <mask> expect(inputElement.props.style[0].marginLeft).toBe( <mask> defaultTheme.space['3'] <mask> ); <mask> expect(inputElement.props.style[0].marginRight).toBe( <mask> defaultTheme.space['3'] <mask> ); </s> Revert "Revert "Feat/unit testing jest"" </s> remove expect(inputElement.props.style[0].width).toBe('100%'); </s> add const inputElementStack = getByTestId('StackTest'); expect(inputElement.props.style.width).toBe('100%'); </s> remove expect(inputElement.props.style[0].marginRight).toBe( </s> add expect(inputElementStack.props.style.marginRight).toBe( </s> remove </Center> </s> add </ScrollView> </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.sm ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.sm);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/hooks/useThemeProps/usePropsResolution.test.tsx
expect(inputElementStack.props.style.marginRight).toBe(
<mask> ); <mask> expect(inputElement.props.style[0].marginLeft).toBe( <mask> defaultTheme.space['3'] <mask> ); <mask> expect(inputElement.props.style[0].marginRight).toBe( <mask> defaultTheme.space['3'] <mask> ); <mask> }); <mask> <mask> it('Input: color mode', () => { </s> Revert "Revert "Feat/unit testing jest"" </s> remove expect(inputElement.props.style[0].marginLeft).toBe( </s> add expect(inputElementStack.props.style.marginLeft).toBe( </s> remove expect(inputElement.props.style[0].width).toBe('100%'); </s> add const inputElementStack = getByTestId('StackTest'); expect(inputElement.props.style.width).toBe('100%'); </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.sm ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.sm); </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.xs ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.xs); </s> remove expect(inputElement.props.style[0].borderBottomWidth).toBe(1); </s> add expect(inputElement.props.style.borderBottomWidth).toBe(1);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/hooks/useThemeProps/usePropsResolution.test.tsx
_input={{ testID: 'test' }}
<mask> }); <mask> const { getByTestId } = render( <mask> <Provider theme={newTheme}> <mask> <Input <mask> testID="test" <mask> _light={{ <mask> placeholderTextColor: 'blueGray.400', <mask> }} <mask> _dark={{ <mask> placeholderTextColor: 'blueGray.50', </s> Revert "Revert "Feat/unit testing jest"" </s> remove testID="test" </s> add _input={{ testID: 'test' }} </s> remove testID="test" </s> add _stack={{ testID: 'stackTest' }} _input={{ testID: 'test' }} </s> remove <Input testID="test" variant="underlined" /> </s> add <Input _stack={{ testID: 'test' }} variant="underlined" /> </s> remove testID="test" </s> add _input={{ testID: 'test' }} </s> remove testID="test" </s> add _stack={{ testID: 'StackTest' }} _input={{ testID: 'test' }}
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/hooks/useThemeProps/usePropsResolution.test.tsx
_input={{ testID: 'test' }}
<mask> }); <mask> const { getByTestId } = render( <mask> <Provider theme={newTheme}> <mask> <Input <mask> testID="test" <mask> size="sm" <mask> variant="outline" <mask> _dark={{ <mask> size: 'md', <mask> }} </s> Revert "Revert "Feat/unit testing jest"" </s> remove testID="test" </s> add _input={{ testID: 'test' }} </s> remove testID="test" </s> add _stack={{ testID: 'stackTest' }} _input={{ testID: 'test' }} </s> remove <Input testID="test" variant="underlined" /> </s> add <Input _stack={{ testID: 'test' }} variant="underlined" /> </s> remove testID="test" </s> add _input={{ testID: 'test' }} </s> remove testID="test" </s> add _stack={{ testID: 'StackTest' }} _input={{ testID: 'test' }}
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/hooks/useThemeProps/usePropsResolution.test.tsx
expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.sm);
<mask> /> <mask> </Provider> <mask> ); <mask> const inputElement = getByTestId('test'); <mask> expect(inputElement.props.style[0].fontSize).toBe( <mask> defaultTheme.fontSizes.sm <mask> ); <mask> }); <mask> <mask> it('Input: variant', () => { <mask> const { getByTestId } = render( <mask> <Provider> </s> Revert "Revert "Feat/unit testing jest"" </s> remove <Input testID="test" variant="underlined" /> </s> add <Input _stack={{ testID: 'test' }} variant="underlined" /> </s> remove expect(inputElement.props.style[0].borderBottomWidth).toBe(1); </s> add expect(inputElement.props.style.borderBottomWidth).toBe(1); </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.xs ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.xs); </s> remove expect(inputElement.props.style[0].borderBottomWidth).toBe(1); </s> add const inputElementStack = getByTestId('stackTest'); expect(inputElementStack.props.style.borderBottomWidth).toBe(1); </s> remove testID="test" </s> add _input={{ testID: 'test' }}
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/hooks/useThemeProps/usePropsResolution.test.tsx
<Input _stack={{ testID: 'test' }} variant="underlined" />
<mask> <mask> it('Input: variant', () => { <mask> const { getByTestId } = render( <mask> <Provider> <mask> <Input testID="test" variant="underlined" /> <mask> </Provider> <mask> ); <mask> const inputElement = getByTestId('test'); <mask> expect(inputElement.props.style[0].borderBottomWidth).toBe(1); <mask> }); </s> Revert "Revert "Feat/unit testing jest"" </s> remove expect(inputElement.props.style[0].borderBottomWidth).toBe(1); </s> add expect(inputElement.props.style.borderBottomWidth).toBe(1); </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.sm ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.sm); </s> remove testID="test" </s> add _input={{ testID: 'test' }} </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.xs ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.xs); </s> remove testID="test" </s> add _stack={{ testID: 'StackTest' }} _input={{ testID: 'test' }}
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/hooks/useThemeProps/usePropsResolution.test.tsx
expect(inputElement.props.style.borderBottomWidth).toBe(1);
<mask> <Input testID="test" variant="underlined" /> <mask> </Provider> <mask> ); <mask> const inputElement = getByTestId('test'); <mask> expect(inputElement.props.style[0].borderBottomWidth).toBe(1); <mask> }); <mask> <mask> // it('Input: inputElements', () => { <mask> // const { getByTestId } = render( <mask> // <Provider> </s> Revert "Revert "Feat/unit testing jest"" </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.xs ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.xs); </s> remove <Input testID="test" variant="underlined" /> </s> add <Input _stack={{ testID: 'test' }} variant="underlined" /> </s> remove it('inDeterminant on checkBox', () => { const { getAllByRole } = render( <NativeBaseProvider initialWindowMetrics={{ frame: { x: 0, y: 0, width: 0, height: 0 }, insets: { top: 0, left: 0, right: 0, bottom: 0 }, }} > <CheckBox group={false} /> </NativeBaseProvider> ); const checkbox = getAllByRole('checkbox'); expect(checkbox.length).toBe(2); fireEvent.press(checkbox[1]); expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); }); </s> add // it('inDeterminant on checkBoxGroup', () => { // const { getAllByRole } = render( // <NativeBaseProvider // initialWindowMetrics={{ // frame: { x: 0, y: 0, width: 0, height: 0 }, // insets: { top: 0, left: 0, right: 0, bottom: 0 }, // }} // > // <CheckBox group={true} /> // </NativeBaseProvider> // ); // const checkbox = getAllByRole('checkbox'); // expect(checkbox.length).toBe(2); // expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); // }); // it('inDeterminant on checkBox', () => { // const { getAllByRole } = render( // <NativeBaseProvider // initialWindowMetrics={{ // frame: { x: 0, y: 0, width: 0, height: 0 }, // insets: { top: 0, left: 0, right: 0, bottom: 0 }, // }} // > // <CheckBox group={false} /> // </NativeBaseProvider> // ); // const checkbox = getAllByRole('checkbox'); // expect(checkbox.length).toBe(2); // fireEvent.press(checkbox[1]); // expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); // }); </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.sm ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.sm); </s> remove expect(inputElement.props.style[0].borderBottomWidth).toBe(1); </s> add const inputElementStack = getByTestId('stackTest'); expect(inputElementStack.props.style.borderBottomWidth).toBe(1);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/hooks/useThemeProps/usePropsResolution.test.tsx
_stack={{ testID: 'stackTest' }} _input={{ testID: 'test' }}
<mask> Platform.OS = 'ios'; <mask> const { getByTestId } = render( <mask> <Provider theme={newTheme}> <mask> <Input <mask> testID="test" <mask> _ios={{ _dark: { variant: 'underlined', size: 'sm' } }} <mask> variant="outline" <mask> size="lg" <mask> /> <mask> </Provider> </s> Revert "Revert "Feat/unit testing jest"" </s> remove testID="test" </s> add _input={{ testID: 'test' }} </s> remove testID="test" </s> add _input={{ testID: 'test' }} </s> remove testID="test" </s> add _input={{ testID: 'test' }} </s> remove <Input testID="test" variant="underlined" /> </s> add <Input _stack={{ testID: 'test' }} variant="underlined" /> </s> remove expect(inputElement.props.style[0].borderBottomWidth).toBe(1); </s> add expect(inputElement.props.style.borderBottomWidth).toBe(1);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/hooks/useThemeProps/usePropsResolution.test.tsx
const inputElementStack = getByTestId('stackTest'); expect(inputElementStack.props.style.borderBottomWidth).toBe(1);
<mask> /> <mask> </Provider> <mask> ); <mask> const inputElement = getByTestId('test'); <mask> expect(inputElement.props.style[0].borderBottomWidth).toBe(1); <mask> // as input of 'sm' size is mapped to 'xs' fontsize <mask> expect(inputElement.props.style[0].fontSize).toBe( <mask> defaultTheme.fontSizes.xs <mask> ); <mask> }); </s> Revert "Revert "Feat/unit testing jest"" </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.xs ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.xs); </s> remove expect(inputElement.props.style[0].borderBottomWidth).toBe(1); </s> add expect(inputElement.props.style.borderBottomWidth).toBe(1); </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.sm ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.sm); </s> remove <Input testID="test" variant="underlined" /> </s> add <Input _stack={{ testID: 'test' }} variant="underlined" /> </s> remove expect(inputElement.props.style[0].width).toBe('100%'); </s> add const inputElementStack = getByTestId('StackTest'); expect(inputElement.props.style.width).toBe('100%');
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/hooks/useThemeProps/usePropsResolution.test.tsx
expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.xs);
<mask> ); <mask> const inputElement = getByTestId('test'); <mask> expect(inputElement.props.style[0].borderBottomWidth).toBe(1); <mask> // as input of 'sm' size is mapped to 'xs' fontsize <mask> expect(inputElement.props.style[0].fontSize).toBe( <mask> defaultTheme.fontSizes.xs <mask> ); <mask> }); <mask> <mask> // it('Input: inputElemets', () => { <mask> // const { getByTestId } = render( <mask> // <Provider> </s> Revert "Revert "Feat/unit testing jest"" </s> remove expect(inputElement.props.style[0].borderBottomWidth).toBe(1); </s> add const inputElementStack = getByTestId('stackTest'); expect(inputElementStack.props.style.borderBottomWidth).toBe(1); </s> remove expect(inputElement.props.style[0].borderBottomWidth).toBe(1); </s> add expect(inputElement.props.style.borderBottomWidth).toBe(1); </s> remove it('inDeterminant on checkBox', () => { const { getAllByRole } = render( <NativeBaseProvider initialWindowMetrics={{ frame: { x: 0, y: 0, width: 0, height: 0 }, insets: { top: 0, left: 0, right: 0, bottom: 0 }, }} > <CheckBox group={false} /> </NativeBaseProvider> ); const checkbox = getAllByRole('checkbox'); expect(checkbox.length).toBe(2); fireEvent.press(checkbox[1]); expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); }); </s> add // it('inDeterminant on checkBoxGroup', () => { // const { getAllByRole } = render( // <NativeBaseProvider // initialWindowMetrics={{ // frame: { x: 0, y: 0, width: 0, height: 0 }, // insets: { top: 0, left: 0, right: 0, bottom: 0 }, // }} // > // <CheckBox group={true} /> // </NativeBaseProvider> // ); // const checkbox = getAllByRole('checkbox'); // expect(checkbox.length).toBe(2); // expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); // }); // it('inDeterminant on checkBox', () => { // const { getAllByRole } = render( // <NativeBaseProvider // initialWindowMetrics={{ // frame: { x: 0, y: 0, width: 0, height: 0 }, // insets: { top: 0, left: 0, right: 0, bottom: 0 }, // }} // > // <CheckBox group={false} /> // </NativeBaseProvider> // ); // const checkbox = getAllByRole('checkbox'); // expect(checkbox.length).toBe(2); // fireEvent.press(checkbox[1]); // expect(checkbox[1].props.accessibilityState.checked).toBe('mixed'); // }); </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.sm ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.sm); </s> remove <Input testID="test" variant="underlined" /> </s> add <Input _stack={{ testID: 'test' }} variant="underlined" />
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/hooks/useThemeProps/usePropsResolution.test.tsx
_input={{ testID: 'test' }}
<mask> it('Input: disabled', () => { <mask> const { getByTestId } = render( <mask> <Provider> <mask> <Input <mask> testID="test" <mask> type="password" <mask> isDisabled={true} <mask> isRequired={true} <mask> /> <mask> </Provider> </s> Revert "Revert "Feat/unit testing jest"" </s> remove <Input testID="test" variant="underlined" /> </s> add <Input _stack={{ testID: 'test' }} variant="underlined" /> </s> remove expect(inputElement.props.style[0].borderBottomWidth).toBe(1); </s> add expect(inputElement.props.style.borderBottomWidth).toBe(1); </s> remove testID="test" </s> add _stack={{ testID: 'StackTest' }} _input={{ testID: 'test' }} </s> remove expect(inputElement.props.style[0].fontSize).toBe( defaultTheme.fontSizes.sm ); </s> add expect(inputElement.props.style.fontSize).toBe(defaultTheme.fontSizes.sm); </s> remove testID="test" </s> add _stack={{ testID: 'stackTest' }} _input={{ testID: 'test' }}
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/311ad8a16488ba7e56d0dde0c3324851c5a6f6b0
src/hooks/useThemeProps/usePropsResolution.test.tsx
"expo-font": "~8.4.0",
<mask> "@expo/vector-icons": "^12.0.2", <mask> "@react-native-aria/overlays": "^0.2.9", <mask> "@react-native-async-storage/async-storage": "^1.13.2", <mask> "expo": "~40.0.0", <mask> "expo-splash-screen": "^0.8.1", <mask> "expo-status-bar": "~1.0.3", <mask> "formik": "^2.2.6", <mask> "react": "16.13.1", <mask> "react-dom": "16.13.1", </s> fix: v3 change typography and custom font support </s> remove const defaultProps = { size: 'xl' }; </s> add const defaultProps = { size: 'md', }; </s> remove bg={useColorModeValue(`gray.50`, `gray.800`)} </s> add bg={bgColor} </s> remove <Button size="lg" colorScheme="green" mt="24px"> </s> add <Button size="md" colorScheme="green" mt="24px">
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
example/package.json
import { useFonts } from 'expo-font';
<mask> import type { StorageManager } from 'native-base'; <mask> import { Button } from 'react-native'; <mask> import AsyncStorage from '@react-native-async-storage/async-storage'; <mask> <mask> function MyWrapper({ children }: any) { <mask> const { colorMode, toggleColorMode } = useColorMode(); <mask> </s> fix: v3 change typography and custom font support </s> remove '2xl': { fontSize: '4xl' }, 'xl': { fontSize: '3xl' }, 'lg': { fontSize: '2xl' }, 'md': { fontSize: 'xl' }, 'sm': { fontSize: 'md' }, 'xs': { fontSize: 'sm' }, </s> add '2xl': { fontSize: '6xl', fontWeight: 'light', letterSpacing: 'xxs', }, 'xl': { fontSize: '5xl', fontWeight: 'light', letterSpacing: 'xs', }, 'lg': { fontSize: '4xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'md': { fontSize: '3xl', fontWeight: 'normal', letterSpacing: 'xl', }, 'sm': { fontSize: 'xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'xs': { fontSize: 'lg', fontWeight: 'medium', letterSpacing: 'lg', }, </s> remove const defaultProps = { size: 'xl' }; </s> add const defaultProps = { size: 'md', }; </s> remove fontWeight: 'bold', </s> add
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
example/storybook/stories/components/Wrapper.tsx
const bgColor = useColorModeValue(`gray.50`, `gray.800`); const [loaded] = useFonts({ 'Roboto-Bold': require('../../../assets/fonts/Roboto-Bold.ttf'), 'Roboto-Italic': require('../../../assets/fonts/Roboto-Italic.ttf'), 'Roboto-Light': require('../../../assets/fonts/Roboto-Light.ttf'), 'Roboto-Regular': require('../../../assets/fonts/Roboto-Regular.ttf'), 'Roboto-Medium': require('../../../assets/fonts/Roboto-Medium.ttf'), }); if (!loaded) return null;
<mask> function MyWrapper({ children }: any) { <mask> const { colorMode, toggleColorMode } = useColorMode(); <mask> return ( <mask> <View <mask> flex={1} <mask> justifyContent="center" <mask> alignItems="center" </s> fix: v3 change typography and custom font support </s> remove bg={useColorModeValue(`gray.50`, `gray.800`)} </s> add bg={bgColor} </s> remove fontWeight: 'bold', </s> add </s> remove '2xl': { fontSize: '4xl' }, 'xl': { fontSize: '3xl' }, 'lg': { fontSize: '2xl' }, 'md': { fontSize: 'xl' }, 'sm': { fontSize: 'md' }, 'xs': { fontSize: 'sm' }, </s> add '2xl': { fontSize: '6xl', fontWeight: 'light', letterSpacing: 'xxs', }, 'xl': { fontSize: '5xl', fontWeight: 'light', letterSpacing: 'xs', }, 'lg': { fontSize: '4xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'md': { fontSize: '3xl', fontWeight: 'normal', letterSpacing: 'xl', }, 'sm': { fontSize: 'xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'xs': { fontSize: 'lg', fontWeight: 'medium', letterSpacing: 'lg', }, </s> remove <Heading size={36}>(36) In love with React Native</Heading> <Heading size="2xl">(2xl) In love with React Native</Heading> <Heading size="xl">(xl) In love with React Native</Heading> <Heading size="lg">(lg) In love with React Native</Heading> <Heading size="md">(md) In love with React Native</Heading> <Heading size="sm">(sm) In love with React Native</Heading> <Heading size="xs">(xs) In love with React Native</Heading> </s> add <Heading size="2xl">(2xl) Heading</Heading> <Heading size="xl">(xl) Heading</Heading> <Heading size="lg">(lg) Heading</Heading> <Heading size="md">(md) Heading </Heading> <Heading size="sm">(sm) Heading </Heading> <Heading size="xs">(xs) Heading </Heading>
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
example/storybook/stories/components/Wrapper.tsx
bg={bgColor}
<mask> <View <mask> flex={1} <mask> justifyContent="center" <mask> alignItems="center" <mask> bg={useColorModeValue(`gray.50`, `gray.800`)} <mask> safeAreaY <mask> > <mask> <IconButton <mask> position="absolute" <mask> top={12} </s> fix: v3 change typography and custom font support </s> remove fontWeight: 300, letterSpacing: 1, </s> add fontWeight: 400, letterSpacing: '3xl', fontFamily: 'body', fontStyle: 'normal',
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
example/storybook/stories/components/Wrapper.tsx
<Button size="md" colorScheme="green" mt="24px">
<mask> <Text fontSize="xl"> <mask> An accessible & utility-first component library to build your design <mask> system for all the platforms (web in beta). <mask> </Text> <mask> <Button size="lg" colorScheme="green" mt="24px"> <mask> Let's get started <mask> </Button> <mask> </Box> <mask> ); <mask> } </s> fix: v3 change typography and custom font support </s> remove <Heading size={36}>(36) In love with React Native</Heading> <Heading size="2xl">(2xl) In love with React Native</Heading> <Heading size="xl">(xl) In love with React Native</Heading> <Heading size="lg">(lg) In love with React Native</Heading> <Heading size="md">(md) In love with React Native</Heading> <Heading size="sm">(sm) In love with React Native</Heading> <Heading size="xs">(xs) In love with React Native</Heading> </s> add <Heading size="2xl">(2xl) Heading</Heading> <Heading size="xl">(xl) Heading</Heading> <Heading size="lg">(lg) Heading</Heading> <Heading size="md">(md) Heading </Heading> <Heading size="sm">(sm) Heading </Heading> <Heading size="xs">(xs) Heading </Heading> </s> remove fontWeight: 300, letterSpacing: 1, </s> add fontWeight: 400, letterSpacing: '3xl', fontFamily: 'body', fontStyle: 'normal',
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
example/storybook/stories/components/primitives/Heading/Composition.tsx
<Heading size="2xl">(2xl) Heading</Heading> <Heading size="xl">(xl) Heading</Heading> <Heading size="lg">(lg) Heading</Heading> <Heading size="md">(md) Heading </Heading> <Heading size="sm">(sm) Heading </Heading> <Heading size="xs">(xs) Heading </Heading>
<mask> <mask> export default function () { <mask> return ( <mask> <VStack> <mask> <Heading size={36}>(36) In love with React Native</Heading> <mask> <Heading size="2xl">(2xl) In love with React Native</Heading> <mask> <Heading size="xl">(xl) In love with React Native</Heading> <mask> <Heading size="lg">(lg) In love with React Native</Heading> <mask> <Heading size="md">(md) In love with React Native</Heading> <mask> <Heading size="sm">(sm) In love with React Native</Heading> <mask> <Heading size="xs">(xs) In love with React Native</Heading> <mask> </VStack> <mask> ); <mask> } </s> fix: v3 change typography and custom font support </s> remove const defaultProps = { size: 'xl' }; </s> add const defaultProps = { size: 'md', }; </s> remove fontWeight: 300, letterSpacing: 1, </s> add fontWeight: 400, letterSpacing: '3xl', fontFamily: 'body', fontStyle: 'normal',
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
example/storybook/stories/components/primitives/Heading/Sizes.tsx
import { useTheme } from '../../../hooks';
<mask> import React from 'react'; <mask> import { Text as NativeText } from 'react-native'; <mask> import styled from 'styled-components/native'; <mask> import { <mask> color, <mask> position, </s> fix: v3 change typography and custom font support </s> remove <Heading size={36}>(36) In love with React Native</Heading> <Heading size="2xl">(2xl) In love with React Native</Heading> <Heading size="xl">(xl) In love with React Native</Heading> <Heading size="lg">(lg) In love with React Native</Heading> <Heading size="md">(md) In love with React Native</Heading> <Heading size="sm">(sm) In love with React Native</Heading> <Heading size="xs">(xs) In love with React Native</Heading> </s> add <Heading size="2xl">(2xl) Heading</Heading> <Heading size="xl">(xl) Heading</Heading> <Heading size="lg">(lg) Heading</Heading> <Heading size="md">(md) Heading </Heading> <Heading size="sm">(sm) Heading </Heading> <Heading size="xs">(xs) Heading </Heading> </s> remove '2xl': { fontSize: '4xl' }, 'xl': { fontSize: '3xl' }, 'lg': { fontSize: '2xl' }, 'md': { fontSize: 'xl' }, 'sm': { fontSize: 'md' }, 'xs': { fontSize: 'sm' }, </s> add '2xl': { fontSize: '6xl', fontWeight: 'light', letterSpacing: 'xxs', }, 'xl': { fontSize: '5xl', fontWeight: 'light', letterSpacing: 'xs', }, 'lg': { fontSize: '4xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'md': { fontSize: '3xl', fontWeight: 'normal', letterSpacing: 'xl', }, 'sm': { fontSize: 'xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'xs': { fontSize: 'lg', fontWeight: 'medium', letterSpacing: 'lg', }, </s> remove const defaultProps = { size: 'xl' }; </s> add const defaultProps = { size: 'md', }; </s> remove fontWeight: 'bold', </s> add
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
src/components/primitives/Text/index.tsx
fontFamily: propFontFamily, fontWeight: propFontWeight, fontStyle: propFontStyle,
<mask> underline, <mask> strikeThrough, <mask> ...newProps <mask> } = useThemeProps('Text', props); <mask> <mask> let fontFamily = propFontFamily; <mask> let fontStyle = italic ? 'italic' : propFontStyle; <mask> let fontWeight = bold ? 'bold' : propFontWeight; </s> fix: v3 change typography and custom font support </s> remove fontWeight={bold ? 'bold' : newProps.fontWeight} fontStyle={italic ? 'italic' : newProps.fontStyle} </s> add fontWeight={bold ? 'bold' : fontWeight} fontStyle={italic ? 'italic' : fontStyle}
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
src/components/primitives/Text/index.tsx
let fontFamily = propFontFamily; let fontStyle = italic ? 'italic' : propFontStyle; let fontWeight = bold ? 'bold' : propFontWeight; const resolvedFontFamily = useResolvedFontFamily({ fontFamily, fontWeight, fontStyle, }); if (resolvedFontFamily) { fontFamily = resolvedFontFamily; }
<mask> fontStyle: propFontStyle, <mask> ...newProps <mask> } = useThemeProps('Text', props); <mask> return ( <mask> <StyledText <mask> {...newProps} <mask> numberOfLines={noOfLines ? noOfLines : isTruncated ? 1 : undefined} <mask> fontWeight={bold ? 'bold' : fontWeight} </s> fix: v3 change typography and custom font support </s> remove fontWeight={bold ? 'bold' : newProps.fontWeight} fontStyle={italic ? 'italic' : newProps.fontStyle} </s> add fontWeight={bold ? 'bold' : fontWeight} fontStyle={italic ? 'italic' : fontStyle} </s> remove fontWeight: 300, letterSpacing: 1, </s> add fontWeight: 400, letterSpacing: '3xl', fontFamily: 'body', fontStyle: 'normal',
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
src/components/primitives/Text/index.tsx
fontWeight={bold ? 'bold' : fontWeight} fontStyle={italic ? 'italic' : fontStyle}
<mask> return ( <mask> <StyledText <mask> {...newProps} <mask> numberOfLines={noOfLines ? noOfLines : isTruncated ? 1 : undefined} <mask> fontWeight={bold ? 'bold' : newProps.fontWeight} <mask> fontStyle={italic ? 'italic' : newProps.fontStyle} <mask> bg={highlight ? 'warning.200' : newProps.bg} <mask> textDecorationLine={ <mask> underline <mask> ? 'underline' <mask> : strikeThrough </s> fix: v3 change typography and custom font support </s> remove <Heading size={36}>(36) In love with React Native</Heading> <Heading size="2xl">(2xl) In love with React Native</Heading> <Heading size="xl">(xl) In love with React Native</Heading> <Heading size="lg">(lg) In love with React Native</Heading> <Heading size="md">(md) In love with React Native</Heading> <Heading size="sm">(sm) In love with React Native</Heading> <Heading size="xs">(xs) In love with React Native</Heading> </s> add <Heading size="2xl">(2xl) Heading</Heading> <Heading size="xl">(xl) Heading</Heading> <Heading size="lg">(lg) Heading</Heading> <Heading size="md">(md) Heading </Heading> <Heading size="sm">(sm) Heading </Heading> <Heading size="xs">(xs) Heading </Heading>
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
src/components/primitives/Text/index.tsx
fontFamily={fontFamily}
<mask> : newProps.textDecorationLine <mask> } <mask> fontSize={sub ? 10 : newProps.fontSize} <mask> ref={ref} <mask> > <mask> {children} <mask> </StyledText> <mask> ); <mask> }; </s> fix: v3 change typography and custom font support </s> remove fontWeight={bold ? 'bold' : newProps.fontWeight} fontStyle={italic ? 'italic' : newProps.fontStyle} </s> add fontWeight={bold ? 'bold' : fontWeight} fontStyle={italic ? 'italic' : fontStyle} </s> remove bg={useColorModeValue(`gray.50`, `gray.800`)} </s> add bg={bgColor} </s> remove <Button size="lg" colorScheme="green" mt="24px"> </s> add <Button size="md" colorScheme="green" mt="24px">
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
src/components/primitives/Text/index.tsx
xxs: -1.5, xs: -0.5, sm: 0, md: 0.1, lg: 0.15, xl: 0.25, '2xl': 0.4, '3xl': 0.5, '4xl': 1.25, '5xl': 1.5,
<mask> const typography = { <mask> letterSpacings: { <mask> tighter: '-0.08px', <mask> tight: '-0.4px', <mask> normal: '0', <mask> wide: '0.4px', <mask> wider: '0.8px', <mask> widest: '1.6px', <mask> }, <mask> lineHeights: { <mask> none: 1, <mask> shorter: 1.25, <mask> short: 1.375, </s> fix: v3 change typography and custom font support </s> remove '2xl': { fontSize: '4xl' }, 'xl': { fontSize: '3xl' }, 'lg': { fontSize: '2xl' }, 'md': { fontSize: 'xl' }, 'sm': { fontSize: 'md' }, 'xs': { fontSize: 'sm' }, </s> add '2xl': { fontSize: '6xl', fontWeight: 'light', letterSpacing: 'xxs', }, 'xl': { fontSize: '5xl', fontWeight: 'light', letterSpacing: 'xs', }, 'lg': { fontSize: '4xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'md': { fontSize: '3xl', fontWeight: 'normal', letterSpacing: 'xl', }, 'sm': { fontSize: 'xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'xs': { fontSize: 'lg', fontWeight: 'medium', letterSpacing: 'lg', }, </s> remove fontWeight: 300, letterSpacing: 1, </s> add fontWeight: 400, letterSpacing: '3xl', fontFamily: 'body', fontStyle: 'normal', </s> remove heading: `Courier`, body: `Courier`, mono: `monospace`, </s> add heading: 'Roboto', body: 'Roboto', mono: 'monospace', </s> remove const defaultProps = { size: 'xl' }; </s> add const defaultProps = { size: 'md', };
[ "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
src/theme/base/typography.ts
heading: 'Roboto', body: 'Roboto', mono: 'monospace',
<mask> extrabold: 800, <mask> black: 900, <mask> }, <mask> fonts: { <mask> heading: `Courier`, <mask> body: `Courier`, <mask> mono: `monospace`, <mask> }, <mask> fontSizes: { <mask> xs: 12, <mask> sm: 14, <mask> md: 16, </s> fix: v3 change typography and custom font support </s> remove lg: 18, xl: 20, </s> add lg: 20, xl: 24, </s> remove tighter: '-0.08px', tight: '-0.4px', normal: '0', wide: '0.4px', wider: '0.8px', widest: '1.6px', </s> add xxs: -1.5, xs: -0.5, sm: 0, md: 0.1, lg: 0.15, xl: 0.25, '2xl': 0.4, '3xl': 0.5, '4xl': 1.25, '5xl': 1.5, </s> remove '2xl': { fontSize: '4xl' }, 'xl': { fontSize: '3xl' }, 'lg': { fontSize: '2xl' }, 'md': { fontSize: 'xl' }, 'sm': { fontSize: 'md' }, 'xs': { fontSize: 'sm' }, </s> add '2xl': { fontSize: '6xl', fontWeight: 'light', letterSpacing: 'xxs', }, 'xl': { fontSize: '5xl', fontWeight: 'light', letterSpacing: 'xs', }, 'lg': { fontSize: '4xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'md': { fontSize: '3xl', fontWeight: 'normal', letterSpacing: 'xl', }, 'sm': { fontSize: 'xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'xs': { fontSize: 'lg', fontWeight: 'medium', letterSpacing: 'lg', }, </s> remove '3xl': 30, '4xl': 36, '5xl': 48, '6xl': 64, </s> add '3xl': 34, '4xl': 48, '5xl': 60, '6xl': 96,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
src/theme/base/typography.ts
xxs: 10,
<mask> }, <mask> fontSizes: { <mask> xs: 12, <mask> sm: 14, <mask> md: 16, <mask> lg: 20, <mask> xl: 24, <mask> '2xl': 24, </s> fix: v3 change typography and custom font support </s> remove lg: 18, xl: 20, </s> add lg: 20, xl: 24, </s> remove heading: `Courier`, body: `Courier`, mono: `monospace`, </s> add heading: 'Roboto', body: 'Roboto', mono: 'monospace', </s> remove '3xl': 30, '4xl': 36, '5xl': 48, '6xl': 64, </s> add '3xl': 34, '4xl': 48, '5xl': 60, '6xl': 96, </s> remove tighter: '-0.08px', tight: '-0.4px', normal: '0', wide: '0.4px', wider: '0.8px', widest: '1.6px', </s> add xxs: -1.5, xs: -0.5, sm: 0, md: 0.1, lg: 0.15, xl: 0.25, '2xl': 0.4, '3xl': 0.5, '4xl': 1.25, '5xl': 1.5, </s> remove '2xl': { fontSize: '4xl' }, 'xl': { fontSize: '3xl' }, 'lg': { fontSize: '2xl' }, 'md': { fontSize: 'xl' }, 'sm': { fontSize: 'md' }, 'xs': { fontSize: 'sm' }, </s> add '2xl': { fontSize: '6xl', fontWeight: 'light', letterSpacing: 'xxs', }, 'xl': { fontSize: '5xl', fontWeight: 'light', letterSpacing: 'xs', }, 'lg': { fontSize: '4xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'md': { fontSize: '3xl', fontWeight: 'normal', letterSpacing: 'xl', }, 'sm': { fontSize: 'xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'xs': { fontSize: 'lg', fontWeight: 'medium', letterSpacing: 'lg', },
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
src/theme/base/typography.ts
lg: 20, xl: 24,
<mask> fontSizes: { <mask> xs: 12, <mask> sm: 14, <mask> md: 16, <mask> lg: 18, <mask> xl: 20, <mask> '2xl': 24, <mask> '3xl': 30, <mask> '4xl': 36, <mask> '5xl': 48, <mask> '6xl': 64, </s> fix: v3 change typography and custom font support </s> remove '3xl': 30, '4xl': 36, '5xl': 48, '6xl': 64, </s> add '3xl': 34, '4xl': 48, '5xl': 60, '6xl': 96, </s> remove heading: `Courier`, body: `Courier`, mono: `monospace`, </s> add heading: 'Roboto', body: 'Roboto', mono: 'monospace', </s> remove tighter: '-0.08px', tight: '-0.4px', normal: '0', wide: '0.4px', wider: '0.8px', widest: '1.6px', </s> add xxs: -1.5, xs: -0.5, sm: 0, md: 0.1, lg: 0.15, xl: 0.25, '2xl': 0.4, '3xl': 0.5, '4xl': 1.25, '5xl': 1.5, </s> remove '2xl': { fontSize: '4xl' }, 'xl': { fontSize: '3xl' }, 'lg': { fontSize: '2xl' }, 'md': { fontSize: 'xl' }, 'sm': { fontSize: 'md' }, 'xs': { fontSize: 'sm' }, </s> add '2xl': { fontSize: '6xl', fontWeight: 'light', letterSpacing: 'xxs', }, 'xl': { fontSize: '5xl', fontWeight: 'light', letterSpacing: 'xs', }, 'lg': { fontSize: '4xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'md': { fontSize: '3xl', fontWeight: 'normal', letterSpacing: 'xl', }, 'sm': { fontSize: 'xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'xs': { fontSize: 'lg', fontWeight: 'medium', letterSpacing: 'lg', },
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
src/theme/base/typography.ts
'3xl': 34, '4xl': 48, '5xl': 60, '6xl': 96,
<mask> md: 16, <mask> lg: 18, <mask> xl: 20, <mask> '2xl': 24, <mask> '3xl': 30, <mask> '4xl': 36, <mask> '5xl': 48, <mask> '6xl': 64, <mask> }, <mask> }; <mask> <mask> export type ITypography = typeof typography; <mask> </s> fix: v3 change typography and custom font support </s> remove lg: 18, xl: 20, </s> add lg: 20, xl: 24, </s> remove tighter: '-0.08px', tight: '-0.4px', normal: '0', wide: '0.4px', wider: '0.8px', widest: '1.6px', </s> add xxs: -1.5, xs: -0.5, sm: 0, md: 0.1, lg: 0.15, xl: 0.25, '2xl': 0.4, '3xl': 0.5, '4xl': 1.25, '5xl': 1.5, </s> remove heading: `Courier`, body: `Courier`, mono: `monospace`, </s> add heading: 'Roboto', body: 'Roboto', mono: 'monospace', </s> remove '2xl': { fontSize: '4xl' }, 'xl': { fontSize: '3xl' }, 'lg': { fontSize: '2xl' }, 'md': { fontSize: 'xl' }, 'sm': { fontSize: 'md' }, 'xs': { fontSize: 'sm' }, </s> add '2xl': { fontSize: '6xl', fontWeight: 'light', letterSpacing: 'xxs', }, 'xl': { fontSize: '5xl', fontWeight: 'light', letterSpacing: 'xs', }, 'lg': { fontSize: '4xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'md': { fontSize: '3xl', fontWeight: 'normal', letterSpacing: 'xl', }, 'sm': { fontSize: 'xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'xs': { fontSize: 'lg', fontWeight: 'medium', letterSpacing: 'lg', },
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
src/theme/base/typography.ts
<mask> <mask> const baseStyle = (props: Record<string, any>) => { <mask> return { <mask> color: mode('muted.800', 'white')(props), <mask> fontWeight: 'bold', <mask> }; <mask> }; <mask> <mask> const sizeArray = ['2xl', 'xl', 'lg', 'md', 'sm', 'xs']; <mask> </s> fix: v3 change typography and custom font support </s> remove fontWeight: 300, letterSpacing: 1, </s> add fontWeight: 400, letterSpacing: '3xl', fontFamily: 'body', fontStyle: 'normal', </s> remove '2xl': { fontSize: '4xl' }, 'xl': { fontSize: '3xl' }, 'lg': { fontSize: '2xl' }, 'md': { fontSize: 'xl' }, 'sm': { fontSize: 'md' }, 'xs': { fontSize: 'sm' }, </s> add '2xl': { fontSize: '6xl', fontWeight: 'light', letterSpacing: 'xxs', }, 'xl': { fontSize: '5xl', fontWeight: 'light', letterSpacing: 'xs', }, 'lg': { fontSize: '4xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'md': { fontSize: '3xl', fontWeight: 'normal', letterSpacing: 'xl', }, 'sm': { fontSize: 'xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'xs': { fontSize: 'lg', fontWeight: 'medium', letterSpacing: 'lg', }, </s> remove const defaultProps = { size: 'xl' }; </s> add const defaultProps = { size: 'md', };
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
src/theme/components/heading.ts
'2xl': { fontSize: '6xl', fontWeight: 'light', letterSpacing: 'xxs', }, 'xl': { fontSize: '5xl', fontWeight: 'light', letterSpacing: 'xs', }, 'lg': { fontSize: '4xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'md': { fontSize: '3xl', fontWeight: 'normal', letterSpacing: 'xl', }, 'sm': { fontSize: 'xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'xs': { fontSize: 'lg', fontWeight: 'medium', letterSpacing: 'lg', },
<mask> } else if (typeof size === 'string' && !sizeArray.includes(size)) { <mask> return { fontSize: size }; <mask> } else { <mask> return { <mask> '2xl': { fontSize: '4xl' }, <mask> 'xl': { fontSize: '3xl' }, <mask> 'lg': { fontSize: '2xl' }, <mask> 'md': { fontSize: 'xl' }, <mask> 'sm': { fontSize: 'md' }, <mask> 'xs': { fontSize: 'sm' }, <mask> }; <mask> } <mask> } <mask> <mask> const defaultProps = { size: 'xl' }; </s> fix: v3 change typography and custom font support </s> remove const defaultProps = { size: 'xl' }; </s> add const defaultProps = { size: 'md', }; </s> remove heading: `Courier`, body: `Courier`, mono: `monospace`, </s> add heading: 'Roboto', body: 'Roboto', mono: 'monospace', </s> remove fontWeight: 300, letterSpacing: 1, </s> add fontWeight: 400, letterSpacing: '3xl', fontFamily: 'body', fontStyle: 'normal', </s> remove tighter: '-0.08px', tight: '-0.4px', normal: '0', wide: '0.4px', wider: '0.8px', widest: '1.6px', </s> add xxs: -1.5, xs: -0.5, sm: 0, md: 0.1, lg: 0.15, xl: 0.25, '2xl': 0.4, '3xl': 0.5, '4xl': 1.25, '5xl': 1.5,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
src/theme/components/heading.ts
const defaultProps = { size: 'md', };
<mask> }; <mask> } <mask> } <mask> <mask> const defaultProps = { size: 'xl' }; <mask> <mask> export default { <mask> baseStyle, <mask> sizes, <mask> defaultProps, </s> fix: v3 change typography and custom font support </s> remove fontWeight: 300, letterSpacing: 1, </s> add fontWeight: 400, letterSpacing: '3xl', fontFamily: 'body', fontStyle: 'normal', </s> remove '2xl': { fontSize: '4xl' }, 'xl': { fontSize: '3xl' }, 'lg': { fontSize: '2xl' }, 'md': { fontSize: 'xl' }, 'sm': { fontSize: 'md' }, 'xs': { fontSize: 'sm' }, </s> add '2xl': { fontSize: '6xl', fontWeight: 'light', letterSpacing: 'xxs', }, 'xl': { fontSize: '5xl', fontWeight: 'light', letterSpacing: 'xs', }, 'lg': { fontSize: '4xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'md': { fontSize: '3xl', fontWeight: 'normal', letterSpacing: 'xl', }, 'sm': { fontSize: 'xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'xs': { fontSize: 'lg', fontWeight: 'medium', letterSpacing: 'lg', }, </s> remove fontWeight: 'bold', </s> add </s> remove '3xl': 30, '4xl': 36, '5xl': 48, '6xl': 64, </s> add '3xl': 34, '4xl': 48, '5xl': 60, '6xl': 96, </s> remove <Heading size={36}>(36) In love with React Native</Heading> <Heading size="2xl">(2xl) In love with React Native</Heading> <Heading size="xl">(xl) In love with React Native</Heading> <Heading size="lg">(lg) In love with React Native</Heading> <Heading size="md">(md) In love with React Native</Heading> <Heading size="sm">(sm) In love with React Native</Heading> <Heading size="xs">(xs) In love with React Native</Heading> </s> add <Heading size="2xl">(2xl) Heading</Heading> <Heading size="xl">(xl) Heading</Heading> <Heading size="lg">(lg) Heading</Heading> <Heading size="md">(md) Heading </Heading> <Heading size="sm">(sm) Heading </Heading> <Heading size="xs">(xs) Heading </Heading>
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
src/theme/components/heading.ts
fontWeight: 400, letterSpacing: '3xl', fontFamily: 'body', fontStyle: 'normal',
<mask> color: mode('muted.800', 'white')(props), <mask> }; <mask> }; <mask> const defaultProps = { <mask> fontWeight: 300, <mask> letterSpacing: 1, <mask> }; <mask> <mask> export default { baseStyle, defaultProps }; </s> fix: v3 change typography and custom font support </s> remove const defaultProps = { size: 'xl' }; </s> add const defaultProps = { size: 'md', }; </s> remove fontWeight: 'bold', </s> add </s> remove '2xl': { fontSize: '4xl' }, 'xl': { fontSize: '3xl' }, 'lg': { fontSize: '2xl' }, 'md': { fontSize: 'xl' }, 'sm': { fontSize: 'md' }, 'xs': { fontSize: 'sm' }, </s> add '2xl': { fontSize: '6xl', fontWeight: 'light', letterSpacing: 'xxs', }, 'xl': { fontSize: '5xl', fontWeight: 'light', letterSpacing: 'xs', }, 'lg': { fontSize: '4xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'md': { fontSize: '3xl', fontWeight: 'normal', letterSpacing: 'xl', }, 'sm': { fontSize: 'xl', fontWeight: 'normal', letterSpacing: 'sm', }, 'xs': { fontSize: 'lg', fontWeight: 'medium', letterSpacing: 'lg', }, </s> remove '3xl': 30, '4xl': 36, '5xl': 48, '6xl': 64, </s> add '3xl': 34, '4xl': 48, '5xl': 60, '6xl': 96,
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/31a9cc62359471ed0e47ef637e5733b52f1512e0
src/theme/components/text.ts
import { usePropsResolutionTest } from '../../../hooks/useThemeProps';
<mask> import React, { memo, forwardRef } from 'react'; <mask> import { View } from 'react-native'; <mask> import { usePropsResolution } from '../../../hooks'; <mask> import Text from './../Text'; <mask> import { makeStyledComponent } from '../../../utils/styled'; <mask> import type { IBoxProps } from './types'; <mask> import { useSafeArea } from '../../../hooks/useSafeArea'; <mask> import { useNativeBaseConfig } from '../../../core/NativeBaseContext'; </s> feat: override base style more specific props </s> remove import { usePropsResolution } from '../../../hooks/useThemeProps'; </s> add import { usePropsResolutionTest } from '../../../hooks/useThemeProps'; </s> remove margin: -defaultTheme.space['5'], </s> add marginTop: -defaultTheme.space['5'], marginLeft: -defaultTheme.space['5'], marginRight: -defaultTheme.space['5'], marginBottom: -defaultTheme.space['5'], </s> remove const { _text, ...resolvedProps } = usePropsResolution('Box', props); </s> add const { _text, ...resolvedProps } = usePropsResolutionTest('Box', props); </s> remove } = usePropsResolution('Button', props); </s> add } = usePropsResolutionTest('Button', props); </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['2']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['2']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['2']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['2']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['2']);
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/components/primitives/Box/index.tsx
const { _text, ...resolvedProps } = usePropsResolutionTest('Box', props);
<mask> let MemoizedGradient: any = undefined; <mask> <mask> const Box = ({ children, ...props }: IBoxProps, ref: any) => { <mask> // const { _text, ...resolvedProps } = useThemeProps('Box', props); <mask> const { _text, ...resolvedProps } = usePropsResolution('Box', props); <mask> let Gradient = useNativeBaseConfig('NativeBaseConfigProvider').config <mask> .dependencies?.['linear-gradient']; <mask> <mask> const safeAreaProps = useSafeArea(resolvedProps); <mask> </s> feat: override base style more specific props </s> remove } = usePropsResolution('Button', props); </s> add } = usePropsResolutionTest('Button', props); </s> remove } = usePropsResolution('Text', props); </s> add } = usePropsResolutionTest('Text', props); </s> remove expect(box2.props.style.padding).toBe(defaultTheme.space['5']); </s> add expect(box2.props.style.paddingTop).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingBottom).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingLeft).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingRight).toBe(defaultTheme.space['5']); </s> remove flattenProps = merge( flattenProps, </s> add const defaultStyles = merge(
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/components/primitives/Box/index.tsx
import { usePropsResolutionTest } from '../../../hooks/useThemeProps';
<mask> import React, { memo, forwardRef } from 'react'; <mask> import Spinner from '../Spinner'; <mask> import { usePropsResolution } from '../../../hooks/useThemeProps'; <mask> import { default as Box, IBoxProps } from '../Box'; <mask> import HStack from '../Stack/HStack'; <mask> import { Pressable } from '../Pressable'; <mask> import type { IButtonProps } from './types'; <mask> </s> feat: override base style more specific props </s> remove import { usePropsResolution } from '../../../hooks'; </s> add import { usePropsResolutionTest } from '../../../hooks/useThemeProps'; </s> remove margin: -defaultTheme.space['5'], </s> add marginTop: -defaultTheme.space['5'], marginLeft: -defaultTheme.space['5'], marginRight: -defaultTheme.space['5'], marginBottom: -defaultTheme.space['5'], </s> remove const { _text, ...resolvedProps } = usePropsResolution('Box', props); </s> add const { _text, ...resolvedProps } = usePropsResolutionTest('Box', props); </s> remove } = usePropsResolution('Button', props); </s> add } = usePropsResolutionTest('Button', props); </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['2']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['2']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['2']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['2']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['2']);
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/components/primitives/Button/Button.tsx
} = usePropsResolutionTest('Button', props);
<mask> _pressed, <mask> _focusVisible, <mask> _stack, <mask> ...resolvedProps <mask> } = usePropsResolution('Button', props); <mask> <mask> const pressableProps = { <mask> ...resolvedProps, <mask> _hover, <mask> _pressed, </s> feat: override base style more specific props </s> remove const { _text, ...resolvedProps } = usePropsResolution('Box', props); </s> add const { _text, ...resolvedProps } = usePropsResolutionTest('Box', props); </s> remove } = usePropsResolution('Text', props); </s> add } = usePropsResolutionTest('Text', props); </s> remove expect(box2.props.style.padding).toBe(defaultTheme.space['5']); </s> add expect(box2.props.style.paddingTop).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingBottom).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingLeft).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingRight).toBe(defaultTheme.space['5']); </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['2']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['2']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['2']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['2']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['2']); </s> remove margin: -defaultTheme.space['5'], </s> add marginTop: -defaultTheme.space['5'], marginLeft: -defaultTheme.space['5'], marginRight: -defaultTheme.space['5'], marginBottom: -defaultTheme.space['5'],
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/components/primitives/Button/Button.tsx
} = usePropsResolutionTest('Text', props);
<mask> fontSize = 'md', <mask> lineHeight = '2xs', <mask> letterSpacing = 'sm', <mask> ...reslovedProps <mask> } = usePropsResolution('Text', props); <mask> <mask> const _ref = useRef(null); <mask> <mask> const [lineHeightValue] = useToken('lineHeights', [lineHeight]); <mask> const [fontSizeValue] = useToken('fontSizes', [fontSize]); </s> feat: override base style more specific props </s> remove const { _text, ...resolvedProps } = usePropsResolution('Box', props); </s> add const { _text, ...resolvedProps } = usePropsResolutionTest('Box', props); </s> remove } = usePropsResolution('Button', props); </s> add } = usePropsResolutionTest('Button', props); </s> remove expect(box2.props.style.padding).toBe(defaultTheme.space['5']); </s> add expect(box2.props.style.paddingTop).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingBottom).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingLeft).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingRight).toBe(defaultTheme.space['5']); </s> remove flattenProps = merge( flattenProps, </s> add const defaultStyles = merge( </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['2']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['2']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['2']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['2']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['2']);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/components/primitives/Text/index.tsx
expect(box.props.style.paddingTop).toBe(defaultTheme.space['2']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['2']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['2']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['2']);
<mask> </Box> <mask> </Provider> <mask> ); <mask> const box = getByTestId('test'); <mask> expect(box.props.style.padding).toBe(defaultTheme.space['2']); <mask> }); <mask> <mask> it('tests simple resolution with responsive props', () => { <mask> const { getByTestId } = render( <mask> <Provider> </s> feat: override base style more specific props </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['10']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['10']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['10']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['10']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['10']); </s> remove margin: -defaultTheme.space['5'], </s> add marginTop: -defaultTheme.space['5'], marginLeft: -defaultTheme.space['5'], marginRight: -defaultTheme.space['5'], marginBottom: -defaultTheme.space['5'], </s> remove expect(box2.props.style.padding).toBe(defaultTheme.space['5']); </s> add expect(box2.props.style.paddingTop).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingBottom).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingLeft).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingRight).toBe(defaultTheme.space['5']); </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['4']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['4']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['4']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['4']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['4']); </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingRight: newTheme.space['5'], paddingLeft: newTheme.space['5'],
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/hooks/useThemeProps/usePropsResolutionTest.test.tsx
expect(box.props.style.paddingTop).toBe(defaultTheme.space['4']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['4']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['4']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['4']);
<mask> </Provider> <mask> ); <mask> <mask> const box = getByTestId('test'); <mask> expect(box.props.style.padding).toBe(defaultTheme.space['4']); <mask> const box2 = getByTestId('test2'); <mask> expect(box2.props.style.padding).toBe(defaultTheme.space['5']); <mask> }); <mask> <mask> it('resolves platform props', () => { </s> feat: override base style more specific props </s> remove expect(box2.props.style.padding).toBe(defaultTheme.space['5']); </s> add expect(box2.props.style.paddingTop).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingBottom).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingLeft).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingRight).toBe(defaultTheme.space['5']); </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['10']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['10']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['10']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['10']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['10']); </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['2']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['2']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['2']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['2']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['2']); </s> remove margin: -defaultTheme.space['5'], </s> add marginTop: -defaultTheme.space['5'], marginLeft: -defaultTheme.space['5'], marginRight: -defaultTheme.space['5'], marginBottom: -defaultTheme.space['5'], </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingRight: newTheme.space['5'], paddingLeft: newTheme.space['5'],
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/hooks/useThemeProps/usePropsResolutionTest.test.tsx
expect(box2.props.style.paddingTop).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingBottom).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingLeft).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingRight).toBe(defaultTheme.space['5']);
<mask> <mask> const box = getByTestId('test'); <mask> expect(box.props.style.padding).toBe(defaultTheme.space['4']); <mask> const box2 = getByTestId('test2'); <mask> expect(box2.props.style.padding).toBe(defaultTheme.space['5']); <mask> }); <mask> <mask> it('resolves platform props', () => { <mask> Platform.OS = 'android'; <mask> const { getByTestId } = render( </s> feat: override base style more specific props </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['4']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['4']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['4']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['4']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['4']); </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['2']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['2']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['2']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['2']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['2']); </s> remove margin: -defaultTheme.space['5'], </s> add marginTop: -defaultTheme.space['5'], marginLeft: -defaultTheme.space['5'], marginRight: -defaultTheme.space['5'], marginBottom: -defaultTheme.space['5'], </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['10']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['10']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['10']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['10']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['10']); </s> remove const { _text, ...resolvedProps } = usePropsResolution('Box', props); </s> add const { _text, ...resolvedProps } = usePropsResolutionTest('Box', props);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/hooks/useThemeProps/usePropsResolutionTest.test.tsx
expect(box.props.style.paddingTop).toBe(defaultTheme.space['10']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['10']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['10']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['10']);
<mask> </Box> <mask> </Provider> <mask> ); <mask> const box = getByTestId('test'); <mask> expect(box.props.style.padding).toBe(defaultTheme.space['10']); <mask> }); <mask> <mask> it('resolves base style with props', () => { <mask> const newTheme = extendTheme({ <mask> components: { </s> feat: override base style more specific props </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['2']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['2']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['2']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['2']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['2']); </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingRight: newTheme.space['5'], paddingLeft: newTheme.space['5'], </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['4']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['4']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['4']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['4']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['4']); </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingLeft: newTheme.space['5'], paddingRight: newTheme.space['5'], </s> remove margin: -defaultTheme.space['5'], </s> add marginTop: -defaultTheme.space['5'], marginLeft: -defaultTheme.space['5'], marginRight: -defaultTheme.space['5'], marginBottom: -defaultTheme.space['5'],
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/hooks/useThemeProps/usePropsResolutionTest.test.tsx
paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingRight: newTheme.space['5'], paddingLeft: newTheme.space['5'],
<mask> </Provider> <mask> ); <mask> const box = getByTestId('test'); <mask> expect(box.props.style).toEqual({ <mask> paddingTop: newTheme.space['10'], <mask> paddingBottom: newTheme.space['10'], <mask> padding: newTheme.space['5'], <mask> backgroundColor: newTheme.colors.cyan['500'], <mask> }); <mask> }); <mask> <mask> it('resolves base style and variants with props', () => { </s> feat: override base style more specific props </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingLeft: newTheme.space['5'], paddingRight: newTheme.space['5'], </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingLeft: newTheme.space['5'], paddingRight: newTheme.space['5'], </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingLeft: newTheme.space['5'], paddingRight: newTheme.space['5'], </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['10']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['10']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['10']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['10']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['10']); </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['2']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['2']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['2']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['2']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['2']);
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/hooks/useThemeProps/usePropsResolutionTest.test.tsx
paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingLeft: newTheme.space['5'], paddingRight: newTheme.space['5'],
<mask> ); <mask> const box = getByTestId('test'); <mask> expect(box.props.style).toEqual({ <mask> marginTop: newTheme.space['10'], <mask> paddingTop: newTheme.space['10'], <mask> paddingBottom: newTheme.space['10'], <mask> padding: newTheme.space['5'], <mask> backgroundColor: newTheme.colors.cyan['500'], <mask> }); <mask> }); <mask> <mask> it('resolves base style, variants and sizes with props', () => { </s> feat: override base style more specific props </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingRight: newTheme.space['5'], paddingLeft: newTheme.space['5'], </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingLeft: newTheme.space['5'], paddingRight: newTheme.space['5'], </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingLeft: newTheme.space['5'], paddingRight: newTheme.space['5'], </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['10']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['10']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['10']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['10']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['10']); </s> remove margin: -defaultTheme.space['5'], </s> add marginTop: -defaultTheme.space['5'], marginLeft: -defaultTheme.space['5'], marginRight: -defaultTheme.space['5'], marginBottom: -defaultTheme.space['5'],
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/hooks/useThemeProps/usePropsResolutionTest.test.tsx
paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingLeft: newTheme.space['5'], paddingRight: newTheme.space['5'],
<mask> ); <mask> const box = getByTestId('test'); <mask> expect(box.props.style).toEqual({ <mask> marginTop: newTheme.space['10'], <mask> paddingTop: newTheme.space['10'], <mask> paddingBottom: newTheme.space['10'], <mask> padding: newTheme.space['5'], <mask> height: newTheme.sizes['10'], <mask> backgroundColor: newTheme.colors.cyan['500'], <mask> }); <mask> }); <mask> </s> feat: override base style more specific props </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingLeft: newTheme.space['5'], paddingRight: newTheme.space['5'], </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingLeft: newTheme.space['5'], paddingRight: newTheme.space['5'], </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingRight: newTheme.space['5'], paddingLeft: newTheme.space['5'], </s> remove margin: -defaultTheme.space['5'], </s> add marginTop: -defaultTheme.space['5'], marginLeft: -defaultTheme.space['5'], marginRight: -defaultTheme.space['5'], marginBottom: -defaultTheme.space['5'], </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['4']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['4']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['4']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['4']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['4']);
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/hooks/useThemeProps/usePropsResolutionTest.test.tsx
paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingLeft: newTheme.space['5'], paddingRight: newTheme.space['5'],
<mask> ); <mask> const box = getByTestId('test'); <mask> expect(box.props.style).toEqual({ <mask> marginTop: newTheme.space['10'], <mask> paddingTop: newTheme.space['10'], <mask> paddingBottom: newTheme.space['10'], <mask> padding: newTheme.space['5'], <mask> height: newTheme.sizes['10'], <mask> backgroundColor: newTheme.colors.cyan['500'], <mask> }); <mask> }); <mask> </s> feat: override base style more specific props
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/hooks/useThemeProps/usePropsResolutionTest.test.tsx
marginTop: -defaultTheme.space['5'], marginLeft: -defaultTheme.space['5'], marginRight: -defaultTheme.space['5'], marginBottom: -defaultTheme.space['5'],
<mask> </Provider> <mask> ); <mask> const box = getByTestId('test'); <mask> expect(box.props.style).toEqual({ <mask> margin: -defaultTheme.space['5'], <mask> }); <mask> }); <mask> <mask> it('resolves shadow from theme', () => { <mask> const { getByTestId } = render( </s> feat: override base style more specific props </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['2']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['2']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['2']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['2']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['2']); </s> remove expect(box2.props.style.padding).toBe(defaultTheme.space['5']); </s> add expect(box2.props.style.paddingTop).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingBottom).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingLeft).toBe(defaultTheme.space['5']); expect(box2.props.style.paddingRight).toBe(defaultTheme.space['5']); </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['4']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['4']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['4']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['4']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['4']); </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['10']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['10']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['10']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['10']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['10']); </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingRight: newTheme.space['5'], paddingLeft: newTheme.space['5'],
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/hooks/useThemeProps/usePropsResolutionTest.test.tsx
const defaultStyles = merge(
<mask> ); <mask> } <mask> <mask> // // STEP 4: merge <mask> <mask> flattenProps = merge( <mask> flattenProps, <mask> flattenBaseStyle, <mask> flattenVariantStyle, <mask> flattenSizeStyle <mask> ); <mask> </s> feat: override base style more specific props </s> remove const { _text, ...resolvedProps } = usePropsResolution('Box', props); </s> add const { _text, ...resolvedProps } = usePropsResolutionTest('Box', props); </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['2']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['2']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['2']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['2']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['2']); </s> remove margin: -defaultTheme.space['5'], </s> add marginTop: -defaultTheme.space['5'], marginLeft: -defaultTheme.space['5'], marginRight: -defaultTheme.space['5'], marginBottom: -defaultTheme.space['5'], </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['4']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['4']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['4']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['4']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['4']);
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/hooks/useThemeProps/usePropsResolutionTest.tsx
flattenProps = overrideDefaultProps(flattenProps, defaultStyles);
<mask> flattenSizeStyle <mask> ); <mask> <mask> // // STEP 5: linear Grad and contrastText <mask> // let ignore: any = []; <mask> // if ( <mask> // flattenProps.bg?.linearGradient || <mask> // flattenProps.background?.linearGradient || </s> feat: override base style more specific props </s> remove flattenProps = merge( flattenProps, </s> add const defaultStyles = merge( </s> remove const { _text, ...resolvedProps } = usePropsResolution('Box', props); </s> add const { _text, ...resolvedProps } = usePropsResolutionTest('Box', props); </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingRight: newTheme.space['5'], paddingLeft: newTheme.space['5'], </s> remove paddingTop: newTheme.space['10'], paddingBottom: newTheme.space['10'], padding: newTheme.space['5'], </s> add paddingTop: newTheme.space['5'], paddingBottom: newTheme.space['5'], paddingLeft: newTheme.space['5'], paddingRight: newTheme.space['5'], </s> remove expect(box.props.style.padding).toBe(defaultTheme.space['4']); </s> add expect(box.props.style.paddingTop).toBe(defaultTheme.space['4']); expect(box.props.style.paddingBottom).toBe(defaultTheme.space['4']); expect(box.props.style.paddingRight).toBe(defaultTheme.space['4']); expect(box.props.style.paddingLeft).toBe(defaultTheme.space['4']);
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/320395e8f830bfa7cb10c37de6e213586aad22e4
src/hooks/useThemeProps/usePropsResolutionTest.tsx
import { Platform, Text as NativeText } from 'react-native';
<mask> import { useHover } from '@react-native-aria/interactions'; <mask> import { mergeRefs } from '../../../utils/mergeRefs'; <mask> import { makeStyledComponent } from '../../../utils/styled'; <mask> import { useResolvedFontFamily } from '../../../hooks/useResolvedFontFamily'; <mask> import { Text as NativeText } from 'react-native'; <mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps'; <mask> <mask> const StyledText = makeStyledComponent(NativeText); <mask> // To have a RN compatible behaviour, we'll inherit parent text styles as base style <mask> const TextAncestorContext = React.createContext(false); </s> fix: font weight for web </s> remove const resolvedFontFamily = useResolvedFontFamily({ </s> add resolvedFontFamily = useResolvedFontFamily({
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/328d1b8b87e81da3e9e615b2fd57679d0492ffb5
src/components/primitives/Text/index.tsx
let resolvedFontFamily;
<mask> // const { isHovered } = useHover({}, _ref); <mask> let fontFamily = propFontFamily; <mask> const fontStyle = italic ? 'italic' : propFontStyle; <mask> const fontWeight = bold ? 'bold' : propFontWeight; <mask> <mask> resolvedFontFamily = useResolvedFontFamily({ <mask> fontFamily, <mask> fontWeight: fontWeight ?? (hasTextAncestor ? undefined : 400), </s> fix: font weight for web </s> remove const resolvedFontFamily = useResolvedFontFamily({ </s> add resolvedFontFamily = useResolvedFontFamily({ </s> remove import { Text as NativeText } from 'react-native'; </s> add import { Platform, Text as NativeText } from 'react-native';
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/328d1b8b87e81da3e9e615b2fd57679d0492ffb5
src/components/primitives/Text/index.tsx
resolvedFontFamily = useResolvedFontFamily({
<mask> let fontFamily = propFontFamily; <mask> const fontStyle = italic ? 'italic' : propFontStyle; <mask> const fontWeight = bold ? 'bold' : propFontWeight; <mask> <mask> const resolvedFontFamily = useResolvedFontFamily({ <mask> fontFamily, <mask> fontWeight: fontWeight ?? (hasTextAncestor ? undefined : 400), <mask> fontStyle: fontStyle ?? (hasTextAncestor ? undefined : 'normal'), <mask> }); <mask> </s> fix: font weight for web </s> remove import { Text as NativeText } from 'react-native'; </s> add import { Platform, Text as NativeText } from 'react-native';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/328d1b8b87e81da3e9e615b2fd57679d0492ffb5
src/components/primitives/Text/index.tsx
if (Platform.OS === 'web') { if (resolvedFontFamily) { fontFamily = resolvedFontFamily; } resolvedFontFamily = { fontFamily, fontWeight: fontWeight ?? (hasTextAncestor ? undefined : 400), fontStyle: fontStyle ?? (hasTextAncestor ? undefined : 'normal'), }; }
<mask> fontFamily = resolvedFontFamily; <mask> } <mask> <mask> //TODO: refactor for responsive prop <mask> if (useHasResponsiveProps(props)) { <mask> return null; </s> fix: font weight for web </s> remove import { Text as NativeText } from 'react-native'; </s> add import { Platform, Text as NativeText } from 'react-native'; </s> remove const resolvedFontFamily = useResolvedFontFamily({ </s> add resolvedFontFamily = useResolvedFontFamily({
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/328d1b8b87e81da3e9e615b2fd57679d0492ffb5
src/components/primitives/Text/index.tsx
var isIcon=false;
<mask> return item; <mask> } <mask> }); <mask> if(this.props.floatingLabel&&icon.length){ <mask> for(var i=0;i<this.props.children.length;i++){ <mask> if(this.props.children[i].props.name){ <mask> isIcon=true; <mask> newChildren.push( </s> fixed label position for icon </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:148}}))); </s> add _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:150}}))); </s> remove },__source:{fileName:_jsxFileName,lineNumber:172}}))); </s> add },__source:{fileName:_jsxFileName,lineNumber:180}})));
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
dist/src/basic/Item.js
isIcon=true;
<mask> var isIcon=false; <mask> for(var i=0;i<this.props.children.length;i++){ <mask> if(this.props.children[i].props.name){ <mask> newChildren.push( <mask> _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:150}}))); <mask> <mask> } <mask> if(this.props.children[i].props.children){ </s> fixed label position for icon </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:148}}))); </s> add _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:150}}))); </s> remove },__source:{fileName:_jsxFileName,lineNumber:172}}))); </s> add },__source:{fileName:_jsxFileName,lineNumber:180}}))); </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:166}}), </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:174}}),
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
dist/src/basic/Item.js
_react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:150}})));
<mask> if(this.props.floatingLabel&&icon.length){ <mask> for(var i=0;i<this.props.children.length;i++){ <mask> if(this.props.children[i].props.name){ <mask> newChildren.push( <mask> _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:148}}))); <mask> <mask> } <mask> <mask> if(this.props.children[i].props.children){ <mask> newChildren.push( </s> fixed label position for icon </s> remove },__source:{fileName:_jsxFileName,lineNumber:172}}))); </s> add },__source:{fileName:_jsxFileName,lineNumber:180}}))); </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:166}}), </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:174}}),
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
dist/src/basic/Item.js
left: this.props.last&&isIcon? 40: this.props.last? 15: isIcon? 26: 0,
<mask> _react2.default.createElement(_reactNative.Animated.View,{ <mask> key:"float", <mask> style:{ <mask> position:"absolute", <mask> left:this.props.last?22:22, <mask> right:0, <mask> top:this.state.topAnim, <mask> opacity:this.state.opacAnim, <mask> paddingTop:_reactNative.Platform.OS==="ios"?undefined:undefined, <mask> paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:154}}, </s> fixed label position for icon </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:154}}, </s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:155}}, </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:198}}, </s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:206}}, </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:166}}), </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:174}}), </s> remove width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:239}}, </s> add width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:247}}, </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:210}}),this.renderLabel(label,labelProps)))); </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:218}}),this.renderLabel(label,labelProps))));
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
dist/src/basic/Item.js
paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:155}},
<mask> right:0, <mask> top:this.state.topAnim, <mask> opacity:this.state.opacAnim, <mask> paddingTop:_reactNative.Platform.OS==="ios"?undefined:undefined, <mask> paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:154}}, <mask> <mask> <mask> _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:166}}), <mask> this.renderLabel(label,labelProps)))); <mask> </s> fixed label position for icon </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:166}}), </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:174}}), </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:198}}, </s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:206}}, </s> remove left:this.props.last?22:22, </s> add left: this.props.last&&isIcon? 40: this.props.last? 15: isIcon? 26: 0, </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:210}}),this.renderLabel(label,labelProps)))); </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:218}}),this.renderLabel(label,labelProps))));
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
dist/src/basic/Item.js
_react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:174}}),
<mask> paddingTop:_reactNative.Platform.OS==="ios"?undefined:undefined, <mask> paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:154}}, <mask> <mask> <mask> _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:166}}), <mask> this.renderLabel(label,labelProps)))); <mask> <mask> <mask> <mask> newChildren.push( </s> fixed label position for icon </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:154}}, </s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:155}}, </s> remove left:this.props.last?22:22, </s> add left: this.props.last&&isIcon? 40: this.props.last? 15: isIcon? 26: 0, </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:210}}),this.renderLabel(label,labelProps)))); </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:218}}),this.renderLabel(label,labelProps)))); </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:198}}, </s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:206}}, </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:148}}))); </s> add _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:150}})));
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
dist/src/basic/Item.js
},__source:{fileName:_jsxFileName,lineNumber:180}})));
<mask> }, <mask> onChangeText:function onChangeText(text){ <mask> _this3.setState({text:text}); <mask> inputProps.onChangeText&&inputProps.onChangeText(text); <mask> },__source:{fileName:_jsxFileName,lineNumber:172}}))); <mask> <mask> <mask> } <mask> } <mask> }else if(this.props.floatingLabel){ </s> fixed label position for icon </s> remove },__source:{fileName:_jsxFileName,lineNumber:214}}))); </s> add },__source:{fileName:_jsxFileName,lineNumber:222}}))); </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:148}}))); </s> add _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:150}})));
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
dist/src/basic/Item.js
paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:206}},
<mask> right:0, <mask> top:this.state.topAnim, <mask> opacity:this.state.opacAnim, <mask> paddingTop:_reactNative.Platform.OS==="ios"?undefined:undefined, <mask> paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:198}}, <mask> <mask> <mask> _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:210}}),this.renderLabel(label,labelProps)))); <mask> <mask> </s> fixed label position for icon </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:154}}, </s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:155}}, </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:210}}),this.renderLabel(label,labelProps)))); </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:218}}),this.renderLabel(label,labelProps)))); </s> remove left:this.props.last?22:22, </s> add left: this.props.last&&isIcon? 40: this.props.last? 15: isIcon? 26: 0, </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:166}}), </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:174}}),
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
dist/src/basic/Item.js
_react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:218}}),this.renderLabel(label,labelProps))));
<mask> paddingTop:_reactNative.Platform.OS==="ios"?undefined:undefined, <mask> paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:198}}, <mask> <mask> <mask> _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:210}}),this.renderLabel(label,labelProps)))); <mask> <mask> <mask> newChildren.push( <mask> _react2.default.createElement(_Input.Input,_extends({ <mask> ref:function ref(c){return _this3._inputRef=c;}, </s> fixed label position for icon </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:198}}, </s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:206}}, </s> remove activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:283}}), </s> add activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:291}}), </s> remove style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:250}}))))); </s> add style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:258}}))))); </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:247}})), _react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:248}}, _react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:249}})), </s> add _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:255}})), _react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:256}}, _react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:257}})), </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:166}}), </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:174}}),
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
dist/src/basic/Item.js
},__source:{fileName:_jsxFileName,lineNumber:222}})));
<mask> }, <mask> onChangeText:function onChangeText(text){ <mask> _this3.setState({text:text}); <mask> inputProps.onChangeText&&inputProps.onChangeText(text); <mask> },__source:{fileName:_jsxFileName,lineNumber:214}}))); <mask> <mask> <mask> }else if(this.props.stackedLabel&&icon.length){ <mask> newChildren.push( <mask> _react2.default.createElement(_reactNative.View,{ </s> fixed label position for icon </s> remove },__source:{fileName:_jsxFileName,lineNumber:172}}))); </s> add },__source:{fileName:_jsxFileName,lineNumber:180}}))); </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:148}}))); </s> add _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:150}}))); </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:166}}), </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:174}}), </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:210}}),this.renderLabel(label,labelProps)))); </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:218}}),this.renderLabel(label,labelProps))));
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
dist/src/basic/Item.js
width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:247}},
<mask> key:"s", <mask> style:{ <mask> flexDirection:"row", <mask> flex:1, <mask> width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:239}}, <mask> <mask> <mask> _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:247}})), <mask> _react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:248}}, <mask> _react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:249}})), </s> fixed label position for icon </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:247}})), _react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:248}}, _react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:249}})), </s> add _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:255}})), _react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:256}}, _react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:257}})), </s> remove style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:250}}))))); </s> add style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:258}}))))); </s> remove left:this.props.last?22:22, </s> add left: this.props.last&&isIcon? 40: this.props.last? 15: isIcon? 26: 0, </s> remove left: this.props.last ? 22 : 22, </s> add left: this.props.last && isIcon ? 40 : this.props.last ? 15 : isIcon ? 26 : 0, </s> remove },__source:{fileName:_jsxFileName,lineNumber:172}}))); </s> add },__source:{fileName:_jsxFileName,lineNumber:180}})));
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
dist/src/basic/Item.js
_react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:255}})), _react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:256}}, _react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:257}})),
<mask> flex:1, <mask> width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:239}}, <mask> <mask> <mask> _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:247}})), <mask> _react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:248}}, <mask> _react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:249}})), <mask> _react2.default.createElement(_Input.Input,_extends({ <mask> key:"s3"}, <mask> inputProps,{ <mask> style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:250}}))))); <mask> </s> fixed label position for icon </s> remove style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:250}}))))); </s> add style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:258}}))))); </s> remove width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:239}}, </s> add width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:247}}, </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:210}}),this.renderLabel(label,labelProps)))); </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:218}}),this.renderLabel(label,labelProps)))); </s> remove },__source:{fileName:_jsxFileName,lineNumber:172}}))); </s> add },__source:{fileName:_jsxFileName,lineNumber:180}})));
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
dist/src/basic/Item.js
style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:258}})))));
<mask> _react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:249}})), <mask> _react2.default.createElement(_Input.Input,_extends({ <mask> key:"s3"}, <mask> inputProps,{ <mask> style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:250}}))))); <mask> <mask> <mask> <mask> <mask> }else{ </s> fixed label position for icon </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:247}})), _react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:248}}, _react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:249}})), </s> add _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:255}})), _react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:256}}, _react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:257}})), </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:210}}),this.renderLabel(label,labelProps)))); </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:218}}),this.renderLabel(label,labelProps)))); </s> remove width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:239}}, </s> add width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:247}}, </s> remove },__source:{fileName:_jsxFileName,lineNumber:172}}))); </s> add },__source:{fileName:_jsxFileName,lineNumber:180}})));
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
dist/src/basic/Item.js
activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:291}}),
<mask> return( <mask> _react2.default.createElement(_reactNative.TouchableOpacity,_extends({ <mask> ref:function ref(c){return _this4._root=c;}}, <mask> this.prepareRootProps(),{ <mask> activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:283}}), <mask> <mask> this.renderChildren())); <mask> <mask> <mask> }}]);return Item;}(_react.Component); </s> fixed label position for icon </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:210}}),this.renderLabel(label,labelProps)))); </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:218}}),this.renderLabel(label,labelProps)))); </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:198}}, </s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:206}}, </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:148}}))); </s> add _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:150}}))); </s> remove left:this.props.last?22:22, </s> add left: this.props.last&&isIcon? 40: this.props.last? 15: isIcon? 26: 0,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
dist/src/basic/Item.js
let isIcon = false;
<mask> }); <mask> if (this.props.floatingLabel && icon.length) { <mask> for (let i = 0; i < this.props.children.length; i++) { <mask> if (this.props.children[i].props.name) { <mask> isIcon = true; <mask> newChildren.push( <mask> <Icon key={[i]} {...this.props.children[i].props} /> </s> fixed label position for icon </s> remove left: this.props.last ? 22 : 22, </s> add left: this.props.last && isIcon ? 40 : this.props.last ? 15 : isIcon ? 26 : 0, </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:148}}))); </s> add _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:150}}))); </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:166}}), </s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:174}}),
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
src/basic/Item.js
isIcon = true;
<mask> for (let i = 0; i < this.props.children.length; i++) { <mask> if (this.props.children[i].props.name) { <mask> newChildren.push( <mask> <Icon key={[i]} {...this.props.children[i].props} /> <mask> ); <mask> } <mask> if (this.props.children[i].props.children) { <mask> newChildren.push( </s> fixed label position for icon </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:148}}))); </s> add _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:150}}))); </s> remove },__source:{fileName:_jsxFileName,lineNumber:172}}))); </s> add },__source:{fileName:_jsxFileName,lineNumber:180}})));
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
src/basic/Item.js
left: this.props.last && isIcon ? 40 : this.props.last ? 15 : isIcon ? 26 : 0,
<mask> <Animated.View <mask> key="float" <mask> style={{ <mask> position: "absolute", <mask> left: this.props.last ? 22 : 22, <mask> right: 0, <mask> top: this.state.topAnim, <mask> opacity: this.state.opacAnim, <mask> paddingTop: Platform.OS === "ios" ? undefined : undefined, <mask> paddingBottom: Platform.OS === "ios" ? undefined : 12 </s> fixed label position for icon </s> remove left:this.props.last?22:22, </s> add left: this.props.last&&isIcon? 40: this.props.last? 15: isIcon? 26: 0, </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:198}}, </s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:206}}, </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:148}}))); </s> add _react2.default.createElement(_Icon.Icon,_extends({key:[i]},this.props.children[i].props,{__source:{fileName:_jsxFileName,lineNumber:150}}))); </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:154}}, </s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:155}},
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32d4278ad1da5731e48b88e307eedef1dd0abf2a
src/basic/Item.js
const [ accessibilityProps, nonAccessibilityProps, ] = extractInObject(nonLayoutProps, [ 'accessibilityRole', 'accessibilityState', ]);
<mask> ]); <mask> <mask> //TODO: refactor for responsive prop <mask> if (useHasResponsiveProps(resolvedProps)) { <mask> return null; <mask> } <mask> </s> fix: checkbox test cases fixes </s> remove import React from 'react'; </s> add </s> remove // alignItems="flex-start" //some input props </s> add </s> remove <Center {...nonLayoutProps}> </s> add <Center {...nonAccessibilityProps}>
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32e663dd4c49365a81d6b8dad75d34ffefaf0390
src/components/primitives/Checkbox/Checkbox.tsx
{...accessibilityProps}
<mask> return ( <mask> <Pressable <mask> {...(pressableProps as IPressableProps)} <mask> onPress={onPress} <mask> ref={mergeRefs([ref, wrapperRef])} <mask> accessibilityRole="checkbox" <mask> onPressIn={composeEventHandlers(onPressIn, pressableProps.onPressIn)} <mask> onPressOut={composeEventHandlers(onPressOut, pressableProps.onPressOut)} <mask> // @ts-ignore - web only </s> fix: checkbox test cases fixes </s> remove // alignItems="flex-start" //some input props </s> add </s> remove import React from 'react'; </s> add </s> remove <Center {...nonLayoutProps}> </s> add <Center {...nonAccessibilityProps}>
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32e663dd4c49365a81d6b8dad75d34ffefaf0390
src/components/primitives/Checkbox/Checkbox.tsx
<mask> return ( <mask> <Pressable <mask> {...(pressableProps as IPressableProps)} <mask> onPress={onPress} <mask> // alignItems="flex-start" <mask> //some input props <mask> ref={mergeRefs([ref, wrapperRef])} <mask> accessibilityRole="checkbox" <mask> onPressIn={composeEventHandlers(onPressIn, pressableProps.onPressIn)} <mask> onPressOut={composeEventHandlers(onPressOut, pressableProps.onPressOut)} <mask> // @ts-ignore - web only </s> fix: checkbox test cases fixes </s> remove import React from 'react'; </s> add </s> remove <Center {...nonLayoutProps}> </s> add <Center {...nonAccessibilityProps}>
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32e663dd4c49365a81d6b8dad75d34ffefaf0390
src/components/primitives/Checkbox/Checkbox.tsx
<Center {...nonAccessibilityProps}>
<mask> <Center> <mask> {/* Interaction Wrapper */} <mask> <Box {..._interactionBox} p={5} w="100%" height="100%" zIndex={-1} /> <mask> {/* Checkbox */} <mask> <Center {...nonLayoutProps}> <mask> <SizedIcon icon={icon} _icon={_icon} isChecked={isChecked} /> <mask> </Center> <mask> </Center> <mask> {/* Label */} <mask> {combinedProps.children} </s> fix: checkbox test cases fixes </s> remove import React from 'react'; </s> add </s> remove // alignItems="flex-start" //some input props </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32e663dd4c49365a81d6b8dad75d34ffefaf0390
src/components/primitives/Checkbox/Checkbox.tsx
<mask> import { Box } from '../../primitives'; <mask> import { CheckIcon } from '../../primitives/Icon/Icons'; <mask> import React from 'react'; <mask> <mask> const SizedIcon = ({ <mask> icon, <mask> _icon, <mask> isChecked, </s> fix: checkbox test cases fixes </s> remove <Center {...nonLayoutProps}> </s> add <Center {...nonAccessibilityProps}> </s> remove // alignItems="flex-start" //some input props </s> add
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/32e663dd4c49365a81d6b8dad75d34ffefaf0390
src/components/primitives/Checkbox/SizedIcon.tsx
<mask> listDividerBg?: string; <mask> listNoteColor?: string; <mask> listItemPadding?: number; <mask> listNoteSize?: number; <mask> listItemHeight?: number; <mask> inset?: boolean; <mask> /** <mask> * Array of data chunks to render iteratively. <mask> */ <mask> dataArray?: Array<any>; </s> Fixed issue #1398. Removed unused variable listItemHeight </s> remove listItemHeight: 45, </s> add </s> remove listItemHeight: 45, </s> add </s> remove listItemHeight: 45, </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/3302008b99e8bfaec2bed0992693f80e0b8e2bab
index.d.ts
<mask> // List <mask> listBg: "#fff", <mask> listBorderColor: "#c9c9c9", <mask> listDividerBg: "#f4f4f4", <mask> listItemHeight: 45, <mask> listBtnUnderlayColor: "#DDD", <mask> <mask> // Card <mask> cardBorderColor: "#ccc", <mask> </s> Fixed issue #1398. Removed unused variable listItemHeight </s> remove listItemHeight: 45, </s> add </s> remove listItemHeight: 45, </s> add </s> remove listItemHeight?: number; </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/3302008b99e8bfaec2bed0992693f80e0b8e2bab
src/theme/variables/commonColor.js
<mask> // List <mask> listBg: "#fff", <mask> listBorderColor: "#c9c9c9", <mask> listDividerBg: "#f4f4f4", <mask> listItemHeight: 45, <mask> listBtnUnderlayColor: "#DDD", <mask> <mask> // Card <mask> cardBorderColor: "#ccc", <mask> </s> Fixed issue #1398. Removed unused variable listItemHeight
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/3302008b99e8bfaec2bed0992693f80e0b8e2bab
src/theme/variables/material.js
<mask> // List <mask> listBg: "#fff", <mask> listBorderColor: "#c9c9c9", <mask> listDividerBg: "#f4f4f4", <mask> listItemHeight: 45, <mask> listBtnUnderlayColor: "#DDD", <mask> <mask> // Card <mask> cardBorderColor: "#ccc", <mask> </s> Fixed issue #1398. Removed unused variable listItemHeight
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/3302008b99e8bfaec2bed0992693f80e0b8e2bab
src/theme/variables/platform.js
position="absolute" top={10} right={10}
<mask> {children} <mask> <Switch <mask> onToggle={toggleColorMode} <mask> isChecked={colorMode === 'dark'} <mask> style={{ position: 'absolute', top: 10, right: 10 }} <mask> /> <mask> </View> <mask> ); <mask> } <mask> </s> Added position props in all components </s> remove <ScrollView style={{ width: '100%' }}> <VStack space={10}> <Box> <Material /> </Box> <Box> <IOSLike /> </Box> <Box> <Customized /> </Box> <Box> <CustomizedWithBorder /> </Box> </VStack> </ScrollView> </s> add <VStack space={10}> <Material /> <IOSLike /> <Customized /> <CustomizedWithBorder /> </VStack> </s> remove <Box> <HeartIcon /> </Box> <Box> <SearchIcon /> </Box> <Box> <MoreIcon /> </Box> </s> add <HeartIcon /> <SearchIcon /> <MoreIcon /> </s> remove return ( <IconButton icon={ <Icon name="heart-outline" type="Ionicons" size={6} color="white" /> } /> ); </s> add return <IconButton icon={<Icon name="heart" size={6} color="white" />} />; </s> remove return ( <IconButton icon={ <Icon name="dots-vertical" type="MaterialCommunityIcons" size={6} color="white" /> } /> ); </s> add return <IconButton icon={<Icon name="more-vert" size={6} color="white" />} />; </s> remove import { ScrollView, TouchableOpacity } from 'react-native'; </s> add import { TouchableOpacity } from 'react-native';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/33358caff6992d51f9beedeaa40d69f5054edab2
example/storybook/stories/components/Wrapper.tsx
<mask> import { <mask> AppBar, <mask> IconButton, <mask> Icon, <mask> Box, <mask> Text, <mask> HStack, <mask> VStack, <mask> Button, <mask> } from 'native-base'; </s> Added position props in all components </s> remove import { ScrollView, TouchableOpacity } from 'react-native'; </s> add import { TouchableOpacity } from 'react-native'; </s> remove import { border, color, flexbox, layout, space } from 'styled-system'; import { customBorder, customBackground, customOutline, customLayout, customExtra, customShadow, customTypography, } from '../../../utils/customProps'; </s> add </s> remove import { space } from 'styled-system'; </s> add </s> remove import { color, space, typography } from 'styled-system'; </s> add import { border, color, flexbox, layout, space, typography, position, } from 'styled-system'; import { customBorder, customBackground, customOutline, customLayout, customExtra, customShadow, customTypography, customPosition, } from '../../../utils/customProps'; </s> remove import { View, TouchableWithoutFeedback, StyleSheet } from 'react-native'; </s> add import { TouchableWithoutFeedback, StyleSheet } from 'react-native'; import View from './../View';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/33358caff6992d51f9beedeaa40d69f5054edab2
example/storybook/stories/components/composites/AppBar/AppBarExamples.tsx
import { TouchableOpacity } from 'react-native';
<mask> HStack, <mask> VStack, <mask> Button, <mask> } from 'native-base'; <mask> import { ScrollView, TouchableOpacity } from 'react-native'; <mask> <mask> export default function Examples() { <mask> return ( <mask> <ScrollView style={{ width: '100%' }}> <mask> <VStack space={10}> </s> Added position props in all components </s> remove <ScrollView style={{ width: '100%' }}> <VStack space={10}> <Box> <Material /> </Box> <Box> <IOSLike /> </Box> <Box> <Customized /> </Box> <Box> <CustomizedWithBorder /> </Box> </VStack> </ScrollView> </s> add <VStack space={10}> <Material /> <IOSLike /> <Customized /> <CustomizedWithBorder /> </VStack> </s> remove Box, </s> add </s> remove import { ViewProps, View } from 'react-native'; </s> add import { IViewProps, default as View } from '../View'; </s> remove import { BorderProps, ColorProps, FlexboxProps, LayoutProps, SpaceProps, border, color, flexbox, layout, space as spacing, } from 'styled-system'; </s> add import { IViewProps, default as View } from '../View'; </s> remove const StyledBadge = styled(Box)<IBadgeProps>(space); </s> add const StyledBadge = styled(Box)<IBadgeProps>({});
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/33358caff6992d51f9beedeaa40d69f5054edab2
example/storybook/stories/components/composites/AppBar/AppBarExamples.tsx
<VStack space={10}> <Material /> <IOSLike /> <Customized /> <CustomizedWithBorder /> </VStack>
<mask> import { ScrollView, TouchableOpacity } from 'react-native'; <mask> <mask> export default function Examples() { <mask> return ( <mask> <ScrollView style={{ width: '100%' }}> <mask> <VStack space={10}> <mask> <Box> <mask> <Material /> <mask> </Box> <mask> <mask> <Box> <mask> <IOSLike /> <mask> </Box> <mask> <mask> <Box> <mask> <Customized /> <mask> </Box> <mask> <mask> <Box> <mask> <CustomizedWithBorder /> <mask> </Box> <mask> </VStack> <mask> </ScrollView> <mask> ); <mask> } <mask> <mask> function Material() { <mask> return ( </s> Added position props in all components </s> remove <Box> <HeartIcon /> </Box> <Box> <SearchIcon /> </Box> <Box> <MoreIcon /> </Box> </s> add <HeartIcon /> <SearchIcon /> <MoreIcon /> </s> remove import { ScrollView, TouchableOpacity } from 'react-native'; </s> add import { TouchableOpacity } from 'react-native'; </s> remove <IconButton icon={<Icon name="menu" type="MaterialIcons" size={6} />} /> </s> add <IconButton icon={<Icon name="menu" size={6} />} /> </s> remove return ( <IconButton icon={ <Icon name="dots-vertical" type="MaterialCommunityIcons" size={6} color="white" /> } /> ); </s> add return <IconButton icon={<Icon name="more-vert" size={6} color="white" />} />; </s> remove return ( <IconButton icon={ <Icon name="heart-outline" type="Ionicons" size={6} color="white" /> } /> ); </s> add return <IconButton icon={<Icon name="heart" size={6} color="white" />} />;
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", ...
https://github.com/GeekyAnts/NativeBase/commit/33358caff6992d51f9beedeaa40d69f5054edab2
example/storybook/stories/components/composites/AppBar/AppBarExamples.tsx
<HeartIcon /> <SearchIcon /> <MoreIcon />
<mask> </VStack> <mask> </AppBar.Content> <mask> <mask> <AppBar.Right space={2}> <mask> <Box> <mask> <HeartIcon /> <mask> </Box> <mask> <Box> <mask> <SearchIcon /> <mask> </Box> <mask> <Box> <mask> <MoreIcon /> <mask> </Box> <mask> </AppBar.Right> <mask> </AppBar> <mask> ); <mask> } <mask> </s> Added position props in all components </s> remove <ScrollView style={{ width: '100%' }}> <VStack space={10}> <Box> <Material /> </Box> <Box> <IOSLike /> </Box> <Box> <Customized /> </Box> <Box> <CustomizedWithBorder /> </Box> </VStack> </ScrollView> </s> add <VStack space={10}> <Material /> <IOSLike /> <Customized /> <CustomizedWithBorder /> </VStack> </s> remove style={{ position: 'absolute', top: 10, right: 10 }} </s> add position="absolute" top={10} right={10} </s> remove return ( <IconButton icon={ <Icon name="dots-vertical" type="MaterialCommunityIcons" size={6} color="white" /> } /> ); </s> add return <IconButton icon={<Icon name="more-vert" size={6} color="white" />} />; </s> remove return ( <IconButton icon={ <Icon name="heart-outline" type="Ionicons" size={6} color="white" /> } /> ); </s> add return <IconButton icon={<Icon name="heart" size={6} color="white" />} />; </s> remove <IconButton icon={<Icon name="menu" type="MaterialIcons" size={6} />} /> </s> add <IconButton icon={<Icon name="menu" size={6} />} />
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/33358caff6992d51f9beedeaa40d69f5054edab2
example/storybook/stories/components/composites/AppBar/AppBarExamples.tsx
<IconButton icon={<Icon name="menu" size={6} />} />
<mask> function CustomizedWithBorder() { <mask> return ( <mask> <AppBar bg="white" shadow={3} px={4} space={3}> <mask> <AppBar.Left> <mask> <IconButton icon={<Icon name="menu" type="MaterialIcons" size={6} />} /> <mask> </AppBar.Left> <mask> <AppBar.Content> <mask> <Text isTruncated fontWeight="bold" fontSize={20}> <mask> Home <mask> </Text> </s> Added position props in all components </s> remove return ( <IconButton icon={ <Icon name="dots-vertical" type="MaterialCommunityIcons" size={6} color="white" /> } /> ); </s> add return <IconButton icon={<Icon name="more-vert" size={6} color="white" />} />; </s> remove return ( <IconButton icon={ <Icon name="heart-outline" type="Ionicons" size={6} color="white" /> } /> ); </s> add return <IconButton icon={<Icon name="heart" size={6} color="white" />} />; </s> remove <ScrollView style={{ width: '100%' }}> <VStack space={10}> <Box> <Material /> </Box> <Box> <IOSLike /> </Box> <Box> <Customized /> </Box> <Box> <CustomizedWithBorder /> </Box> </VStack> </ScrollView> </s> add <VStack space={10}> <Material /> <IOSLike /> <Customized /> <CustomizedWithBorder /> </VStack> </s> remove import { ScrollView, TouchableOpacity } from 'react-native'; </s> add import { TouchableOpacity } from 'react-native'; </s> remove <Box> <HeartIcon /> </Box> <Box> <SearchIcon /> </Box> <Box> <MoreIcon /> </Box> </s> add <HeartIcon /> <SearchIcon /> <MoreIcon />
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/33358caff6992d51f9beedeaa40d69f5054edab2
example/storybook/stories/components/composites/AppBar/AppBarExamples.tsx
return <IconButton icon={<Icon name="heart" size={6} color="white" />} />;
<mask> ); <mask> }; <mask> <mask> const HeartIcon = () => { <mask> return ( <mask> <IconButton <mask> icon={ <mask> <Icon name="heart-outline" type="Ionicons" size={6} color="white" /> <mask> } <mask> /> <mask> ); <mask> }; <mask> const SearchIcon = () => { <mask> return <IconButton icon={<Icon name="search" size={6} color="white" />} />; <mask> }; <mask> const MoreIcon = () => { </s> Added position props in all components </s> remove return ( <IconButton icon={ <Icon name="dots-vertical" type="MaterialCommunityIcons" size={6} color="white" /> } /> ); </s> add return <IconButton icon={<Icon name="more-vert" size={6} color="white" />} />; </s> remove <IconButton icon={<Icon name="menu" type="MaterialIcons" size={6} />} /> </s> add <IconButton icon={<Icon name="menu" size={6} />} /> </s> remove export const VStack = (props: StackProps) => { </s> add export const VStack = (props: IStackProps) => { </s> remove export const HStack = (props: StackProps) => { </s> add export const HStack = (props: IStackProps) => { </s> remove const ZStack = ({ children, reversed, ...props }: ZStackProps) => { </s> add const ZStack = ({ children, reversed, ...props }: IZStackProps) => {
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/33358caff6992d51f9beedeaa40d69f5054edab2
example/storybook/stories/components/composites/AppBar/AppBarExamples.tsx
return <IconButton icon={<Icon name="more-vert" size={6} color="white" />} />;
<mask> const SearchIcon = () => { <mask> return <IconButton icon={<Icon name="search" size={6} color="white" />} />; <mask> }; <mask> const MoreIcon = () => { <mask> return ( <mask> <IconButton <mask> icon={ <mask> <Icon <mask> name="dots-vertical" <mask> type="MaterialCommunityIcons" <mask> size={6} <mask> color="white" <mask> /> <mask> } <mask> /> <mask> ); <mask> }; </s> Added position props in all components </s> remove return ( <IconButton icon={ <Icon name="heart-outline" type="Ionicons" size={6} color="white" /> } /> ); </s> add return <IconButton icon={<Icon name="heart" size={6} color="white" />} />; </s> remove <IconButton icon={<Icon name="menu" type="MaterialIcons" size={6} />} /> </s> add <IconButton icon={<Icon name="menu" size={6} />} /> </s> remove export const VStack = (props: StackProps) => { </s> add export const VStack = (props: IStackProps) => { </s> remove export const HStack = (props: StackProps) => { </s> add export const HStack = (props: IStackProps) => { </s> remove const ZStack = ({ children, reversed, ...props }: ZStackProps) => { </s> add const ZStack = ({ children, reversed, ...props }: IZStackProps) => {
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/33358caff6992d51f9beedeaa40d69f5054edab2
example/storybook/stories/components/composites/AppBar/AppBarExamples.tsx
customPositionProps,
<mask> customTransformProps, <mask> customFlexboxProps, <mask> } from '../../../utils/customProps'; <mask> import type { ImageSourcePropType } from 'react-native'; <mask> <mask> export type IAvatarProps = ColorProps & <mask> SpaceProps & </s> Added position props in all components </s> remove import type { ColorProps, SpaceProps, TypographyProps } from 'styled-system'; </s> add import type { BorderProps, ColorProps, FlexboxProps, LayoutProps, SpaceProps, TypographyProps, PositionProps, } from 'styled-system'; import type { customBorderProps, customBackgroundProps, customOutlineProps, customLayoutProps, customExtraProps, customShadowProps, customTypographyProps, customTransformProps, customFlexboxProps, customPositionProps, } from '../../../utils/customProps';
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/33358caff6992d51f9beedeaa40d69f5054edab2
src/components/composites/Avatar/props.tsx
customPositionProps &
<mask> export type IAvatarProps = ColorProps & <mask> SpaceProps & <mask> LayoutProps & <mask> PositionProps & <mask> customBorderProps & <mask> customExtraProps & <mask> customOutlineProps & <mask> customShadowProps & <mask> customLayoutProps & </s> Added position props in all components
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/33358caff6992d51f9beedeaa40d69f5054edab2
src/components/composites/Avatar/props.tsx
<mask> import React from 'react'; <mask> import styled from 'styled-components/native'; <mask> import Box from '../../primitives/Box'; <mask> import { space } from 'styled-system'; <mask> import type { IBadgeProps } from './props'; <mask> import { usePropsConfig } from '../../../hooks'; <mask> <mask> const StyledBadge = styled(Box)<IBadgeProps>(space); <mask> </s> Added position props in all components </s> remove const StyledBadge = styled(Box)<IBadgeProps>(space); </s> add const StyledBadge = styled(Box)<IBadgeProps>({}); </s> remove import { border, color, flexbox, layout, space } from 'styled-system'; import { customBorder, customBackground, customOutline, customLayout, customExtra, customShadow, customTypography, } from '../../../utils/customProps'; </s> add </s> remove import { View, TouchableWithoutFeedback, StyleSheet } from 'react-native'; </s> add import { TouchableWithoutFeedback, StyleSheet } from 'react-native'; import View from './../View'; </s> remove import { color, space, typography } from 'styled-system'; </s> add import { border, color, flexbox, layout, space, typography, position, } from 'styled-system'; import { customBorder, customBackground, customOutline, customLayout, customExtra, customShadow, customTypography, customPosition, } from '../../../utils/customProps';
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/33358caff6992d51f9beedeaa40d69f5054edab2
src/components/composites/Badge/index.tsx
const StyledBadge = styled(Box)<IBadgeProps>({});
<mask> import { space } from 'styled-system'; <mask> import type { IBadgeProps } from './props'; <mask> import { usePropsConfig } from '../../../hooks'; <mask> <mask> const StyledBadge = styled(Box)<IBadgeProps>(space); <mask> <mask> const Badge = ({ children, style, ...props }: IBadgeProps) => { <mask> let newProps = usePropsConfig('Badge', props); <mask> return ( <mask> <StyledBadge {...newProps} style={style}> </s> Added position props in all components </s> remove import { space } from 'styled-system'; </s> add </s> remove const ZStack = ({ children, reversed, ...props }: ZStackProps) => { </s> add const ZStack = ({ children, reversed, ...props }: IZStackProps) => { </s> remove type ZStackProps = IZStackProps & ViewProps & { children: JSX.Element[] | JSX.Element; reversed?: boolean; }; </s> add const StyledZStack = styled(View)<IZStackProps>({}); </s> remove import { border, color, flexbox, layout, space } from 'styled-system'; import { customBorder, customBackground, customOutline, customLayout, customExtra, customShadow, customTypography, } from '../../../utils/customProps'; </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/33358caff6992d51f9beedeaa40d69f5054edab2
src/components/composites/Badge/index.tsx
import { border, color, flexbox, layout, space, position } from 'styled-system';
<mask> Platform, <mask> } from 'react-native'; <mask> import type { Modal as ModalType } from 'react-native'; <mask> import styled from 'styled-components/native'; <mask> import { border, color, flexbox, layout, space } from 'styled-system'; <mask> import { <mask> customBorder, <mask> customBackground, <mask> customOutline, <mask> customLayout, </s> Added position props in all components </s> remove import { border, color, flexbox, layout, space } from 'styled-system'; </s> add import { border, color, flexbox, layout, space, position } from 'styled-system'; </s> remove import { border, color, flexbox, layout, space } from 'styled-system'; </s> add import { border, color, flexbox, layout, space, position } from 'styled-system'; </s> remove import { View, TouchableWithoutFeedback, StyleSheet } from 'react-native'; </s> add import { TouchableWithoutFeedback, StyleSheet } from 'react-native'; import View from './../View'; </s> remove import { border, color, flexbox, layout, space } from 'styled-system'; import { customBorder, customBackground, customOutline, customLayout, customExtra, customShadow, customTypography, } from '../../../utils/customProps'; </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/33358caff6992d51f9beedeaa40d69f5054edab2
src/components/composites/Modal/index.tsx