docstring_tokens
stringlengths
0
76.5k
code_tokens
stringlengths
75
1.81M
label_window
sequencelengths
4
2.12k
html_url
stringlengths
74
116
file_name
stringlengths
3
311
/> <Skeleton.Text startColor="#0dead0" endColor="#0face0" lineHeight={20} h={24}
<mask> <Skeleton <mask> startColor="warning.200" <mask> endColor="danger.200" <mask> size={20} <mask> variant="circle" <mask> /> <mask> </VStack> <mask> ); <mask> }; </s> feat: skeleton example and api update </s> remove <Skeleton </s> add <Skeleton.Circle </s> remove <Stack width="90%"> <Skeleton variant="text" height={6} /> <Skeleton my={2} height={6} variant="rect" /> <Skeleton my={2} height={6} variant="circle" size={20} /> </s> add <Stack w="50%" space={8}> <Skeleton h={20}></Skeleton> <Skeleton.Circle size={20} /> <Skeleton.Text noOfLines={5} lineHeight={12} h={90}></Skeleton.Text> </s> remove ) : ( <Skeleton variant="rect" height="100%" /> )} </s> add </Skeleton> </s> remove <Composition /> <Composition loaded /> </s> add <CompositionComponent />
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
example/storybook/stories/components/composites/Skeleton/Color.tsx
import React, { useState } from 'react';
<mask> import React from 'react'; <mask> import { <mask> Box, <mask> Skeleton, <mask> VStack, <mask> Text, </s> feat: skeleton example and api update </s> remove import { Box } from 'native-base'; </s> add import { Box, Text } from 'native-base'; </s> remove import Basic from './Basic'; import Color from './Color'; import Composition from './Composition'; </s> add import { Example as Basic } from './Basic'; import { Example as Color } from './Color'; import { Example as Composition } from './Composition'; import { Example as IsLoaded } from './isLoaded'; import { Example as FadeDuration } from './FadeDuration'; </s> remove <Stack width="90%"> <Skeleton variant="text" height={6} /> <Skeleton my={2} height={6} variant="rect" /> <Skeleton my={2} height={6} variant="circle" size={20} /> </s> add <Stack w="50%" space={8}> <Skeleton h={20}></Skeleton> <Skeleton.Circle size={20} /> <Skeleton.Text noOfLines={5} lineHeight={12} h={90}></Skeleton.Text> </s> remove import Skeleton from './skeleton'; </s> add import { Skeleton, SkeletonText } from './skeleton';
[ "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
example/storybook/stories/components/composites/Skeleton/Composition.tsx
function CompositionComponent() { const [loaded, setLoaded] = useState(false); setTimeout(() => { setLoaded(true); }, 5000);
<mask> Avatar, <mask> HStack, <mask> Image, <mask> } from 'native-base'; <mask> function Composition({ loaded }: any) { <mask> return ( <mask> <VStack> <mask> <HStack alignItems="center"> <mask> {loaded ? ( <mask> <Avatar </s> feat: skeleton example and api update </s> remove {loaded ? ( </s> add <Skeleton.Circle size={12} isLoaded={loaded}> </s> remove import { Box } from 'native-base'; </s> add import { Box, Text } from 'native-base'; </s> remove <Composition /> <Composition loaded /> </s> add <CompositionComponent /> </s> remove ) : ( <Skeleton variant="circle" size={12} /> )} <Text fontWeight="bold" fontSize="lg" ml={2}> {loaded ? ( 'Nativebase' ) : ( <Skeleton> <Box>Nativebase</Box> </Skeleton> )} </Text> </s> add </Skeleton.Circle> <Skeleton.Text isLoaded={loaded} w="50%" ml={2} _stack={{ justifyContent: 'center' }} > <Text fontWeight="bold" fontSize="lg" my="auto" ml={2}> Nativebase </Text> </Skeleton.Text> </s> remove <Stack width="90%"> <Skeleton variant="text" height={6} /> <Skeleton my={2} height={6} variant="rect" /> <Skeleton my={2} height={6} variant="circle" size={20} /> </s> add <Stack w="50%" space={8}> <Skeleton h={20}></Skeleton> <Skeleton.Circle size={20} /> <Skeleton.Text noOfLines={5} lineHeight={12} h={90}></Skeleton.Text>
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
example/storybook/stories/components/composites/Skeleton/Composition.tsx
<Skeleton.Circle size={12} isLoaded={loaded}>
<mask> function Composition({ loaded }: any) { <mask> return ( <mask> <VStack> <mask> <HStack alignItems="center"> <mask> {loaded ? ( <mask> <Avatar <mask> source={{ <mask> uri: 'https://nativebase.github.io/img/native-base-icon.png', <mask> }} <mask> /> </s> feat: skeleton example and api update </s> remove function Composition({ loaded }: any) { </s> add function CompositionComponent() { const [loaded, setLoaded] = useState(false); setTimeout(() => { setLoaded(true); }, 5000); </s> remove ) : ( <Skeleton variant="circle" size={12} /> )} <Text fontWeight="bold" fontSize="lg" ml={2}> {loaded ? ( 'Nativebase' ) : ( <Skeleton> <Box>Nativebase</Box> </Skeleton> )} </Text> </s> add </Skeleton.Circle> <Skeleton.Text isLoaded={loaded} w="50%" ml={2} _stack={{ justifyContent: 'center' }} > <Text fontWeight="bold" fontSize="lg" my="auto" ml={2}> Nativebase </Text> </Skeleton.Text> </s> remove {loaded ? ( </s> add <Skeleton height="100%" isLoaded={loaded}> </s> remove <Composition /> <Composition loaded /> </s> add <CompositionComponent />
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
example/storybook/stories/components/composites/Skeleton/Composition.tsx
</Skeleton.Circle> <Skeleton.Text isLoaded={loaded} w="50%" ml={2} _stack={{ justifyContent: 'center' }} > <Text fontWeight="bold" fontSize="lg" my="auto" ml={2}> Nativebase </Text> </Skeleton.Text>
<mask> source={{ <mask> uri: 'https://nativebase.github.io/img/native-base-icon.png', <mask> }} <mask> /> <mask> ) : ( <mask> <Skeleton variant="circle" size={12} /> <mask> )} <mask> <Text fontWeight="bold" fontSize="lg" ml={2}> <mask> {loaded ? ( <mask> 'Nativebase' <mask> ) : ( <mask> <Skeleton> <mask> <Box>Nativebase</Box> <mask> </Skeleton> <mask> )} <mask> </Text> <mask> </HStack> <mask> <Box size={200} mt={1}> <mask> {loaded ? ( <mask> <Image <mask> source={{ </s> feat: skeleton example and api update </s> remove {loaded ? ( </s> add <Skeleton height="100%" isLoaded={loaded}> </s> remove ) : ( <Skeleton variant="rect" height="100%" /> )} </s> add </Skeleton> </s> remove {loaded ? ( </s> add <Skeleton.Circle size={12} isLoaded={loaded}>
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
example/storybook/stories/components/composites/Skeleton/Composition.tsx
<Skeleton height="100%" isLoaded={loaded}>
<mask> )} <mask> </Text> <mask> </HStack> <mask> <Box size={200} mt={1}> <mask> {loaded ? ( <mask> <Image <mask> source={{ <mask> uri: 'https://www.w3schools.com/css/img_lights.jpg', <mask> }} <mask> alt="NativeBase logo" </s> feat: skeleton example and api update </s> remove ) : ( <Skeleton variant="circle" size={12} /> )} <Text fontWeight="bold" fontSize="lg" ml={2}> {loaded ? ( 'Nativebase' ) : ( <Skeleton> <Box>Nativebase</Box> </Skeleton> )} </Text> </s> add </Skeleton.Circle> <Skeleton.Text isLoaded={loaded} w="50%" ml={2} _stack={{ justifyContent: 'center' }} > <Text fontWeight="bold" fontSize="lg" my="auto" ml={2}> Nativebase </Text> </Skeleton.Text> </s> remove ) : ( <Skeleton variant="rect" height="100%" /> )} </s> add </Skeleton> </s> remove {loaded ? ( </s> add <Skeleton.Circle size={12} isLoaded={loaded}> </s> remove return ( <Box style={[ style, { transform: props.transform ?? variant === 'text' ? [{ scaleY: 0.6 }] : undefined, }, ]} borderRadius={variant === 'circle' ? 999 : 3} bg={baseColor} {...props} ref={ref} > </s> add return newProps.isLoaded ? ( children ) : ( <Box style={[style]} borderRadius={3} bg={baseColor} {...props} ref={ref}>
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
example/storybook/stories/components/composites/Skeleton/Composition.tsx
size={200}
<mask> source={{ <mask> uri: 'https://www.w3schools.com/css/img_lights.jpg', <mask> }} <mask> alt="NativeBase logo" <mask> /> <mask> </Skeleton> <mask> </Box> <mask> </VStack> </s> feat: skeleton example and api update </s> remove ) : ( <Skeleton variant="rect" height="100%" /> )} </s> add </Skeleton> </s> remove {loaded ? ( </s> add <Skeleton height="100%" isLoaded={loaded}> </s> remove ) : ( <Skeleton variant="circle" size={12} /> )} <Text fontWeight="bold" fontSize="lg" ml={2}> {loaded ? ( 'Nativebase' ) : ( <Skeleton> <Box>Nativebase</Box> </Skeleton> )} </Text> </s> add </Skeleton.Circle> <Skeleton.Text isLoaded={loaded} w="50%" ml={2} _stack={{ justifyContent: 'center' }} > <Text fontWeight="bold" fontSize="lg" my="auto" ml={2}> Nativebase </Text> </Skeleton.Text> </s> remove {loaded ? ( </s> add <Skeleton.Circle size={12} isLoaded={loaded}>
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
example/storybook/stories/components/composites/Skeleton/Composition.tsx
</Skeleton>
<mask> uri: 'https://www.w3schools.com/css/img_lights.jpg', <mask> }} <mask> alt="NativeBase logo" <mask> /> <mask> ) : ( <mask> <Skeleton variant="rect" height="100%" /> <mask> )} <mask> </Box> <mask> </VStack> <mask> ); <mask> } <mask> </s> feat: skeleton example and api update </s> remove {loaded ? ( </s> add <Skeleton height="100%" isLoaded={loaded}> </s> remove ) : ( <Skeleton variant="circle" size={12} /> )} <Text fontWeight="bold" fontSize="lg" ml={2}> {loaded ? ( 'Nativebase' ) : ( <Skeleton> <Box>Nativebase</Box> </Skeleton> )} </Text> </s> add </Skeleton.Circle> <Skeleton.Text isLoaded={loaded} w="50%" ml={2} _stack={{ justifyContent: 'center' }} > <Text fontWeight="bold" fontSize="lg" my="auto" ml={2}> Nativebase </Text> </Skeleton.Text> </s> remove <Stack width="90%"> <Skeleton variant="text" height={6} /> <Skeleton my={2} height={6} variant="rect" /> <Skeleton my={2} height={6} variant="circle" size={20} /> </s> add <Stack w="50%" space={8}> <Skeleton h={20}></Skeleton> <Skeleton.Circle size={20} /> <Skeleton.Text noOfLines={5} lineHeight={12} h={90}></Skeleton.Text>
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
example/storybook/stories/components/composites/Skeleton/Composition.tsx
<CompositionComponent />
<mask> <mask> export const Example = () => { <mask> return ( <mask> <VStack space={4}> <mask> <Composition /> <mask> <Composition loaded /> <mask> </VStack> <mask> ); <mask> }; </s> feat: skeleton example and api update </s> remove .add('Composition', () => <Composition />); </s> add .add('Composition', () => <Composition />) .add('FadeDuration', () => <FadeDuration />) .add('isLoaded', () => <IsLoaded />); </s> remove <Stack width="90%"> <Skeleton variant="text" height={6} /> <Skeleton my={2} height={6} variant="rect" /> <Skeleton my={2} height={6} variant="circle" size={20} /> </s> add <Stack w="50%" space={8}> <Skeleton h={20}></Skeleton> <Skeleton.Circle size={20} /> <Skeleton.Text noOfLines={5} lineHeight={12} h={90}></Skeleton.Text> </s> remove import { Box } from 'native-base'; </s> add import { Box, Text } from 'native-base'; </s> remove {loaded ? ( </s> add <Skeleton.Circle size={12} isLoaded={loaded}> </s> remove variant="circle" </s> add /> <Skeleton.Text startColor="#0dead0" endColor="#0face0" lineHeight={20} h={24}
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
example/storybook/stories/components/composites/Skeleton/Composition.tsx
import { Example as Basic } from './Basic'; import { Example as Color } from './Color'; import { Example as Composition } from './Composition'; import { Example as IsLoaded } from './isLoaded'; import { Example as FadeDuration } from './FadeDuration';
<mask> import React from 'react'; <mask> import { storiesOf } from '@storybook/react-native'; <mask> import { withKnobs } from '@storybook/addon-knobs'; <mask> import Wrapper from './../../Wrapper'; <mask> import Basic from './Basic'; <mask> import Color from './Color'; <mask> import Composition from './Composition'; <mask> <mask> storiesOf('Skeleton', module) <mask> .addDecorator(withKnobs) <mask> .addDecorator((getStory: any) => <Wrapper>{getStory()}</Wrapper>) <mask> .add('Basic', () => <Basic />) </s> feat: skeleton example and api update </s> remove import { Box } from 'native-base'; </s> add import { Box, Text } from 'native-base'; </s> remove import React from 'react'; </s> add import React, { useState } from 'react'; </s> remove import Skeleton from './skeleton'; </s> add import { Skeleton, SkeletonText } from './skeleton'; </s> remove .add('Composition', () => <Composition />); </s> add .add('Composition', () => <Composition />) .add('FadeDuration', () => <FadeDuration />) .add('isLoaded', () => <IsLoaded />);
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
example/storybook/stories/components/composites/Skeleton/index.tsx
.add('Composition', () => <Composition />) .add('FadeDuration', () => <FadeDuration />) .add('isLoaded', () => <IsLoaded />);
<mask> .addDecorator(withKnobs) <mask> .addDecorator((getStory: any) => <Wrapper>{getStory()}</Wrapper>) <mask> .add('Basic', () => <Basic />) <mask> .add('Color', () => <Color />) <mask> .add('Composition', () => <Composition />); </s> feat: skeleton example and api update </s> remove import Basic from './Basic'; import Color from './Color'; import Composition from './Composition'; </s> add import { Example as Basic } from './Basic'; import { Example as Color } from './Color'; import { Example as Composition } from './Composition'; import { Example as IsLoaded } from './isLoaded'; import { Example as FadeDuration } from './FadeDuration'; </s> remove <Composition /> <Composition loaded /> </s> add <CompositionComponent /> </s> remove import { Box } from 'native-base'; </s> add import { Box, Text } from 'native-base'; </s> remove <Stack width="90%"> <Skeleton variant="text" height={6} /> <Skeleton my={2} height={6} variant="rect" /> <Skeleton my={2} height={6} variant="circle" size={20} /> </s> add <Stack w="50%" space={8}> <Skeleton h={20}></Skeleton> <Skeleton.Circle size={20} /> <Skeleton.Text noOfLines={5} lineHeight={12} h={90}></Skeleton.Text> </s> remove const { variant, children, ...props } = allProps; </s> add const { children, ...props } = allProps;
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
example/storybook/stories/components/composites/Skeleton/index.tsx
import { Box, Text } from 'native-base';
<mask> import React from 'react'; <mask> import { Box } from 'native-base'; <mask> export const Example = () => { <mask> return ( <mask> <Box <mask> bg="primary.400" <mask> p={4} </s> feat: skeleton example and api update </s> remove <Stack width="90%"> <Skeleton variant="text" height={6} /> <Skeleton my={2} height={6} variant="rect" /> <Skeleton my={2} height={6} variant="circle" size={20} /> </s> add <Stack w="50%" space={8}> <Skeleton h={20}></Skeleton> <Skeleton.Circle size={20} /> <Skeleton.Text noOfLines={5} lineHeight={12} h={90}></Skeleton.Text> </s> remove import Basic from './Basic'; import Color from './Color'; import Composition from './Composition'; </s> add import { Example as Basic } from './Basic'; import { Example as Color } from './Color'; import { Example as Composition } from './Composition'; import { Example as IsLoaded } from './isLoaded'; import { Example as FadeDuration } from './FadeDuration'; </s> remove import React from 'react'; </s> add import React, { useState } from 'react'; </s> remove <Composition /> <Composition loaded /> </s> add <CompositionComponent />
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
example/storybook/stories/components/primitives/Box/basic.tsx
<Text></Text>
<mask> _text={{ fontSize: 'md', fontWeight: 'bold', color: 'white' }} <mask> > <mask> This is a Box <mask> </Box> <mask> ); <mask> }; </s> feat: skeleton example and api update </s> remove ) : ( <Skeleton variant="rect" height="100%" /> )} </s> add </Skeleton> </s> remove return ( <Box style={[ style, { transform: props.transform ?? variant === 'text' ? [{ scaleY: 0.6 }] : undefined, }, ]} borderRadius={variant === 'circle' ? 999 : 3} bg={baseColor} {...props} ref={ref} > </s> add return newProps.isLoaded ? ( children ) : ( <Box style={[style]} borderRadius={3} bg={baseColor} {...props} ref={ref}> </s> remove ) : ( <Skeleton variant="circle" size={12} /> )} <Text fontWeight="bold" fontSize="lg" ml={2}> {loaded ? ( 'Nativebase' ) : ( <Skeleton> <Box>Nativebase</Box> </Skeleton> )} </Text> </s> add </Skeleton.Circle> <Skeleton.Text isLoaded={loaded} w="50%" ml={2} _stack={{ justifyContent: 'center' }} > <Text fontWeight="bold" fontSize="lg" my="auto" ml={2}> Nativebase </Text> </Skeleton.Text>
[ "keep", "keep", "add", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
example/storybook/stories/components/primitives/Box/basic.tsx
export * from './components/composites/Skeleton';
<mask> export * from './components/primitives/Radio'; <mask> export * from './components/primitives/Row'; <mask> export * from './components/primitives/Select'; <mask> // export * from './components/composites/SimpleGrid'; <mask> // export * from './components/composites/Skeleton'; <mask> export * from './components/primitives/Slider'; <mask> export * from './components/primitives/Spinner'; <mask> export * from './components/primitives/Stack'; <mask> // export * from './components/composites/Stat'; <mask> export * from './components/primitives/Switch'; </s> feat: skeleton example and api update </s> remove duration: 1000, </s> add duration: newProps.fadeDuration * 10000 * (1 / newProps.speed), </s> remove duration: 1000, </s> add duration: newProps.fadeDuration * 10000 * (1 / newProps.speed), </s> remove export type { ISkeletonProps } from './Skeleton'; </s> add export type { ISkeletonProps, ISkeletonTextProps } from './Skeleton'; </s> remove import { Box } from 'native-base'; </s> add import { Box, Text } from 'native-base';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
example/storybook/stories/index.ts
const { children, ...props } = allProps;
<mask> import type { ISkeletonProps } from './types'; <mask> <mask> const Skeleton = (allProps: ISkeletonProps, ref: any) => { <mask> const isDomUsable = canUseDom(); <mask> const { variant, children, ...props } = allProps; <mask> const newProps = useThemeProps('Skeleton', props); <mask> const { style, skeletonColor, baseColor } = newProps; <mask> const blinkAnim = React.useRef(new Animated.Value(0)).current; <mask> <mask> React.useEffect(() => { </s> feat: skeleton example and api update </s> remove export default { </s> add // Skeleton export const Skeleton = { </s> remove import { Box } from 'native-base'; </s> add import { Box, Text } from 'native-base'; </s> remove export type { ISkeletonProps } from './Skeleton'; </s> add export type { ISkeletonProps, ISkeletonTextProps } from './Skeleton';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/components/composites/Skeleton/Skeleton.tsx
duration: newProps.fadeDuration * 10000 * (1 / newProps.speed),
<mask> if (isDomUsable) { <mask> const blink = Animated.sequence([ <mask> Animated.timing(blinkAnim, { <mask> toValue: 1, <mask> duration: 1000, <mask> useNativeDriver: Platform.OS !== 'web', <mask> }), <mask> Animated.timing(blinkAnim, { <mask> toValue: 0, <mask> duration: 1000, </s> feat: skeleton example and api update </s> remove duration: 1000, </s> add duration: newProps.fadeDuration * 10000 * (1 / newProps.speed), </s> remove }, [blinkAnim, isDomUsable]); </s> add }, [blinkAnim, isDomUsable, newProps]); </s> remove variant: 'text', </s> add fadeDuration: 0.1, speed: 1.0, isLoaded: false, }; const fontSizes = { ...typography.fontSizes, }; const lineHeights = { ...typography.lineHeights, }; const defaultPropsText = { fadeDuration: 0.1, speed: 1.0, isLoaded: false, noOfLines: 1, lineHeight: 12, }; // SkeletonText export const SkeletonText = { baseStyle: baseStyleText, fontSizes, lineHeights, defaultProps: defaultPropsText, </s> remove const { variant, children, ...props } = allProps; </s> add const { children, ...props } = allProps; </s> remove export default { </s> add // Skeleton export const Skeleton = {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/components/composites/Skeleton/Skeleton.tsx
duration: newProps.fadeDuration * 10000 * (1 / newProps.speed),
<mask> useNativeDriver: Platform.OS !== 'web', <mask> }), <mask> Animated.timing(blinkAnim, { <mask> toValue: 0, <mask> duration: 1000, <mask> useNativeDriver: Platform.OS !== 'web', <mask> }), <mask> ]); <mask> Animated.loop(blink).start(); <mask> } </s> feat: skeleton example and api update </s> remove duration: 1000, </s> add duration: newProps.fadeDuration * 10000 * (1 / newProps.speed), </s> remove }, [blinkAnim, isDomUsable]); </s> add }, [blinkAnim, isDomUsable, newProps]); </s> remove borderRadius: variant === 'circle' ? 999 : 3, </s> add borderRadius: 3, </s> remove export type { ISkeletonProps } from './Skeleton'; </s> add export type { ISkeletonProps, ISkeletonTextProps } from './Skeleton'; </s> remove const { variant, children, ...props } = allProps; </s> add const { children, ...props } = allProps;
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/components/composites/Skeleton/Skeleton.tsx
}, [blinkAnim, isDomUsable, newProps]);
<mask> }), <mask> ]); <mask> Animated.loop(blink).start(); <mask> } <mask> }, [blinkAnim, isDomUsable]); <mask> <mask> const skeletonStyle: any = { <mask> skeleton: { <mask> position: 'absolute', <mask> top: 0, </s> feat: skeleton example and api update </s> remove duration: 1000, </s> add duration: newProps.fadeDuration * 10000 * (1 / newProps.speed), </s> remove duration: 1000, </s> add duration: newProps.fadeDuration * 10000 * (1 / newProps.speed), </s> remove borderRadius: variant === 'circle' ? 999 : 3, </s> add borderRadius: 3, </s> remove variant?: 'rect' | 'circle' | 'text'; </s> add }; export type ISkeletonTextProps = ITextProps & IBoxProps & { fadeDuration?: number; isLoaded?: boolean; speed?: number; startColor?: string; endColor?: string; noOfLines?: number; space?: number | string; _stack?: any; }; export type ISkeletonComponentType = (( props: ISkeletonProps & { ref?: any } ) => JSX.Element) & { Circle: React.MemoExoticComponent< (props: ISkeletonProps & { ref?: any }) => JSX.Element >; Text: React.MemoExoticComponent< (props: ISkeletonTextProps & { ref?: any }) => JSX.Element >; </s> remove function Composition({ loaded }: any) { </s> add function CompositionComponent() { const [loaded, setLoaded] = useState(false); setTimeout(() => { setLoaded(true); }, 5000);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/components/composites/Skeleton/Skeleton.tsx
borderRadius: 3,
<mask> top: 0, <mask> bottom: 0, <mask> height: '100%', <mask> width: '100%', <mask> borderRadius: variant === 'circle' ? 999 : 3, <mask> backgroundColor: skeletonColor, <mask> opacity: blinkAnim, // Bind opacity to animated value <mask> }, <mask> }; <mask> </s> feat: skeleton example and api update </s> remove return ( <Box style={[ style, { transform: props.transform ?? variant === 'text' ? [{ scaleY: 0.6 }] : undefined, }, ]} borderRadius={variant === 'circle' ? 999 : 3} bg={baseColor} {...props} ref={ref} > </s> add return newProps.isLoaded ? ( children ) : ( <Box style={[style]} borderRadius={3} bg={baseColor} {...props} ref={ref}> </s> remove }, [blinkAnim, isDomUsable]); </s> add }, [blinkAnim, isDomUsable, newProps]); </s> remove duration: 1000, </s> add duration: newProps.fadeDuration * 10000 * (1 / newProps.speed), </s> remove duration: 1000, </s> add duration: newProps.fadeDuration * 10000 * (1 / newProps.speed),
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/components/composites/Skeleton/Skeleton.tsx
return newProps.isLoaded ? ( children ) : ( <Box style={[style]} borderRadius={3} bg={baseColor} {...props} ref={ref}>
<mask> opacity: blinkAnim, // Bind opacity to animated value <mask> }, <mask> }; <mask> <mask> return ( <mask> <Box <mask> style={[ <mask> style, <mask> { <mask> transform: <mask> props.transform ?? variant === 'text' <mask> ? [{ scaleY: 0.6 }] <mask> : undefined, <mask> }, <mask> ]} <mask> borderRadius={variant === 'circle' ? 999 : 3} <mask> bg={baseColor} <mask> {...props} <mask> ref={ref} <mask> > <mask> <Animated.View style={skeletonStyle.skeleton} /> <mask> {children ? <View style={{ opacity: 0 }}>{children}</View> : null} <mask> </Box> <mask> ); <mask> }; </s> feat: skeleton example and api update </s> remove borderRadius: variant === 'circle' ? 999 : 3, </s> add borderRadius: 3, </s> remove ) : ( <Skeleton variant="circle" size={12} /> )} <Text fontWeight="bold" fontSize="lg" ml={2}> {loaded ? ( 'Nativebase' ) : ( <Skeleton> <Box>Nativebase</Box> </Skeleton> )} </Text> </s> add </Skeleton.Circle> <Skeleton.Text isLoaded={loaded} w="50%" ml={2} _stack={{ justifyContent: 'center' }} > <Text fontWeight="bold" fontSize="lg" my="auto" ml={2}> Nativebase </Text> </Skeleton.Text> </s> remove ) : ( <Skeleton variant="rect" height="100%" /> )} </s> add </Skeleton> </s> remove function Composition({ loaded }: any) { </s> add function CompositionComponent() { const [loaded, setLoaded] = useState(false); setTimeout(() => { setLoaded(true); }, 5000);
[ "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/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/components/composites/Skeleton/Skeleton.tsx
{/* <Box h={fontSize}></Box> */}
<mask> children <mask> ) : ( <mask> <Box style={[style]} borderRadius={3} bg={baseColor} {...props} ref={ref}> <mask> <Animated.View style={skeletonStyle.skeleton} /> <mask> {children ? <View style={{ opacity: 0 }}>{children}</View> : null} <mask> </Box> <mask> ); <mask> }; <mask> <mask> export default React.memo(React.forwardRef(Skeleton)); </s> feat: skeleton example and api update </s> remove return ( <Box style={[ style, { transform: props.transform ?? variant === 'text' ? [{ scaleY: 0.6 }] : undefined, }, ]} borderRadius={variant === 'circle' ? 999 : 3} bg={baseColor} {...props} ref={ref} > </s> add return newProps.isLoaded ? ( children ) : ( <Box style={[style]} borderRadius={3} bg={baseColor} {...props} ref={ref}> </s> remove ) : ( <Skeleton variant="rect" height="100%" /> )} </s> add </Skeleton> </s> remove ) : ( <Skeleton variant="circle" size={12} /> )} <Text fontWeight="bold" fontSize="lg" ml={2}> {loaded ? ( 'Nativebase' ) : ( <Skeleton> <Box>Nativebase</Box> </Skeleton> )} </Text> </s> add </Skeleton.Circle> <Skeleton.Text isLoaded={loaded} w="50%" ml={2} _stack={{ justifyContent: 'center' }} > <Text fontWeight="bold" fontSize="lg" my="auto" ml={2}> Nativebase </Text> </Skeleton.Text> </s> remove borderRadius: variant === 'circle' ? 999 : 3, </s> add borderRadius: 3, </s> remove <Composition /> <Composition loaded /> </s> add <CompositionComponent />
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/components/composites/Skeleton/Skeleton.tsx
import type { ITextProps } from '../../primitives';
<mask> import type { IBoxProps } from '../../primitives'; <mask> <mask> export type ISkeletonProps = IBoxProps & { <mask> fadeDuration?: number; <mask> isLoaded?: boolean; <mask> speed?: number; </s> feat: skeleton example and api update </s> remove variant?: 'rect' | 'circle' | 'text'; </s> add }; export type ISkeletonTextProps = ITextProps & IBoxProps & { fadeDuration?: number; isLoaded?: boolean; speed?: number; startColor?: string; endColor?: string; noOfLines?: number; space?: number | string; _stack?: any; }; export type ISkeletonComponentType = (( props: ISkeletonProps & { ref?: any } ) => JSX.Element) & { Circle: React.MemoExoticComponent< (props: ISkeletonProps & { ref?: any }) => JSX.Element >; Text: React.MemoExoticComponent< (props: ISkeletonTextProps & { ref?: any }) => JSX.Element >; </s> remove export type { ISkeletonProps } from './Skeleton'; </s> add export type { ISkeletonProps, ISkeletonTextProps } from './Skeleton'; </s> remove const { variant, children, ...props } = allProps; </s> add const { children, ...props } = allProps; </s> remove import { Box } from 'native-base'; </s> add import { Box, Text } from 'native-base';
[ "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/components/composites/Skeleton/types.tsx
fadeDuration?: number; isLoaded?: boolean; speed?: number;
<mask> <mask> export type ISkeletonProps = IBoxProps & { <mask> startColor?: string; <mask> endColor?: string; <mask> size?: string | number; <mask> }; <mask> </s> feat: skeleton example and api update </s> remove variant?: 'rect' | 'circle' | 'text'; </s> add }; export type ISkeletonTextProps = ITextProps & IBoxProps & { fadeDuration?: number; isLoaded?: boolean; speed?: number; startColor?: string; endColor?: string; noOfLines?: number; space?: number | string; _stack?: any; }; export type ISkeletonComponentType = (( props: ISkeletonProps & { ref?: any } ) => JSX.Element) & { Circle: React.MemoExoticComponent< (props: ISkeletonProps & { ref?: any }) => JSX.Element >; Text: React.MemoExoticComponent< (props: ISkeletonTextProps & { ref?: any }) => JSX.Element >; </s> remove export type { ISkeletonProps } from './Skeleton'; </s> add export type { ISkeletonProps, ISkeletonTextProps } from './Skeleton'; </s> remove const { variant, children, ...props } = allProps; </s> add const { children, ...props } = allProps; </s> remove export default { </s> add // Skeleton export const Skeleton = {
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/components/composites/Skeleton/types.tsx
}; export type ISkeletonTextProps = ITextProps & IBoxProps & { fadeDuration?: number; isLoaded?: boolean; speed?: number; startColor?: string; endColor?: string; noOfLines?: number; space?: number | string; _stack?: any; }; export type ISkeletonComponentType = (( props: ISkeletonProps & { ref?: any } ) => JSX.Element) & { Circle: React.MemoExoticComponent< (props: ISkeletonProps & { ref?: any }) => JSX.Element >; Text: React.MemoExoticComponent< (props: ISkeletonTextProps & { ref?: any }) => JSX.Element >;
<mask> export type ISkeletonProps = IBoxProps & { <mask> startColor?: string; <mask> endColor?: string; <mask> size?: string | number; <mask> variant?: 'rect' | 'circle' | 'text'; <mask> }; </s> feat: skeleton example and api update </s> remove export type { ISkeletonProps } from './Skeleton'; </s> add export type { ISkeletonProps, ISkeletonTextProps } from './Skeleton'; </s> remove const { variant, children, ...props } = allProps; </s> add const { children, ...props } = allProps; </s> remove export default { </s> add // Skeleton export const Skeleton = {
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/components/composites/Skeleton/types.tsx
export type { ISkeletonProps, ISkeletonTextProps } from './Skeleton';
<mask> <mask> // export { default as Stat } from './Stat'; <mask> <mask> export { Skeleton } from './Skeleton'; <mask> export type { ISkeletonProps } from './Skeleton'; <mask> <mask> export { Accordion } from './Accordion'; <mask> export type { <mask> IAccordionProps, <mask> IAccordionDetailsProps, </s> feat: skeleton example and api update </s> remove export default { </s> add // Skeleton export const Skeleton = { </s> remove import Skeleton from './skeleton'; </s> add import { Skeleton, SkeletonText } from './skeleton'; </s> remove import Basic from './Basic'; import Color from './Color'; import Composition from './Composition'; </s> add import { Example as Basic } from './Basic'; import { Example as Color } from './Color'; import { Example as Composition } from './Composition'; import { Example as IsLoaded } from './isLoaded'; import { Example as FadeDuration } from './FadeDuration'; </s> remove variant?: 'rect' | 'circle' | 'text'; </s> add }; export type ISkeletonTextProps = ITextProps & IBoxProps & { fadeDuration?: number; isLoaded?: boolean; speed?: number; startColor?: string; endColor?: string; noOfLines?: number; space?: number | string; _stack?: any; }; export type ISkeletonComponentType = (( props: ISkeletonProps & { ref?: any } ) => JSX.Element) & { Circle: React.MemoExoticComponent< (props: ISkeletonProps & { ref?: any }) => JSX.Element >; Text: React.MemoExoticComponent< (props: ISkeletonTextProps & { ref?: any }) => JSX.Element >;
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/components/composites/index.ts
'none': 16, 'shorter': 20, 'short': 22, 'base': 24, 'tall': 26, 'taller': 32, '3': 12, '4': 16, '5': 20, '6': 24, '7': 28, '8': 32, '9': 36, '10': 40,
<mask> '4xl': 1.25, <mask> '5xl': 1.5, <mask> }, <mask> lineHeights: { <mask> 'none': 1, <mask> 'shorter': 1.25, <mask> 'short': 1.375, <mask> 'base': 1.5, <mask> 'tall': 1.625, <mask> 'taller': '2', <mask> '3': '12px', <mask> '4': '16px', <mask> '5': '20px', <mask> '6': '24px', <mask> '7': '28px', <mask> '8': '32px', <mask> '9': '36px', <mask> '10': '40px', <mask> }, <mask> // fontConfig: { <mask> // Roboto: { <mask> // 100: { <mask> // normal: 'Roboto-Light', </s> feat: skeleton example and api update </s> remove export default { </s> add // Skeleton export const Skeleton = { </s> remove variant: 'text', </s> add fadeDuration: 0.1, speed: 1.0, isLoaded: false, }; const fontSizes = { ...typography.fontSizes, }; const lineHeights = { ...typography.lineHeights, }; const defaultPropsText = { fadeDuration: 0.1, speed: 1.0, isLoaded: false, noOfLines: 1, lineHeight: 12, }; // SkeletonText export const SkeletonText = { baseStyle: baseStyleText, fontSizes, lineHeights, defaultProps: defaultPropsText, </s> remove export type { ISkeletonProps } from './Skeleton'; </s> add export type { ISkeletonProps, ISkeletonTextProps } from './Skeleton'; </s> remove }, [blinkAnim, isDomUsable]); </s> add }, [blinkAnim, isDomUsable, newProps]); </s> remove borderRadius: variant === 'circle' ? 999 : 3, </s> add borderRadius: 3,
[ "keep", "keep", "keep", "keep", "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/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/theme/base/typography.ts
import { Skeleton, SkeletonText } from './skeleton';
<mask> import { default as NumberInput, NumberInputStepper } from './number-input'; <mask> import PinInput from './pin-input'; <mask> import Progress from './progress'; <mask> import Radio from './radio'; <mask> import Skeleton from './skeleton'; <mask> import Spinner from './spinner'; <mask> import Stat from './stat'; <mask> import Switch from './switch'; <mask> import Tabs from './tabs'; <mask> import Tag from './tag'; </s> feat: skeleton example and api update </s> remove import Basic from './Basic'; import Color from './Color'; import Composition from './Composition'; </s> add import { Example as Basic } from './Basic'; import { Example as Color } from './Color'; import { Example as Composition } from './Composition'; import { Example as IsLoaded } from './isLoaded'; import { Example as FadeDuration } from './FadeDuration'; </s> remove import React from 'react'; </s> add import React, { useState } from 'react'; </s> remove import { Box } from 'native-base'; </s> add import { Box, Text } from 'native-base';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/theme/components/index.ts
SkeletonText,
<mask> SimpleGrid, <mask> Skeleton, <mask> SliderFilledTrack, <mask> SliderThumb, <mask> SliderTrack, <mask> Slider, <mask> Slide, <mask> SlideFade, </s> feat: skeleton example and api update </s> remove import React from 'react'; </s> add import React, { useState } from 'react'; </s> remove <Stack width="90%"> <Skeleton variant="text" height={6} /> <Skeleton my={2} height={6} variant="rect" /> <Skeleton my={2} height={6} variant="circle" size={20} /> </s> add <Stack w="50%" space={8}> <Skeleton h={20}></Skeleton> <Skeleton.Circle size={20} /> <Skeleton.Text noOfLines={5} lineHeight={12} h={90}></Skeleton.Text> </s> remove import Skeleton from './skeleton'; </s> add import { Skeleton, SkeletonText } from './skeleton'; </s> remove import { Box } from 'native-base'; </s> add import { Box, Text } from 'native-base';
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/theme/components/index.ts
import typography from '../base/typography';
<mask> import { getColor } from '../tools/colors'; <mask> import { mode } from '../tools'; <mask> <mask> const baseStyle = (props: Record<string, any>) => { <mask> let { startColor, endColor, theme } = props; <mask> let skeletonColor = getColor( </s> feat: skeleton example and api update </s> remove import { Box } from 'native-base'; </s> add import { Box, Text } from 'native-base'; </s> remove import Basic from './Basic'; import Color from './Color'; import Composition from './Composition'; </s> add import { Example as Basic } from './Basic'; import { Example as Color } from './Color'; import { Example as Composition } from './Composition'; import { Example as IsLoaded } from './isLoaded'; import { Example as FadeDuration } from './FadeDuration'; </s> remove const { variant, children, ...props } = allProps; </s> add const { children, ...props } = allProps;
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/theme/components/skeleton.ts
const baseStyleText = (props: Record<string, any>) => { let { startColor, theme } = props; let skeletonColor = getColor( theme, startColor, mode(theme.colors.muted[200], theme.colors.muted[600])(props) ); let baseColor = 'transparent'; return { skeletonColor, baseColor, }; };
<mask> skeletonColor, <mask> baseColor, <mask> }; <mask> }; <mask> <mask> const defaultProps = { <mask> fadeDuration: 0.1, <mask> speed: 1.0, <mask> isLoaded: false, <mask> }; </s> feat: skeleton example and api update </s> remove variant: 'text', </s> add fadeDuration: 0.1, speed: 1.0, isLoaded: false, }; const fontSizes = { ...typography.fontSizes, }; const lineHeights = { ...typography.lineHeights, }; const defaultPropsText = { fadeDuration: 0.1, speed: 1.0, isLoaded: false, noOfLines: 1, lineHeight: 12, }; // SkeletonText export const SkeletonText = { baseStyle: baseStyleText, fontSizes, lineHeights, defaultProps: defaultPropsText, </s> remove export default { </s> add // Skeleton export const Skeleton = { </s> remove const { variant, children, ...props } = allProps; </s> add const { children, ...props } = allProps; </s> remove <Composition /> <Composition loaded /> </s> add <CompositionComponent /> </s> remove borderRadius: variant === 'circle' ? 999 : 3, </s> add borderRadius: 3,
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/theme/components/skeleton.ts
fadeDuration: 0.1, speed: 1.0, isLoaded: false, }; const fontSizes = { ...typography.fontSizes, }; const lineHeights = { ...typography.lineHeights, }; const defaultPropsText = { fadeDuration: 0.1, speed: 1.0, isLoaded: false, noOfLines: 1, lineHeight: 12, }; // SkeletonText export const SkeletonText = { baseStyle: baseStyleText, fontSizes, lineHeights, defaultProps: defaultPropsText,
<mask> }; <mask> }; <mask> <mask> const defaultProps = { <mask> variant: 'text', <mask> }; <mask> <mask> export default { <mask> baseStyle, <mask> defaultProps, </s> feat: skeleton example and api update </s> remove export default { </s> add // Skeleton export const Skeleton = { </s> remove <Composition /> <Composition loaded /> </s> add <CompositionComponent /> </s> remove export type { ISkeletonProps } from './Skeleton'; </s> add export type { ISkeletonProps, ISkeletonTextProps } from './Skeleton'; </s> remove variant?: 'rect' | 'circle' | 'text'; </s> add }; export type ISkeletonTextProps = ITextProps & IBoxProps & { fadeDuration?: number; isLoaded?: boolean; speed?: number; startColor?: string; endColor?: string; noOfLines?: number; space?: number | string; _stack?: any; }; export type ISkeletonComponentType = (( props: ISkeletonProps & { ref?: any } ) => JSX.Element) & { Circle: React.MemoExoticComponent< (props: ISkeletonProps & { ref?: any }) => JSX.Element >; Text: React.MemoExoticComponent< (props: ISkeletonTextProps & { ref?: any }) => JSX.Element >;
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/theme/components/skeleton.ts
// Skeleton export const Skeleton = {
<mask> const defaultProps = { <mask> variant: 'text', <mask> }; <mask> <mask> export default { <mask> baseStyle, <mask> defaultProps, <mask> }; </s> feat: skeleton example and api update </s> remove variant: 'text', </s> add fadeDuration: 0.1, speed: 1.0, isLoaded: false, }; const fontSizes = { ...typography.fontSizes, }; const lineHeights = { ...typography.lineHeights, }; const defaultPropsText = { fadeDuration: 0.1, speed: 1.0, isLoaded: false, noOfLines: 1, lineHeight: 12, }; // SkeletonText export const SkeletonText = { baseStyle: baseStyleText, fontSizes, lineHeights, defaultProps: defaultPropsText, </s> remove export type { ISkeletonProps } from './Skeleton'; </s> add export type { ISkeletonProps, ISkeletonTextProps } from './Skeleton'; </s> remove <Composition /> <Composition loaded /> </s> add <CompositionComponent /> </s> remove variant?: 'rect' | 'circle' | 'text'; </s> add }; export type ISkeletonTextProps = ITextProps & IBoxProps & { fadeDuration?: number; isLoaded?: boolean; speed?: number; startColor?: string; endColor?: string; noOfLines?: number; space?: number | string; _stack?: any; }; export type ISkeletonComponentType = (( props: ISkeletonProps & { ref?: any } ) => JSX.Element) & { Circle: React.MemoExoticComponent< (props: ISkeletonProps & { ref?: any }) => JSX.Element >; Text: React.MemoExoticComponent< (props: ISkeletonTextProps & { ref?: any }) => JSX.Element >;
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/bf6b4c6d2021ab59de381a161cbede6b70315b79
src/theme/components/skeleton.ts
import ViewNB from './View'; import Header from './Header'; import Content from './Content'; import Footer from './Footer'; import NativeBaseComponent from '../Base/NativeBaseComponent';
<mask> 'use strict'; <mask> <mask> import React from 'react'; <mask> import {View, Image, ScrollView} from 'react-native'; <mask> import ViewNB from './../View'; <mask> import Header from './../Header'; <mask> import Content from './../Content'; <mask> import Footer from './../Footer'; <mask> import Fab from './../Fab'; <mask> import NativeBaseComponent from '../../Base/NativeBaseComponent'; <mask> import _ from 'lodash'; <mask> import computeProps from '../../../Utils/computeProps'; <mask> <mask> export default class Container extends NativeBaseComponent { <mask> </s> Updates the Container widget with the changes of merge request #218 </s> remove import computeProps from '../../../Utils/computeProps'; </s> add import computeProps from '../../Utils/computeProps'; </s> remove if(item && (_.get(item, 'type', null) == ViewNB || _.get(item, 'type', null) == Content || _.get(item, 'type', null) == Image || _.get(item, 'type', null) == View || _.get(item, 'type', null) == ScrollView || _.get(item, 'type', null) == Fab )) { </s> add if(item && (item.type == ViewNB || item.type == Content || item.type == Image || item.type == View || item.type == ScrollView )) { </s> remove 'use strict';Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}(); </s> add 'use strict';Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}(); </s> remove var _View=require('./../View');var _View2=_interopRequireDefault(_View); var _Header=require('./../Header');var _Header2=_interopRequireDefault(_Header); var _Content=require('./../Content');var _Content2=_interopRequireDefault(_Content); var _Footer=require('./../Footer');var _Footer2=_interopRequireDefault(_Footer); var _Fab=require('./../Fab');var _Fab2=_interopRequireDefault(_Fab); var _NativeBaseComponent2=require('../../Base/NativeBaseComponent');var _NativeBaseComponent3=_interopRequireDefault(_NativeBaseComponent2); </s> add var _View=require('./View');var _View2=_interopRequireDefault(_View); var _Header=require('./Header');var _Header2=_interopRequireDefault(_Header); var _Content=require('./Content');var _Content2=_interopRequireDefault(_Content); var _Footer=require('./Footer');var _Footer2=_interopRequireDefault(_Footer); var _NativeBaseComponent2=require('../Base/NativeBaseComponent');var _NativeBaseComponent3=_interopRequireDefault(_NativeBaseComponent2); </s> remove if(item && _.get(item, 'type', null) == Header) { </s> add if(item && item.type == Header) {
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
Components/Widgets/Container/index.js
import computeProps from '../../Utils/computeProps';
<mask> import Footer from './../Footer'; <mask> import Fab from './../Fab'; <mask> import NativeBaseComponent from '../../Base/NativeBaseComponent'; <mask> import _ from 'lodash'; <mask> import computeProps from '../../../Utils/computeProps'; <mask> <mask> export default class Container extends NativeBaseComponent { <mask> <mask> propTypes: { <mask> style : React.PropTypes.object </s> Updates the Container widget with the changes of merge request #218 </s> remove import ViewNB from './../View'; import Header from './../Header'; import Content from './../Content'; import Footer from './../Footer'; import Fab from './../Fab'; import NativeBaseComponent from '../../Base/NativeBaseComponent'; </s> add import ViewNB from './View'; import Header from './Header'; import Content from './Content'; import Footer from './Footer'; import NativeBaseComponent from '../Base/NativeBaseComponent'; </s> remove if(item && (_.get(item, 'type', null) == ViewNB || _.get(item, 'type', null) == Content || _.get(item, 'type', null) == Image || _.get(item, 'type', null) == View || _.get(item, 'type', null) == ScrollView || _.get(item, 'type', null) == Fab )) { </s> add if(item && (item.type == ViewNB || item.type == Content || item.type == Image || item.type == View || item.type == ScrollView )) { </s> remove if(item && _.get(item, 'type', null) == Header) { </s> add if(item && item.type == Header) { </s> remove if(item && _.get(item, 'type', null) == Footer) { </s> add if(item && item.type == Footer) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
Components/Widgets/Container/index.js
if(item && item.type == Header) {
<mask> <mask> renderHeader() { <mask> if(Array.isArray(this.props.children)) { <mask> return _.find(this.props.children, function(item) { <mask> if(item && _.get(item, 'type', null) == Header) { <mask> return true; <mask> } <mask> }); <mask> } <mask> </s> Updates the Container widget with the changes of merge request #218 </s> remove if(item && _.get(item, 'type', null) == Footer) { </s> add if(item && item.type == Footer) { </s> remove if(item && (_.get(item, 'type', null) == ViewNB || _.get(item, 'type', null) == Content || _.get(item, 'type', null) == Image || _.get(item, 'type', null) == View || _.get(item, 'type', null) == ScrollView || _.get(item, 'type', null) == Fab )) { </s> add if(item && (item.type == ViewNB || item.type == Content || item.type == Image || item.type == View || item.type == ScrollView )) { </s> remove if(this.props.children && _.get(this.props.children, 'type', null) == Header) { </s> add if(this.props.children && this.props.children.type == Header) { </s> remove if(item&&(_lodash2.default.get(item,'type',null)==_View2.default||_lodash2.default.get(item,'type',null)==_Content2.default||_lodash2.default.get(item,'type',null)==_reactNative.Image||_lodash2.default.get(item,'type',null)==_reactNative.View||_lodash2.default.get(item,'type',null)==_reactNative.ScrollView||_lodash2.default.get(item,'type',null)==_Fab2.default)){ </s> add if(item&&(item.type==_View2.default||item.type==_Content2.default||item.type==_reactNative.Image||item.type==_reactNative.View||item.type==_reactNative.ScrollView)){ </s> remove if(item&&_lodash2.default.get(item,'type',null)==_Header2.default){ </s> add if(item&&item.type==_Header2.default){
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
Components/Widgets/Container/index.js
if(this.props.children && this.props.children.type == Header) {
<mask> }); <mask> } <mask> <mask> else { <mask> if(this.props.children && _.get(this.props.children, 'type', null) == Header) { <mask> return this.props.children; <mask> } <mask> } <mask> } <mask> renderContent() { </s> Updates the Container widget with the changes of merge request #218 </s> remove if(item && _.get(item, 'type', null) == Header) { </s> add if(item && item.type == Header) { </s> remove if(item && (_.get(item, 'type', null) == ViewNB || _.get(item, 'type', null) == Content || _.get(item, 'type', null) == Image || _.get(item, 'type', null) == View || _.get(item, 'type', null) == ScrollView || _.get(item, 'type', null) == Fab )) { </s> add if(item && (item.type == ViewNB || item.type == Content || item.type == Image || item.type == View || item.type == ScrollView )) { </s> remove if(item && _.get(item, 'type', null) == Footer) { </s> add if(item && item.type == Footer) { </s> remove if(this.props.children&&_lodash2.default.get(this.props.children,'type',null)==_Header2.default){ </s> add if(this.props.children&&this.props.children.type==_Header2.default){ </s> remove if(item&&(_lodash2.default.get(item,'type',null)==_View2.default||_lodash2.default.get(item,'type',null)==_Content2.default||_lodash2.default.get(item,'type',null)==_reactNative.Image||_lodash2.default.get(item,'type',null)==_reactNative.View||_lodash2.default.get(item,'type',null)==_reactNative.ScrollView||_lodash2.default.get(item,'type',null)==_Fab2.default)){ </s> add if(item&&(item.type==_View2.default||item.type==_Content2.default||item.type==_reactNative.Image||item.type==_reactNative.View||item.type==_reactNative.ScrollView)){
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
Components/Widgets/Container/index.js
if(item && (item.type == ViewNB || item.type == Content || item.type == Image || item.type == View || item.type == ScrollView )) {
<mask> renderContent() { <mask> if(Array.isArray(this.props.children)) { <mask> <mask> return _.filter(this.props.children, function(item) { <mask> if(item && (_.get(item, 'type', null) == ViewNB || _.get(item, 'type', null) == Content || _.get(item, 'type', null) == Image || _.get(item, 'type', null) == View || _.get(item, 'type', null) == ScrollView || _.get(item, 'type', null) == Fab )) { <mask> <mask> return true; <mask> } <mask> }); <mask> } </s> Updates the Container widget with the changes of merge request #218 </s> remove if(item && _.get(item, 'type', null) == Header) { </s> add if(item && item.type == Header) { </s> remove if(item && _.get(item, 'type', null) == Footer) { </s> add if(item && item.type == Footer) { </s> remove if(this.props.children && _.get(this.props.children, 'type', null) == Header) { </s> add if(this.props.children && this.props.children.type == Header) { </s> remove if(this.props.children&&_lodash2.default.get(this.props.children,'type',null)==_Header2.default){ </s> add if(this.props.children&&this.props.children.type==_Header2.default){
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
Components/Widgets/Container/index.js
if(item && item.type == Footer) {
<mask> } <mask> renderFooter() { <mask> if(Array.isArray(this.props.children)) { <mask> return _.find(this.props.children, function(item) { <mask> if(item && _.get(item, 'type', null) == Footer) { <mask> return true; <mask> } <mask> }); <mask> } <mask> </s> Updates the Container widget with the changes of merge request #218 </s> remove if(item && _.get(item, 'type', null) == Header) { </s> add if(item && item.type == Header) { </s> remove if(item && (_.get(item, 'type', null) == ViewNB || _.get(item, 'type', null) == Content || _.get(item, 'type', null) == Image || _.get(item, 'type', null) == View || _.get(item, 'type', null) == ScrollView || _.get(item, 'type', null) == Fab )) { </s> add if(item && (item.type == ViewNB || item.type == Content || item.type == Image || item.type == View || item.type == ScrollView )) { </s> remove if(this.props.children && _.get(this.props.children, 'type', null) == Header) { </s> add if(this.props.children && this.props.children.type == Header) { </s> remove if(item&&_lodash2.default.get(item,'type',null)==_Footer2.default){ </s> add if(item&&item.type==_Footer2.default){ </s> remove if(item&&(_lodash2.default.get(item,'type',null)==_View2.default||_lodash2.default.get(item,'type',null)==_Content2.default||_lodash2.default.get(item,'type',null)==_reactNative.Image||_lodash2.default.get(item,'type',null)==_reactNative.View||_lodash2.default.get(item,'type',null)==_reactNative.ScrollView||_lodash2.default.get(item,'type',null)==_Fab2.default)){ </s> add if(item&&(item.type==_View2.default||item.type==_Content2.default||item.type==_reactNative.Image||item.type==_reactNative.View||item.type==_reactNative.ScrollView)){
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
Components/Widgets/Container/index.js
<View {...this.prepareRootProps()}>
<mask> return computeProps(this.props, defaultProps); <mask> } <mask> render() { <mask> return( <mask> <View ref={c => this._root = c} {...this.prepareRootProps()}> <mask> <mask> {this.renderHeader()} <mask> <mask> {this.renderContent()} <mask> </s> Updates the Container widget with the changes of merge request #218 </s> remove {var _this2=this; </s> add { </s> remove _react2.default.createElement(_reactNative.View,_extends({ref:function ref(c){return _this2._root=c;}},this.prepareRootProps()), </s> add _react2.default.createElement(_reactNative.View,this.prepareRootProps(), </s> remove if(item && _.get(item, 'type', null) == Header) { </s> add if(item && item.type == Header) { </s> remove if(item && _.get(item, 'type', null) == Footer) { </s> add if(item && item.type == Footer) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
Components/Widgets/Container/index.js
{this.props.allowExtraContent == true ? this.renderOther() : null}
<mask> {this.renderContent()} <mask> <mask> {this.renderFooter()} <mask> <mask> </View> <mask> ); <mask> <mask> } <mask> </s> Updates the Container widget with the changes of merge request #218 </s> remove <View ref={c => this._root = c} {...this.prepareRootProps()}> </s> add <View {...this.prepareRootProps()}> </s> remove this.renderFooter())); </s> add this.renderFooter(), </s> remove import computeProps from '../../../Utils/computeProps'; </s> add import computeProps from '../../Utils/computeProps'; </s> remove if(item && _.get(item, 'type', null) == Header) { </s> add if(item && item.type == Header) {
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
Components/Widgets/Container/index.js
'use strict';Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();
<mask> <mask> 'use strict';Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}(); <mask> <mask> var _react=require('react');var _react2=_interopRequireDefault(_react); <mask> var _reactNative=require('react-native'); <mask> var _View=require('./../View');var _View2=_interopRequireDefault(_View); <mask> var _Header=require('./../Header');var _Header2=_interopRequireDefault(_Header); </s> Updates the Container widget with the changes of merge request #218 </s> remove var _View=require('./../View');var _View2=_interopRequireDefault(_View); var _Header=require('./../Header');var _Header2=_interopRequireDefault(_Header); var _Content=require('./../Content');var _Content2=_interopRequireDefault(_Content); var _Footer=require('./../Footer');var _Footer2=_interopRequireDefault(_Footer); var _Fab=require('./../Fab');var _Fab2=_interopRequireDefault(_Fab); var _NativeBaseComponent2=require('../../Base/NativeBaseComponent');var _NativeBaseComponent3=_interopRequireDefault(_NativeBaseComponent2); </s> add var _View=require('./View');var _View2=_interopRequireDefault(_View); var _Header=require('./Header');var _Header2=_interopRequireDefault(_Header); var _Content=require('./Content');var _Content2=_interopRequireDefault(_Content); var _Footer=require('./Footer');var _Footer2=_interopRequireDefault(_Footer); var _NativeBaseComponent2=require('../Base/NativeBaseComponent');var _NativeBaseComponent3=_interopRequireDefault(_NativeBaseComponent2); </s> remove var _computeProps=require('../../../Utils/computeProps');var _computeProps2=_interopRequireDefault(_computeProps);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var </s> add var _computeProps=require('../../Utils/computeProps');var _computeProps2=_interopRequireDefault(_computeProps);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var </s> remove Container=function(_NativeBaseComponent){_inherits(Container,_NativeBaseComponent);function Container(){_classCallCheck(this,Container);return _possibleConstructorReturn(this,(Container.__proto__||Object.getPrototypeOf(Container)).apply(this,arguments));}_createClass(Container,[{key:'renderHeader',value:function renderHeader() </s> add Container=function(_NativeBaseComponent){_inherits(Container,_NativeBaseComponent);function Container(){_classCallCheck(this,Container);return _possibleConstructorReturn(this,(Container.__proto__||Object.getPrototypeOf(Container)).apply(this,arguments));}_createClass(Container,[{key:'renderOther',value:function renderOther() </s> remove import ViewNB from './../View'; import Header from './../Header'; import Content from './../Content'; import Footer from './../Footer'; import Fab from './../Fab'; import NativeBaseComponent from '../../Base/NativeBaseComponent'; </s> add import ViewNB from './View'; import Header from './Header'; import Content from './Content'; import Footer from './Footer'; import NativeBaseComponent from '../Base/NativeBaseComponent'; </s> remove if(item&&(_lodash2.default.get(item,'type',null)==_View2.default||_lodash2.default.get(item,'type',null)==_Content2.default||_lodash2.default.get(item,'type',null)==_reactNative.Image||_lodash2.default.get(item,'type',null)==_reactNative.View||_lodash2.default.get(item,'type',null)==_reactNative.ScrollView||_lodash2.default.get(item,'type',null)==_Fab2.default)){ </s> add if(item&&(item.type==_View2.default||item.type==_Content2.default||item.type==_reactNative.Image||item.type==_reactNative.View||item.type==_reactNative.ScrollView)){
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
dist/Components/Widgets/Container/index.js
var _View=require('./View');var _View2=_interopRequireDefault(_View); var _Header=require('./Header');var _Header2=_interopRequireDefault(_Header); var _Content=require('./Content');var _Content2=_interopRequireDefault(_Content); var _Footer=require('./Footer');var _Footer2=_interopRequireDefault(_Footer); var _NativeBaseComponent2=require('../Base/NativeBaseComponent');var _NativeBaseComponent3=_interopRequireDefault(_NativeBaseComponent2);
<mask> 'use strict';Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}(); <mask> <mask> var _react=require('react');var _react2=_interopRequireDefault(_react); <mask> var _reactNative=require('react-native'); <mask> var _View=require('./../View');var _View2=_interopRequireDefault(_View); <mask> var _Header=require('./../Header');var _Header2=_interopRequireDefault(_Header); <mask> var _Content=require('./../Content');var _Content2=_interopRequireDefault(_Content); <mask> var _Footer=require('./../Footer');var _Footer2=_interopRequireDefault(_Footer); <mask> var _Fab=require('./../Fab');var _Fab2=_interopRequireDefault(_Fab); <mask> var _NativeBaseComponent2=require('../../Base/NativeBaseComponent');var _NativeBaseComponent3=_interopRequireDefault(_NativeBaseComponent2); <mask> var _lodash=require('lodash');var _lodash2=_interopRequireDefault(_lodash); <mask> var _computeProps=require('../../../Utils/computeProps');var _computeProps2=_interopRequireDefault(_computeProps);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var <mask> <mask> Container=function(_NativeBaseComponent){_inherits(Container,_NativeBaseComponent);function Container(){_classCallCheck(this,Container);return _possibleConstructorReturn(this,(Container.__proto__||Object.getPrototypeOf(Container)).apply(this,arguments));}_createClass(Container,[{key:'renderHeader',value:function renderHeader() <mask> </s> Updates the Container widget with the changes of merge request #218 </s> remove var _computeProps=require('../../../Utils/computeProps');var _computeProps2=_interopRequireDefault(_computeProps);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var </s> add var _computeProps=require('../../Utils/computeProps');var _computeProps2=_interopRequireDefault(_computeProps);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var </s> remove Container=function(_NativeBaseComponent){_inherits(Container,_NativeBaseComponent);function Container(){_classCallCheck(this,Container);return _possibleConstructorReturn(this,(Container.__proto__||Object.getPrototypeOf(Container)).apply(this,arguments));}_createClass(Container,[{key:'renderHeader',value:function renderHeader() </s> add Container=function(_NativeBaseComponent){_inherits(Container,_NativeBaseComponent);function Container(){_classCallCheck(this,Container);return _possibleConstructorReturn(this,(Container.__proto__||Object.getPrototypeOf(Container)).apply(this,arguments));}_createClass(Container,[{key:'renderOther',value:function renderOther() </s> remove 'use strict';Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}(); </s> add 'use strict';Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}(); </s> remove import ViewNB from './../View'; import Header from './../Header'; import Content from './../Content'; import Footer from './../Footer'; import Fab from './../Fab'; import NativeBaseComponent from '../../Base/NativeBaseComponent'; </s> add import ViewNB from './View'; import Header from './Header'; import Content from './Content'; import Footer from './Footer'; import NativeBaseComponent from '../Base/NativeBaseComponent'; </s> remove if(item && _.get(item, 'type', null) == Header) { </s> add if(item && item.type == Header) {
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
dist/Components/Widgets/Container/index.js
var _computeProps=require('../../Utils/computeProps');var _computeProps2=_interopRequireDefault(_computeProps);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var
<mask> var _Footer=require('./../Footer');var _Footer2=_interopRequireDefault(_Footer); <mask> var _Fab=require('./../Fab');var _Fab2=_interopRequireDefault(_Fab); <mask> var _NativeBaseComponent2=require('../../Base/NativeBaseComponent');var _NativeBaseComponent3=_interopRequireDefault(_NativeBaseComponent2); <mask> var _lodash=require('lodash');var _lodash2=_interopRequireDefault(_lodash); <mask> var _computeProps=require('../../../Utils/computeProps');var _computeProps2=_interopRequireDefault(_computeProps);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var <mask> <mask> Container=function(_NativeBaseComponent){_inherits(Container,_NativeBaseComponent);function Container(){_classCallCheck(this,Container);return _possibleConstructorReturn(this,(Container.__proto__||Object.getPrototypeOf(Container)).apply(this,arguments));}_createClass(Container,[{key:'renderHeader',value:function renderHeader() <mask> <mask> <mask> </s> Updates the Container widget with the changes of merge request #218 </s> remove Container=function(_NativeBaseComponent){_inherits(Container,_NativeBaseComponent);function Container(){_classCallCheck(this,Container);return _possibleConstructorReturn(this,(Container.__proto__||Object.getPrototypeOf(Container)).apply(this,arguments));}_createClass(Container,[{key:'renderHeader',value:function renderHeader() </s> add Container=function(_NativeBaseComponent){_inherits(Container,_NativeBaseComponent);function Container(){_classCallCheck(this,Container);return _possibleConstructorReturn(this,(Container.__proto__||Object.getPrototypeOf(Container)).apply(this,arguments));}_createClass(Container,[{key:'renderOther',value:function renderOther() </s> remove var _View=require('./../View');var _View2=_interopRequireDefault(_View); var _Header=require('./../Header');var _Header2=_interopRequireDefault(_Header); var _Content=require('./../Content');var _Content2=_interopRequireDefault(_Content); var _Footer=require('./../Footer');var _Footer2=_interopRequireDefault(_Footer); var _Fab=require('./../Fab');var _Fab2=_interopRequireDefault(_Fab); var _NativeBaseComponent2=require('../../Base/NativeBaseComponent');var _NativeBaseComponent3=_interopRequireDefault(_NativeBaseComponent2); </s> add var _View=require('./View');var _View2=_interopRequireDefault(_View); var _Header=require('./Header');var _Header2=_interopRequireDefault(_Header); var _Content=require('./Content');var _Content2=_interopRequireDefault(_Content); var _Footer=require('./Footer');var _Footer2=_interopRequireDefault(_Footer); var _NativeBaseComponent2=require('../Base/NativeBaseComponent');var _NativeBaseComponent3=_interopRequireDefault(_NativeBaseComponent2); </s> remove 'use strict';Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}(); </s> add 'use strict';Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}(); </s> remove if(item && _.get(item, 'type', null) == Header) { </s> add if(item && item.type == Header) { </s> remove import computeProps from '../../../Utils/computeProps'; </s> add import computeProps from '../../Utils/computeProps';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
dist/Components/Widgets/Container/index.js
Container=function(_NativeBaseComponent){_inherits(Container,_NativeBaseComponent);function Container(){_classCallCheck(this,Container);return _possibleConstructorReturn(this,(Container.__proto__||Object.getPrototypeOf(Container)).apply(this,arguments));}_createClass(Container,[{key:'renderOther',value:function renderOther()
<mask> var _NativeBaseComponent2=require('../../Base/NativeBaseComponent');var _NativeBaseComponent3=_interopRequireDefault(_NativeBaseComponent2); <mask> var _lodash=require('lodash');var _lodash2=_interopRequireDefault(_lodash); <mask> var _computeProps=require('../../../Utils/computeProps');var _computeProps2=_interopRequireDefault(_computeProps);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var <mask> <mask> Container=function(_NativeBaseComponent){_inherits(Container,_NativeBaseComponent);function Container(){_classCallCheck(this,Container);return _possibleConstructorReturn(this,(Container.__proto__||Object.getPrototypeOf(Container)).apply(this,arguments));}_createClass(Container,[{key:'renderHeader',value:function renderHeader() <mask> <mask> <mask> <mask> <mask> </s> Updates the Container widget with the changes of merge request #218 </s> remove var _computeProps=require('../../../Utils/computeProps');var _computeProps2=_interopRequireDefault(_computeProps);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var </s> add var _computeProps=require('../../Utils/computeProps');var _computeProps2=_interopRequireDefault(_computeProps);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var </s> remove var _View=require('./../View');var _View2=_interopRequireDefault(_View); var _Header=require('./../Header');var _Header2=_interopRequireDefault(_Header); var _Content=require('./../Content');var _Content2=_interopRequireDefault(_Content); var _Footer=require('./../Footer');var _Footer2=_interopRequireDefault(_Footer); var _Fab=require('./../Fab');var _Fab2=_interopRequireDefault(_Fab); var _NativeBaseComponent2=require('../../Base/NativeBaseComponent');var _NativeBaseComponent3=_interopRequireDefault(_NativeBaseComponent2); </s> add var _View=require('./View');var _View2=_interopRequireDefault(_View); var _Header=require('./Header');var _Header2=_interopRequireDefault(_Header); var _Content=require('./Content');var _Content2=_interopRequireDefault(_Content); var _Footer=require('./Footer');var _Footer2=_interopRequireDefault(_Footer); var _NativeBaseComponent2=require('../Base/NativeBaseComponent');var _NativeBaseComponent3=_interopRequireDefault(_NativeBaseComponent2); </s> remove 'use strict';Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}(); </s> add 'use strict';Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}(); </s> remove if(item && _.get(item, 'type', null) == Header) { </s> add if(item && item.type == Header) { </s> remove import computeProps from '../../../Utils/computeProps'; </s> add import computeProps from '../../Utils/computeProps';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
dist/Components/Widgets/Container/index.js
if(item&&item.type==_Header2.default){
<mask> <mask> { <mask> if(Array.isArray(this.props.children)){ <mask> return _lodash2.default.find(this.props.children,function(item){ <mask> if(item&&_lodash2.default.get(item,'type',null)==_Header2.default){ <mask> return true; <mask> } <mask> }); <mask> }else <mask> </s> Updates the Container widget with the changes of merge request #218 </s> remove if(item&&_lodash2.default.get(item,'type',null)==_Footer2.default){ </s> add if(item&&item.type==_Footer2.default){ </s> remove if(item&&(_lodash2.default.get(item,'type',null)==_View2.default||_lodash2.default.get(item,'type',null)==_Content2.default||_lodash2.default.get(item,'type',null)==_reactNative.Image||_lodash2.default.get(item,'type',null)==_reactNative.View||_lodash2.default.get(item,'type',null)==_reactNative.ScrollView||_lodash2.default.get(item,'type',null)==_Fab2.default)){ </s> add if(item&&(item.type==_View2.default||item.type==_Content2.default||item.type==_reactNative.Image||item.type==_reactNative.View||item.type==_reactNative.ScrollView)){ </s> remove if(this.props.children&&_lodash2.default.get(this.props.children,'type',null)==_Header2.default){ </s> add if(this.props.children&&this.props.children.type==_Header2.default){ </s> remove if(item && _.get(item, 'type', null) == Header) { </s> add if(item && item.type == Header) { </s> remove if(item && _.get(item, 'type', null) == Footer) { </s> add if(item && item.type == Footer) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
dist/Components/Widgets/Container/index.js
if(this.props.children&&this.props.children.type==_Header2.default){
<mask> }); <mask> }else <mask> <mask> { <mask> if(this.props.children&&_lodash2.default.get(this.props.children,'type',null)==_Header2.default){ <mask> return this.props.children; <mask> } <mask> } <mask> }},{key:'renderContent',value:function renderContent() <mask> { </s> Updates the Container widget with the changes of merge request #218 </s> remove if(this.props.children && _.get(this.props.children, 'type', null) == Header) { </s> add if(this.props.children && this.props.children.type == Header) { </s> remove if(item&&(_lodash2.default.get(item,'type',null)==_View2.default||_lodash2.default.get(item,'type',null)==_Content2.default||_lodash2.default.get(item,'type',null)==_reactNative.Image||_lodash2.default.get(item,'type',null)==_reactNative.View||_lodash2.default.get(item,'type',null)==_reactNative.ScrollView||_lodash2.default.get(item,'type',null)==_Fab2.default)){ </s> add if(item&&(item.type==_View2.default||item.type==_Content2.default||item.type==_reactNative.Image||item.type==_reactNative.View||item.type==_reactNative.ScrollView)){ </s> remove if(item&&_lodash2.default.get(item,'type',null)==_Header2.default){ </s> add if(item&&item.type==_Header2.default){ </s> remove if(item&&_lodash2.default.get(item,'type',null)==_Footer2.default){ </s> add if(item&&item.type==_Footer2.default){ </s> remove if(item && (_.get(item, 'type', null) == ViewNB || _.get(item, 'type', null) == Content || _.get(item, 'type', null) == Image || _.get(item, 'type', null) == View || _.get(item, 'type', null) == ScrollView || _.get(item, 'type', null) == Fab )) { </s> add if(item && (item.type == ViewNB || item.type == Content || item.type == Image || item.type == View || item.type == ScrollView )) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
dist/Components/Widgets/Container/index.js
if(item&&(item.type==_View2.default||item.type==_Content2.default||item.type==_reactNative.Image||item.type==_reactNative.View||item.type==_reactNative.ScrollView)){
<mask> { <mask> if(Array.isArray(this.props.children)){ <mask> <mask> return _lodash2.default.filter(this.props.children,function(item){ <mask> if(item&&(_lodash2.default.get(item,'type',null)==_View2.default||_lodash2.default.get(item,'type',null)==_Content2.default||_lodash2.default.get(item,'type',null)==_reactNative.Image||_lodash2.default.get(item,'type',null)==_reactNative.View||_lodash2.default.get(item,'type',null)==_reactNative.ScrollView||_lodash2.default.get(item,'type',null)==_Fab2.default)){ <mask> <mask> return true; <mask> } <mask> }); <mask> }else </s> Updates the Container widget with the changes of merge request #218 </s> remove if(item&&_lodash2.default.get(item,'type',null)==_Header2.default){ </s> add if(item&&item.type==_Header2.default){ </s> remove if(item&&_lodash2.default.get(item,'type',null)==_Footer2.default){ </s> add if(item&&item.type==_Footer2.default){ </s> remove if(this.props.children&&_lodash2.default.get(this.props.children,'type',null)==_Header2.default){ </s> add if(this.props.children&&this.props.children.type==_Header2.default){ </s> remove if(item && _.get(item, 'type', null) == Header) { </s> add if(item && item.type == Header) { </s> remove if(item && _.get(item, 'type', null) == Footer) { </s> add if(item && item.type == Footer) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
dist/Components/Widgets/Container/index.js
if(item&&item.type==_Footer2.default){
<mask> }},{key:'renderFooter',value:function renderFooter() <mask> { <mask> if(Array.isArray(this.props.children)){ <mask> return _lodash2.default.find(this.props.children,function(item){ <mask> if(item&&_lodash2.default.get(item,'type',null)==_Footer2.default){ <mask> return true; <mask> } <mask> }); <mask> }else <mask> </s> Updates the Container widget with the changes of merge request #218 </s> remove if(item&&_lodash2.default.get(item,'type',null)==_Header2.default){ </s> add if(item&&item.type==_Header2.default){ </s> remove if(item&&(_lodash2.default.get(item,'type',null)==_View2.default||_lodash2.default.get(item,'type',null)==_Content2.default||_lodash2.default.get(item,'type',null)==_reactNative.Image||_lodash2.default.get(item,'type',null)==_reactNative.View||_lodash2.default.get(item,'type',null)==_reactNative.ScrollView||_lodash2.default.get(item,'type',null)==_Fab2.default)){ </s> add if(item&&(item.type==_View2.default||item.type==_Content2.default||item.type==_reactNative.Image||item.type==_reactNative.View||item.type==_reactNative.ScrollView)){ </s> remove if(item && _.get(item, 'type', null) == Footer) { </s> add if(item && item.type == Footer) { </s> remove if(this.props.children&&_lodash2.default.get(this.props.children,'type',null)==_Header2.default){ </s> add if(this.props.children&&this.props.children.type==_Header2.default){ </s> remove if(item && _.get(item, 'type', null) == Header) { </s> add if(item && item.type == Header) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
dist/Components/Widgets/Container/index.js
{
<mask> <mask> <mask> return(0,_computeProps2.default)(this.props,defaultProps); <mask> }},{key:'render',value:function render() <mask> {var _this2=this; <mask> return( <mask> _react2.default.createElement(_reactNative.View,_extends({ref:function ref(c){return _this2._root=c;}},this.prepareRootProps()), <mask> <mask> this.renderHeader(), <mask> </s> Updates the Container widget with the changes of merge request #218 </s> remove _react2.default.createElement(_reactNative.View,_extends({ref:function ref(c){return _this2._root=c;}},this.prepareRootProps()), </s> add _react2.default.createElement(_reactNative.View,this.prepareRootProps(), </s> remove <View ref={c => this._root = c} {...this.prepareRootProps()}> </s> add <View {...this.prepareRootProps()}> </s> remove this.renderFooter())); </s> add this.renderFooter(),
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
dist/Components/Widgets/Container/index.js
_react2.default.createElement(_reactNative.View,this.prepareRootProps(),
<mask> return(0,_computeProps2.default)(this.props,defaultProps); <mask> }},{key:'render',value:function render() <mask> {var _this2=this; <mask> return( <mask> _react2.default.createElement(_reactNative.View,_extends({ref:function ref(c){return _this2._root=c;}},this.prepareRootProps()), <mask> <mask> this.renderHeader(), <mask> <mask> this.renderContent(), <mask> </s> Updates the Container widget with the changes of merge request #218 </s> remove {var _this2=this; </s> add { </s> remove this.renderFooter())); </s> add this.renderFooter(), </s> remove <View ref={c => this._root = c} {...this.prepareRootProps()}> </s> add <View {...this.prepareRootProps()}>
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
dist/Components/Widgets/Container/index.js
this.renderFooter(),
<mask> this.renderHeader(), <mask> <mask> this.renderContent(), <mask> <mask> this.renderFooter())); <mask> <mask> <mask> <mask> <mask> }}]);return Container;}(_NativeBaseComponent3.default);exports.default=Container; </s> Updates the Container widget with the changes of merge request #218 </s> remove _react2.default.createElement(_reactNative.View,_extends({ref:function ref(c){return _this2._root=c;}},this.prepareRootProps()), </s> add _react2.default.createElement(_reactNative.View,this.prepareRootProps(), </s> remove {var _this2=this; </s> add { </s> remove import computeProps from '../../../Utils/computeProps'; </s> add import computeProps from '../../Utils/computeProps';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
dist/Components/Widgets/Container/index.js
this.props.allowExtraContent==true?this.renderOther():null));
<mask> this.renderFooter(), <mask> <mask> <mask> <mask> <mask> }}]);return Container;}(_NativeBaseComponent3.default);exports.default=Container; <mask> //# sourceMappingURL=index.js.map </s> Updates the Container widget with the changes of merge request #218 </s> remove this.renderFooter())); </s> add this.renderFooter(), </s> remove import computeProps from '../../../Utils/computeProps'; </s> add import computeProps from '../../Utils/computeProps'; </s> remove if(item && _.get(item, 'type', null) == Header) { </s> add if(item && item.type == Header) { </s> remove if(this.props.children && _.get(this.props.children, 'type', null) == Header) { </s> add if(this.props.children && this.props.children.type == Header) { </s> remove if(item && (_.get(item, 'type', null) == ViewNB || _.get(item, 'type', null) == Content || _.get(item, 'type', null) == Image || _.get(item, 'type', null) == View || _.get(item, 'type', null) == ScrollView || _.get(item, 'type', null) == Fab )) { </s> add if(item && (item.type == ViewNB || item.type == Content || item.type == Image || item.type == View || item.type == ScrollView )) {
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c13e57140006cf37bcd46e99b8a072a81ba52569
dist/Components/Widgets/Container/index.js
import variable from './../variables/platform';
<mask> import variable from "./../variables/platform"; <mask> <mask> export default (variables = variable) => { <mask> const platformStyle = variables.platformStyle; <mask> const platform = variables.platform; <mask> </s> Added brandDark and brandLight color constants to theme/variables </s> remove const platformStyle = variables.platformStyle; const platform = variables.platform; </s> add const platformStyle = variables.platformStyle; const platform = variables.platform; </s> remove const buttonTheme = { ".disabled": { backgroundColor: variables.btnDisabledBg, }, ".bordered": { ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, backgroundColor: "transparent", borderColor: "#000", borderWidth: variables.borderWidth * 2, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, backgroundColor: "transparent", borderColor: "#f4f4f4", borderWidth: variables.borderWidth * 2, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, backgroundColor: "transparent", borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, backgroundColor: "transparent", borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, backgroundColor: "transparent", borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, backgroundColor: "transparent", borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, backgroundColor: "transparent", borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, ".disabled": { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, "NativeBase.Text": { color: variables.btnDisabledBg, }, }, "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: "transparent", }, </s> add const buttonTheme = { '.disabled': { backgroundColor: variables.btnDisabledBg, }, '.bordered': { '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: 'transparent', borderColor: variables.brandDark, borderWidth: variables.borderWidth * 2, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: 'transparent', borderColor: variables.brandLight, borderWidth: variables.borderWidth * 2, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, backgroundColor: 'transparent', borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, backgroundColor: 'transparent', borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, backgroundColor: 'transparent', borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, backgroundColor: 'transparent', borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, backgroundColor: 'transparent', borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, '.disabled': { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, 'NativeBase.Text': { color: variables.btnDisabledBg, }, }, 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: 'transparent', }, </s> remove paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: "flex-start", flexDirection: "row", elevation: 2, shadowColor: platformStyle === "material" ? "#000" : undefined, shadowOffset: platformStyle === "material" ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === "material" ? 0.2 : undefined, shadowRadius: platformStyle === "material" ? 1.2 : undefined, alignItems: "center", justifyContent: "space-between", }; return buttonTheme; </s> add paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: 'flex-start', flexDirection: 'row', elevation: 2, shadowColor: platformStyle === 'material' ? variables.brandDark : undefined, shadowOffset: platformStyle === 'material' ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === 'material' ? 0.2 : undefined, shadowRadius: platformStyle === 'material' ? 1.2 : undefined, alignItems: 'center', justifyContent: 'space-between', }; return buttonTheme; </s> remove "NativeBase.Icon": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, "NativeBase.IconNB": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, </s> add 'NativeBase.Icon': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, 'NativeBase.IconNB': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, },
[ "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
const platformStyle = variables.platformStyle; const platform = variables.platform;
<mask> import variable from "./../variables/platform"; <mask> <mask> export default (variables = variable) => { <mask> const platformStyle = variables.platformStyle; <mask> const platform = variables.platform; <mask> <mask> const buttonTheme = { <mask> ".disabled": { <mask> backgroundColor: variables.btnDisabledBg, <mask> }, </s> Added brandDark and brandLight color constants to theme/variables </s> remove import variable from "./../variables/platform"; </s> add import variable from './../variables/platform'; </s> remove const buttonTheme = { ".disabled": { backgroundColor: variables.btnDisabledBg, }, ".bordered": { ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, backgroundColor: "transparent", borderColor: "#000", borderWidth: variables.borderWidth * 2, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, backgroundColor: "transparent", borderColor: "#f4f4f4", borderWidth: variables.borderWidth * 2, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, backgroundColor: "transparent", borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, backgroundColor: "transparent", borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, backgroundColor: "transparent", borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, backgroundColor: "transparent", borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, backgroundColor: "transparent", borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, ".disabled": { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, "NativeBase.Text": { color: variables.btnDisabledBg, }, }, "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: "transparent", }, </s> add const buttonTheme = { '.disabled': { backgroundColor: variables.btnDisabledBg, }, '.bordered': { '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: 'transparent', borderColor: variables.brandDark, borderWidth: variables.borderWidth * 2, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: 'transparent', borderColor: variables.brandLight, borderWidth: variables.borderWidth * 2, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, backgroundColor: 'transparent', borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, backgroundColor: 'transparent', borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, backgroundColor: 'transparent', borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, backgroundColor: 'transparent', borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, backgroundColor: 'transparent', borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, '.disabled': { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, 'NativeBase.Text': { color: variables.btnDisabledBg, }, }, 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: 'transparent', }, </s> remove paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: "flex-start", flexDirection: "row", elevation: 2, shadowColor: platformStyle === "material" ? "#000" : undefined, shadowOffset: platformStyle === "material" ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === "material" ? 0.2 : undefined, shadowRadius: platformStyle === "material" ? 1.2 : undefined, alignItems: "center", justifyContent: "space-between", }; return buttonTheme; </s> add paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: 'flex-start', flexDirection: 'row', elevation: 2, shadowColor: platformStyle === 'material' ? variables.brandDark : undefined, shadowOffset: platformStyle === 'material' ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === 'material' ? 0.2 : undefined, shadowRadius: platformStyle === 'material' ? 1.2 : undefined, alignItems: 'center', justifyContent: 'space-between', }; return buttonTheme; </s> remove "NativeBase.Icon": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, "NativeBase.IconNB": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, </s> add 'NativeBase.Icon': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, 'NativeBase.IconNB': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, </s> remove "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, backgroundColor: null, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, backgroundColor: null, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, backgroundColor: null, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, backgroundColor: null, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, backgroundColor: null, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, backgroundColor: null, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, backgroundColor: null, }, }, </s> add 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, backgroundColor: null, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, backgroundColor: null, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, backgroundColor: null, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, backgroundColor: null, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, backgroundColor: null, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, backgroundColor: null, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, backgroundColor: null, }, },
[ "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
const buttonTheme = { '.disabled': { backgroundColor: variables.btnDisabledBg, }, '.bordered': { '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: 'transparent', borderColor: variables.brandDark, borderWidth: variables.borderWidth * 2, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: 'transparent', borderColor: variables.brandLight, borderWidth: variables.borderWidth * 2, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, backgroundColor: 'transparent', borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, backgroundColor: 'transparent', borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, backgroundColor: 'transparent', borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, backgroundColor: 'transparent', borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, backgroundColor: 'transparent', borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, '.disabled': { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, 'NativeBase.Text': { color: variables.btnDisabledBg, }, }, 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: 'transparent', },
<mask> export default (variables = variable) => { <mask> const platformStyle = variables.platformStyle; <mask> const platform = variables.platform; <mask> <mask> const buttonTheme = { <mask> ".disabled": { <mask> backgroundColor: variables.btnDisabledBg, <mask> }, <mask> ".bordered": { <mask> ".dark": { <mask> "NativeBase.Text": { <mask> color: "#000", <mask> }, <mask> "NativeBase.Icon": { <mask> color: "#000", <mask> }, <mask> "NativeBase.IconNB": { <mask> color: "#000", <mask> }, <mask> backgroundColor: "transparent", <mask> borderColor: "#000", <mask> borderWidth: variables.borderWidth * 2, <mask> }, <mask> ".light": { <mask> "NativeBase.Text": { <mask> color: "#f4f4f4", <mask> }, <mask> "NativeBase.Icon": { <mask> color: "#f4f4f4", <mask> }, <mask> "NativeBase.IconNB": { <mask> color: "#f4f4f4", <mask> }, <mask> backgroundColor: "transparent", <mask> borderColor: "#f4f4f4", <mask> borderWidth: variables.borderWidth * 2, <mask> }, <mask> ".primary": { <mask> "NativeBase.Text": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> backgroundColor: "transparent", <mask> borderColor: variables.btnPrimaryBg, <mask> borderWidth: variables.borderWidth * 2, <mask> }, <mask> ".success": { <mask> "NativeBase.Text": { <mask> color: variables.btnSuccessBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnSuccessBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnSuccessBg, <mask> }, <mask> backgroundColor: "transparent", <mask> borderColor: variables.btnSuccessBg, <mask> borderWidth: variables.borderWidth * 2, <mask> }, <mask> ".info": { <mask> "NativeBase.Text": { <mask> color: variables.btnInfoBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnInfoBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnInfoBg, <mask> }, <mask> backgroundColor: "transparent", <mask> borderColor: variables.btnInfoBg, <mask> borderWidth: variables.borderWidth * 2, <mask> }, <mask> ".warning": { <mask> "NativeBase.Text": { <mask> color: variables.btnWarningBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnWarningBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnWarningBg, <mask> }, <mask> backgroundColor: "transparent", <mask> borderColor: variables.btnWarningBg, <mask> borderWidth: variables.borderWidth * 2, <mask> }, <mask> ".danger": { <mask> "NativeBase.Text": { <mask> color: variables.btnDangerBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnDangerBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnDangerBg, <mask> }, <mask> backgroundColor: "transparent", <mask> borderColor: variables.btnDangerBg, <mask> borderWidth: variables.borderWidth * 2, <mask> }, <mask> ".disabled": { <mask> backgroundColor: null, <mask> borderColor: variables.btnDisabledBg, <mask> borderWidth: variables.borderWidth * 2, <mask> "NativeBase.Text": { <mask> color: variables.btnDisabledBg, <mask> }, <mask> }, <mask> "NativeBase.Text": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> borderWidth: variables.borderWidth * 2, <mask> elevation: null, <mask> shadowColor: null, <mask> shadowOffset: null, <mask> shadowOpacity: null, <mask> shadowRadius: null, <mask> backgroundColor: "transparent", <mask> }, <mask> <mask> ".dark": { <mask> ".bordered": { <mask> "NativeBase.Text": { <mask> color: "#000", </s> Added brandDark and brandLight color constants to theme/variables </s> remove "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, backgroundColor: null, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, backgroundColor: null, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, backgroundColor: null, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, backgroundColor: null, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, backgroundColor: null, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, backgroundColor: null, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, backgroundColor: null, }, }, </s> add 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, backgroundColor: null, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, backgroundColor: null, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, backgroundColor: null, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, backgroundColor: null, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, backgroundColor: null, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, backgroundColor: null, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, backgroundColor: null, }, }, </s> remove ".dark": { ".bordered": { "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, }, backgroundColor: "#000", }, ".light": { ".transparent": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, backgroundColor: null, }, ".bordered": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, }, "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, backgroundColor: "#f4f4f4", }, </s> add '.dark': { '.bordered': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, }, backgroundColor: variables.brandDark, }, '.light': { '.transparent': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: null, }, '.bordered': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, }, 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: variables.brandLight, }, </s> remove ".success": { ".bordered": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, }, backgroundColor: variables.btnSuccessBg, }, </s> add '.success': { '.bordered': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, }, backgroundColor: variables.btnSuccessBg, }, </s> remove ".primary": { ".bordered": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, }, backgroundColor: variables.btnPrimaryBg, }, </s> add '.primary': { '.bordered': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, }, backgroundColor: variables.btnPrimaryBg, }, </s> remove ".warning": { ".bordered": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, }, backgroundColor: variables.btnWarningBg, }, </s> add '.warning': { '.bordered': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, }, backgroundColor: variables.btnWarningBg, },
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "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/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'.dark': { '.bordered': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, }, backgroundColor: variables.brandDark, }, '.light': { '.transparent': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: null, }, '.bordered': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, }, 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: variables.brandLight, },
<mask> shadowRadius: null, <mask> backgroundColor: "transparent", <mask> }, <mask> <mask> ".dark": { <mask> ".bordered": { <mask> "NativeBase.Text": { <mask> color: "#000", <mask> }, <mask> "NativeBase.Icon": { <mask> color: "#000", <mask> }, <mask> "NativeBase.IconNB": { <mask> color: "#000", <mask> }, <mask> }, <mask> backgroundColor: "#000", <mask> }, <mask> ".light": { <mask> ".transparent": { <mask> "NativeBase.Text": { <mask> color: "#f4f4f4", <mask> }, <mask> "NativeBase.Icon": { <mask> color: "#f4f4f4", <mask> }, <mask> "NativeBase.IconNB": { <mask> color: "#f4f4f4", <mask> }, <mask> backgroundColor: null, <mask> }, <mask> ".bordered": { <mask> "NativeBase.Text": { <mask> color: "#f4f4f4", <mask> }, <mask> "NativeBase.Icon": { <mask> color: "#f4f4f4", <mask> }, <mask> "NativeBase.IconNB": { <mask> color: "#f4f4f4", <mask> }, <mask> }, <mask> "NativeBase.Text": { <mask> color: "#000", <mask> }, <mask> "NativeBase.Icon": { <mask> color: "#000", <mask> }, <mask> "NativeBase.IconNB": { <mask> color: "#000", <mask> }, <mask> backgroundColor: "#f4f4f4", <mask> }, <mask> <mask> ".primary": { <mask> ".bordered": { <mask> "NativeBase.Text": { <mask> color: variables.btnPrimaryBg, </s> Added brandDark and brandLight color constants to theme/variables </s> remove "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, backgroundColor: null, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, backgroundColor: null, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, backgroundColor: null, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, backgroundColor: null, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, backgroundColor: null, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, backgroundColor: null, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, backgroundColor: null, }, }, </s> add 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, backgroundColor: null, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, backgroundColor: null, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, backgroundColor: null, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, backgroundColor: null, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, backgroundColor: null, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, backgroundColor: null, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, backgroundColor: null, }, }, </s> remove const buttonTheme = { ".disabled": { backgroundColor: variables.btnDisabledBg, }, ".bordered": { ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, backgroundColor: "transparent", borderColor: "#000", borderWidth: variables.borderWidth * 2, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, backgroundColor: "transparent", borderColor: "#f4f4f4", borderWidth: variables.borderWidth * 2, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, backgroundColor: "transparent", borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, backgroundColor: "transparent", borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, backgroundColor: "transparent", borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, backgroundColor: "transparent", borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, backgroundColor: "transparent", borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, ".disabled": { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, "NativeBase.Text": { color: variables.btnDisabledBg, }, }, "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: "transparent", }, </s> add const buttonTheme = { '.disabled': { backgroundColor: variables.btnDisabledBg, }, '.bordered': { '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: 'transparent', borderColor: variables.brandDark, borderWidth: variables.borderWidth * 2, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: 'transparent', borderColor: variables.brandLight, borderWidth: variables.borderWidth * 2, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, backgroundColor: 'transparent', borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, backgroundColor: 'transparent', borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, backgroundColor: 'transparent', borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, backgroundColor: 'transparent', borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, backgroundColor: 'transparent', borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, '.disabled': { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, 'NativeBase.Text': { color: variables.btnDisabledBg, }, }, 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: 'transparent', }, </s> remove ".primary": { ".bordered": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, }, backgroundColor: variables.btnPrimaryBg, }, </s> add '.primary': { '.bordered': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, }, backgroundColor: variables.btnPrimaryBg, }, </s> remove ".success": { ".bordered": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, }, backgroundColor: variables.btnSuccessBg, }, </s> add '.success': { '.bordered': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, }, backgroundColor: variables.btnSuccessBg, }, </s> remove ".info": { ".bordered": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, }, backgroundColor: variables.btnInfoBg, }, </s> add '.info': { '.bordered': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, }, backgroundColor: variables.btnInfoBg, },
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "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/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'.primary': { '.bordered': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, }, backgroundColor: variables.btnPrimaryBg, },
<mask> }, <mask> backgroundColor: "#f4f4f4", <mask> }, <mask> <mask> ".primary": { <mask> ".bordered": { <mask> "NativeBase.Text": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> }, <mask> backgroundColor: variables.btnPrimaryBg, <mask> }, <mask> <mask> ".success": { <mask> ".bordered": { <mask> "NativeBase.Text": { <mask> color: variables.btnSuccessBg, </s> Added brandDark and brandLight color constants to theme/variables </s> remove ".success": { ".bordered": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, }, backgroundColor: variables.btnSuccessBg, }, </s> add '.success': { '.bordered': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, }, backgroundColor: variables.btnSuccessBg, }, </s> remove "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, backgroundColor: null, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, backgroundColor: null, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, backgroundColor: null, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, backgroundColor: null, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, backgroundColor: null, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, backgroundColor: null, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, backgroundColor: null, }, }, </s> add 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, backgroundColor: null, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, backgroundColor: null, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, backgroundColor: null, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, backgroundColor: null, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, backgroundColor: null, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, backgroundColor: null, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, backgroundColor: null, }, }, </s> remove const buttonTheme = { ".disabled": { backgroundColor: variables.btnDisabledBg, }, ".bordered": { ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, backgroundColor: "transparent", borderColor: "#000", borderWidth: variables.borderWidth * 2, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, backgroundColor: "transparent", borderColor: "#f4f4f4", borderWidth: variables.borderWidth * 2, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, backgroundColor: "transparent", borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, backgroundColor: "transparent", borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, backgroundColor: "transparent", borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, backgroundColor: "transparent", borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, backgroundColor: "transparent", borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, ".disabled": { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, "NativeBase.Text": { color: variables.btnDisabledBg, }, }, "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: "transparent", }, </s> add const buttonTheme = { '.disabled': { backgroundColor: variables.btnDisabledBg, }, '.bordered': { '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: 'transparent', borderColor: variables.brandDark, borderWidth: variables.borderWidth * 2, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: 'transparent', borderColor: variables.brandLight, borderWidth: variables.borderWidth * 2, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, backgroundColor: 'transparent', borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, backgroundColor: 'transparent', borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, backgroundColor: 'transparent', borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, backgroundColor: 'transparent', borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, backgroundColor: 'transparent', borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, '.disabled': { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, 'NativeBase.Text': { color: variables.btnDisabledBg, }, }, 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: 'transparent', }, </s> remove ".dark": { ".bordered": { "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, }, backgroundColor: "#000", }, ".light": { ".transparent": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, backgroundColor: null, }, ".bordered": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, }, "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, backgroundColor: "#f4f4f4", }, </s> add '.dark': { '.bordered': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, }, backgroundColor: variables.brandDark, }, '.light': { '.transparent': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: null, }, '.bordered': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, }, 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: variables.brandLight, }, </s> remove ".info": { ".bordered": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, }, backgroundColor: variables.btnInfoBg, }, </s> add '.info': { '.bordered': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, }, backgroundColor: variables.btnInfoBg, },
[ "keep", "keep", "keep", "keep", "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/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'.success': { '.bordered': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, }, backgroundColor: variables.btnSuccessBg, },
<mask> }, <mask> backgroundColor: variables.btnPrimaryBg, <mask> }, <mask> <mask> ".success": { <mask> ".bordered": { <mask> "NativeBase.Text": { <mask> color: variables.btnSuccessBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnSuccessBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnSuccessBg, <mask> }, <mask> }, <mask> backgroundColor: variables.btnSuccessBg, <mask> }, <mask> <mask> ".info": { <mask> ".bordered": { <mask> "NativeBase.Text": { <mask> color: variables.btnInfoBg, </s> Added brandDark and brandLight color constants to theme/variables </s> remove ".info": { ".bordered": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, }, backgroundColor: variables.btnInfoBg, }, </s> add '.info': { '.bordered': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, }, backgroundColor: variables.btnInfoBg, }, </s> remove ".primary": { ".bordered": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, }, backgroundColor: variables.btnPrimaryBg, }, </s> add '.primary': { '.bordered': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, }, backgroundColor: variables.btnPrimaryBg, }, </s> remove "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, backgroundColor: null, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, backgroundColor: null, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, backgroundColor: null, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, backgroundColor: null, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, backgroundColor: null, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, backgroundColor: null, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, backgroundColor: null, }, }, </s> add 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, backgroundColor: null, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, backgroundColor: null, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, backgroundColor: null, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, backgroundColor: null, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, backgroundColor: null, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, backgroundColor: null, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, backgroundColor: null, }, }, </s> remove const buttonTheme = { ".disabled": { backgroundColor: variables.btnDisabledBg, }, ".bordered": { ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, backgroundColor: "transparent", borderColor: "#000", borderWidth: variables.borderWidth * 2, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, backgroundColor: "transparent", borderColor: "#f4f4f4", borderWidth: variables.borderWidth * 2, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, backgroundColor: "transparent", borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, backgroundColor: "transparent", borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, backgroundColor: "transparent", borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, backgroundColor: "transparent", borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, backgroundColor: "transparent", borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, ".disabled": { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, "NativeBase.Text": { color: variables.btnDisabledBg, }, }, "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: "transparent", }, </s> add const buttonTheme = { '.disabled': { backgroundColor: variables.btnDisabledBg, }, '.bordered': { '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: 'transparent', borderColor: variables.brandDark, borderWidth: variables.borderWidth * 2, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: 'transparent', borderColor: variables.brandLight, borderWidth: variables.borderWidth * 2, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, backgroundColor: 'transparent', borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, backgroundColor: 'transparent', borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, backgroundColor: 'transparent', borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, backgroundColor: 'transparent', borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, backgroundColor: 'transparent', borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, '.disabled': { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, 'NativeBase.Text': { color: variables.btnDisabledBg, }, }, 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: 'transparent', }, </s> remove ".warning": { ".bordered": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, }, backgroundColor: variables.btnWarningBg, }, </s> add '.warning': { '.bordered': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, }, backgroundColor: variables.btnWarningBg, },
[ "keep", "keep", "keep", "keep", "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/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'.info': { '.bordered': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, }, backgroundColor: variables.btnInfoBg, },
<mask> }, <mask> backgroundColor: variables.btnSuccessBg, <mask> }, <mask> <mask> ".info": { <mask> ".bordered": { <mask> "NativeBase.Text": { <mask> color: variables.btnInfoBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnInfoBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnInfoBg, <mask> }, <mask> }, <mask> backgroundColor: variables.btnInfoBg, <mask> }, <mask> <mask> ".warning": { <mask> ".bordered": { <mask> "NativeBase.Text": { <mask> color: variables.btnWarningBg, </s> Added brandDark and brandLight color constants to theme/variables </s> remove ".success": { ".bordered": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, }, backgroundColor: variables.btnSuccessBg, }, </s> add '.success': { '.bordered': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, }, backgroundColor: variables.btnSuccessBg, }, </s> remove ".warning": { ".bordered": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, }, backgroundColor: variables.btnWarningBg, }, </s> add '.warning': { '.bordered': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, }, backgroundColor: variables.btnWarningBg, }, </s> remove "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, backgroundColor: null, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, backgroundColor: null, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, backgroundColor: null, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, backgroundColor: null, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, backgroundColor: null, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, backgroundColor: null, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, backgroundColor: null, }, }, </s> add 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, backgroundColor: null, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, backgroundColor: null, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, backgroundColor: null, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, backgroundColor: null, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, backgroundColor: null, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, backgroundColor: null, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, backgroundColor: null, }, }, </s> remove const buttonTheme = { ".disabled": { backgroundColor: variables.btnDisabledBg, }, ".bordered": { ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, backgroundColor: "transparent", borderColor: "#000", borderWidth: variables.borderWidth * 2, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, backgroundColor: "transparent", borderColor: "#f4f4f4", borderWidth: variables.borderWidth * 2, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, backgroundColor: "transparent", borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, backgroundColor: "transparent", borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, backgroundColor: "transparent", borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, backgroundColor: "transparent", borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, backgroundColor: "transparent", borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, ".disabled": { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, "NativeBase.Text": { color: variables.btnDisabledBg, }, }, "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: "transparent", }, </s> add const buttonTheme = { '.disabled': { backgroundColor: variables.btnDisabledBg, }, '.bordered': { '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: 'transparent', borderColor: variables.brandDark, borderWidth: variables.borderWidth * 2, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: 'transparent', borderColor: variables.brandLight, borderWidth: variables.borderWidth * 2, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, backgroundColor: 'transparent', borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, backgroundColor: 'transparent', borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, backgroundColor: 'transparent', borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, backgroundColor: 'transparent', borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, backgroundColor: 'transparent', borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, '.disabled': { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, 'NativeBase.Text': { color: variables.btnDisabledBg, }, }, 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: 'transparent', }, </s> remove ".primary": { ".bordered": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, }, backgroundColor: variables.btnPrimaryBg, }, </s> add '.primary': { '.bordered': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, }, backgroundColor: variables.btnPrimaryBg, },
[ "keep", "keep", "keep", "keep", "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/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'.warning': { '.bordered': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, }, backgroundColor: variables.btnWarningBg, },
<mask> }, <mask> backgroundColor: variables.btnInfoBg, <mask> }, <mask> <mask> ".warning": { <mask> ".bordered": { <mask> "NativeBase.Text": { <mask> color: variables.btnWarningBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnWarningBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnWarningBg, <mask> }, <mask> }, <mask> backgroundColor: variables.btnWarningBg, <mask> }, <mask> <mask> ".danger": { <mask> ".bordered": { <mask> "NativeBase.Text": { <mask> color: variables.btnDangerBg, </s> Added brandDark and brandLight color constants to theme/variables </s> remove ".info": { ".bordered": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, }, backgroundColor: variables.btnInfoBg, }, </s> add '.info': { '.bordered': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, }, backgroundColor: variables.btnInfoBg, }, </s> remove "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, backgroundColor: null, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, backgroundColor: null, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, backgroundColor: null, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, backgroundColor: null, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, backgroundColor: null, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, backgroundColor: null, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, backgroundColor: null, }, }, </s> add 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, backgroundColor: null, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, backgroundColor: null, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, backgroundColor: null, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, backgroundColor: null, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, backgroundColor: null, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, backgroundColor: null, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, backgroundColor: null, }, }, </s> remove ".danger": { ".bordered": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, }, backgroundColor: variables.btnDangerBg, }, </s> add '.danger': { '.bordered': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, }, backgroundColor: variables.btnDangerBg, }, </s> remove const buttonTheme = { ".disabled": { backgroundColor: variables.btnDisabledBg, }, ".bordered": { ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, backgroundColor: "transparent", borderColor: "#000", borderWidth: variables.borderWidth * 2, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, backgroundColor: "transparent", borderColor: "#f4f4f4", borderWidth: variables.borderWidth * 2, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, backgroundColor: "transparent", borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, backgroundColor: "transparent", borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, backgroundColor: "transparent", borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, backgroundColor: "transparent", borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, backgroundColor: "transparent", borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, ".disabled": { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, "NativeBase.Text": { color: variables.btnDisabledBg, }, }, "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: "transparent", }, </s> add const buttonTheme = { '.disabled': { backgroundColor: variables.btnDisabledBg, }, '.bordered': { '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: 'transparent', borderColor: variables.brandDark, borderWidth: variables.borderWidth * 2, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: 'transparent', borderColor: variables.brandLight, borderWidth: variables.borderWidth * 2, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, backgroundColor: 'transparent', borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, backgroundColor: 'transparent', borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, backgroundColor: 'transparent', borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, backgroundColor: 'transparent', borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, backgroundColor: 'transparent', borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, '.disabled': { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, 'NativeBase.Text': { color: variables.btnDisabledBg, }, }, 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: 'transparent', }, </s> remove ".success": { ".bordered": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, }, backgroundColor: variables.btnSuccessBg, }, </s> add '.success': { '.bordered': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, }, backgroundColor: variables.btnSuccessBg, },
[ "keep", "keep", "keep", "keep", "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/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'.danger': { '.bordered': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, }, backgroundColor: variables.btnDangerBg, },
<mask> }, <mask> backgroundColor: variables.btnWarningBg, <mask> }, <mask> <mask> ".danger": { <mask> ".bordered": { <mask> "NativeBase.Text": { <mask> color: variables.btnDangerBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnDangerBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnDangerBg, <mask> }, <mask> }, <mask> backgroundColor: variables.btnDangerBg, <mask> }, <mask> <mask> ".block": { <mask> justifyContent: "center", <mask> alignSelf: "stretch", <mask> }, </s> Added brandDark and brandLight color constants to theme/variables </s> remove ".block": { justifyContent: "center", alignSelf: "stretch", }, </s> add '.block': { justifyContent: 'center', alignSelf: 'stretch', }, </s> remove ".warning": { ".bordered": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, }, backgroundColor: variables.btnWarningBg, }, </s> add '.warning': { '.bordered': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, }, backgroundColor: variables.btnWarningBg, }, </s> remove "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, backgroundColor: null, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, backgroundColor: null, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, backgroundColor: null, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, backgroundColor: null, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, backgroundColor: null, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, backgroundColor: null, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, backgroundColor: null, }, }, </s> add 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, backgroundColor: null, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, backgroundColor: null, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, backgroundColor: null, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, backgroundColor: null, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, backgroundColor: null, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, backgroundColor: null, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, backgroundColor: null, }, }, </s> remove const buttonTheme = { ".disabled": { backgroundColor: variables.btnDisabledBg, }, ".bordered": { ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, backgroundColor: "transparent", borderColor: "#000", borderWidth: variables.borderWidth * 2, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, backgroundColor: "transparent", borderColor: "#f4f4f4", borderWidth: variables.borderWidth * 2, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, backgroundColor: "transparent", borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, backgroundColor: "transparent", borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, backgroundColor: "transparent", borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, backgroundColor: "transparent", borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, backgroundColor: "transparent", borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, ".disabled": { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, "NativeBase.Text": { color: variables.btnDisabledBg, }, }, "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: "transparent", }, </s> add const buttonTheme = { '.disabled': { backgroundColor: variables.btnDisabledBg, }, '.bordered': { '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: 'transparent', borderColor: variables.brandDark, borderWidth: variables.borderWidth * 2, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: 'transparent', borderColor: variables.brandLight, borderWidth: variables.borderWidth * 2, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, backgroundColor: 'transparent', borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, backgroundColor: 'transparent', borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, backgroundColor: 'transparent', borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, backgroundColor: 'transparent', borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, backgroundColor: 'transparent', borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, '.disabled': { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, 'NativeBase.Text': { color: variables.btnDisabledBg, }, }, 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: 'transparent', }, </s> remove ".full": { justifyContent: "center", alignSelf: "stretch", borderRadius: 0, }, </s> add '.full': { justifyContent: 'center', alignSelf: 'stretch', borderRadius: 0, },
[ "keep", "keep", "keep", "keep", "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/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'.block': { justifyContent: 'center', alignSelf: 'stretch', },
<mask> }, <mask> backgroundColor: variables.btnDangerBg, <mask> }, <mask> <mask> ".block": { <mask> justifyContent: "center", <mask> alignSelf: "stretch", <mask> }, <mask> <mask> ".full": { <mask> justifyContent: "center", <mask> alignSelf: "stretch", <mask> borderRadius: 0, </s> Added brandDark and brandLight color constants to theme/variables </s> remove ".full": { justifyContent: "center", alignSelf: "stretch", borderRadius: 0, }, </s> add '.full': { justifyContent: 'center', alignSelf: 'stretch', borderRadius: 0, }, </s> remove ".danger": { ".bordered": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, }, backgroundColor: variables.btnDangerBg, }, </s> add '.danger': { '.bordered': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, }, backgroundColor: variables.btnDangerBg, }, </s> remove ".rounded": { // paddingHorizontal: variables.buttonPadding + 20, borderRadius: variables.borderRadiusLarge, }, </s> add '.rounded': { // paddingHorizontal: variables.buttonPadding + 20, borderRadius: variables.borderRadiusLarge, }, </s> remove paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: "flex-start", flexDirection: "row", elevation: 2, shadowColor: platformStyle === "material" ? "#000" : undefined, shadowOffset: platformStyle === "material" ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === "material" ? 0.2 : undefined, shadowRadius: platformStyle === "material" ? 1.2 : undefined, alignItems: "center", justifyContent: "space-between", }; return buttonTheme; </s> add paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: 'flex-start', flexDirection: 'row', elevation: 2, shadowColor: platformStyle === 'material' ? variables.brandDark : undefined, shadowOffset: platformStyle === 'material' ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === 'material' ? 0.2 : undefined, shadowRadius: platformStyle === 'material' ? 1.2 : undefined, alignItems: 'center', justifyContent: 'space-between', }; return buttonTheme; </s> remove "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, backgroundColor: null, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, backgroundColor: null, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, backgroundColor: null, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, backgroundColor: null, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, backgroundColor: null, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, backgroundColor: null, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, backgroundColor: null, }, }, </s> add 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, backgroundColor: null, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, backgroundColor: null, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, backgroundColor: null, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, backgroundColor: null, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, backgroundColor: null, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, backgroundColor: null, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, backgroundColor: null, }, },
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'.full': { justifyContent: 'center', alignSelf: 'stretch', borderRadius: 0, },
<mask> justifyContent: "center", <mask> alignSelf: "stretch", <mask> }, <mask> <mask> ".full": { <mask> justifyContent: "center", <mask> alignSelf: "stretch", <mask> borderRadius: 0, <mask> }, <mask> <mask> ".rounded": { <mask> // paddingHorizontal: variables.buttonPadding + 20, <mask> borderRadius: variables.borderRadiusLarge, <mask> }, </s> Added brandDark and brandLight color constants to theme/variables </s> remove ".block": { justifyContent: "center", alignSelf: "stretch", }, </s> add '.block': { justifyContent: 'center', alignSelf: 'stretch', }, </s> remove ".rounded": { // paddingHorizontal: variables.buttonPadding + 20, borderRadius: variables.borderRadiusLarge, }, </s> add '.rounded': { // paddingHorizontal: variables.buttonPadding + 20, borderRadius: variables.borderRadiusLarge, }, </s> remove paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: "flex-start", flexDirection: "row", elevation: 2, shadowColor: platformStyle === "material" ? "#000" : undefined, shadowOffset: platformStyle === "material" ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === "material" ? 0.2 : undefined, shadowRadius: platformStyle === "material" ? 1.2 : undefined, alignItems: "center", justifyContent: "space-between", }; return buttonTheme; </s> add paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: 'flex-start', flexDirection: 'row', elevation: 2, shadowColor: platformStyle === 'material' ? variables.brandDark : undefined, shadowOffset: platformStyle === 'material' ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === 'material' ? 0.2 : undefined, shadowRadius: platformStyle === 'material' ? 1.2 : undefined, alignItems: 'center', justifyContent: 'space-between', }; return buttonTheme; </s> remove ".danger": { ".bordered": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, }, backgroundColor: variables.btnDangerBg, }, </s> add '.danger': { '.bordered': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, }, backgroundColor: variables.btnDangerBg, }, </s> remove ".transparent": { backgroundColor: "transparent", elevation: 0, shadowColor: null, shadowOffset: null, shadowRadius: null, shadowOpacity: null, </s> add '.transparent': { backgroundColor: 'transparent', elevation: 0, shadowColor: null, shadowOffset: null, shadowRadius: null, shadowOpacity: null,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'.rounded': { // paddingHorizontal: variables.buttonPadding + 20, borderRadius: variables.borderRadiusLarge, },
<mask> alignSelf: "stretch", <mask> borderRadius: 0, <mask> }, <mask> <mask> ".rounded": { <mask> // paddingHorizontal: variables.buttonPadding + 20, <mask> borderRadius: variables.borderRadiusLarge, <mask> }, <mask> <mask> ".transparent": { <mask> backgroundColor: "transparent", <mask> elevation: 0, <mask> shadowColor: null, </s> Added brandDark and brandLight color constants to theme/variables </s> remove ".full": { justifyContent: "center", alignSelf: "stretch", borderRadius: 0, }, </s> add '.full': { justifyContent: 'center', alignSelf: 'stretch', borderRadius: 0, }, </s> remove ".transparent": { backgroundColor: "transparent", elevation: 0, shadowColor: null, shadowOffset: null, shadowRadius: null, shadowOpacity: null, </s> add '.transparent': { backgroundColor: 'transparent', elevation: 0, shadowColor: null, shadowOffset: null, shadowRadius: null, shadowOpacity: null, </s> remove paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: "flex-start", flexDirection: "row", elevation: 2, shadowColor: platformStyle === "material" ? "#000" : undefined, shadowOffset: platformStyle === "material" ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === "material" ? 0.2 : undefined, shadowRadius: platformStyle === "material" ? 1.2 : undefined, alignItems: "center", justifyContent: "space-between", }; return buttonTheme; </s> add paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: 'flex-start', flexDirection: 'row', elevation: 2, shadowColor: platformStyle === 'material' ? variables.brandDark : undefined, shadowOffset: platformStyle === 'material' ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === 'material' ? 0.2 : undefined, shadowRadius: platformStyle === 'material' ? 1.2 : undefined, alignItems: 'center', justifyContent: 'space-between', }; return buttonTheme; </s> remove ".block": { justifyContent: "center", alignSelf: "stretch", }, </s> add '.block': { justifyContent: 'center', alignSelf: 'stretch', }, </s> remove ".iconLeft": { "NativeBase.Text": { marginLeft: 0, }, "NativeBase.IconNB": { marginRight: 0, marginLeft: 16, }, "NativeBase.Icon": { marginRight: 0, marginLeft: 16, }, }, ".iconRight": { "NativeBase.Text": { marginRight: 0, }, "NativeBase.IconNB": { marginLeft: 0, marginRight: 16, }, "NativeBase.Icon": { marginLeft: 0, marginRight: 16, }, }, ".picker": { "NativeBase.Text": { ".note": { fontSize: 16, lineHeight: null, }, }, }, </s> add '.iconLeft': { 'NativeBase.Text': { marginLeft: 0, }, 'NativeBase.IconNB': { marginRight: 0, marginLeft: 16, }, 'NativeBase.Icon': { marginRight: 0, marginLeft: 16, }, }, '.iconRight': { 'NativeBase.Text': { marginRight: 0, }, 'NativeBase.IconNB': { marginLeft: 0, marginRight: 16, }, 'NativeBase.Icon': { marginLeft: 0, marginRight: 16, }, }, '.picker': { 'NativeBase.Text': { '.note': { fontSize: 16, lineHeight: null, }, }, },
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'.transparent': { backgroundColor: 'transparent', elevation: 0, shadowColor: null, shadowOffset: null, shadowRadius: null, shadowOpacity: null,
<mask> // paddingHorizontal: variables.buttonPadding + 20, <mask> borderRadius: variables.borderRadiusLarge, <mask> }, <mask> <mask> ".transparent": { <mask> backgroundColor: "transparent", <mask> elevation: 0, <mask> shadowColor: null, <mask> shadowOffset: null, <mask> shadowRadius: null, <mask> shadowOpacity: null, <mask> <mask> "NativeBase.Text": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> "NativeBase.Icon": { </s> Added brandDark and brandLight color constants to theme/variables </s> remove ".rounded": { // paddingHorizontal: variables.buttonPadding + 20, borderRadius: variables.borderRadiusLarge, }, </s> add '.rounded': { // paddingHorizontal: variables.buttonPadding + 20, borderRadius: variables.borderRadiusLarge, }, </s> remove paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: "flex-start", flexDirection: "row", elevation: 2, shadowColor: platformStyle === "material" ? "#000" : undefined, shadowOffset: platformStyle === "material" ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === "material" ? 0.2 : undefined, shadowRadius: platformStyle === "material" ? 1.2 : undefined, alignItems: "center", justifyContent: "space-between", }; return buttonTheme; </s> add paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: 'flex-start', flexDirection: 'row', elevation: 2, shadowColor: platformStyle === 'material' ? variables.brandDark : undefined, shadowOffset: platformStyle === 'material' ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === 'material' ? 0.2 : undefined, shadowRadius: platformStyle === 'material' ? 1.2 : undefined, alignItems: 'center', justifyContent: 'space-between', }; return buttonTheme; </s> remove ".full": { justifyContent: "center", alignSelf: "stretch", borderRadius: 0, }, </s> add '.full': { justifyContent: 'center', alignSelf: 'stretch', borderRadius: 0, }, </s> remove const buttonTheme = { ".disabled": { backgroundColor: variables.btnDisabledBg, }, ".bordered": { ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, backgroundColor: "transparent", borderColor: "#000", borderWidth: variables.borderWidth * 2, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, backgroundColor: "transparent", borderColor: "#f4f4f4", borderWidth: variables.borderWidth * 2, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, backgroundColor: "transparent", borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, backgroundColor: "transparent", borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, backgroundColor: "transparent", borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, backgroundColor: "transparent", borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, backgroundColor: "transparent", borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, ".disabled": { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, "NativeBase.Text": { color: variables.btnDisabledBg, }, }, "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: "transparent", }, </s> add const buttonTheme = { '.disabled': { backgroundColor: variables.btnDisabledBg, }, '.bordered': { '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: 'transparent', borderColor: variables.brandDark, borderWidth: variables.borderWidth * 2, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: 'transparent', borderColor: variables.brandLight, borderWidth: variables.borderWidth * 2, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, backgroundColor: 'transparent', borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, backgroundColor: 'transparent', borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, backgroundColor: 'transparent', borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, backgroundColor: 'transparent', borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, backgroundColor: 'transparent', borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, '.disabled': { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, 'NativeBase.Text': { color: variables.btnDisabledBg, }, }, 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: 'transparent', }, </s> remove "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, backgroundColor: null, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, backgroundColor: null, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, backgroundColor: null, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, backgroundColor: null, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, backgroundColor: null, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, backgroundColor: null, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, backgroundColor: null, }, }, </s> add 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, backgroundColor: null, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, backgroundColor: null, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, backgroundColor: null, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, backgroundColor: null, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, backgroundColor: null, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, backgroundColor: null, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, backgroundColor: null, }, },
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, backgroundColor: null, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, backgroundColor: null, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, backgroundColor: null, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, backgroundColor: null, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, backgroundColor: null, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, backgroundColor: null, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, backgroundColor: null, }, },
<mask> shadowOffset: null, <mask> shadowRadius: null, <mask> shadowOpacity: null, <mask> <mask> "NativeBase.Text": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> ".dark": { <mask> "NativeBase.Text": { <mask> color: "#000", <mask> }, <mask> "NativeBase.IconNB": { <mask> color: "#000", <mask> }, <mask> "NativeBase.Icon": { <mask> color: "#000", <mask> }, <mask> backgroundColor: null, <mask> }, <mask> ".danger": { <mask> "NativeBase.Text": { <mask> color: variables.btnDangerBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnDangerBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnDangerBg, <mask> }, <mask> backgroundColor: null, <mask> }, <mask> ".warning": { <mask> "NativeBase.Text": { <mask> color: variables.btnWarningBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnWarningBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnWarningBg, <mask> }, <mask> backgroundColor: null, <mask> }, <mask> ".info": { <mask> "NativeBase.Text": { <mask> color: variables.btnInfoBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnInfoBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnInfoBg, <mask> }, <mask> backgroundColor: null, <mask> }, <mask> ".primary": { <mask> "NativeBase.Text": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnPrimaryBg, <mask> }, <mask> backgroundColor: null, <mask> }, <mask> ".success": { <mask> "NativeBase.Text": { <mask> color: variables.btnSuccessBg, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.btnSuccessBg, <mask> }, <mask> "NativeBase.Icon": { <mask> color: variables.btnSuccessBg, <mask> }, <mask> backgroundColor: null, <mask> }, <mask> ".light": { <mask> "NativeBase.Text": { <mask> color: "#f4f4f4", <mask> }, <mask> "NativeBase.IconNB": { <mask> color: "#f4f4f4", <mask> }, <mask> "NativeBase.Icon": { <mask> color: "#f4f4f4", <mask> }, <mask> backgroundColor: null, <mask> }, <mask> }, <mask> <mask> ".small": { <mask> height: 30, <mask> "NativeBase.Text": { <mask> fontSize: 14, </s> Added brandDark and brandLight color constants to theme/variables </s> remove const buttonTheme = { ".disabled": { backgroundColor: variables.btnDisabledBg, }, ".bordered": { ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, backgroundColor: "transparent", borderColor: "#000", borderWidth: variables.borderWidth * 2, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, backgroundColor: "transparent", borderColor: "#f4f4f4", borderWidth: variables.borderWidth * 2, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, backgroundColor: "transparent", borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, backgroundColor: "transparent", borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, backgroundColor: "transparent", borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, backgroundColor: "transparent", borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, backgroundColor: "transparent", borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, ".disabled": { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, "NativeBase.Text": { color: variables.btnDisabledBg, }, }, "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: "transparent", }, </s> add const buttonTheme = { '.disabled': { backgroundColor: variables.btnDisabledBg, }, '.bordered': { '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: 'transparent', borderColor: variables.brandDark, borderWidth: variables.borderWidth * 2, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: 'transparent', borderColor: variables.brandLight, borderWidth: variables.borderWidth * 2, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, backgroundColor: 'transparent', borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, backgroundColor: 'transparent', borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, backgroundColor: 'transparent', borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, backgroundColor: 'transparent', borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, backgroundColor: 'transparent', borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, '.disabled': { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, 'NativeBase.Text': { color: variables.btnDisabledBg, }, }, 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: 'transparent', }, </s> remove ".dark": { ".bordered": { "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, }, backgroundColor: "#000", }, ".light": { ".transparent": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, backgroundColor: null, }, ".bordered": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, }, "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, backgroundColor: "#f4f4f4", }, </s> add '.dark': { '.bordered': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, }, backgroundColor: variables.brandDark, }, '.light': { '.transparent': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: null, }, '.bordered': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, }, 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: variables.brandLight, }, </s> remove ".primary": { ".bordered": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, }, backgroundColor: variables.btnPrimaryBg, }, </s> add '.primary': { '.bordered': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, }, backgroundColor: variables.btnPrimaryBg, }, </s> remove ".success": { ".bordered": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, }, backgroundColor: variables.btnSuccessBg, }, </s> add '.success': { '.bordered': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, }, backgroundColor: variables.btnSuccessBg, }, </s> remove ".info": { ".bordered": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, }, backgroundColor: variables.btnInfoBg, }, </s> add '.info': { '.bordered': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, }, backgroundColor: variables.btnInfoBg, },
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "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/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'.small': { height: 30, 'NativeBase.Text': { fontSize: 14, }, },
<mask> backgroundColor: null, <mask> }, <mask> }, <mask> <mask> ".small": { <mask> height: 30, <mask> "NativeBase.Text": { <mask> fontSize: 14, <mask> }, <mask> }, <mask> <mask> ".large": { <mask> height: 60, <mask> "NativeBase.Text": { <mask> fontSize: 22, </s> Added brandDark and brandLight color constants to theme/variables </s> remove ".large": { height: 60, "NativeBase.Text": { fontSize: 22, lineHeight: 32, }, }, </s> add '.large': { height: 60, 'NativeBase.Text': { fontSize: 22, lineHeight: 32, }, }, </s> remove "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, backgroundColor: null, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, backgroundColor: null, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, backgroundColor: null, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, backgroundColor: null, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, backgroundColor: null, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, backgroundColor: null, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, backgroundColor: null, }, }, </s> add 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, backgroundColor: null, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, backgroundColor: null, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, backgroundColor: null, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, backgroundColor: null, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, backgroundColor: null, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, backgroundColor: null, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, backgroundColor: null, }, }, </s> remove "NativeBase.Text": { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: "transparent", // childPosition: 1 }, </s> add 'NativeBase.Text': { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: 'transparent', // childPosition: 1 }, </s> remove ".vertical": { flexDirection: "column", height: null, }, </s> add '.vertical': { flexDirection: 'column', height: null, }, </s> remove "NativeBase.Icon": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, "NativeBase.IconNB": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, </s> add 'NativeBase.Icon': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, 'NativeBase.IconNB': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, },
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'.large': { height: 60, 'NativeBase.Text': { fontSize: 22, lineHeight: 32, }, },
<mask> fontSize: 14, <mask> }, <mask> }, <mask> <mask> ".large": { <mask> height: 60, <mask> "NativeBase.Text": { <mask> fontSize: 22, <mask> lineHeight: 32, <mask> }, <mask> }, <mask> <mask> ".capitalize": {}, <mask> <mask> ".vertical": { <mask> flexDirection: "column", </s> Added brandDark and brandLight color constants to theme/variables </s> remove ".capitalize": {}, </s> add '.capitalize': {}, </s> remove ".small": { height: 30, "NativeBase.Text": { fontSize: 14, }, }, </s> add '.small': { height: 30, 'NativeBase.Text': { fontSize: 14, }, }, </s> remove ".vertical": { flexDirection: "column", height: null, }, </s> add '.vertical': { flexDirection: 'column', height: null, }, </s> remove "NativeBase.Text": { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: "transparent", // childPosition: 1 }, </s> add 'NativeBase.Text': { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: 'transparent', // childPosition: 1 }, </s> remove ".iconLeft": { "NativeBase.Text": { marginLeft: 0, }, "NativeBase.IconNB": { marginRight: 0, marginLeft: 16, }, "NativeBase.Icon": { marginRight: 0, marginLeft: 16, }, }, ".iconRight": { "NativeBase.Text": { marginRight: 0, }, "NativeBase.IconNB": { marginLeft: 0, marginRight: 16, }, "NativeBase.Icon": { marginLeft: 0, marginRight: 16, }, }, ".picker": { "NativeBase.Text": { ".note": { fontSize: 16, lineHeight: null, }, }, }, </s> add '.iconLeft': { 'NativeBase.Text': { marginLeft: 0, }, 'NativeBase.IconNB': { marginRight: 0, marginLeft: 16, }, 'NativeBase.Icon': { marginRight: 0, marginLeft: 16, }, }, '.iconRight': { 'NativeBase.Text': { marginRight: 0, }, 'NativeBase.IconNB': { marginLeft: 0, marginRight: 16, }, 'NativeBase.Icon': { marginLeft: 0, marginRight: 16, }, }, '.picker': { 'NativeBase.Text': { '.note': { fontSize: 16, lineHeight: null, }, }, },
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'.capitalize': {},
<mask> lineHeight: 32, <mask> }, <mask> }, <mask> <mask> ".capitalize": {}, <mask> <mask> ".vertical": { <mask> flexDirection: "column", <mask> height: null, <mask> }, </s> Added brandDark and brandLight color constants to theme/variables </s> remove ".large": { height: 60, "NativeBase.Text": { fontSize: 22, lineHeight: 32, }, }, </s> add '.large': { height: 60, 'NativeBase.Text': { fontSize: 22, lineHeight: 32, }, }, </s> remove ".vertical": { flexDirection: "column", height: null, }, </s> add '.vertical': { flexDirection: 'column', height: null, }, </s> remove "NativeBase.Text": { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: "transparent", // childPosition: 1 }, </s> add 'NativeBase.Text': { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: 'transparent', // childPosition: 1 }, </s> remove ".small": { height: 30, "NativeBase.Text": { fontSize: 14, }, }, </s> add '.small': { height: 30, 'NativeBase.Text': { fontSize: 14, }, }, </s> remove ".iconLeft": { "NativeBase.Text": { marginLeft: 0, }, "NativeBase.IconNB": { marginRight: 0, marginLeft: 16, }, "NativeBase.Icon": { marginRight: 0, marginLeft: 16, }, }, ".iconRight": { "NativeBase.Text": { marginRight: 0, }, "NativeBase.IconNB": { marginLeft: 0, marginRight: 16, }, "NativeBase.Icon": { marginLeft: 0, marginRight: 16, }, }, ".picker": { "NativeBase.Text": { ".note": { fontSize: 16, lineHeight: null, }, }, }, </s> add '.iconLeft': { 'NativeBase.Text': { marginLeft: 0, }, 'NativeBase.IconNB': { marginRight: 0, marginLeft: 16, }, 'NativeBase.Icon': { marginRight: 0, marginLeft: 16, }, }, '.iconRight': { 'NativeBase.Text': { marginRight: 0, }, 'NativeBase.IconNB': { marginLeft: 0, marginRight: 16, }, 'NativeBase.Icon': { marginLeft: 0, marginRight: 16, }, }, '.picker': { 'NativeBase.Text': { '.note': { fontSize: 16, lineHeight: null, }, }, },
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'.vertical': { flexDirection: 'column', height: null, },
<mask> }, <mask> <mask> ".capitalize": {}, <mask> <mask> ".vertical": { <mask> flexDirection: "column", <mask> height: null, <mask> }, <mask> <mask> "NativeBase.Text": { <mask> fontFamily: variables.btnFontFamily, <mask> marginLeft: 0, <mask> marginRight: 0, </s> Added brandDark and brandLight color constants to theme/variables </s> remove "NativeBase.Text": { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: "transparent", // childPosition: 1 }, </s> add 'NativeBase.Text': { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: 'transparent', // childPosition: 1 }, </s> remove ".capitalize": {}, </s> add '.capitalize': {}, </s> remove ".large": { height: 60, "NativeBase.Text": { fontSize: 22, lineHeight: 32, }, }, </s> add '.large': { height: 60, 'NativeBase.Text': { fontSize: 22, lineHeight: 32, }, }, </s> remove ".iconLeft": { "NativeBase.Text": { marginLeft: 0, }, "NativeBase.IconNB": { marginRight: 0, marginLeft: 16, }, "NativeBase.Icon": { marginRight: 0, marginLeft: 16, }, }, ".iconRight": { "NativeBase.Text": { marginRight: 0, }, "NativeBase.IconNB": { marginLeft: 0, marginRight: 16, }, "NativeBase.Icon": { marginLeft: 0, marginRight: 16, }, }, ".picker": { "NativeBase.Text": { ".note": { fontSize: 16, lineHeight: null, }, }, }, </s> add '.iconLeft': { 'NativeBase.Text': { marginLeft: 0, }, 'NativeBase.IconNB': { marginRight: 0, marginLeft: 16, }, 'NativeBase.Icon': { marginRight: 0, marginLeft: 16, }, }, '.iconRight': { 'NativeBase.Text': { marginRight: 0, }, 'NativeBase.IconNB': { marginLeft: 0, marginRight: 16, }, 'NativeBase.Icon': { marginLeft: 0, marginRight: 16, }, }, '.picker': { 'NativeBase.Text': { '.note': { fontSize: 16, lineHeight: null, }, }, }, </s> remove paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: "flex-start", flexDirection: "row", elevation: 2, shadowColor: platformStyle === "material" ? "#000" : undefined, shadowOffset: platformStyle === "material" ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === "material" ? 0.2 : undefined, shadowRadius: platformStyle === "material" ? 1.2 : undefined, alignItems: "center", justifyContent: "space-between", }; return buttonTheme; </s> add paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: 'flex-start', flexDirection: 'row', elevation: 2, shadowColor: platformStyle === 'material' ? variables.brandDark : undefined, shadowOffset: platformStyle === 'material' ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === 'material' ? 0.2 : undefined, shadowRadius: platformStyle === 'material' ? 1.2 : undefined, alignItems: 'center', justifyContent: 'space-between', }; return buttonTheme;
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'NativeBase.Text': { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: 'transparent', // childPosition: 1 },
<mask> flexDirection: "column", <mask> height: null, <mask> }, <mask> <mask> "NativeBase.Text": { <mask> fontFamily: variables.btnFontFamily, <mask> marginLeft: 0, <mask> marginRight: 0, <mask> color: variables.inverseTextColor, <mask> fontSize: variables.btnTextSize, <mask> lineHeight: variables.btnLineHeight, <mask> paddingHorizontal: 16, <mask> backgroundColor: "transparent", <mask> // childPosition: 1 <mask> }, <mask> <mask> "NativeBase.Icon": { <mask> color: variables.inverseTextColor, <mask> fontSize: 24, <mask> marginHorizontal: 16, </s> Added brandDark and brandLight color constants to theme/variables </s> remove "NativeBase.Icon": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, "NativeBase.IconNB": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, </s> add 'NativeBase.Icon': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, 'NativeBase.IconNB': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, </s> remove ".iconLeft": { "NativeBase.Text": { marginLeft: 0, }, "NativeBase.IconNB": { marginRight: 0, marginLeft: 16, }, "NativeBase.Icon": { marginRight: 0, marginLeft: 16, }, }, ".iconRight": { "NativeBase.Text": { marginRight: 0, }, "NativeBase.IconNB": { marginLeft: 0, marginRight: 16, }, "NativeBase.Icon": { marginLeft: 0, marginRight: 16, }, }, ".picker": { "NativeBase.Text": { ".note": { fontSize: 16, lineHeight: null, }, }, }, </s> add '.iconLeft': { 'NativeBase.Text': { marginLeft: 0, }, 'NativeBase.IconNB': { marginRight: 0, marginLeft: 16, }, 'NativeBase.Icon': { marginRight: 0, marginLeft: 16, }, }, '.iconRight': { 'NativeBase.Text': { marginRight: 0, }, 'NativeBase.IconNB': { marginLeft: 0, marginRight: 16, }, 'NativeBase.Icon': { marginLeft: 0, marginRight: 16, }, }, '.picker': { 'NativeBase.Text': { '.note': { fontSize: 16, lineHeight: null, }, }, }, </s> remove ".vertical": { flexDirection: "column", height: null, }, </s> add '.vertical': { flexDirection: 'column', height: null, }, </s> remove ".large": { height: 60, "NativeBase.Text": { fontSize: 22, lineHeight: 32, }, }, </s> add '.large': { height: 60, 'NativeBase.Text': { fontSize: 22, lineHeight: 32, }, }, </s> remove ".capitalize": {}, </s> add '.capitalize': {},
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'NativeBase.Icon': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, 'NativeBase.IconNB': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, },
<mask> backgroundColor: "transparent", <mask> // childPosition: 1 <mask> }, <mask> <mask> "NativeBase.Icon": { <mask> color: variables.inverseTextColor, <mask> fontSize: 24, <mask> marginHorizontal: 16, <mask> paddingTop: platform === "ios" ? 2 : undefined, <mask> }, <mask> "NativeBase.IconNB": { <mask> color: variables.inverseTextColor, <mask> fontSize: 24, <mask> marginHorizontal: 16, <mask> paddingTop: platform === "ios" ? 2 : undefined, <mask> }, <mask> <mask> ".iconLeft": { <mask> "NativeBase.Text": { <mask> marginLeft: 0, <mask> }, </s> Added brandDark and brandLight color constants to theme/variables </s> remove "NativeBase.Text": { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: "transparent", // childPosition: 1 }, </s> add 'NativeBase.Text': { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: 'transparent', // childPosition: 1 }, </s> remove ".iconLeft": { "NativeBase.Text": { marginLeft: 0, }, "NativeBase.IconNB": { marginRight: 0, marginLeft: 16, }, "NativeBase.Icon": { marginRight: 0, marginLeft: 16, }, }, ".iconRight": { "NativeBase.Text": { marginRight: 0, }, "NativeBase.IconNB": { marginLeft: 0, marginRight: 16, }, "NativeBase.Icon": { marginLeft: 0, marginRight: 16, }, }, ".picker": { "NativeBase.Text": { ".note": { fontSize: 16, lineHeight: null, }, }, }, </s> add '.iconLeft': { 'NativeBase.Text': { marginLeft: 0, }, 'NativeBase.IconNB': { marginRight: 0, marginLeft: 16, }, 'NativeBase.Icon': { marginRight: 0, marginLeft: 16, }, }, '.iconRight': { 'NativeBase.Text': { marginRight: 0, }, 'NativeBase.IconNB': { marginLeft: 0, marginRight: 16, }, 'NativeBase.Icon': { marginLeft: 0, marginRight: 16, }, }, '.picker': { 'NativeBase.Text': { '.note': { fontSize: 16, lineHeight: null, }, }, }, </s> remove paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: "flex-start", flexDirection: "row", elevation: 2, shadowColor: platformStyle === "material" ? "#000" : undefined, shadowOffset: platformStyle === "material" ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === "material" ? 0.2 : undefined, shadowRadius: platformStyle === "material" ? 1.2 : undefined, alignItems: "center", justifyContent: "space-between", }; return buttonTheme; </s> add paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: 'flex-start', flexDirection: 'row', elevation: 2, shadowColor: platformStyle === 'material' ? variables.brandDark : undefined, shadowOffset: platformStyle === 'material' ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === 'material' ? 0.2 : undefined, shadowRadius: platformStyle === 'material' ? 1.2 : undefined, alignItems: 'center', justifyContent: 'space-between', }; return buttonTheme; </s> remove return color(this.toolbarDefaultBg).darken(0.2).hex(); </s> add return color(this.toolbarDefaultBg) .darken(0.2) .hex(); </s> remove return color(this.toolbarDefaultBg).darken(0.2).hex(); </s> add return color(this.toolbarDefaultBg) .darken(0.2) .hex();
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
'.iconLeft': { 'NativeBase.Text': { marginLeft: 0, }, 'NativeBase.IconNB': { marginRight: 0, marginLeft: 16, }, 'NativeBase.Icon': { marginRight: 0, marginLeft: 16, }, }, '.iconRight': { 'NativeBase.Text': { marginRight: 0, }, 'NativeBase.IconNB': { marginLeft: 0, marginRight: 16, }, 'NativeBase.Icon': { marginLeft: 0, marginRight: 16, }, }, '.picker': { 'NativeBase.Text': { '.note': { fontSize: 16, lineHeight: null, }, }, },
<mask> marginHorizontal: 16, <mask> paddingTop: platform === "ios" ? 2 : undefined, <mask> }, <mask> <mask> ".iconLeft": { <mask> "NativeBase.Text": { <mask> marginLeft: 0, <mask> }, <mask> "NativeBase.IconNB": { <mask> marginRight: 0, <mask> marginLeft: 16, <mask> }, <mask> "NativeBase.Icon": { <mask> marginRight: 0, <mask> marginLeft: 16, <mask> }, <mask> }, <mask> ".iconRight": { <mask> "NativeBase.Text": { <mask> marginRight: 0, <mask> }, <mask> "NativeBase.IconNB": { <mask> marginLeft: 0, <mask> marginRight: 16, <mask> }, <mask> "NativeBase.Icon": { <mask> marginLeft: 0, <mask> marginRight: 16, <mask> }, <mask> }, <mask> ".picker": { <mask> "NativeBase.Text": { <mask> ".note": { <mask> fontSize: 16, <mask> lineHeight: null, <mask> }, <mask> }, <mask> }, <mask> <mask> paddingVertical: variables.buttonPadding, <mask> // paddingHorizontal: variables.buttonPadding + 10, <mask> backgroundColor: variables.btnPrimaryBg, <mask> borderRadius: variables.borderRadiusBase, </s> Added brandDark and brandLight color constants to theme/variables </s> remove "NativeBase.Text": { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: "transparent", // childPosition: 1 }, </s> add 'NativeBase.Text': { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: 'transparent', // childPosition: 1 }, </s> remove "NativeBase.Icon": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, "NativeBase.IconNB": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, </s> add 'NativeBase.Icon': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, 'NativeBase.IconNB': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, </s> remove ".vertical": { flexDirection: "column", height: null, }, </s> add '.vertical': { flexDirection: 'column', height: null, }, </s> remove paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: "flex-start", flexDirection: "row", elevation: 2, shadowColor: platformStyle === "material" ? "#000" : undefined, shadowOffset: platformStyle === "material" ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === "material" ? 0.2 : undefined, shadowRadius: platformStyle === "material" ? 1.2 : undefined, alignItems: "center", justifyContent: "space-between", }; return buttonTheme; </s> add paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: 'flex-start', flexDirection: 'row', elevation: 2, shadowColor: platformStyle === 'material' ? variables.brandDark : undefined, shadowOffset: platformStyle === 'material' ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === 'material' ? 0.2 : undefined, shadowRadius: platformStyle === 'material' ? 1.2 : undefined, alignItems: 'center', justifyContent: 'space-between', }; return buttonTheme; </s> remove ".rounded": { // paddingHorizontal: variables.buttonPadding + 20, borderRadius: variables.borderRadiusLarge, }, </s> add '.rounded': { // paddingHorizontal: variables.buttonPadding + 20, borderRadius: variables.borderRadiusLarge, },
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "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/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: 'flex-start', flexDirection: 'row', elevation: 2, shadowColor: platformStyle === 'material' ? variables.brandDark : undefined, shadowOffset: platformStyle === 'material' ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === 'material' ? 0.2 : undefined, shadowRadius: platformStyle === 'material' ? 1.2 : undefined, alignItems: 'center', justifyContent: 'space-between', }; return buttonTheme;
<mask> }, <mask> }, <mask> }, <mask> <mask> paddingVertical: variables.buttonPadding, <mask> // paddingHorizontal: variables.buttonPadding + 10, <mask> backgroundColor: variables.btnPrimaryBg, <mask> borderRadius: variables.borderRadiusBase, <mask> borderColor: variables.btnPrimaryBg, <mask> borderWidth: null, <mask> height: 45, <mask> alignSelf: "flex-start", <mask> flexDirection: "row", <mask> elevation: 2, <mask> shadowColor: platformStyle === "material" ? "#000" : undefined, <mask> shadowOffset: platformStyle === "material" ? { width: 0, height: 2 } : undefined, <mask> shadowOpacity: platformStyle === "material" ? 0.2 : undefined, <mask> shadowRadius: platformStyle === "material" ? 1.2 : undefined, <mask> alignItems: "center", <mask> justifyContent: "space-between", <mask> }; <mask> return buttonTheme; <mask> }; </s> Added brandDark and brandLight color constants to theme/variables </s> remove "NativeBase.Icon": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, "NativeBase.IconNB": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, </s> add 'NativeBase.Icon': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, 'NativeBase.IconNB': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, </s> remove ".iconLeft": { "NativeBase.Text": { marginLeft: 0, }, "NativeBase.IconNB": { marginRight: 0, marginLeft: 16, }, "NativeBase.Icon": { marginRight: 0, marginLeft: 16, }, }, ".iconRight": { "NativeBase.Text": { marginRight: 0, }, "NativeBase.IconNB": { marginLeft: 0, marginRight: 16, }, "NativeBase.Icon": { marginLeft: 0, marginRight: 16, }, }, ".picker": { "NativeBase.Text": { ".note": { fontSize: 16, lineHeight: null, }, }, }, </s> add '.iconLeft': { 'NativeBase.Text': { marginLeft: 0, }, 'NativeBase.IconNB': { marginRight: 0, marginLeft: 16, }, 'NativeBase.Icon': { marginRight: 0, marginLeft: 16, }, }, '.iconRight': { 'NativeBase.Text': { marginRight: 0, }, 'NativeBase.IconNB': { marginLeft: 0, marginRight: 16, }, 'NativeBase.Icon': { marginLeft: 0, marginRight: 16, }, }, '.picker': { 'NativeBase.Text': { '.note': { fontSize: 16, lineHeight: null, }, }, }, </s> remove ".transparent": { backgroundColor: "transparent", elevation: 0, shadowColor: null, shadowOffset: null, shadowRadius: null, shadowOpacity: null, </s> add '.transparent': { backgroundColor: 'transparent', elevation: 0, shadowColor: null, shadowOffset: null, shadowRadius: null, shadowOpacity: null, </s> remove const buttonTheme = { ".disabled": { backgroundColor: variables.btnDisabledBg, }, ".bordered": { ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, backgroundColor: "transparent", borderColor: "#000", borderWidth: variables.borderWidth * 2, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, backgroundColor: "transparent", borderColor: "#f4f4f4", borderWidth: variables.borderWidth * 2, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, backgroundColor: "transparent", borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, backgroundColor: "transparent", borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, backgroundColor: "transparent", borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, backgroundColor: "transparent", borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, backgroundColor: "transparent", borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, ".disabled": { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, "NativeBase.Text": { color: variables.btnDisabledBg, }, }, "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: "transparent", }, </s> add const buttonTheme = { '.disabled': { backgroundColor: variables.btnDisabledBg, }, '.bordered': { '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: 'transparent', borderColor: variables.brandDark, borderWidth: variables.borderWidth * 2, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: 'transparent', borderColor: variables.brandLight, borderWidth: variables.borderWidth * 2, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, backgroundColor: 'transparent', borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, backgroundColor: 'transparent', borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, backgroundColor: 'transparent', borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, backgroundColor: 'transparent', borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, backgroundColor: 'transparent', borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, '.disabled': { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, 'NativeBase.Text': { color: variables.btnDisabledBg, }, }, 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: 'transparent', }, </s> remove return color(this.toolbarDefaultBg).darken(0.2).hex(); </s> add return color(this.toolbarDefaultBg) .darken(0.2) .hex();
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/components/Button.js
brandDark: "#000", brandLight: "#f4f4f4",
<mask> brandWarning: "#f0ad4e", <mask> brandSidebar: "#252932", <mask> <mask> // Font <mask> fontFamily: platform === "ios" ? "System" : "Roboto", <mask> fontSizeBase: 15, </s> Added brandDark and brandLight color constants to theme/variables </s> remove "NativeBase.Icon": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, "NativeBase.IconNB": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, </s> add 'NativeBase.Icon': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, 'NativeBase.IconNB': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, </s> remove return color(this.toolbarDefaultBg).darken(0.2).hex(); </s> add return color(this.toolbarDefaultBg) .darken(0.2) .hex(); </s> remove return color(this.toolbarDefaultBg).darken(0.2).hex(); </s> add return color(this.toolbarDefaultBg) .darken(0.2) .hex();
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/variables/commonColor.js
return color(this.toolbarDefaultBg) .darken(0.2) .hex();
<mask> toolbarTextColor: "#fff", <mask> iosStatusbar: "light-content", <mask> toolbarDefaultBorder: "#2874F0", <mask> get statusBarColor() { <mask> return color(this.toolbarDefaultBg).darken(0.2).hex(); <mask> }, <mask> <mask> // Icon <mask> iconFamily: "Ionicons", <mask> iconFontSize: platform === "ios" ? 30 : 28, </s> Added brandDark and brandLight color constants to theme/variables </s> remove return color(this.toolbarDefaultBg).darken(0.2).hex(); </s> add return color(this.toolbarDefaultBg) .darken(0.2) .hex(); </s> remove "NativeBase.Icon": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, "NativeBase.IconNB": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, </s> add 'NativeBase.Icon': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, 'NativeBase.IconNB': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, </s> remove paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: "flex-start", flexDirection: "row", elevation: 2, shadowColor: platformStyle === "material" ? "#000" : undefined, shadowOffset: platformStyle === "material" ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === "material" ? 0.2 : undefined, shadowRadius: platformStyle === "material" ? 1.2 : undefined, alignItems: "center", justifyContent: "space-between", }; return buttonTheme; </s> add paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: 'flex-start', flexDirection: 'row', elevation: 2, shadowColor: platformStyle === 'material' ? variables.brandDark : undefined, shadowOffset: platformStyle === 'material' ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === 'material' ? 0.2 : undefined, shadowRadius: platformStyle === 'material' ? 1.2 : undefined, alignItems: 'center', justifyContent: 'space-between', }; return buttonTheme;
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/variables/commonColor.js
return color(this.radioColor) .darken(0.2) .hex();
<mask> <mask> radioColor: "#7e7e7e", <mask> <mask> get radioSelectedColor() { <mask> return color(this.radioColor).darken(0.2).hex(); <mask> }, <mask> <mask> // Spinner <mask> defaultSpinnerColor: "#45D56E", <mask> inverseSpinnerColor: "#1A191B", </s> Added brandDark and brandLight color constants to theme/variables </s> remove return color(this.radioColor).darken(0.2).hex(); </s> add return color(this.radioColor) .darken(0.2) .hex(); </s> remove return color(this.toolbarDefaultBg).darken(0.2).hex(); </s> add return color(this.toolbarDefaultBg) .darken(0.2) .hex(); </s> remove return color(this.toolbarDefaultBg).darken(0.2).hex(); </s> add return color(this.toolbarDefaultBg) .darken(0.2) .hex(); </s> remove return color(this.tabBgColor).darken(0.03).hex(); </s> add return color(this.tabBgColor) .darken(0.03) .hex(); </s> remove return color(this.tabBgColor).darken(0.03).hex(); </s> add return color(this.tabBgColor) .darken(0.03) .hex();
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/variables/commonColor.js
return color(this.tabBgColor) .darken(0.03) .hex();
<mask> borderWidth: 1 / PixelRatio.getPixelSizeForLayoutSize(1), <mask> contentPadding: 10, <mask> <mask> get darkenHeader() { <mask> return color(this.tabBgColor).darken(0.03).hex(); <mask> }, <mask> <mask> dropdownBg: "#000", <mask> dropdownLinkColor: "#414142", <mask> inputLineHeight: 24, </s> Added brandDark and brandLight color constants to theme/variables </s> remove return color(this.tabBgColor).darken(0.03).hex(); </s> add return color(this.tabBgColor) .darken(0.03) .hex(); </s> remove "NativeBase.Icon": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, "NativeBase.IconNB": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, </s> add 'NativeBase.Icon': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, 'NativeBase.IconNB': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, </s> remove "NativeBase.Text": { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: "transparent", // childPosition: 1 }, </s> add 'NativeBase.Text': { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: 'transparent', // childPosition: 1 }, </s> remove paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: "flex-start", flexDirection: "row", elevation: 2, shadowColor: platformStyle === "material" ? "#000" : undefined, shadowOffset: platformStyle === "material" ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === "material" ? 0.2 : undefined, shadowRadius: platformStyle === "material" ? 1.2 : undefined, alignItems: "center", justifyContent: "space-between", }; return buttonTheme; </s> add paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: 'flex-start', flexDirection: 'row', elevation: 2, shadowColor: platformStyle === 'material' ? variables.brandDark : undefined, shadowOffset: platformStyle === 'material' ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === 'material' ? 0.2 : undefined, shadowRadius: platformStyle === 'material' ? 1.2 : undefined, alignItems: 'center', justifyContent: 'space-between', }; return buttonTheme; </s> remove const buttonTheme = { ".disabled": { backgroundColor: variables.btnDisabledBg, }, ".bordered": { ".dark": { "NativeBase.Text": { color: "#000", }, "NativeBase.Icon": { color: "#000", }, "NativeBase.IconNB": { color: "#000", }, backgroundColor: "transparent", borderColor: "#000", borderWidth: variables.borderWidth * 2, }, ".light": { "NativeBase.Text": { color: "#f4f4f4", }, "NativeBase.Icon": { color: "#f4f4f4", }, "NativeBase.IconNB": { color: "#f4f4f4", }, backgroundColor: "transparent", borderColor: "#f4f4f4", borderWidth: variables.borderWidth * 2, }, ".primary": { "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, backgroundColor: "transparent", borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, ".success": { "NativeBase.Text": { color: variables.btnSuccessBg, }, "NativeBase.Icon": { color: variables.btnSuccessBg, }, "NativeBase.IconNB": { color: variables.btnSuccessBg, }, backgroundColor: "transparent", borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, ".info": { "NativeBase.Text": { color: variables.btnInfoBg, }, "NativeBase.Icon": { color: variables.btnInfoBg, }, "NativeBase.IconNB": { color: variables.btnInfoBg, }, backgroundColor: "transparent", borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, ".warning": { "NativeBase.Text": { color: variables.btnWarningBg, }, "NativeBase.Icon": { color: variables.btnWarningBg, }, "NativeBase.IconNB": { color: variables.btnWarningBg, }, backgroundColor: "transparent", borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, ".danger": { "NativeBase.Text": { color: variables.btnDangerBg, }, "NativeBase.Icon": { color: variables.btnDangerBg, }, "NativeBase.IconNB": { color: variables.btnDangerBg, }, backgroundColor: "transparent", borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, ".disabled": { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, "NativeBase.Text": { color: variables.btnDisabledBg, }, }, "NativeBase.Text": { color: variables.btnPrimaryBg, }, "NativeBase.Icon": { color: variables.btnPrimaryBg, }, "NativeBase.IconNB": { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: "transparent", }, </s> add const buttonTheme = { '.disabled': { backgroundColor: variables.btnDisabledBg, }, '.bordered': { '.dark': { 'NativeBase.Text': { color: variables.brandDark, }, 'NativeBase.Icon': { color: variables.brandDark, }, 'NativeBase.IconNB': { color: variables.brandDark, }, backgroundColor: 'transparent', borderColor: variables.brandDark, borderWidth: variables.borderWidth * 2, }, '.light': { 'NativeBase.Text': { color: variables.brandLight, }, 'NativeBase.Icon': { color: variables.brandLight, }, 'NativeBase.IconNB': { color: variables.brandLight, }, backgroundColor: 'transparent', borderColor: variables.brandLight, borderWidth: variables.borderWidth * 2, }, '.primary': { 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, backgroundColor: 'transparent', borderColor: variables.btnPrimaryBg, borderWidth: variables.borderWidth * 2, }, '.success': { 'NativeBase.Text': { color: variables.btnSuccessBg, }, 'NativeBase.Icon': { color: variables.btnSuccessBg, }, 'NativeBase.IconNB': { color: variables.btnSuccessBg, }, backgroundColor: 'transparent', borderColor: variables.btnSuccessBg, borderWidth: variables.borderWidth * 2, }, '.info': { 'NativeBase.Text': { color: variables.btnInfoBg, }, 'NativeBase.Icon': { color: variables.btnInfoBg, }, 'NativeBase.IconNB': { color: variables.btnInfoBg, }, backgroundColor: 'transparent', borderColor: variables.btnInfoBg, borderWidth: variables.borderWidth * 2, }, '.warning': { 'NativeBase.Text': { color: variables.btnWarningBg, }, 'NativeBase.Icon': { color: variables.btnWarningBg, }, 'NativeBase.IconNB': { color: variables.btnWarningBg, }, backgroundColor: 'transparent', borderColor: variables.btnWarningBg, borderWidth: variables.borderWidth * 2, }, '.danger': { 'NativeBase.Text': { color: variables.btnDangerBg, }, 'NativeBase.Icon': { color: variables.btnDangerBg, }, 'NativeBase.IconNB': { color: variables.btnDangerBg, }, backgroundColor: 'transparent', borderColor: variables.btnDangerBg, borderWidth: variables.borderWidth * 2, }, '.disabled': { backgroundColor: null, borderColor: variables.btnDisabledBg, borderWidth: variables.borderWidth * 2, 'NativeBase.Text': { color: variables.btnDisabledBg, }, }, 'NativeBase.Text': { color: variables.btnPrimaryBg, }, 'NativeBase.Icon': { color: variables.btnPrimaryBg, }, 'NativeBase.IconNB': { color: variables.btnPrimaryBg, }, borderWidth: variables.borderWidth * 2, elevation: null, shadowColor: null, shadowOffset: null, shadowOpacity: null, shadowRadius: null, backgroundColor: 'transparent', },
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/variables/commonColor.js
brandDark: "#000", brandLight: "#f4f4f4",
<mask> brandSuccess: "#5cb85c", <mask> brandDanger: "#d9534f", <mask> brandWarning: "#f0ad4e", <mask> brandSidebar: "#252932", <mask> <mask> // Font <mask> fontFamily: "Roboto", <mask> fontSizeBase: 15, <mask> </s> Added brandDark and brandLight color constants to theme/variables </s> remove "NativeBase.Text": { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: "transparent", // childPosition: 1 }, </s> add 'NativeBase.Text': { fontFamily: variables.btnFontFamily, marginLeft: 0, marginRight: 0, color: variables.inverseTextColor, fontSize: variables.btnTextSize, lineHeight: variables.btnLineHeight, paddingHorizontal: 16, backgroundColor: 'transparent', // childPosition: 1 }, </s> remove ".vertical": { flexDirection: "column", height: null, }, </s> add '.vertical': { flexDirection: 'column', height: null, }, </s> remove ".rounded": { // paddingHorizontal: variables.buttonPadding + 20, borderRadius: variables.borderRadiusLarge, }, </s> add '.rounded': { // paddingHorizontal: variables.buttonPadding + 20, borderRadius: variables.borderRadiusLarge, },
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/variables/material.js
return color(this.toolbarDefaultBg) .darken(0.2) .hex();
<mask> toolbarTextColor: "#fff", <mask> toolbarDefaultBorder: "#3F51B5", <mask> iosStatusbar: "light-content", <mask> get statusBarColor() { <mask> return color(this.toolbarDefaultBg).darken(0.2).hex(); <mask> }, <mask> <mask> // Icon <mask> iconFamily: "Ionicons", <mask> iconFontSize: platform === "ios" ? 30 : 28, </s> Added brandDark and brandLight color constants to theme/variables </s> remove return color(this.toolbarDefaultBg).darken(0.2).hex(); </s> add return color(this.toolbarDefaultBg) .darken(0.2) .hex(); </s> remove "NativeBase.Icon": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, "NativeBase.IconNB": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, </s> add 'NativeBase.Icon': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, 'NativeBase.IconNB': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, </s> remove paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: "flex-start", flexDirection: "row", elevation: 2, shadowColor: platformStyle === "material" ? "#000" : undefined, shadowOffset: platformStyle === "material" ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === "material" ? 0.2 : undefined, shadowRadius: platformStyle === "material" ? 1.2 : undefined, alignItems: "center", justifyContent: "space-between", }; return buttonTheme; </s> add paddingVertical: variables.buttonPadding, // paddingHorizontal: variables.buttonPadding + 10, backgroundColor: variables.btnPrimaryBg, borderRadius: variables.borderRadiusBase, borderColor: variables.btnPrimaryBg, borderWidth: null, height: 45, alignSelf: 'flex-start', flexDirection: 'row', elevation: 2, shadowColor: platformStyle === 'material' ? variables.brandDark : undefined, shadowOffset: platformStyle === 'material' ? { width: 0, height: 2 } : undefined, shadowOpacity: platformStyle === 'material' ? 0.2 : undefined, shadowRadius: platformStyle === 'material' ? 1.2 : undefined, alignItems: 'center', justifyContent: 'space-between', }; return buttonTheme;
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/variables/material.js
return color(this.radioColor) .darken(0.2) .hex();
<mask> <mask> radioColor: "#7e7e7e", <mask> <mask> get radioSelectedColor() { <mask> return color(this.radioColor).darken(0.2).hex(); <mask> }, <mask> <mask> // Spinner <mask> defaultSpinnerColor: "#45D56E", <mask> inverseSpinnerColor: "#1A191B", </s> Added brandDark and brandLight color constants to theme/variables
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/variables/material.js
return color(this.tabBgColor) .darken(0.03) .hex();
<mask> borderWidth: 1 / PixelRatio.getPixelSizeForLayoutSize(1), <mask> contentPadding: 10, <mask> <mask> get darkenHeader() { <mask> return color(this.tabBgColor).darken(0.03).hex(); <mask> }, <mask> <mask> dropdownBg: "#000", <mask> dropdownLinkColor: "#414142", <mask> inputLineHeight: 24, </s> Added brandDark and brandLight color constants to theme/variables
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/variables/material.js
brandDark: "#000", brandLight: "#f4f4f4",
<mask> brandDanger: "#d9534f", <mask> brandWarning: "#f0ad4e", <mask> brandSidebar: "#252932", <mask> <mask> // Font <mask> fontFamily: platform === "ios" ? "System" : "Roboto", <mask> fontSizeBase: 15, <mask> <mask> get fontSizeH1() { </s> Added brandDark and brandLight color constants to theme/variables </s> remove "NativeBase.Icon": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, "NativeBase.IconNB": { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === "ios" ? 2 : undefined, }, </s> add 'NativeBase.Icon': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, 'NativeBase.IconNB': { color: variables.inverseTextColor, fontSize: 24, marginHorizontal: 16, paddingTop: platform === 'ios' ? 2 : undefined, }, </s> remove return color(this.toolbarDefaultBg).darken(0.2).hex(); </s> add return color(this.toolbarDefaultBg) .darken(0.2) .hex(); </s> remove return color(this.toolbarDefaultBg).darken(0.2).hex(); </s> add return color(this.toolbarDefaultBg) .darken(0.2) .hex();
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1ccfd0c299d63a1b94aafaa384fcac5ccdd20b7
src/theme/variables/platform.js
deceleration: 0.98, useNativeDriver: false
<mask> } <mask> <mask> Animated.decay(this.state.pan, { <mask> velocity: { x: velocity, y: vy }, <mask> deceleration: 0.98 <mask> }).start(this._resetState.bind(this)); <mask> } else { <mask> Animated.spring(this.state.pan, { <mask> toValue: { x: 0, y: 0 }, <mask> friction: 4, </s> added useNativeDriver:false to Animated.decay of DeckSwiper </s> remove deceleration: 0.98 </s> add deceleration: 0.98, userNativeDriver: false </s> remove deceleration: 0.98 </s> add deceleration: 0.98, useNativeDriver: false
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1e4a42f8a2152510762ad6233316e58e63558ed
src/basic/DeckSwiper.js
deceleration: 0.98, useNativeDriver: false
<mask> Animated.spring(this.state.enter, { toValue: 1, friction: 7, useNativeDriver: false }).start(); <mask> this.selectNext(); <mask> Animated.decay(this.state.pan, { <mask> velocity: { x: 8, y: 1 }, <mask> deceleration: 0.98 <mask> }).start(this._resetState.bind(this)); <mask> }, 300); <mask> } <mask> <mask> swipeLeft() { </s> added useNativeDriver:false to Animated.decay of DeckSwiper </s> remove deceleration: 0.98 </s> add deceleration: 0.98, useNativeDriver: false </s> remove deceleration: 0.98 </s> add deceleration: 0.98, userNativeDriver: false
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1e4a42f8a2152510762ad6233316e58e63558ed
src/basic/DeckSwiper.js
deceleration: 0.98, userNativeDriver: false
<mask> Animated.spring(this.state.enter, { toValue: 1, friction: 7, useNativeDriver: false }).start(); <mask> this.selectNext(); <mask> Animated.decay(this.state.pan, { <mask> velocity: { x: -8, y: 1 }, <mask> deceleration: 0.98 <mask> }).start(this._resetState.bind(this)); <mask> }, 300); <mask> } <mask> <mask> selectNext() { </s> added useNativeDriver:false to Animated.decay of DeckSwiper </s> remove deceleration: 0.98 </s> add deceleration: 0.98, useNativeDriver: false </s> remove deceleration: 0.98 </s> add deceleration: 0.98, useNativeDriver: false
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c1e4a42f8a2152510762ad6233316e58e63558ed
src/basic/DeckSwiper.js
import { getColor } from '../../../theme'; import { useTheme } from '../../../hooks';
<mask> import { View } from 'react-native'; <mask> import { usePropsResolution } from '../../../hooks/useThemeProps'; <mask> import { makeStyledComponent } from '../../../utils/styled'; <mask> import { wrapStringChild } from '../../../utils/wrapStringChild'; <mask> import type { IBoxProps } from './types'; <mask> import { useSafeArea } from '../../../hooks/useSafeArea'; <mask> import { useNativeBaseConfig } from '../../../core/NativeBaseContext'; </s> fix: migrated linear gradint and contrast text </s> remove import { useContrastText } from '../useContrastText'; </s> add </s> remove import { useNativeBaseConfig } from '../../core/NativeBaseContext'; </s> add </s> remove export function useContrastText( bg: string, color?: string, disableContrastText?: boolean ) { </s> add export function useContrastText(bg: string, color?: string) { </s> remove { isHovered, isDisabled }, </s> add { isHovered, isDisabled, isFocused, isInvalid, isReadOnly },
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c417b7deee8cf5f22f48576a8750b53d87acb96b
src/components/primitives/Box/index.tsx
const theme = useTheme();
<mask> let MemoizedGradient: any; <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); </s> fix: migrated linear gradint and contrast text </s> remove { wrapperRef, isDisabled, ...props }: ITextAreaProps, </s> add { wrapperRef, isDisabled, isInvalid, isReadOnly, ...props }: ITextAreaProps, </s> remove const { totalLines, ...newProps } = usePropsResolution( </s> add const [isFocused, setIsFocused] = React.useState(false); const handleFocus = (focusState: boolean, callback: any) => { setIsFocused(focusState); callback(); }; const { totalLines, onFocus, onBlur, ...newProps } = usePropsResolution( </s> remove let darkTextConstrast = getContrastRatio(trueBg, trueDarkText); let lightTextConstrast = getContrastRatio(trueBg, trueLightText); </s> add const darkTextConstrast = getContrastRatio(trueBg, trueDarkText); const lightTextConstrast = getContrastRatio(trueBg, trueLightText); </s> remove // // STEP 5: linear Grad and contrastText let ignore: any = []; if ( flattenProps.bg?.linearGradient || flattenProps.background?.linearGradient || flattenProps.bgColor?.linearGradient || flattenProps.backgroundColor?.linearGradient ) { let bgProp = 'bg'; if (flattenProps.background?.linearGradient) { bgProp = 'background'; } else if (flattenProps.bgColor?.linearGradient) { bgProp = 'bgColor'; } else if (flattenProps.backgroundColor?.linearGradient) { bgProp = 'backgroundColor'; } flattenProps[bgProp].linearGradient.colors = flattenProps[ bgProp ].linearGradient.colors.map((color: string) => { return get(theme.colors, color, color); }); ignore = ['bg', 'background', 'backgroundColor', 'bgColor']; } // // NOTE: seprating bg props when linearGardiant is available const [gradientProps] = extractInObject(flattenProps, ignore); const disableContrastText = useNativeBaseConfig('NativeBaseConfigProvider') .disableContrastText; const bgColor = flattenProps.bg ?? flattenProps.backgroundColor ?? flattenProps.bgColor; const contrastTextColor = useContrastText( bgColor, flattenProps?._text?.color, disableCSSMediaQueries ? (disableContrastText ? true : false) : true ); flattenProps._text = contrastTextColor && flattenProps?._text?.color === undefined ? { color: contrastTextColor, ...flattenProps._text, } : flattenProps._text; </s> add
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c417b7deee8cf5f22f48576a8750b53d87acb96b
src/components/primitives/Box/index.tsx
lgrad.colors = lgrad.colors?.map((color: string) => { return getColor(color, theme.colors, theme); });
<mask> } <mask> <mask> Gradient = MemoizedGradient; <mask> <mask> let startObj = { x: 0, y: 0 }; <mask> let endObj = { x: 0, y: 1 }; <mask> if (lgrad.start && lgrad.start.length === 2) { <mask> startObj = { </s> fix: migrated linear gradint and contrast text </s> remove // // STEP 5: linear Grad and contrastText let ignore: any = []; if ( flattenProps.bg?.linearGradient || flattenProps.background?.linearGradient || flattenProps.bgColor?.linearGradient || flattenProps.backgroundColor?.linearGradient ) { let bgProp = 'bg'; if (flattenProps.background?.linearGradient) { bgProp = 'background'; } else if (flattenProps.bgColor?.linearGradient) { bgProp = 'bgColor'; } else if (flattenProps.backgroundColor?.linearGradient) { bgProp = 'backgroundColor'; } flattenProps[bgProp].linearGradient.colors = flattenProps[ bgProp ].linearGradient.colors.map((color: string) => { return get(theme.colors, color, color); }); ignore = ['bg', 'background', 'backgroundColor', 'bgColor']; } // // NOTE: seprating bg props when linearGardiant is available const [gradientProps] = extractInObject(flattenProps, ignore); const disableContrastText = useNativeBaseConfig('NativeBaseConfigProvider') .disableContrastText; const bgColor = flattenProps.bg ?? flattenProps.backgroundColor ?? flattenProps.bgColor; const contrastTextColor = useContrastText( bgColor, flattenProps?._text?.color, disableCSSMediaQueries ? (disableContrastText ? true : false) : true ); flattenProps._text = contrastTextColor && flattenProps?._text?.color === undefined ? { color: contrastTextColor, ...flattenProps._text, } : flattenProps._text; </s> add </s> remove let darkTextConstrast = getContrastRatio(trueBg, trueDarkText); let lightTextConstrast = getContrastRatio(trueBg, trueLightText); </s> add const darkTextConstrast = getContrastRatio(trueBg, trueDarkText); const lightTextConstrast = getContrastRatio(trueBg, trueLightText); </s> remove const { totalLines, ...newProps } = usePropsResolution( </s> add const [isFocused, setIsFocused] = React.useState(false); const handleFocus = (focusState: boolean, callback: any) => { setIsFocused(focusState); callback(); }; const { totalLines, onFocus, onBlur, ...newProps } = usePropsResolution(
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c417b7deee8cf5f22f48576a8750b53d87acb96b
src/components/primitives/Box/index.tsx
import { useContrastText } from '../../../hooks';
<mask> useIsPressed, <mask> } from '../../primitives/Pressable/Pressable'; <mask> import { useFocusRing } from '@react-native-aria/focus'; <mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps'; <mask> <mask> const Button = ( <mask> { <mask> //@ts-ignore <mask> children, <mask> startIcon, </s> fix: migrated linear gradint and contrast text </s> remove import { useNativeBaseConfig } from '../../core/NativeBaseContext'; </s> add </s> remove import { useContrastText } from '../useContrastText'; </s> add </s> remove export function useContrastText( bg: string, color?: string, disableContrastText?: boolean ) { </s> add export function useContrastText(bg: string, color?: string) {
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c417b7deee8cf5f22f48576a8750b53d87acb96b
src/components/primitives/Button/Button.tsx
// Setting contrast text then no color is comming const contrastTextColor = useContrastText( resolvedProps.bg || resolvedProps.backgroundColor || resolvedProps.bgColor, _text?.color ); if ( (resolvedProps.bg || resolvedProps.backgroundColor || resolvedProps.bgColor) && contrastTextColor && _text.color === undefined ) { _text.color = contrastTextColor; }
<mask> isFocusVisible: isFocusVisibleProp || isFocusVisible, <mask> }); <mask> <mask> //TODO: refactor for responsive prop <mask> if (useHasResponsiveProps(props)) { <mask> return null; <mask> } <mask> </s> fix: migrated linear gradint and contrast text </s> remove { isHovered, isDisabled }, </s> add { isHovered, isDisabled, isFocused, isInvalid, isReadOnly }, </s> remove // // STEP 5: linear Grad and contrastText let ignore: any = []; if ( flattenProps.bg?.linearGradient || flattenProps.background?.linearGradient || flattenProps.bgColor?.linearGradient || flattenProps.backgroundColor?.linearGradient ) { let bgProp = 'bg'; if (flattenProps.background?.linearGradient) { bgProp = 'background'; } else if (flattenProps.bgColor?.linearGradient) { bgProp = 'bgColor'; } else if (flattenProps.backgroundColor?.linearGradient) { bgProp = 'backgroundColor'; } flattenProps[bgProp].linearGradient.colors = flattenProps[ bgProp ].linearGradient.colors.map((color: string) => { return get(theme.colors, color, color); }); ignore = ['bg', 'background', 'backgroundColor', 'bgColor']; } // // NOTE: seprating bg props when linearGardiant is available const [gradientProps] = extractInObject(flattenProps, ignore); const disableContrastText = useNativeBaseConfig('NativeBaseConfigProvider') .disableContrastText; const bgColor = flattenProps.bg ?? flattenProps.backgroundColor ?? flattenProps.bgColor; const contrastTextColor = useContrastText( bgColor, flattenProps?._text?.color, disableCSSMediaQueries ? (disableContrastText ? true : false) : true ); flattenProps._text = contrastTextColor && flattenProps?._text?.color === undefined ? { color: contrastTextColor, ...flattenProps._text, } : flattenProps._text; </s> add </s> remove if (disableContrastText) { return; </s> add if (useNativeBaseConfig('NativeBaseConfigProvider').disableContrastText) { return trueColor; </s> remove let darkTextConstrast = getContrastRatio(trueBg, trueDarkText); let lightTextConstrast = getContrastRatio(trueBg, trueLightText); </s> add const darkTextConstrast = getContrastRatio(trueBg, trueDarkText); const lightTextConstrast = getContrastRatio(trueBg, trueLightText);
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c417b7deee8cf5f22f48576a8750b53d87acb96b
src/components/primitives/Button/Button.tsx
{ wrapperRef, isDisabled, isInvalid, isReadOnly, ...props }: ITextAreaProps,
<mask> totalLines?: number; <mask> } <mask> <mask> const TextArea = ( <mask> { wrapperRef, isDisabled, ...props }: ITextAreaProps, <mask> ref: any <mask> ) => { <mask> const _ref = React.useRef(null); <mask> const { isHovered } = useHover({}, _ref); <mask> const { totalLines, ...newProps } = usePropsResolution( </s> fix: migrated linear gradint and contrast text </s> remove const { totalLines, ...newProps } = usePropsResolution( </s> add const [isFocused, setIsFocused] = React.useState(false); const handleFocus = (focusState: boolean, callback: any) => { setIsFocused(focusState); callback(); }; const { totalLines, onFocus, onBlur, ...newProps } = usePropsResolution( </s> remove { isHovered, isDisabled }, </s> add { isHovered, isDisabled, isFocused, isInvalid, isReadOnly }, </s> remove // // STEP 5: linear Grad and contrastText let ignore: any = []; if ( flattenProps.bg?.linearGradient || flattenProps.background?.linearGradient || flattenProps.bgColor?.linearGradient || flattenProps.backgroundColor?.linearGradient ) { let bgProp = 'bg'; if (flattenProps.background?.linearGradient) { bgProp = 'background'; } else if (flattenProps.bgColor?.linearGradient) { bgProp = 'bgColor'; } else if (flattenProps.backgroundColor?.linearGradient) { bgProp = 'backgroundColor'; } flattenProps[bgProp].linearGradient.colors = flattenProps[ bgProp ].linearGradient.colors.map((color: string) => { return get(theme.colors, color, color); }); ignore = ['bg', 'background', 'backgroundColor', 'bgColor']; } // // NOTE: seprating bg props when linearGardiant is available const [gradientProps] = extractInObject(flattenProps, ignore); const disableContrastText = useNativeBaseConfig('NativeBaseConfigProvider') .disableContrastText; const bgColor = flattenProps.bg ?? flattenProps.backgroundColor ?? flattenProps.bgColor; const contrastTextColor = useContrastText( bgColor, flattenProps?._text?.color, disableCSSMediaQueries ? (disableContrastText ? true : false) : true ); flattenProps._text = contrastTextColor && flattenProps?._text?.color === undefined ? { color: contrastTextColor, ...flattenProps._text, } : flattenProps._text; </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c417b7deee8cf5f22f48576a8750b53d87acb96b
src/components/primitives/TextArea/index.tsx
const [isFocused, setIsFocused] = React.useState(false); const handleFocus = (focusState: boolean, callback: any) => { setIsFocused(focusState); callback(); }; const { totalLines, onFocus, onBlur, ...newProps } = usePropsResolution(
<mask> ref: any <mask> ) => { <mask> const _ref = React.useRef(null); <mask> const { isHovered } = useHover({}, _ref); <mask> const { totalLines, ...newProps } = usePropsResolution( <mask> 'TextArea', <mask> props, <mask> { isHovered, isDisabled }, <mask> { extendTheme: ['Input'] } <mask> ); </s> fix: migrated linear gradint and contrast text </s> remove { isHovered, isDisabled }, </s> add { isHovered, isDisabled, isFocused, isInvalid, isReadOnly }, </s> remove { wrapperRef, isDisabled, ...props }: ITextAreaProps, </s> add { wrapperRef, isDisabled, isInvalid, isReadOnly, ...props }: ITextAreaProps, </s> remove // // STEP 5: linear Grad and contrastText let ignore: any = []; if ( flattenProps.bg?.linearGradient || flattenProps.background?.linearGradient || flattenProps.bgColor?.linearGradient || flattenProps.backgroundColor?.linearGradient ) { let bgProp = 'bg'; if (flattenProps.background?.linearGradient) { bgProp = 'background'; } else if (flattenProps.bgColor?.linearGradient) { bgProp = 'bgColor'; } else if (flattenProps.backgroundColor?.linearGradient) { bgProp = 'backgroundColor'; } flattenProps[bgProp].linearGradient.colors = flattenProps[ bgProp ].linearGradient.colors.map((color: string) => { return get(theme.colors, color, color); }); ignore = ['bg', 'background', 'backgroundColor', 'bgColor']; } // // NOTE: seprating bg props when linearGardiant is available const [gradientProps] = extractInObject(flattenProps, ignore); const disableContrastText = useNativeBaseConfig('NativeBaseConfigProvider') .disableContrastText; const bgColor = flattenProps.bg ?? flattenProps.backgroundColor ?? flattenProps.bgColor; const contrastTextColor = useContrastText( bgColor, flattenProps?._text?.color, disableCSSMediaQueries ? (disableContrastText ? true : false) : true ); flattenProps._text = contrastTextColor && flattenProps?._text?.color === undefined ? { color: contrastTextColor, ...flattenProps._text, } : flattenProps._text; </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c417b7deee8cf5f22f48576a8750b53d87acb96b
src/components/primitives/TextArea/index.tsx
{ isHovered, isDisabled, isFocused, isInvalid, isReadOnly },
<mask> const { isHovered } = useHover({}, _ref); <mask> const { totalLines, ...newProps } = usePropsResolution( <mask> 'TextArea', <mask> props, <mask> { isHovered, isDisabled }, <mask> { extendTheme: ['Input'] } <mask> ); <mask> //TODO: refactor for responsive prop <mask> if (useHasResponsiveProps(props)) { <mask> return null; </s> fix: migrated linear gradint and contrast text </s> remove const { totalLines, ...newProps } = usePropsResolution( </s> add const [isFocused, setIsFocused] = React.useState(false); const handleFocus = (focusState: boolean, callback: any) => { setIsFocused(focusState); callback(); }; const { totalLines, onFocus, onBlur, ...newProps } = usePropsResolution( </s> remove { wrapperRef, isDisabled, ...props }: ITextAreaProps, </s> add { wrapperRef, isDisabled, isInvalid, isReadOnly, ...props }: ITextAreaProps, </s> remove // // STEP 5: linear Grad and contrastText let ignore: any = []; if ( flattenProps.bg?.linearGradient || flattenProps.background?.linearGradient || flattenProps.bgColor?.linearGradient || flattenProps.backgroundColor?.linearGradient ) { let bgProp = 'bg'; if (flattenProps.background?.linearGradient) { bgProp = 'background'; } else if (flattenProps.bgColor?.linearGradient) { bgProp = 'bgColor'; } else if (flattenProps.backgroundColor?.linearGradient) { bgProp = 'backgroundColor'; } flattenProps[bgProp].linearGradient.colors = flattenProps[ bgProp ].linearGradient.colors.map((color: string) => { return get(theme.colors, color, color); }); ignore = ['bg', 'background', 'backgroundColor', 'bgColor']; } // // NOTE: seprating bg props when linearGardiant is available const [gradientProps] = extractInObject(flattenProps, ignore); const disableContrastText = useNativeBaseConfig('NativeBaseConfigProvider') .disableContrastText; const bgColor = flattenProps.bg ?? flattenProps.backgroundColor ?? flattenProps.bgColor; const contrastTextColor = useContrastText( bgColor, flattenProps?._text?.color, disableCSSMediaQueries ? (disableContrastText ? true : false) : true ); flattenProps._text = contrastTextColor && flattenProps?._text?.color === undefined ? { color: contrastTextColor, ...flattenProps._text, } : flattenProps._text; </s> add </s> remove if (disableContrastText) { return; </s> add if (useNativeBaseConfig('NativeBaseConfigProvider').disableContrastText) { return trueColor;
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c417b7deee8cf5f22f48576a8750b53d87acb96b
src/components/primitives/TextArea/index.tsx
onFocus={(e) => { handleFocus(true, onFocus ? () => onFocus(e) : () => {}); }} onBlur={(e) => { handleFocus(false, onBlur ? () => onBlur(e) : () => {}); }}
<mask> INTERNAL_notResolveThemeAndPseudoProps <mask> numberOfLines={totalLines} <mask> wrapperRef={wrapperRef} <mask> ref={mergeRefs([_ref, ref])} <mask> // onFocus={(e) => { <mask> // handleFocus(true, onFocus ? () => onFocus(e) : () => {}); <mask> // }} <mask> // onBlur={(e) => { <mask> // handleFocus(false, onBlur ? () => onBlur(e) : () => {}); <mask> // }} <mask> /> <mask> ); <mask> }; <mask> <mask> export default memo(forwardRef(TextArea)); </s> fix: migrated linear gradint and contrast text </s> remove // // STEP 5: linear Grad and contrastText let ignore: any = []; if ( flattenProps.bg?.linearGradient || flattenProps.background?.linearGradient || flattenProps.bgColor?.linearGradient || flattenProps.backgroundColor?.linearGradient ) { let bgProp = 'bg'; if (flattenProps.background?.linearGradient) { bgProp = 'background'; } else if (flattenProps.bgColor?.linearGradient) { bgProp = 'bgColor'; } else if (flattenProps.backgroundColor?.linearGradient) { bgProp = 'backgroundColor'; } flattenProps[bgProp].linearGradient.colors = flattenProps[ bgProp ].linearGradient.colors.map((color: string) => { return get(theme.colors, color, color); }); ignore = ['bg', 'background', 'backgroundColor', 'bgColor']; } // // NOTE: seprating bg props when linearGardiant is available const [gradientProps] = extractInObject(flattenProps, ignore); const disableContrastText = useNativeBaseConfig('NativeBaseConfigProvider') .disableContrastText; const bgColor = flattenProps.bg ?? flattenProps.backgroundColor ?? flattenProps.bgColor; const contrastTextColor = useContrastText( bgColor, flattenProps?._text?.color, disableCSSMediaQueries ? (disableContrastText ? true : false) : true ); flattenProps._text = contrastTextColor && flattenProps?._text?.color === undefined ? { color: contrastTextColor, ...flattenProps._text, } : flattenProps._text; </s> add </s> remove const { totalLines, ...newProps } = usePropsResolution( </s> add const [isFocused, setIsFocused] = React.useState(false); const handleFocus = (focusState: boolean, callback: any) => { setIsFocused(focusState); callback(); }; const { totalLines, onFocus, onBlur, ...newProps } = usePropsResolution( </s> remove { wrapperRef, isDisabled, ...props }: ITextAreaProps, </s> add { wrapperRef, isDisabled, isInvalid, isReadOnly, ...props }: ITextAreaProps,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c417b7deee8cf5f22f48576a8750b53d87acb96b
src/components/primitives/TextArea/index.tsx
export function useContrastText(bg: string, color?: string) {
<mask> import { useToken } from './useToken'; <mask> import { useAccessibleColors } from '../core/color-mode/hooks'; <mask> import { useNativeBaseConfig } from '../core/NativeBaseContext'; <mask> <mask> export function useContrastText( <mask> bg: string, <mask> color?: string, <mask> disableContrastText?: boolean <mask> ) { <mask> const [ <mask> contrastThreshold, <mask> trueDarkText, <mask> trueLightText, <mask> trueBg, </s> fix: migrated linear gradint and contrast text </s> remove import { useNativeBaseConfig } from '../../core/NativeBaseContext'; </s> add </s> remove import { useContrastText } from '../useContrastText'; </s> add </s> remove const { totalLines, ...newProps } = usePropsResolution( </s> add const [isFocused, setIsFocused] = React.useState(false); const handleFocus = (focusState: boolean, callback: any) => { setIsFocused(focusState); callback(); }; const { totalLines, onFocus, onBlur, ...newProps } = usePropsResolution(
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c417b7deee8cf5f22f48576a8750b53d87acb96b
src/hooks/useContrastText.ts
if (useNativeBaseConfig('NativeBaseConfigProvider').disableContrastText) { return trueColor;
<mask> 'NativeBaseConfigProvider' <mask> ).config.suppressColorAccessibilityWarning; <mask> <mask> const [accessibleColors] = useAccessibleColors(); <mask> if (disableContrastText) { <mask> return; <mask> } <mask> if (typeof bg !== 'string') { <mask> return; <mask> } <mask> </s> fix: migrated linear gradint and contrast text </s> remove // // STEP 5: linear Grad and contrastText let ignore: any = []; if ( flattenProps.bg?.linearGradient || flattenProps.background?.linearGradient || flattenProps.bgColor?.linearGradient || flattenProps.backgroundColor?.linearGradient ) { let bgProp = 'bg'; if (flattenProps.background?.linearGradient) { bgProp = 'background'; } else if (flattenProps.bgColor?.linearGradient) { bgProp = 'bgColor'; } else if (flattenProps.backgroundColor?.linearGradient) { bgProp = 'backgroundColor'; } flattenProps[bgProp].linearGradient.colors = flattenProps[ bgProp ].linearGradient.colors.map((color: string) => { return get(theme.colors, color, color); }); ignore = ['bg', 'background', 'backgroundColor', 'bgColor']; } // // NOTE: seprating bg props when linearGardiant is available const [gradientProps] = extractInObject(flattenProps, ignore); const disableContrastText = useNativeBaseConfig('NativeBaseConfigProvider') .disableContrastText; const bgColor = flattenProps.bg ?? flattenProps.backgroundColor ?? flattenProps.bgColor; const contrastTextColor = useContrastText( bgColor, flattenProps?._text?.color, disableCSSMediaQueries ? (disableContrastText ? true : false) : true ); flattenProps._text = contrastTextColor && flattenProps?._text?.color === undefined ? { color: contrastTextColor, ...flattenProps._text, } : flattenProps._text; </s> add </s> remove { isHovered, isDisabled }, </s> add { isHovered, isDisabled, isFocused, isInvalid, isReadOnly }, </s> remove const { totalLines, ...newProps } = usePropsResolution( </s> add const [isFocused, setIsFocused] = React.useState(false); const handleFocus = (focusState: boolean, callback: any) => { setIsFocused(focusState); callback(); }; const { totalLines, onFocus, onBlur, ...newProps } = usePropsResolution( </s> remove { wrapperRef, isDisabled, ...props }: ITextAreaProps, </s> add { wrapperRef, isDisabled, isInvalid, isReadOnly, ...props }: ITextAreaProps,
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c417b7deee8cf5f22f48576a8750b53d87acb96b
src/hooks/useContrastText.ts
const darkTextConstrast = getContrastRatio(trueBg, trueDarkText); const lightTextConstrast = getContrastRatio(trueBg, trueLightText);
<mask> trueBg = bg; <mask> } <mask> let trueContrastColor; <mask> let contrastColorToken; <mask> let darkTextConstrast = getContrastRatio(trueBg, trueDarkText); <mask> let lightTextConstrast = getContrastRatio(trueBg, trueLightText); <mask> <mask> if ( <mask> darkTextConstrast >= contrastThreshold || <mask> darkTextConstrast > lightTextConstrast <mask> ) { </s> fix: migrated linear gradint and contrast text </s> remove // // STEP 5: linear Grad and contrastText let ignore: any = []; if ( flattenProps.bg?.linearGradient || flattenProps.background?.linearGradient || flattenProps.bgColor?.linearGradient || flattenProps.backgroundColor?.linearGradient ) { let bgProp = 'bg'; if (flattenProps.background?.linearGradient) { bgProp = 'background'; } else if (flattenProps.bgColor?.linearGradient) { bgProp = 'bgColor'; } else if (flattenProps.backgroundColor?.linearGradient) { bgProp = 'backgroundColor'; } flattenProps[bgProp].linearGradient.colors = flattenProps[ bgProp ].linearGradient.colors.map((color: string) => { return get(theme.colors, color, color); }); ignore = ['bg', 'background', 'backgroundColor', 'bgColor']; } // // NOTE: seprating bg props when linearGardiant is available const [gradientProps] = extractInObject(flattenProps, ignore); const disableContrastText = useNativeBaseConfig('NativeBaseConfigProvider') .disableContrastText; const bgColor = flattenProps.bg ?? flattenProps.backgroundColor ?? flattenProps.bgColor; const contrastTextColor = useContrastText( bgColor, flattenProps?._text?.color, disableCSSMediaQueries ? (disableContrastText ? true : false) : true ); flattenProps._text = contrastTextColor && flattenProps?._text?.color === undefined ? { color: contrastTextColor, ...flattenProps._text, } : flattenProps._text; </s> add </s> remove { wrapperRef, isDisabled, ...props }: ITextAreaProps, </s> add { wrapperRef, isDisabled, isInvalid, isReadOnly, ...props }: ITextAreaProps,
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c417b7deee8cf5f22f48576a8750b53d87acb96b
src/hooks/useContrastText.ts
<mask> import { Platform } from 'react-native'; <mask> import { useNativeBase } from '../useNativeBase'; <mask> import { useColorMode } from '../../core/color-mode'; <mask> import { omitUndefined, extractInObject } from '../../theme/tools'; <mask> import { useContrastText } from '../useContrastText'; <mask> import { useBreakpointResolvedProps } from '../useBreakpointResolvedProps'; <mask> import { <mask> propsFlattener, <mask> compareSpecificity, <mask> IStateProps, </s> fix: migrated linear gradint and contrast text </s> remove import { useNativeBaseConfig } from '../../core/NativeBaseContext'; </s> add </s> remove export function useContrastText( bg: string, color?: string, disableContrastText?: boolean ) { </s> add export function useContrastText(bg: string, color?: string) { </s> remove { isHovered, isDisabled }, </s> add { isHovered, isDisabled, isFocused, isInvalid, isReadOnly },
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c417b7deee8cf5f22f48576a8750b53d87acb96b
src/hooks/useThemeProps/usePropsResolution.tsx
<mask> import { useResponsiveSSRProps } from '../useResponsiveSSRProps'; <mask> import React from 'react'; <mask> import { ResponsiveQueryContext } from '../../utils/useResponsiveQuery/ResponsiveQueryProvider'; <mask> import type { ComponentTheme } from '../../theme'; <mask> import { useNativeBaseConfig } from '../../core/NativeBaseContext'; <mask> <mask> const SPREAD_PROP_SPECIFICITY_ORDER = [ <mask> 'p', <mask> 'padding', <mask> 'px', </s> fix: migrated linear gradint and contrast text </s> remove import { useContrastText } from '../useContrastText'; </s> add </s> remove export function useContrastText( bg: string, color?: string, disableContrastText?: boolean ) { </s> add export function useContrastText(bg: string, color?: string) { </s> remove const { totalLines, ...newProps } = usePropsResolution( </s> add const [isFocused, setIsFocused] = React.useState(false); const handleFocus = (focusState: boolean, callback: any) => { setIsFocused(focusState); callback(); }; const { totalLines, onFocus, onBlur, ...newProps } = usePropsResolution(
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/c417b7deee8cf5f22f48576a8750b53d87acb96b
src/hooks/useThemeProps/usePropsResolution.tsx