docstring_tokens
stringlengths
0
76.5k
code_tokens
stringlengths
75
1.81M
label_window
listlengths
4
2.12k
html_url
stringlengths
74
116
file_name
stringlengths
3
311
subtitleColor:platform==="ios"?"#000":"#fff",
<mask> <mask> titleFontfamily:platform==="ios"?"System":"Roboto_medium", <mask> titleFontSize:platform==="ios"?17:19, <mask> subTitleFontSize:platform==="ios"?12:14, <mask> subtitleColor:"#FFF", <mask> <mask> <mask> titleFontColor:"#FFF", <mask> <mask> </s> Modified color values to standard ones in variable files </s> remove titleFontColor:"#FFF", </s> add titleFontColor:platform==="ios"?"#000":"#fff", </s> remove brandPrimary:"#2874F0", </s> add brandPrimary:platform==="ios"?"#007aff":"#3F51B5", </s> remove footerDefaultBg:"#2874F0", </s> add footerDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5", </s> remove tabBarTextColor:"#8bb3f4", </s> add tabBarTextColor:platform==="ios"?"#737373":"#bfc6ea", </s> remove tabBarActiveTextColor:"#fff", tabActiveBgColor:platform==="ios"?"#1569f4":undefined, </s> add tabBarActiveTextColor:platform==="ios"?"#2874F0":"#fff", tabActiveBgColor:platform==="ios"?"#cde1f9":"#3F51B5",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2bfd1bd0523371468998c076e10cf738f789ba81
dist/src/theme/variables/commonColor.js
titleFontColor:platform==="ios"?"#000":"#fff",
<mask> subTitleFontSize:platform==="ios"?12:14, <mask> subtitleColor:"#FFF", <mask> <mask> <mask> titleFontColor:"#FFF", <mask> <mask> <mask> borderRadiusBase:platform==="ios"?5:2, <mask> borderWidth:1/_reactNative.PixelRatio.getPixelSizeForLayoutSize(1), <mask> contentPadding:10, </s> Modified color values to standard ones in variable files </s> remove subtitleColor:"#FFF", </s> add subtitleColor:platform==="ios"?"#000":"#fff", </s> remove brandPrimary:"#2874F0", </s> add brandPrimary:platform==="ios"?"#007aff":"#3F51B5", </s> remove footerDefaultBg:"#2874F0", </s> add footerDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5", </s> remove tabBarTextColor:"#8bb3f4", </s> add tabBarTextColor:platform==="ios"?"#737373":"#bfc6ea", </s> remove tabBarActiveTextColor:"#fff", tabActiveBgColor:platform==="ios"?"#1569f4":undefined, </s> add tabBarActiveTextColor:platform==="ios"?"#2874F0":"#fff", tabActiveBgColor:platform==="ios"?"#cde1f9":"#3F51B5",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2bfd1bd0523371468998c076e10cf738f789ba81
dist/src/theme/variables/commonColor.js
tabBarTextColor:"#fff",
<mask> footerDefaultBg:"#3F51B5", <mask> footerPaddingBottom:isIphoneX?34:0, <mask> <mask> <mask> tabBarTextColor:"#b3c7f9", <mask> tabBarTextSize:platform==="ios"?14:11, <mask> activeTab:"#fff", <mask> sTabBarActiveTextColor:"#007aff", <mask> tabBarActiveTextColor:"#fff", <mask> tabActiveBgColor:undefined, </s> Modified color values to standard ones in variable files </s> remove tabActiveBgColor:undefined, </s> add tabActiveBgColor:"#3F51B5", </s> remove tabBarTextColor:"#8bb3f4", </s> add tabBarTextColor:platform==="ios"?"#737373":"#bfc6ea", </s> remove activeTab:platform==="ios"?"#007aff":"#fff", </s> add activeTab:"#fff", </s> remove tabBarTextColor:platform==="ios"?"#6b6b6b":"#b3c7f9", </s> add tabBarTextColor:"#2874F0", </s> remove footerDefaultBg:"#2874F0", </s> add footerDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2bfd1bd0523371468998c076e10cf738f789ba81
dist/src/theme/variables/material.js
tabActiveBgColor:"#3F51B5",
<mask> tabBarTextSize:platform==="ios"?14:11, <mask> activeTab:"#fff", <mask> sTabBarActiveTextColor:"#007aff", <mask> tabBarActiveTextColor:"#fff", <mask> tabActiveBgColor:undefined, <mask> <mask> <mask> tabDefaultBg:"#3F51B5", <mask> topTabBarTextColor:"#b3c7f9", <mask> topTabBarActiveTextColor:"#fff", </s> Modified color values to standard ones in variable files </s> remove tabBarTextColor:"#b3c7f9", </s> add tabBarTextColor:"#fff", </s> remove tabBarActiveTextColor:"#fff", tabActiveBgColor:platform==="ios"?"#1569f4":undefined, </s> add tabBarActiveTextColor:platform==="ios"?"#2874F0":"#fff", tabActiveBgColor:platform==="ios"?"#cde1f9":"#3F51B5", </s> remove tabDefaultBg:"#2874F0", topTabBarTextColor:"#b3c7f9", topTabBarActiveTextColor:"#fff", topTabBarBorderColor:"#fff", topTabBarActiveBorderColor:"#fff", </s> add tabDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5", topTabBarTextColor:platform==="ios"?"#6b6b6b":"#b3c7f9", topTabBarActiveTextColor:platform==="ios"?"#007aff":"#fff", topTabBarBorderColor:platform==="ios"?"#a7a6ab":"#fff", topTabBarActiveBorderColor:platform==="ios"?"#007aff":"#fff", </s> remove activeTab:platform==="ios"?"#007aff":"#fff", </s> add activeTab:"#fff", </s> remove tabBarTextColor:"#8bb3f4", </s> add tabBarTextColor:platform==="ios"?"#737373":"#bfc6ea",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2bfd1bd0523371468998c076e10cf738f789ba81
dist/src/theme/variables/material.js
toolbarDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5",
<mask> topTabBarActiveBorderColor:"#fff", <mask> <mask> <mask> toolbarBtnColor:"#fff", <mask> toolbarDefaultBg:"#3F51B5", <mask> toolbarHeight:platform==="ios"?isIphoneX?88:64:56, <mask> toolbarSearchIconSize:platform==="ios"?20:23, <mask> toolbarInputColor:"#fff", <mask> searchBarHeight:platform==="ios"?30:40, <mask> searchBarInputHeight:platform==="ios"?30:50, </s> Modified color values to standard ones in variable files </s> remove toolbarBtnColor:"#fff", toolbarDefaultBg:"#2874F0", </s> add toolbarBtnColor:platform==="ios"?"#007aff":"#fff", toolbarDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5", </s> remove tabDefaultBg:"#2874F0", topTabBarTextColor:"#b3c7f9", topTabBarActiveTextColor:"#fff", topTabBarBorderColor:"#fff", topTabBarActiveBorderColor:"#fff", </s> add tabDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5", topTabBarTextColor:platform==="ios"?"#6b6b6b":"#b3c7f9", topTabBarActiveTextColor:platform==="ios"?"#007aff":"#fff", topTabBarBorderColor:platform==="ios"?"#a7a6ab":"#fff", topTabBarActiveBorderColor:platform==="ios"?"#007aff":"#fff", </s> remove toolbarBtnColor:platform==="ios"?"#007aff":"#fff", </s> add toolbarBtnColor:"#007aff", </s> remove toolbarBtnTextColor:platform==="ios"?"#007aff":"#fff", toolbarDefaultBorder:platform==="ios"?"#a7a6ab":"#3F51B5", </s> add toolbarBtnTextColor:"#000", toolbarDefaultBorder:"#a7a6ab", </s> remove toolbarBtnTextColor:"#fff", iosStatusbar:"light-content", toolbarDefaultBorder:"#2874F0", </s> add toolbarBtnTextColor:platform==="ios"?"#000":"#fff", iosStatusbar:"dark-content", toolbarDefaultBorder:platform==="ios"?"#a7a6ab":"#3F51B5",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2bfd1bd0523371468998c076e10cf738f789ba81
dist/src/theme/variables/material.js
brandPrimary:"#007aff",
<mask> <mask> cardDefaultBg:"#fff", <mask> <mask> <mask> brandPrimary:platform==="ios"?"#007aff":"#3F51B5", <mask> brandInfo:"#62B1F6", <mask> brandSuccess:"#5cb85c", <mask> brandDanger:"#d9534f", <mask> brandWarning:"#f0ad4e", <mask> brandDark:"#000", </s> Modified color values to standard ones in variable files </s> remove brandPrimary:"#2874F0", </s> add brandPrimary:platform==="ios"?"#007aff":"#3F51B5", </s> remove toolbarBtnTextColor:platform==="ios"?"#007aff":"#fff", toolbarDefaultBorder:platform==="ios"?"#a7a6ab":"#3F51B5", </s> add toolbarBtnTextColor:"#000", toolbarDefaultBorder:"#a7a6ab", </s> remove subtitleColor:"#FFF", </s> add subtitleColor:platform==="ios"?"#000":"#fff", </s> remove footerDefaultBg:"#2874F0", </s> add footerDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5", </s> remove tabBarTextColor:"#8bb3f4", </s> add tabBarTextColor:platform==="ios"?"#737373":"#bfc6ea",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2bfd1bd0523371468998c076e10cf738f789ba81
dist/src/theme/variables/platform.js
tabBarTextColor:"#2874F0",
<mask> footerDefaultBg:platform==="ios"?"#F8F8F8":"#4179F7", <mask> footerPaddingBottom:isIphoneX?34:0, <mask> <mask> <mask> tabBarTextColor:platform==="ios"?"#6b6b6b":"#b3c7f9", <mask> tabBarTextSize:platform==="ios"?14:11, <mask> activeTab:platform==="ios"?"#007aff":"#fff", <mask> sTabBarActiveTextColor:"#007aff", <mask> tabBarActiveTextColor:platform==="ios"?"#007aff":"#fff", <mask> tabActiveBgColor:platform==="ios"?"#cde1f9":"#3F51B5", </s> Modified color values to standard ones in variable files </s> remove activeTab:platform==="ios"?"#007aff":"#fff", </s> add activeTab:"#fff", </s> remove tabBarActiveTextColor:platform==="ios"?"#007aff":"#fff", tabActiveBgColor:platform==="ios"?"#cde1f9":"#3F51B5", </s> add tabBarActiveTextColor:"#2874F0", tabActiveBgColor:"#cde1f9", </s> remove tabBarTextColor:"#8bb3f4", </s> add tabBarTextColor:platform==="ios"?"#737373":"#bfc6ea", </s> remove tabBarActiveTextColor:"#fff", tabActiveBgColor:platform==="ios"?"#1569f4":undefined, </s> add tabBarActiveTextColor:platform==="ios"?"#2874F0":"#fff", tabActiveBgColor:platform==="ios"?"#cde1f9":"#3F51B5", </s> remove tabBarTextColor:"#b3c7f9", </s> add tabBarTextColor:"#fff",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2bfd1bd0523371468998c076e10cf738f789ba81
dist/src/theme/variables/platform.js
activeTab:"#fff",
<mask> <mask> <mask> tabBarTextColor:platform==="ios"?"#6b6b6b":"#b3c7f9", <mask> tabBarTextSize:platform==="ios"?14:11, <mask> activeTab:platform==="ios"?"#007aff":"#fff", <mask> sTabBarActiveTextColor:"#007aff", <mask> tabBarActiveTextColor:platform==="ios"?"#007aff":"#fff", <mask> tabActiveBgColor:platform==="ios"?"#cde1f9":"#3F51B5", <mask> <mask> </s> Modified color values to standard ones in variable files </s> remove tabBarTextColor:platform==="ios"?"#6b6b6b":"#b3c7f9", </s> add tabBarTextColor:"#2874F0", </s> remove tabBarActiveTextColor:platform==="ios"?"#007aff":"#fff", tabActiveBgColor:platform==="ios"?"#cde1f9":"#3F51B5", </s> add tabBarActiveTextColor:"#2874F0", tabActiveBgColor:"#cde1f9", </s> remove tabBarActiveTextColor:"#fff", tabActiveBgColor:platform==="ios"?"#1569f4":undefined, </s> add tabBarActiveTextColor:platform==="ios"?"#2874F0":"#fff", tabActiveBgColor:platform==="ios"?"#cde1f9":"#3F51B5", </s> remove tabBarTextColor:"#8bb3f4", </s> add tabBarTextColor:platform==="ios"?"#737373":"#bfc6ea", </s> remove tabActiveBgColor:undefined, </s> add tabActiveBgColor:"#3F51B5",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2bfd1bd0523371468998c076e10cf738f789ba81
dist/src/theme/variables/platform.js
tabBarActiveTextColor:"#2874F0", tabActiveBgColor:"#cde1f9",
<mask> tabBarTextColor:platform==="ios"?"#6b6b6b":"#b3c7f9", <mask> tabBarTextSize:platform==="ios"?14:11, <mask> activeTab:platform==="ios"?"#007aff":"#fff", <mask> sTabBarActiveTextColor:"#007aff", <mask> tabBarActiveTextColor:platform==="ios"?"#007aff":"#fff", <mask> tabActiveBgColor:platform==="ios"?"#cde1f9":"#3F51B5", <mask> <mask> <mask> tabDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5", <mask> topTabBarTextColor:platform==="ios"?"#6b6b6b":"#b3c7f9", <mask> topTabBarActiveTextColor:platform==="ios"?"#007aff":"#fff", </s> Modified color values to standard ones in variable files </s> remove activeTab:platform==="ios"?"#007aff":"#fff", </s> add activeTab:"#fff", </s> remove tabBarTextColor:platform==="ios"?"#6b6b6b":"#b3c7f9", </s> add tabBarTextColor:"#2874F0", </s> remove tabDefaultBg:"#2874F0", topTabBarTextColor:"#b3c7f9", topTabBarActiveTextColor:"#fff", topTabBarBorderColor:"#fff", topTabBarActiveBorderColor:"#fff", </s> add tabDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5", topTabBarTextColor:platform==="ios"?"#6b6b6b":"#b3c7f9", topTabBarActiveTextColor:platform==="ios"?"#007aff":"#fff", topTabBarBorderColor:platform==="ios"?"#a7a6ab":"#fff", topTabBarActiveBorderColor:platform==="ios"?"#007aff":"#fff", </s> remove tabBarActiveTextColor:"#fff", tabActiveBgColor:platform==="ios"?"#1569f4":undefined, </s> add tabBarActiveTextColor:platform==="ios"?"#2874F0":"#fff", tabActiveBgColor:platform==="ios"?"#cde1f9":"#3F51B5", </s> remove tabBarTextColor:"#8bb3f4", </s> add tabBarTextColor:platform==="ios"?"#737373":"#bfc6ea",
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2bfd1bd0523371468998c076e10cf738f789ba81
dist/src/theme/variables/platform.js
toolbarBtnColor:"#007aff",
<mask> topTabBarBorderColor:platform==="ios"?"#a7a6ab":"#fff", <mask> topTabBarActiveBorderColor:platform==="ios"?"#007aff":"#fff", <mask> <mask> <mask> toolbarBtnColor:platform==="ios"?"#007aff":"#fff", <mask> toolbarDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5", <mask> toolbarHeight:platform==="ios"?isIphoneX?88:64:56, <mask> toolbarSearchIconSize:platform==="ios"?20:23, <mask> toolbarInputColor:platform==="ios"?"#CECDD2":"#fff", <mask> searchBarHeight:platform==="ios"?30:40, </s> Modified color values to standard ones in variable files </s> remove toolbarBtnColor:"#fff", toolbarDefaultBg:"#2874F0", </s> add toolbarBtnColor:platform==="ios"?"#007aff":"#fff", toolbarDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5", </s> remove toolbarDefaultBg:"#3F51B5", </s> add toolbarDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5", </s> remove tabDefaultBg:"#2874F0", topTabBarTextColor:"#b3c7f9", topTabBarActiveTextColor:"#fff", topTabBarBorderColor:"#fff", topTabBarActiveBorderColor:"#fff", </s> add tabDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5", topTabBarTextColor:platform==="ios"?"#6b6b6b":"#b3c7f9", topTabBarActiveTextColor:platform==="ios"?"#007aff":"#fff", topTabBarBorderColor:platform==="ios"?"#a7a6ab":"#fff", topTabBarActiveBorderColor:platform==="ios"?"#007aff":"#fff", </s> remove toolbarBtnTextColor:platform==="ios"?"#007aff":"#fff", toolbarDefaultBorder:platform==="ios"?"#a7a6ab":"#3F51B5", </s> add toolbarBtnTextColor:"#000", toolbarDefaultBorder:"#a7a6ab", </s> remove toolbarBtnTextColor:"#fff", iosStatusbar:"light-content", toolbarDefaultBorder:"#2874F0", </s> add toolbarBtnTextColor:platform==="ios"?"#000":"#fff", iosStatusbar:"dark-content", toolbarDefaultBorder:platform==="ios"?"#a7a6ab":"#3F51B5",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2bfd1bd0523371468998c076e10cf738f789ba81
dist/src/theme/variables/platform.js
toolbarBtnTextColor:"#000", toolbarDefaultBorder:"#a7a6ab",
<mask> toolbarSearchIconSize:platform==="ios"?20:23, <mask> toolbarInputColor:platform==="ios"?"#CECDD2":"#fff", <mask> searchBarHeight:platform==="ios"?30:40, <mask> searchBarInputHeight:platform==="ios"?30:50, <mask> toolbarBtnTextColor:platform==="ios"?"#007aff":"#fff", <mask> toolbarDefaultBorder:platform==="ios"?"#a7a6ab":"#3F51B5", <mask> iosStatusbar:platform==="ios"?"dark-content":"light-content", <mask> get statusBarColor(){ <mask> return(0,_color2.default)(this.toolbarDefaultBg). <mask> darken(0.2). <mask> hex(); </s> Modified color values to standard ones in variable files </s> remove toolbarBtnTextColor:"#fff", iosStatusbar:"light-content", toolbarDefaultBorder:"#2874F0", </s> add toolbarBtnTextColor:platform==="ios"?"#000":"#fff", iosStatusbar:"dark-content", toolbarDefaultBorder:platform==="ios"?"#a7a6ab":"#3F51B5", </s> remove toolbarBtnColor:"#fff", toolbarDefaultBg:"#2874F0", </s> add toolbarBtnColor:platform==="ios"?"#007aff":"#fff", toolbarDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5", </s> remove toolbarDefaultBg:"#3F51B5", </s> add toolbarDefaultBg:platform==="ios"?"#F8F8F8":"#3F51B5", </s> remove toolbarBtnColor:platform==="ios"?"#007aff":"#fff", </s> add toolbarBtnColor:"#007aff", </s> remove segmentBackgroundColor:"#3F51B5", segmentActiveBackgroundColor:"#fff", segmentTextColor:"#fff", segmentActiveTextColor:"#3F51B5", segmentBorderColor:"#fff", segmentBorderColorMain:"#3F51B5", </s> add segmentBackgroundColor:platform==="ios"?"#F8F8F8":"#3F51B5", segmentActiveBackgroundColor:platform==="ios"?"#007aff":"#fff", segmentTextColor:platform==="ios"?"#007aff":"#fff", segmentActiveTextColor:platform==="ios"?"#fff":"#3F51B5", segmentBorderColor:platform==="ios"?"#007aff":"#fff", segmentBorderColorMain:platform==="ios"?"#a7a6ab":"#3F51B5",
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2bfd1bd0523371468998c076e10cf738f789ba81
dist/src/theme/variables/platform.js
<mask> export const ModalContext = React.createContext({ <mask> visible: false, <mask> toggleVisible: (_bool: boolean) => {}, <mask> toggleOnClose: (_bool: boolean) => {}, <mask> newProps: { <mask> _width: '60%', <mask> size: 'md', <mask> modalOverlayStyle: {}, <mask> closeOnOverlayClick: true, <mask> modalCloseButtonStyle: {}, <mask> modalCloseButtonProps: {}, <mask> modalFooterProps: {}, <mask> modalBodyProps: {}, <mask> modalContentProps: {}, <mask> modalHeaderProps: {}, <mask> modalOverlayProps: {}, <mask> }, <mask> }); </s> fix: fixed with issue and theme </s> remove newProps: newProps, </s> add contentSize: contentSize, </s> remove const newProps = useThemeProps('Modal', props); </s> add const { contentSize, ...newProps } = useThemeProps('Modal', props); </s> remove rounded: 6, }, // NOTE: Now using custom overlay. // modalOverlayProps: { // bg: 'black', // }, modalHeaderProps: { pb: 3, }, modalFooterProps: { flexDirection: 'row', justifyContent: 'flex-start', flexWrap: 'wrap', }, }; </s> add rounded: 'lg', }; }, }; export const ModalCloseButton = { baseStyle: { position: 'absolute', right: 8, top: 8, zIndex: 1, }, defaultProps: { size: 8, }, }; export const ModalHeader = { baseStyle: { pb: 3, }, }; export const ModalBody = { baseStyle: { mb: 3, fontSize: '2xl', }, }; export const ModalFooter = { baseStyle: { flexDirection: 'row', justifyContent: 'flex-start', flexWrap: 'wrap', }, }; export const ModalOverlay = { baseStyle: { position: 'absolute', left: 0, top: 0, opacity: 0.5, right: 0, bottom: 0, }, </s> remove closeOnPress: props.closeOnOverlayClick === false ? false : true, </s> add closeOnPress: newProps.closeOnOverlayClick === false ? false : true, </s> remove const { newProps } = React.useContext(ModalContext); return <Box {...newProps.modalBodyProps} {...props} />; </s> add // const { newProps } = React.useContext(ModalContext); const newProps = useThemeProps('ModalBody', props); return <Box {...newProps} />;
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/components/composites/Modal/Context.ts
const { contentSize, ...newProps } = useThemeProps('Modal', props);
<mask> const closeOverlayInMobile = () => { <mask> setIsVisible(false); <mask> onClose(false); <mask> }; <mask> const newProps = useThemeProps('Modal', props); <mask> const value: any = { <mask> visible: isVisible, <mask> toggleVisible: setIsVisible, <mask> toggleOnClose: onClose ? onClose : () => {}, <mask> newProps: newProps, </s> fix: fixed with issue and theme </s> remove newProps: newProps, </s> add contentSize: contentSize, </s> remove newProps: { _width: '60%', size: 'md', modalOverlayStyle: {}, closeOnOverlayClick: true, modalCloseButtonStyle: {}, modalCloseButtonProps: {}, modalFooterProps: {}, modalBodyProps: {}, modalContentProps: {}, modalHeaderProps: {}, modalOverlayProps: {}, }, </s> add </s> remove const { newProps } = React.useContext(ModalContext); return <Box {...newProps.modalBodyProps} {...props} />; </s> add // const { newProps } = React.useContext(ModalContext); const newProps = useThemeProps('ModalBody', props); return <Box {...newProps} />; </s> remove const { toggleVisible, toggleOnClose, newProps } = React.useContext( ModalContext ); </s> add const newProps = useThemeProps('ModalCloseButton', props); const { toggleVisible, toggleOnClose } = React.useContext(ModalContext);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/components/composites/Modal/Modal.tsx
contentSize: contentSize,
<mask> const value: any = { <mask> visible: isVisible, <mask> toggleVisible: setIsVisible, <mask> toggleOnClose: onClose ? onClose : () => {}, <mask> newProps: newProps, <mask> }; <mask> const modalChildren = ( <mask> <Box <mask> {...newProps.modalProps} <mask> justifyContent={justifyContent ?? 'center'} </s> fix: fixed with issue and theme </s> remove const newProps = useThemeProps('Modal', props); </s> add const { contentSize, ...newProps } = useThemeProps('Modal', props); </s> remove {...newProps.modalProps} </s> add {...newProps} </s> remove {props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />} </s> add {newProps.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />} </s> remove newProps: { _width: '60%', size: 'md', modalOverlayStyle: {}, closeOnOverlayClick: true, modalCloseButtonStyle: {}, modalCloseButtonProps: {}, modalFooterProps: {}, modalBodyProps: {}, modalContentProps: {}, modalHeaderProps: {}, modalOverlayProps: {}, }, </s> add </s> remove const { newProps } = React.useContext(ModalContext); return <Box {...newProps.modalBodyProps} {...props} />; </s> add // const { newProps } = React.useContext(ModalContext); const newProps = useThemeProps('ModalBody', props); return <Box {...newProps} />;
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/components/composites/Modal/Modal.tsx
{...newProps}
<mask> newProps: newProps, <mask> }; <mask> const modalChildren = ( <mask> <Box <mask> {...newProps.modalProps} <mask> justifyContent={justifyContent ?? 'center'} <mask> alignItems={alignItems ?? 'center'} <mask> > <mask> {props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />} <mask> {children} </s> fix: fixed with issue and theme </s> remove {props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />} </s> add {newProps.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />} </s> remove newProps: newProps, </s> add contentSize: contentSize, </s> remove const newProps = useThemeProps('Modal', props); </s> add const { contentSize, ...newProps } = useThemeProps('Modal', props); </s> remove closeOnPress: props.closeOnOverlayClick === false ? false : true, </s> add closeOnPress: newProps.closeOnOverlayClick === false ? false : true, </s> remove closeOnPress: props.closeOnOverlayClick === false ? false : true, </s> add closeOnPress: newProps.closeOnOverlayClick === false ? false : true,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/components/composites/Modal/Modal.tsx
{newProps.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />}
<mask> {...newProps.modalProps} <mask> justifyContent={justifyContent ?? 'center'} <mask> alignItems={alignItems ?? 'center'} <mask> > <mask> {props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />} <mask> {children} <mask> </Box> <mask> ); <mask> React.useEffect( <mask> () => { </s> fix: fixed with issue and theme </s> remove {...newProps.modalProps} </s> add {...newProps} </s> remove newProps: newProps, </s> add contentSize: contentSize, </s> remove <View style={newProps.modalCloseButtonStyle}> <CloseButton {...newProps.modalCloseButtonProps} {...props} // accessibilityLabel="Close dialog" onPress={() => { toggleVisible(false); toggleOnClose(false); }} /> </View> </s> add <CloseButton {...newProps} // accessibilityLabel="Close dialog" onPress={() => { toggleVisible(false); toggleOnClose(false); }} /> </s> remove closeOnPress: props.closeOnOverlayClick === false ? false : true, </s> add closeOnPress: newProps.closeOnOverlayClick === false ? false : true, </s> remove closeOnPress: props.closeOnOverlayClick === false ? false : true, </s> add closeOnPress: newProps.closeOnOverlayClick === false ? false : true,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/components/composites/Modal/Modal.tsx
closeOnPress: newProps.closeOnOverlayClick === false ? false : true,
<mask> </FocusScope> <mask> </ModalContext.Provider>, <mask> { <mask> onClose: onClose, <mask> closeOnPress: props.closeOnOverlayClick === false ? false : true, <mask> backgroundColor: overlayColor ? overlayColor : undefined, <mask> disableOverlay: overlayVisible === false ? true : false, <mask> } <mask> ) <mask> : setOverlay(<Box />, { </s> fix: fixed with issue and theme </s> remove closeOnPress: props.closeOnOverlayClick === false ? false : true, </s> add closeOnPress: newProps.closeOnOverlayClick === false ? false : true, </s> remove {props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />} </s> add {newProps.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />} </s> remove {...newProps.modalProps} </s> add {...newProps} </s> remove {...props} </s> add {...newProps} </s> remove const newProps = useThemeProps('Modal', props); </s> add const { contentSize, ...newProps } = useThemeProps('Modal', props);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/components/composites/Modal/Modal.tsx
closeOnPress: newProps.closeOnOverlayClick === false ? false : true,
<mask> } <mask> ) <mask> : setOverlay(<Box />, { <mask> onClose: closeOverlayInMobile, <mask> closeOnPress: props.closeOnOverlayClick === false ? false : true, <mask> backgroundColor: overlayColor ? overlayColor : undefined, <mask> disableOverlay: overlayVisible === false ? true : false, <mask> }); <mask> <mask> !isOpen && closeOverlay(); </s> fix: fixed with issue and theme </s> remove closeOnPress: props.closeOnOverlayClick === false ? false : true, </s> add closeOnPress: newProps.closeOnOverlayClick === false ? false : true, </s> remove {props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />} </s> add {newProps.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />} </s> remove {...newProps.modalProps} </s> add {...newProps} </s> remove newProps: { _width: '60%', size: 'md', modalOverlayStyle: {}, closeOnOverlayClick: true, modalCloseButtonStyle: {}, modalCloseButtonProps: {}, modalFooterProps: {}, modalBodyProps: {}, modalContentProps: {}, modalHeaderProps: {}, modalOverlayProps: {}, }, </s> add </s> remove {...props} </s> add {...newProps}
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/components/composites/Modal/Modal.tsx
{...newProps}
<mask> onShow={() => initialFocusRef?.current?.focus()} <mask> onDismiss={() => finalFocusRef?.current?.focus()} <mask> animationType={motionPreset || 'slide'} <mask> transparent <mask> {...props} <mask> ref={ref} <mask> > <mask> {avoidKeyboard ? ( <mask> <KeyboardAvoidingView <mask> behavior={Platform.OS === 'ios' ? 'padding' : 'height'} </s> fix: fixed with issue and theme </s> remove {props.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />} </s> add {newProps.closeOnOverlayClick === false ? <Box /> : <ModalOverlay />} </s> remove {...newProps.modalProps} </s> add {...newProps} </s> remove closeOnPress: props.closeOnOverlayClick === false ? false : true, </s> add closeOnPress: newProps.closeOnOverlayClick === false ? false : true, </s> remove closeOnPress: props.closeOnOverlayClick === false ? false : true, </s> add closeOnPress: newProps.closeOnOverlayClick === false ? false : true, </s> remove <View style={newProps.modalCloseButtonStyle}> <CloseButton {...newProps.modalCloseButtonProps} {...props} // accessibilityLabel="Close dialog" onPress={() => { toggleVisible(false); toggleOnClose(false); }} /> </View> </s> add <CloseButton {...newProps} // accessibilityLabel="Close dialog" onPress={() => { toggleVisible(false); toggleOnClose(false); }} />
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/components/composites/Modal/Modal.tsx
import { useThemeProps } from '../../../hooks';
<mask> import React from 'react'; <mask> import { Box, IBoxProps } from '../../primitives'; <mask> import { ModalContext } from './Context'; <mask> const ModalBody = (props: IBoxProps) => { <mask> const { newProps } = React.useContext(ModalContext); <mask> return <Box {...newProps.modalBodyProps} {...props} />; <mask> }; <mask> </s> fix: fixed with issue and theme </s> remove const { newProps } = React.useContext(ModalContext); return <Box {...newProps.modalBodyProps} {...props} />; </s> add // const { newProps } = React.useContext(ModalContext); const newProps = useThemeProps('ModalBody', props); return <Box {...newProps} />; </s> remove import View from '../../primitives/View'; </s> add </s> remove const { toggleVisible, toggleOnClose, newProps } = React.useContext( ModalContext ); </s> add const newProps = useThemeProps('ModalCloseButton', props); const { toggleVisible, toggleOnClose } = React.useContext(ModalContext);
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/components/composites/Modal/ModalBody.tsx
// const { newProps } = React.useContext(ModalContext); const newProps = useThemeProps('ModalBody', props); return <Box {...newProps} />;
<mask> import React from 'react'; <mask> import { Box, IBoxProps } from '../../primitives'; <mask> import { ModalContext } from './Context'; <mask> const ModalBody = (props: IBoxProps) => { <mask> const { newProps } = React.useContext(ModalContext); <mask> return <Box {...newProps.modalBodyProps} {...props} />; <mask> }; <mask> <mask> export default React.memo(ModalBody); </s> fix: fixed with issue and theme </s> remove import { ModalContext } from './Context'; </s> add import { useThemeProps } from '../../../hooks'; </s> remove import View from '../../primitives/View'; </s> add </s> remove const { toggleVisible, toggleOnClose, newProps } = React.useContext( ModalContext ); </s> add const newProps = useThemeProps('ModalCloseButton', props); const { toggleVisible, toggleOnClose } = React.useContext(ModalContext);
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/components/composites/Modal/ModalBody.tsx
<mask> import React from 'react'; <mask> import View from '../../primitives/View'; <mask> import CloseButton, { ICloseButtonProps } from '../../composites/CloseButton'; <mask> import { ModalContext } from './Context'; <mask> const ModalCloseButton = (props: ICloseButtonProps) => { <mask> const { toggleVisible, toggleOnClose, newProps } = React.useContext( <mask> ModalContext </s> fix: fixed with issue and theme </s> remove const { toggleVisible, toggleOnClose, newProps } = React.useContext( ModalContext ); </s> add const newProps = useThemeProps('ModalCloseButton', props); const { toggleVisible, toggleOnClose } = React.useContext(ModalContext); </s> remove import { ModalContext } from './Context'; </s> add import { useThemeProps } from '../../../hooks'; </s> remove const { newProps } = React.useContext(ModalContext); return <Box {...newProps.modalBodyProps} {...props} />; </s> add // const { newProps } = React.useContext(ModalContext); const newProps = useThemeProps('ModalBody', props); return <Box {...newProps} />;
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/components/composites/Modal/ModalCloseButton.tsx
import { useThemeProps } from '../../../hooks';
<mask> import CloseButton, { ICloseButtonProps } from '../../composites/CloseButton'; <mask> import { ModalContext } from './Context'; <mask> const ModalCloseButton = (props: ICloseButtonProps) => { <mask> const newProps = useThemeProps('ModalCloseButton', props); <mask> const { toggleVisible, toggleOnClose } = React.useContext(ModalContext); <mask> return ( </s> fix: fixed with issue and theme </s> remove const { toggleVisible, toggleOnClose, newProps } = React.useContext( ModalContext ); </s> add const newProps = useThemeProps('ModalCloseButton', props); const { toggleVisible, toggleOnClose } = React.useContext(ModalContext); </s> remove import View from '../../primitives/View'; </s> add </s> remove const { newProps } = React.useContext(ModalContext); return <Box {...newProps.modalBodyProps} {...props} />; </s> add // const { newProps } = React.useContext(ModalContext); const newProps = useThemeProps('ModalBody', props); return <Box {...newProps} />; </s> remove import { ModalContext } from './Context'; </s> add import { useThemeProps } from '../../../hooks';
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/components/composites/Modal/ModalCloseButton.tsx
const newProps = useThemeProps('ModalCloseButton', props); const { toggleVisible, toggleOnClose } = React.useContext(ModalContext);
<mask> import View from '../../primitives/View'; <mask> import CloseButton, { ICloseButtonProps } from '../../composites/CloseButton'; <mask> import { ModalContext } from './Context'; <mask> const ModalCloseButton = (props: ICloseButtonProps) => { <mask> const { toggleVisible, toggleOnClose, newProps } = React.useContext( <mask> ModalContext <mask> ); <mask> return ( <mask> <View style={newProps.modalCloseButtonStyle}> <mask> <CloseButton <mask> {...newProps.modalCloseButtonProps} <mask> {...props} </s> fix: fixed with issue and theme </s> remove import View from '../../primitives/View'; </s> add </s> remove <View style={newProps.modalCloseButtonStyle}> <CloseButton {...newProps.modalCloseButtonProps} {...props} // accessibilityLabel="Close dialog" onPress={() => { toggleVisible(false); toggleOnClose(false); }} /> </View> </s> add <CloseButton {...newProps} // accessibilityLabel="Close dialog" onPress={() => { toggleVisible(false); toggleOnClose(false); }} /> </s> remove import { ModalContext } from './Context'; </s> add import { useThemeProps } from '../../../hooks'; </s> remove const { newProps } = React.useContext(ModalContext); return <Box {...newProps.modalBodyProps} {...props} />; </s> add // const { newProps } = React.useContext(ModalContext); const newProps = useThemeProps('ModalBody', props); return <Box {...newProps} />;
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/components/composites/Modal/ModalCloseButton.tsx
<CloseButton {...newProps} // accessibilityLabel="Close dialog" onPress={() => { toggleVisible(false); toggleOnClose(false); }} />
<mask> const { toggleVisible, toggleOnClose, newProps } = React.useContext( <mask> ModalContext <mask> ); <mask> return ( <mask> <View style={newProps.modalCloseButtonStyle}> <mask> <CloseButton <mask> {...newProps.modalCloseButtonProps} <mask> {...props} <mask> // accessibilityLabel="Close dialog" <mask> onPress={() => { <mask> toggleVisible(false); <mask> toggleOnClose(false); <mask> }} <mask> /> <mask> </View> <mask> ); <mask> }; <mask> <mask> export default React.memo(ModalCloseButton); </s> fix: fixed with issue and theme </s> remove const { toggleVisible, toggleOnClose, newProps } = React.useContext( ModalContext ); </s> add const newProps = useThemeProps('ModalCloseButton', props); const { toggleVisible, toggleOnClose } = React.useContext(ModalContext); </s> remove const { newProps } = React.useContext(ModalContext); return <Box {...newProps.modalBodyProps} {...props} />; </s> add // const { newProps } = React.useContext(ModalContext); const newProps = useThemeProps('ModalBody', props); return <Box {...newProps} />; </s> remove import View from '../../primitives/View'; </s> add </s> remove rounded: 6, }, // NOTE: Now using custom overlay. // modalOverlayProps: { // bg: 'black', // }, modalHeaderProps: { pb: 3, }, modalFooterProps: { flexDirection: 'row', justifyContent: 'flex-start', flexWrap: 'wrap', }, }; </s> add rounded: 'lg', }; }, }; export const ModalCloseButton = { baseStyle: { position: 'absolute', right: 8, top: 8, zIndex: 1, }, defaultProps: { size: 8, }, }; export const ModalHeader = { baseStyle: { pb: 3, }, }; export const ModalBody = { baseStyle: { mb: 3, fontSize: '2xl', }, }; export const ModalFooter = { baseStyle: { flexDirection: 'row', justifyContent: 'flex-start', flexWrap: 'wrap', }, }; export const ModalOverlay = { baseStyle: { position: 'absolute', left: 0, top: 0, opacity: 0.5, right: 0, bottom: 0, },
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/components/composites/Modal/ModalCloseButton.tsx
import type { IModalContextType } from './types'; import { useThemeProps } from '../../../hooks';
<mask> import React from 'react'; <mask> import { Box, IBoxProps } from '../../primitives'; <mask> import { ModalContext } from './Context'; <mask> const ModalContent = (props: IBoxProps) => { <mask> const { ...newProps } = useThemeProps('ModalContent', props); <mask> const { contentSize }: IModalContextType = React.useContext(ModalContext); <mask> </s> fix: fixed with issue and theme </s> remove import { ModalContext } from './Context'; </s> add import { useThemeProps } from '../../../hooks'; </s> remove const { newProps } = React.useContext(ModalContext); return <Box {...newProps.modalBodyProps} {...props} />; </s> add // const { newProps } = React.useContext(ModalContext); const newProps = useThemeProps('ModalBody', props); return <Box {...newProps} />; </s> remove import View from '../../primitives/View'; </s> add </s> remove const { toggleVisible, toggleOnClose, newProps } = React.useContext( ModalContext ); </s> add const newProps = useThemeProps('ModalCloseButton', props); const { toggleVisible, toggleOnClose } = React.useContext(ModalContext);
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/components/composites/Modal/ModalContent.tsx
rounded: 'lg', }; }, }; export const ModalCloseButton = { baseStyle: { position: 'absolute', right: 8, top: 8, zIndex: 1, }, defaultProps: { size: 8, }, }; export const ModalHeader = { baseStyle: { pb: 3, }, }; export const ModalBody = { baseStyle: { mb: 3, fontSize: '2xl', }, }; export const ModalFooter = { baseStyle: { flexDirection: 'row', justifyContent: 'flex-start', flexWrap: 'wrap', }, }; export const ModalOverlay = { baseStyle: { position: 'absolute', left: 0, top: 0, opacity: 0.5, right: 0, bottom: 0, },
<mask> }, <mask> modalContentProps: { <mask> bg: mode('gray.100', 'gray.700')(props), <mask> p: 8, <mask> rounded: 6, <mask> }, <mask> // NOTE: Now using custom overlay. <mask> // modalOverlayProps: { <mask> // bg: 'black', <mask> // }, <mask> modalHeaderProps: { <mask> pb: 3, <mask> }, <mask> modalFooterProps: { <mask> flexDirection: 'row', <mask> justifyContent: 'flex-start', <mask> flexWrap: 'wrap', <mask> }, <mask> }; <mask> }; <mask> <mask> export default { baseStyle, sizes }; </s> fix: fixed with issue and theme </s> remove newProps: { _width: '60%', size: 'md', modalOverlayStyle: {}, closeOnOverlayClick: true, modalCloseButtonStyle: {}, modalCloseButtonProps: {}, modalFooterProps: {}, modalBodyProps: {}, modalContentProps: {}, modalHeaderProps: {}, modalOverlayProps: {}, }, </s> add </s> remove <View style={newProps.modalCloseButtonStyle}> <CloseButton {...newProps.modalCloseButtonProps} {...props} // accessibilityLabel="Close dialog" onPress={() => { toggleVisible(false); toggleOnClose(false); }} /> </View> </s> add <CloseButton {...newProps} // accessibilityLabel="Close dialog" onPress={() => { toggleVisible(false); toggleOnClose(false); }} /> </s> remove const { newProps } = React.useContext(ModalContext); return <Box {...newProps.modalBodyProps} {...props} />; </s> add // const { newProps } = React.useContext(ModalContext); const newProps = useThemeProps('ModalBody', props); return <Box {...newProps} />; </s> remove import { ModalContext } from './Context'; </s> add import { useThemeProps } from '../../../hooks'; </s> remove const newProps = useThemeProps('Modal', props); </s> add const { contentSize, ...newProps } = useThemeProps('Modal', props);
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2cf74cb11f988ecf86051cd696bbb235ae952a4a
src/theme/components/modal.ts
<mask> <mask> // Extracting baseInputProps from remaining props <mask> const [, baseInputProps] = extractInObject(nonLayoutProps, ['variant']); <mask> <mask> const _ref = React.useRef(null); <mask> const { isHovered } = useHover({}, _ref); <mask> <mask> return ( <mask> <Box <mask> display="flex" <mask> flexDirection="row" <mask> alignItems="center" </s> feat: updated few components for the newPropsResolution </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); </s> add const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor); </s> remove let computedStyle: ViewStyle = StyleSheet.flatten([ </s> add const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); const { onTrackColor: _onTrackColor, offTrackColor: _offTrackColor, onThumbColor: _onThumbColor, offThumbColor: _offThumbColor, style: themeStyle, ...resolvedProps } = usePropsResolution('Switch', props, { isHovered, isDisabled }); const computedStyle: ViewStyle = StyleSheet.flatten([ </s> remove const newProps = usePropsResolution('ZStack', props); </s> add const resolvedProps = usePropsResolution('ZStack', props); </s> remove const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor); </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/Input/InputAdvanced.tsx
<mask> alignItems="center" <mask> justifyContent="space-between" <mask> overflow="hidden" <mask> {...layoutProps} <mask> {...(isHovered && _hover)} <mask> {...(isFocused && _focus)} <mask> {...(isInvalid && _invalid)} <mask> {...(isReadOnly && _readOnly)} <mask> {...(isDisabled && _disabled)} <mask> ref={mergeRefs([_ref, wrapperRef])} <mask> > <mask> {InputLeftElement || leftElement ? InputLeftElement || leftElement : null} <mask> <InputBase <mask> inputProps={inputProps} </s> feat: updated few components for the newPropsResolution </s> remove {...(isHovered && _hover)} {...newProps} </s> add {...resolvedProps} </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); </s> add </s> remove resolvedSpace, resolvedDirection === 'row' ? 'X' : 'Y', </s> add space, direction === 'row' ? 'X' : 'Y', </s> remove <Box flexDirection={resolvedDirection} {...newProps} ref={ref}> </s> add <Box flexDirection={direction} {...resolvedProps} ref={ref}> </s> remove const { onTrackColor: _onTrackColor, offTrackColor: _offTrackColor, onThumbColor: _onThumbColor, offThumbColor: _offThumbColor, style: themeStyle, _hover, ...newProps } = usePropsResolution('Switch', props); </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/Input/InputAdvanced.tsx
<mask> import { getSpacedChildren } from '../../../utils'; <mask> import { usePropsResolution } from '../../../hooks/useThemeProps'; <mask> import type { IBoxProps } from '../Box'; <mask> import type { ResponsiveValue } from '../../types'; <mask> import { useBreakpointResolvedProps } from '../../../hooks'; <mask> <mask> export interface IStackProps extends IBoxProps { <mask> /** <mask> * The divider element to use between elements. <mask> */ </s> feat: updated few components for the newPropsResolution </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); </s> add </s> remove ...remainingProps } = props; const newProps: any = usePropsResolution('Stack', remainingProps); const { space: resolvedSpace, direction: resolvedDirection, } = useBreakpointResolvedProps({ space, direction }); </s> add divider, ...resolvedProps }: any = usePropsResolution( 'Stack', props, {}, { resolveResponsively: ['space', 'direction'] } ); </s> remove let computedStyle: ViewStyle = StyleSheet.flatten([ </s> add const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); const { onTrackColor: _onTrackColor, offTrackColor: _offTrackColor, onThumbColor: _onThumbColor, offThumbColor: _offThumbColor, style: themeStyle, ...resolvedProps } = usePropsResolution('Switch', props, { isHovered, isDisabled }); const computedStyle: ViewStyle = StyleSheet.flatten([ </s> remove const newProps = usePropsResolution('VStack', props); return <StackMain ref={ref} {...newProps} />; </s> add const resolvedProps = usePropsResolution('VStack', props); return <StackMain ref={ref} {...resolvedProps} />;
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/Stack/Stack.tsx
<mask> const { <mask> children, <mask> space, <mask> direction, <mask> divider, <mask> reversed, <mask> ...remainingProps <mask> } = props; <mask> const newProps: any = usePropsResolution('Stack', remainingProps); <mask> </s> feat: updated few components for the newPropsResolution </s> remove ...remainingProps } = props; const newProps: any = usePropsResolution('Stack', remainingProps); const { space: resolvedSpace, direction: resolvedDirection, } = useBreakpointResolvedProps({ space, direction }); </s> add divider, ...resolvedProps }: any = usePropsResolution( 'Stack', props, {}, { resolveResponsively: ['space', 'direction'] } ); </s> remove const newProps = usePropsResolution('ZStack', props); </s> add const resolvedProps = usePropsResolution('ZStack', props); </s> remove <Box {...newProps} ref={ref}> </s> add <Box {...resolvedProps} ref={ref}> </s> remove const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor); </s> add </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); </s> add const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/Stack/Stack.tsx
divider, ...resolvedProps }: any = usePropsResolution( 'Stack', props, {}, { resolveResponsively: ['space', 'direction'] } );
<mask> space, <mask> direction, <mask> divider, <mask> reversed, <mask> ...remainingProps <mask> } = props; <mask> const newProps: any = usePropsResolution('Stack', remainingProps); <mask> <mask> const { <mask> space: resolvedSpace, <mask> direction: resolvedDirection, <mask> } = useBreakpointResolvedProps({ space, direction }); <mask> <mask> return ( <mask> <Box flexDirection={resolvedDirection} {...newProps} ref={ref}> <mask> {getSpacedChildren( <mask> children, </s> feat: updated few components for the newPropsResolution </s> remove divider, </s> add </s> remove <Box flexDirection={resolvedDirection} {...newProps} ref={ref}> </s> add <Box flexDirection={direction} {...resolvedProps} ref={ref}> </s> remove resolvedSpace, resolvedDirection === 'row' ? 'X' : 'Y', </s> add space, direction === 'row' ? 'X' : 'Y', </s> remove const newProps = usePropsResolution('ZStack', props); </s> add const resolvedProps = usePropsResolution('ZStack', props); </s> remove <Box {...newProps} ref={ref}> </s> add <Box {...resolvedProps} ref={ref}>
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/Stack/Stack.tsx
<Box flexDirection={direction} {...resolvedProps} ref={ref}>
<mask> direction: resolvedDirection, <mask> } = useBreakpointResolvedProps({ space, direction }); <mask> <mask> return ( <mask> <Box flexDirection={resolvedDirection} {...newProps} ref={ref}> <mask> {getSpacedChildren( <mask> children, <mask> resolvedSpace, <mask> resolvedDirection === 'row' ? 'X' : 'Y', <mask> reversed ? 'reverse' : 'normal', </s> feat: updated few components for the newPropsResolution </s> remove resolvedSpace, resolvedDirection === 'row' ? 'X' : 'Y', </s> add space, direction === 'row' ? 'X' : 'Y', </s> remove ...remainingProps } = props; const newProps: any = usePropsResolution('Stack', remainingProps); const { space: resolvedSpace, direction: resolvedDirection, } = useBreakpointResolvedProps({ space, direction }); </s> add divider, ...resolvedProps }: any = usePropsResolution( 'Stack', props, {}, { resolveResponsively: ['space', 'direction'] } ); </s> remove <Box {...newProps} ref={ref}> </s> add <Box {...resolvedProps} ref={ref}> </s> remove const newProps = usePropsResolution('ZStack', props); </s> add const resolvedProps = usePropsResolution('ZStack', props); </s> remove divider, </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/Stack/Stack.tsx
space, direction === 'row' ? 'X' : 'Y',
<mask> return ( <mask> <Box flexDirection={resolvedDirection} {...newProps} ref={ref}> <mask> {getSpacedChildren( <mask> children, <mask> resolvedSpace, <mask> resolvedDirection === 'row' ? 'X' : 'Y', <mask> reversed ? 'reverse' : 'normal', <mask> divider <mask> )} <mask> </Box> <mask> ); </s> feat: updated few components for the newPropsResolution </s> remove <Box flexDirection={resolvedDirection} {...newProps} ref={ref}> </s> add <Box flexDirection={direction} {...resolvedProps} ref={ref}> </s> remove ...remainingProps } = props; const newProps: any = usePropsResolution('Stack', remainingProps); const { space: resolvedSpace, direction: resolvedDirection, } = useBreakpointResolvedProps({ space, direction }); </s> add divider, ...resolvedProps }: any = usePropsResolution( 'Stack', props, {}, { resolveResponsively: ['space', 'direction'] } ); </s> remove <Box {...newProps} ref={ref}> </s> add <Box {...resolvedProps} ref={ref}> </s> remove const newProps = usePropsResolution('ZStack', props); </s> add const resolvedProps = usePropsResolution('ZStack', props); </s> remove import { useBreakpointResolvedProps } from '../../../hooks'; </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/Stack/Stack.tsx
const resolvedProps = usePropsResolution('VStack', props); return <StackMain ref={ref} {...resolvedProps} />;
<mask> >; <mask> } <mask> <mask> const VStack = (props: IVStackProps, ref?: any) => { <mask> const newProps = usePropsResolution('VStack', props); <mask> return <StackMain ref={ref} {...newProps} />; <mask> }; <mask> <mask> export default memo(forwardRef(VStack)); </s> feat: updated few components for the newPropsResolution </s> remove <Box {...newProps} ref={ref}> </s> add <Box {...resolvedProps} ref={ref}> </s> remove const newProps = usePropsResolution('ZStack', props); </s> add const resolvedProps = usePropsResolution('ZStack', props); </s> remove const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor); </s> add </s> remove const { onTrackColor: _onTrackColor, offTrackColor: _offTrackColor, onThumbColor: _onThumbColor, offThumbColor: _offThumbColor, style: themeStyle, _hover, ...newProps } = usePropsResolution('Switch', props); </s> add </s> remove let computedStyle: ViewStyle = StyleSheet.flatten([ </s> add const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); const { onTrackColor: _onTrackColor, offTrackColor: _offTrackColor, onThumbColor: _onThumbColor, offThumbColor: _offThumbColor, style: themeStyle, ...resolvedProps } = usePropsResolution('Switch', props, { isHovered, isDisabled }); const computedStyle: ViewStyle = StyleSheet.flatten([
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/Stack/VStack.tsx
// TODO: Needs proper refactor
<mask> import { useHover } from '@react-native-aria/interactions'; <mask> <mask> const StyledNBSwitch = makeStyledComponent(RNSwitch); <mask> <mask> const Switch = ( <mask> { <mask> style, <mask> onToggle, </s> feat: updated few components for the newPropsResolution </s> remove import { useBreakpointResolvedProps } from '../../../hooks'; </s> add </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); </s> add </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); </s> add const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor); </s> remove let computedStyle: ViewStyle = StyleSheet.flatten([ </s> add const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); const { onTrackColor: _onTrackColor, offTrackColor: _offTrackColor, onThumbColor: _onThumbColor, offThumbColor: _offThumbColor, style: themeStyle, ...resolvedProps } = usePropsResolution('Switch', props, { isHovered, isDisabled }); const computedStyle: ViewStyle = StyleSheet.flatten([ </s> remove divider, </s> add
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/Switch/index.tsx
<mask> ) => { <mask> const state = useToggleState({ <mask> defaultSelected: !isNil(defaultIsChecked) ? defaultIsChecked : false, <mask> }); <mask> const { <mask> onTrackColor: _onTrackColor, <mask> offTrackColor: _offTrackColor, <mask> onThumbColor: _onThumbColor, <mask> offThumbColor: _offThumbColor, <mask> style: themeStyle, <mask> _hover, <mask> ...newProps <mask> } = usePropsResolution('Switch', props); <mask> const borderColorInvalid = useToken('colors', 'danger.600'); <mask> const checked = !isNil(isChecked) ? isChecked : state.isSelected; <mask> const onTrackColor = useToken('colors', _onTrackColor); <mask> const offTrackColor = useToken('colors', _offTrackColor); <mask> const onThumbColor = useToken('colors', _onThumbColor); </s> feat: updated few components for the newPropsResolution </s> remove const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor); </s> add </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); </s> add const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor); </s> remove let computedStyle: ViewStyle = StyleSheet.flatten([ </s> add const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); const { onTrackColor: _onTrackColor, offTrackColor: _offTrackColor, onThumbColor: _onThumbColor, offThumbColor: _offThumbColor, style: themeStyle, ...resolvedProps } = usePropsResolution('Switch', props, { isHovered, isDisabled }); const computedStyle: ViewStyle = StyleSheet.flatten([ </s> remove const newProps = usePropsResolution('VStack', props); return <StackMain ref={ref} {...newProps} />; </s> add const resolvedProps = usePropsResolution('VStack', props); return <StackMain ref={ref} {...resolvedProps} />; </s> remove const newProps = usePropsResolution('ZStack', props); </s> add const resolvedProps = usePropsResolution('ZStack', props);
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/Switch/index.tsx
<mask> ...newProps <mask> } = usePropsResolution('Switch', props); <mask> const borderColorInvalid = useToken('colors', 'danger.600'); <mask> const checked = !isNil(isChecked) ? isChecked : state.isSelected; <mask> const onTrackColor = useToken('colors', _onTrackColor); <mask> const offTrackColor = useToken('colors', _offTrackColor); <mask> const onThumbColor = useToken('colors', _onThumbColor); <mask> const offThumbColor = useToken('colors', _offThumbColor); <mask> const inValidPropFactors = { <mask> borderWidth: 1, <mask> borderRadius: 16, <mask> borderColor: borderColorInvalid, <mask> }; </s> feat: updated few components for the newPropsResolution </s> remove const { onTrackColor: _onTrackColor, offTrackColor: _offTrackColor, onThumbColor: _onThumbColor, offThumbColor: _offThumbColor, style: themeStyle, _hover, ...newProps } = usePropsResolution('Switch', props); </s> add </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); </s> add const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor); </s> remove let computedStyle: ViewStyle = StyleSheet.flatten([ </s> add const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); const { onTrackColor: _onTrackColor, offTrackColor: _offTrackColor, onThumbColor: _onThumbColor, offThumbColor: _offThumbColor, style: themeStyle, ...resolvedProps } = usePropsResolution('Switch', props, { isHovered, isDisabled }); const computedStyle: ViewStyle = StyleSheet.flatten([ </s> remove const newProps = usePropsResolution('VStack', props); return <StackMain ref={ref} {...newProps} />; </s> add const resolvedProps = usePropsResolution('VStack', props); return <StackMain ref={ref} {...resolvedProps} />; </s> remove const newProps = usePropsResolution('ZStack', props); </s> add const resolvedProps = usePropsResolution('ZStack', props);
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/Switch/index.tsx
const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); const { onTrackColor: _onTrackColor, offTrackColor: _offTrackColor, onThumbColor: _onThumbColor, offThumbColor: _offThumbColor, style: themeStyle, ...resolvedProps } = usePropsResolution('Switch', props, { isHovered, isDisabled }); const computedStyle: ViewStyle = StyleSheet.flatten([
<mask> borderRadius: 16, <mask> borderColor: borderColorInvalid, <mask> }; <mask> <mask> let computedStyle: ViewStyle = StyleSheet.flatten([ <mask> themeStyle, <mask> style, <mask> isInvalid ? inValidPropFactors : {}, <mask> ]); <mask> </s> feat: updated few components for the newPropsResolution </s> remove const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor); </s> add </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); </s> add const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor); </s> remove const { onTrackColor: _onTrackColor, offTrackColor: _offTrackColor, onThumbColor: _onThumbColor, offThumbColor: _offThumbColor, style: themeStyle, _hover, ...newProps } = usePropsResolution('Switch', props); </s> add </s> remove ...remainingProps } = props; const newProps: any = usePropsResolution('Stack', remainingProps); const { space: resolvedSpace, direction: resolvedDirection, } = useBreakpointResolvedProps({ space, direction }); </s> add divider, ...resolvedProps }: any = usePropsResolution( 'Stack', props, {}, { resolveResponsively: ['space', 'direction'] } );
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/Switch/index.tsx
const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor);
<mask> style, <mask> isInvalid ? inValidPropFactors : {}, <mask> ]); <mask> <mask> const _ref = React.useRef(null); <mask> const { isHovered } = useHover({}, _ref); <mask> <mask> return ( <mask> <StyledNBSwitch <mask> accessibilityLabel={accessibilityLabel} <mask> accessibilityHint={accessibilityHint} </s> feat: updated few components for the newPropsResolution </s> remove let computedStyle: ViewStyle = StyleSheet.flatten([ </s> add const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); const { onTrackColor: _onTrackColor, offTrackColor: _offTrackColor, onThumbColor: _onThumbColor, offThumbColor: _offThumbColor, style: themeStyle, ...resolvedProps } = usePropsResolution('Switch', props, { isHovered, isDisabled }); const computedStyle: ViewStyle = StyleSheet.flatten([ </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); </s> add </s> remove const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor); </s> add </s> remove ...remainingProps } = props; const newProps: any = usePropsResolution('Stack', remainingProps); const { space: resolvedSpace, direction: resolvedDirection, } = useBreakpointResolvedProps({ space, direction }); </s> add divider, ...resolvedProps }: any = usePropsResolution( 'Stack', props, {}, { resolveResponsively: ['space', 'direction'] } );
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/Switch/index.tsx
{...resolvedProps}
<mask> trackColor={{ false: offTrackColor, true: onTrackColor }} <mask> thumbColor={checked ? onThumbColor : offThumbColor} <mask> activeThumbColor={onThumbColor} // react-native-web prop for active thumbColor <mask> ios_backgroundColor={offTrackColor} <mask> {...(isHovered && _hover)} <mask> {...newProps} <mask> disabled={isDisabled} <mask> onValueChange={onToggle ? onToggle : state.toggle} <mask> value={checked} <mask> style={computedStyle} <mask> ref={mergeRefs([ref, _ref])} </s> feat: updated few components for the newPropsResolution </s> remove {...(isHovered && _hover)} {...(isFocused && _focus)} {...(isInvalid && _invalid)} {...(isReadOnly && _readOnly)} {...(isDisabled && _disabled)} </s> add </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); </s> add const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor); </s> remove const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor); </s> add </s> remove const { onTrackColor: _onTrackColor, offTrackColor: _offTrackColor, onThumbColor: _onThumbColor, offThumbColor: _offThumbColor, style: themeStyle, _hover, ...newProps } = usePropsResolution('Switch', props); </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/Switch/index.tsx
const resolvedProps = usePropsResolution('ZStack', props);
<mask> reversed?: boolean; <mask> } <mask> <mask> const ZStack = ({ children, reversed, ...props }: IZStackProps, ref?: any) => { <mask> const newProps = usePropsResolution('ZStack', props); <mask> return ( <mask> <Box {...newProps} ref={ref}> <mask> {getAbsoluteChildren(children, reversed)} <mask> </Box> <mask> ); </s> feat: updated few components for the newPropsResolution </s> remove <Box {...newProps} ref={ref}> </s> add <Box {...resolvedProps} ref={ref}> </s> remove const newProps = usePropsResolution('VStack', props); return <StackMain ref={ref} {...newProps} />; </s> add const resolvedProps = usePropsResolution('VStack', props); return <StackMain ref={ref} {...resolvedProps} />; </s> remove ...remainingProps } = props; const newProps: any = usePropsResolution('Stack', remainingProps); const { space: resolvedSpace, direction: resolvedDirection, } = useBreakpointResolvedProps({ space, direction }); </s> add divider, ...resolvedProps }: any = usePropsResolution( 'Stack', props, {}, { resolveResponsively: ['space', 'direction'] } ); </s> remove divider, </s> add </s> remove const { onTrackColor: _onTrackColor, offTrackColor: _offTrackColor, onThumbColor: _onThumbColor, offThumbColor: _offThumbColor, style: themeStyle, _hover, ...newProps } = usePropsResolution('Switch', props); </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/ZStack/index.tsx
<Box {...resolvedProps} ref={ref}>
<mask> <mask> const ZStack = ({ children, reversed, ...props }: IZStackProps, ref?: any) => { <mask> const newProps = usePropsResolution('ZStack', props); <mask> return ( <mask> <Box {...newProps} ref={ref}> <mask> {getAbsoluteChildren(children, reversed)} <mask> </Box> <mask> ); <mask> }; <mask> </s> feat: updated few components for the newPropsResolution </s> remove const newProps = usePropsResolution('ZStack', props); </s> add const resolvedProps = usePropsResolution('ZStack', props); </s> remove const newProps = usePropsResolution('VStack', props); return <StackMain ref={ref} {...newProps} />; </s> add const resolvedProps = usePropsResolution('VStack', props); return <StackMain ref={ref} {...resolvedProps} />; </s> remove ...remainingProps } = props; const newProps: any = usePropsResolution('Stack', remainingProps); const { space: resolvedSpace, direction: resolvedDirection, } = useBreakpointResolvedProps({ space, direction }); </s> add divider, ...resolvedProps }: any = usePropsResolution( 'Stack', props, {}, { resolveResponsively: ['space', 'direction'] } ); </s> remove divider, </s> add </s> remove const onTrackColor = useToken('colors', _onTrackColor); const offTrackColor = useToken('colors', _offTrackColor); const onThumbColor = useToken('colors', _onThumbColor); const offThumbColor = useToken('colors', _offThumbColor); </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/components/primitives/ZStack/index.tsx
// Add new pseudeo props in between ------- _readOnly: { dependentOn: 'state', respondTo: 'isReadOnly', priority: SPECIFICITY_30, }, // Add new pseudeo props in between -------
<mask> dependentOn: 'state', <mask> respondTo: 'isChecked', <mask> priority: SPECIFICITY_30, <mask> }, <mask> _invalid: { <mask> dependentOn: 'state', <mask> respondTo: 'isInvalid', <mask> priority: SPECIFICITY_40, <mask> }, <mask> _focus: { </s> feat: updated few components for the newPropsResolution </s> remove import { useBreakpointResolvedProps } from '../../../hooks'; </s> add </s> remove let computedStyle: ViewStyle = StyleSheet.flatten([ </s> add const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); const { onTrackColor: _onTrackColor, offTrackColor: _offTrackColor, onThumbColor: _onThumbColor, offThumbColor: _offThumbColor, style: themeStyle, ...resolvedProps } = usePropsResolution('Switch', props, { isHovered, isDisabled }); const computedStyle: ViewStyle = StyleSheet.flatten([ </s> remove divider, </s> add </s> remove ...remainingProps } = props; const newProps: any = usePropsResolution('Stack', remainingProps); const { space: resolvedSpace, direction: resolvedDirection, } = useBreakpointResolvedProps({ space, direction }); </s> add divider, ...resolvedProps }: any = usePropsResolution( 'Stack', props, {}, { resolveResponsively: ['space', 'direction'] } );
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d03e131e505aa0609e08396d7db9e9f16103ccf
src/hooks/useThemeProps/propsFlattener.tsx
borderWidth={2} borderRadius="md"
<mask> backgroundColor={ <mask> isChecked ? (isDisabled ? borderColor : activeColor) : 'transparent' <mask> } <mask> borderColor={outlineColor} <mask> borderWidth={1} <mask> borderRadius={4} <mask> p={1} <mask> > <mask> {icon && sizedIcon && isChecked ? ( <mask> sizedIcon() <mask> ) : ( </s> fix: checkbox, radio and slider style update </s> remove borderRadius={999} p={'2px'} </s> add borderRadius="full" p="2px" </s> remove borderWidth={1} </s> add borderWidth={2} </s> remove backgroundColor="light.50" </s> add backgroundColor={colorScheme} </s> remove borderRadius={999} </s> add borderRadius="full" </s> remove import { mode, getColorScheme } from '../tools'; </s> add import { mode, getColorScheme, transparentize } from '../tools';
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d1bd28c67ed08b1fe4c4d6722a9748aa854af78
src/components/primitives/Checkbox/Checkbox.tsx
borderWidth={2}
<mask> > <mask> <Box <mask> borderColor={outlineColor} <mask> backgroundColor={inputProps.disabled ? 'muted.200' : 'transparent'} <mask> borderWidth={1} <mask> display="flex" <mask> justifyContent="center" <mask> alignItems="center" <mask> borderRadius={999} <mask> p={'2px'} </s> fix: checkbox, radio and slider style update </s> remove borderRadius={999} p={'2px'} </s> add borderRadius="full" p="2px" </s> remove borderRadius={999} </s> add borderRadius="full" </s> remove borderWidth={1} borderRadius={4} </s> add borderWidth={2} borderRadius="md" </s> remove backgroundColor="light.50" </s> add backgroundColor={colorScheme} </s> remove trackColor: mode('gray.200', 'gray.700')(props), </s> add trackColor: transparentize( mode( `${simplifiedColorScheme}.500`, `${simplifiedColorScheme}.200` )(props), 0.3 )(props.theme),
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d1bd28c67ed08b1fe4c4d6722a9748aa854af78
src/components/primitives/Radio/Radio.tsx
borderRadius="full" p="2px"
<mask> borderWidth={1} <mask> display="flex" <mask> justifyContent="center" <mask> alignItems="center" <mask> borderRadius={999} <mask> p={'2px'} <mask> > <mask> {icon && isSelected ? ( <mask> sizedIcon() <mask> ) : ( <mask> <Icon </s> fix: checkbox, radio and slider style update </s> remove borderWidth={1} borderRadius={4} </s> add borderWidth={2} borderRadius="md" </s> remove borderWidth={1} </s> add borderWidth={2} </s> remove backgroundColor="light.50" </s> add backgroundColor={colorScheme} </s> remove borderRadius={999} </s> add borderRadius="full" </s> remove trackColor: mode('gray.200', 'gray.700')(props), </s> add trackColor: transparentize( mode( `${simplifiedColorScheme}.500`, `${simplifiedColorScheme}.200` )(props), 0.3 )(props.theme),
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d1bd28c67ed08b1fe4c4d6722a9748aa854af78
src/components/primitives/Radio/Radio.tsx
backgroundColor={colorScheme}
<mask> } <mask> borderColor={colorScheme} <mask> position="relative" <mask> borderRadius="full" <mask> backgroundColor="light.50" <mask> p={1} <mask> display="flex" <mask> justifyContent="center" <mask> alignItems="center" <mask> userSelect={Platform.OS === 'web' ? 'none' : null} </s> fix: checkbox, radio and slider style update </s> remove borderRadius={999} </s> add borderRadius="full" </s> remove borderWidth={1} borderRadius={4} </s> add borderWidth={2} borderRadius="md" </s> remove borderRadius={999} p={'2px'} </s> add borderRadius="full" p="2px" </s> remove borderWidth={1} </s> add borderWidth={2} </s> remove import { mode, getColorScheme } from '../tools'; </s> add import { mode, getColorScheme, transparentize } from '../tools';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d1bd28c67ed08b1fe4c4d6722a9748aa854af78
src/components/primitives/Slider/SliderThumb.tsx
borderRadius="full"
<mask> <Box <mask> position="absolute" <mask> backgroundColor={trackColor} <mask> height={orientation === 'vertical' ? '100%' : `${sliderSize}px`} <mask> borderRadius={999} <mask> width={orientation === 'vertical' ? `${sliderSize}px` : '100%'} <mask> {...props} <mask> overflow="hidden" <mask> > <mask> {children} </s> fix: checkbox, radio and slider style update </s> remove backgroundColor="light.50" </s> add backgroundColor={colorScheme} </s> remove borderWidth={1} </s> add borderWidth={2} </s> remove borderWidth={1} borderRadius={4} </s> add borderWidth={2} borderRadius="md" </s> remove borderRadius={999} p={'2px'} </s> add borderRadius="full" p="2px" </s> remove trackColor: mode('gray.200', 'gray.700')(props), </s> add trackColor: transparentize( mode( `${simplifiedColorScheme}.500`, `${simplifiedColorScheme}.200` )(props), 0.3 )(props.theme),
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d1bd28c67ed08b1fe4c4d6722a9748aa854af78
src/components/primitives/Slider/SliderTrack.tsx
import { mode, getColorScheme, transparentize } from '../tools';
<mask> import { mode, getColorScheme } from '../tools'; <mask> <mask> const baseStyle = (props: Record<string, any>) => { <mask> const simplifiedColorScheme = getColorScheme(props); <mask> return { <mask> activeColor: mode( </s> fix: checkbox, radio and slider style update </s> remove trackColor: mode('gray.200', 'gray.700')(props), </s> add trackColor: transparentize( mode( `${simplifiedColorScheme}.500`, `${simplifiedColorScheme}.200` )(props), 0.3 )(props.theme), </s> remove backgroundColor="light.50" </s> add backgroundColor={colorScheme} </s> remove borderWidth={1} borderRadius={4} </s> add borderWidth={2} borderRadius="md" </s> remove borderRadius={999} </s> add borderRadius="full" </s> remove borderRadius={999} p={'2px'} </s> add borderRadius="full" p="2px"
[ "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d1bd28c67ed08b1fe4c4d6722a9748aa854af78
src/theme/components/slider.ts
trackColor: transparentize( mode( `${simplifiedColorScheme}.500`, `${simplifiedColorScheme}.200` )(props), 0.3 )(props.theme),
<mask> activeColor: mode( <mask> `${simplifiedColorScheme}.500`, <mask> `${simplifiedColorScheme}.200` <mask> )(props), <mask> trackColor: mode('gray.200', 'gray.700')(props), <mask> }; <mask> }; <mask> <mask> const sizes = { <mask> // sizes mentioned here are used in pxiles. </s> fix: checkbox, radio and slider style update </s> remove import { mode, getColorScheme } from '../tools'; </s> add import { mode, getColorScheme, transparentize } from '../tools'; </s> remove borderRadius={999} </s> add borderRadius="full" </s> remove backgroundColor="light.50" </s> add backgroundColor={colorScheme} </s> remove borderRadius={999} p={'2px'} </s> add borderRadius="full" p="2px" </s> remove borderWidth={1} </s> add borderWidth={2}
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2d1bd28c67ed08b1fe4c4d6722a9748aa854af78
src/theme/components/slider.ts
newProps = mergeUnderscoreProps(newProps, props);
<mask> delete newProps[key]; <mask> } <mask> }); <mask> <mask> // Merging _ props <mask> Object.keys(props) <mask> .filter((propName) => propName.startsWith('_')) <mask> .forEach((propName: string) => { <mask> newProps[propName] = { ...newProps[propName], ...props[propName] }; <mask> }); <mask> <mask> return newProps; <mask> } </s> Added useContrastText and added it to text </s> remove _text: { color: mode(color, `gray.800`)(props), }, </s> add </s> remove function variantLink(props: Dict) { const { colorScheme: c } = props; </s> add function variantLink() { </s> remove const { bg = `${c}.500`, color = 'white' } = accessibleColorMap[c] || {}; </s> add const { bg = `${c}.500` } = accessibleColorMap[c] || {}; </s> remove // lineHeight: 'normal', </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2da1a3758a63010d9cdd30ff285ed961bebc448f
src/hooks/useThemeProps/utils.ts
<mask> color: 'black', <mask> }, <mask> cyan: { <mask> bg: 'cyan.400', <mask> color: 'black', <mask> }, <mask> }; <mask> <mask> function variantSolid(props: Dict) { <mask> const { colorScheme: c } = props; </s> Added useContrastText and added it to text </s> remove _text: { color: mode(color, `gray.800`)(props), }, </s> add </s> remove const { bg = `${c}.500`, color = 'white' } = accessibleColorMap[c] || {}; </s> add const { bg = `${c}.500` } = accessibleColorMap[c] || {}; </s> remove function variantLink(props: Dict) { const { colorScheme: c } = props; </s> add function variantLink() { </s> remove // lineHeight: 'normal', </s> add </s> remove color: mode(`${c}.500`, `${c}.200`)(props), </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2da1a3758a63010d9cdd30ff285ed961bebc448f
src/theme/components/button.ts
const { bg = `${c}.500` } = accessibleColorMap[c] || {};
<mask> if (c === 'gray') <mask> return { <mask> bg: mode(`gray.100`, `whiteAlpha.200`)(props), <mask> }; <mask> const { bg = `${c}.500`, color = 'white' } = accessibleColorMap[c] || {}; <mask> return { <mask> bg: mode(bg, `${c}.400`)(props), <mask> _text: { <mask> color: mode(color, `gray.800`)(props), <mask> }, </s> Added useContrastText and added it to text </s> remove _text: { color: mode(color, `gray.800`)(props), }, </s> add </s> remove color: 'black', </s> add </s> remove // lineHeight: 'normal', </s> add </s> remove function variantLink(props: Dict) { const { colorScheme: c } = props; </s> add function variantLink() { </s> remove // Merging _ props Object.keys(props) .filter((propName) => propName.startsWith('_')) .forEach((propName: string) => { newProps[propName] = { ...newProps[propName], ...props[propName] }; }); </s> add newProps = mergeUnderscoreProps(newProps, props);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2da1a3758a63010d9cdd30ff285ed961bebc448f
src/theme/components/button.ts
<mask> }; <mask> const { bg = `${c}.500`, color = 'white' } = accessibleColorMap[c] || {}; <mask> return { <mask> bg: mode(bg, `${c}.400`)(props), <mask> _text: { <mask> color: mode(color, `gray.800`)(props), <mask> }, <mask> }; <mask> } <mask> <mask> function variantLink(props: Dict) { <mask> const { colorScheme: c } = props; </s> Added useContrastText and added it to text </s> remove const { bg = `${c}.500`, color = 'white' } = accessibleColorMap[c] || {}; </s> add const { bg = `${c}.500` } = accessibleColorMap[c] || {}; </s> remove function variantLink(props: Dict) { const { colorScheme: c } = props; </s> add function variantLink() { </s> remove color: 'black', </s> add </s> remove // lineHeight: 'normal', </s> add </s> remove // Merging _ props Object.keys(props) .filter((propName) => propName.startsWith('_')) .forEach((propName: string) => { newProps[propName] = { ...newProps[propName], ...props[propName] }; }); </s> add newProps = mergeUnderscoreProps(newProps, props);
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2da1a3758a63010d9cdd30ff285ed961bebc448f
src/theme/components/button.ts
function variantLink() {
<mask> }, <mask> }; <mask> } <mask> <mask> function variantLink(props: Dict) { <mask> const { colorScheme: c } = props; <mask> return { <mask> padding: 0, <mask> height: 'auto', <mask> // lineHeight: 'normal', <mask> _text: { </s> Added useContrastText and added it to text </s> remove // lineHeight: 'normal', </s> add </s> remove color: mode(`${c}.500`, `${c}.200`)(props), </s> add </s> remove _text: { color: mode(color, `gray.800`)(props), }, </s> add </s> remove color: 'black', </s> add </s> remove const { bg = `${c}.500`, color = 'white' } = accessibleColorMap[c] || {}; </s> add const { bg = `${c}.500` } = accessibleColorMap[c] || {};
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2da1a3758a63010d9cdd30ff285ed961bebc448f
src/theme/components/button.ts
<mask> const { colorScheme: c } = props; <mask> return { <mask> padding: 0, <mask> height: 'auto', <mask> // lineHeight: 'normal', <mask> _text: { <mask> color: mode(`${c}.500`, `${c}.200`)(props), <mask> textDecorationLine: 'underline', <mask> }, <mask> }; </s> Added useContrastText and added it to text </s> remove color: mode(`${c}.500`, `${c}.200`)(props), </s> add </s> remove function variantLink(props: Dict) { const { colorScheme: c } = props; </s> add function variantLink() { </s> remove _text: { color: mode(color, `gray.800`)(props), }, </s> add </s> remove const { bg = `${c}.500`, color = 'white' } = accessibleColorMap[c] || {}; </s> add const { bg = `${c}.500` } = accessibleColorMap[c] || {}; </s> remove color: 'black', </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2da1a3758a63010d9cdd30ff285ed961bebc448f
src/theme/components/button.ts
<mask> padding: 0, <mask> height: 'auto', <mask> // lineHeight: 'normal', <mask> _text: { <mask> color: mode(`${c}.500`, `${c}.200`)(props), <mask> textDecorationLine: 'underline', <mask> }, <mask> }; <mask> } <mask> </s> Added useContrastText and added it to text </s> remove // lineHeight: 'normal', </s> add </s> remove function variantLink(props: Dict) { const { colorScheme: c } = props; </s> add function variantLink() { </s> remove _text: { color: mode(color, `gray.800`)(props), }, </s> add </s> remove color: 'black', </s> add </s> remove const { bg = `${c}.500`, color = 'white' } = accessibleColorMap[c] || {}; </s> add const { bg = `${c}.500` } = accessibleColorMap[c] || {};
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2da1a3758a63010d9cdd30ff285ed961bebc448f
src/theme/components/button.ts
import { useToken } from './../../hooks/useToken';
<mask> import isEmpty from 'lodash/isEmpty'; <mask> import Color from 'tinycolor2'; <mask> import type { Dict } from './utils'; <mask> <mask> export function mode(light: any, dark: any) { <mask> return (props: any) => (props.colorMode === 'dark' ? dark : light); <mask> } <mask> </s> Added useContrastText and added it to text </s> remove // Merging _ props Object.keys(props) .filter((propName) => propName.startsWith('_')) .forEach((propName: string) => { newProps[propName] = { ...newProps[propName], ...props[propName] }; }); </s> add newProps = mergeUnderscoreProps(newProps, props); </s> remove const { bg = `${c}.500`, color = 'white' } = accessibleColorMap[c] || {}; </s> add const { bg = `${c}.500` } = accessibleColorMap[c] || {}; </s> remove function variantLink(props: Dict) { const { colorScheme: c } = props; </s> add function variantLink() { </s> remove _text: { color: mode(color, `gray.800`)(props), }, </s> add </s> remove // lineHeight: 'normal', </s> add
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2da1a3758a63010d9cdd30ff285ed961bebc448f
src/theme/tools/colors.ts
disable,
<mask> render() { <mask> const { <mask> expanded, <mask> expandedIcon, <mask> expandedIconStyle, <mask> headerStyle, <mask> icon, <mask> iconStyle, </s> Revert "Revert "Feat/accordian disable row"" </s> remove selected </s> add selected: props.expanded, </s> remove : { color: variables.iconStyle } </s> add : { color: disable ? variable.disableRow : variables.iconStyle }, </s> remove title={item.title} </s> add disable={disable}
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2de1a1b93b185ab6772718a67e5ddef4667f16ec
src/basic/Accordion.js
<Text style={{ color: disable ? variable.disableRow : null }}> {' '} {title} </Text>
<mask> styles.defaultHeader, <mask> headerStyle || { backgroundColor: variables.headerStyle } <mask> ]} <mask> > <mask> <Text> {title}</Text> <mask> <Icon <mask> style={[ <mask> { fontSize: variables.accordionIconFontSize }, <mask> expanded <mask> ? expandedIcon && expandedIconStyle </s> Revert "Revert "Feat/accordian disable row"" </s> remove : { color: variables.iconStyle } </s> add : { color: disable ? variable.disableRow : variables.iconStyle }, </s> remove selected </s> add selected: props.expanded,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2de1a1b93b185ab6772718a67e5ddef4667f16ec
src/basic/Accordion.js
: { color: disable ? variable.disableRow : variables.iconStyle },
<mask> ? expandedIconStyle <mask> : { color: variables.expandedIconStyle } <mask> : icon && iconStyle <mask> ? iconStyle <mask> : { color: variables.iconStyle } <mask> ]} <mask> name={ <mask> expanded ? expandedIcon || 'ios-arrow-up' : icon || 'ios-arrow-down' <mask> } <mask> /> </s> Revert "Revert "Feat/accordian disable row"" </s> remove <Text> {title}</Text> </s> add <Text style={{ color: disable ? variable.disableRow : null }}> {' '} {title} </Text> </s> remove selected </s> add selected: props.expanded,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2de1a1b93b185ab6772718a67e5ddef4667f16ec
src/basic/Accordion.js
disable,
<mask> const { <mask> contentStyle, <mask> expanded, <mask> expandedIcon, <mask> expandedIconStyle, <mask> headerStyle, </s> Revert "Revert "Feat/accordian disable row"" </s> remove selected </s> add selected: props.expanded, </s> remove title={item.title} </s> add disable={disable} </s> remove : { color: variables.iconStyle } </s> add : { color: disable ? variable.disableRow : variables.iconStyle },
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2de1a1b93b185ab6772718a67e5ddef4667f16ec
src/basic/Accordion.js
disabled={disable}
<mask> } = this.props; <mask> return ( <mask> <View> <mask> <TouchableWithoutFeedback <mask> onPress={() => { <mask> onAccordionOpen && !expanded && onAccordionOpen(item, index); <mask> onAccordionClose && expanded && onAccordionClose(item, index); <mask> setSelected(index); </s> Revert "Revert "Feat/accordian disable row"" </s> remove selected </s> add selected: props.expanded, </s> remove <Text> {title}</Text> </s> add <Text style={{ color: disable ? variable.disableRow : null }}> {' '} {title} </Text> </s> remove : { color: variables.iconStyle } </s> add : { color: disable ? variable.disableRow : variables.iconStyle },
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2de1a1b93b185ab6772718a67e5ddef4667f16ec
src/basic/Accordion.js
disable={disable}
<mask> {renderHeader ? ( <mask> renderHeader(item, expanded, index) <mask> ) : ( <mask> <DefaultHeader <mask> title={item.title} <mask> expanded={expanded} <mask> headerStyle={headerStyle} <mask> icon={icon} <mask> iconStyle={iconStyle} <mask> expandedIcon={expandedIcon} </s> Revert "Revert "Feat/accordian disable row""
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2de1a1b93b185ab6772718a67e5ddef4667f16ec
src/basic/Accordion.js
selected: props.expanded,
<mask> selected = Array.isArray(expanded) ? expanded : [expanded]; <mask> selected = expandMultiple ? selected : selected.slice(0, 1); <mask> } <mask> this.state = { <mask> selected <mask> }; <mask> } <mask> <mask> setSelected(index) { <mask> const { expandMultiple } = this.props; </s> Revert "Revert "Feat/accordian disable row"" </s> remove : { color: variables.iconStyle } </s> add : { color: disable ? variable.disableRow : variables.iconStyle }, </s> remove <Text> {title}</Text> </s> add <Text style={{ color: disable ? variable.disableRow : null }}> {' '} {title} </Text>
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2de1a1b93b185ab6772718a67e5ddef4667f16ec
src/basic/Accordion.js
disable,
<mask> const { <mask> contentStyle, <mask> dataArray, <mask> expandedIcon, <mask> expandedIconStyle, <mask> headerStyle, <mask> icon, <mask> iconStyle, </s> Revert "Revert "Feat/accordian disable row"" </s> remove selected </s> add selected: props.expanded, </s> remove : { color: variables.iconStyle } </s> add : { color: disable ? variable.disableRow : variables.iconStyle }, </s> remove <Text> {title}</Text> </s> add <Text style={{ color: disable ? variable.disableRow : null }}> {' '} {title} </Text>
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2de1a1b93b185ab6772718a67e5ddef4667f16ec
src/basic/Accordion.js
disable={disable == index ? true : false}
<mask> ]} <mask> keyExtractor={(item, index) => String(index)} <mask> renderItem={({ item, index }) => ( <mask> <AccordionItem <mask> key={String(index)} <mask> item={item} <mask> expanded={this.state.selected.indexOf(index) !== -1} <mask> index={index} <mask> setSelected={i => this.setSelected(i)} <mask> headerStyle={headerStyle} </s> Revert "Revert "Feat/accordian disable row"" </s> remove title={item.title} </s> add disable={disable} </s> remove <Text> {title}</Text> </s> add <Text style={{ color: disable ? variable.disableRow : null }}> {' '} {title} </Text> </s> remove : { color: variables.iconStyle } </s> add : { color: disable ? variable.disableRow : variables.iconStyle },
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2de1a1b93b185ab6772718a67e5ddef4667f16ec
src/basic/Accordion.js
setSelected={(i) => this.setSelected(i)}
<mask> expandedIcon={expandedIcon} <mask> expandedIconStyle={expandedIconStyle} <mask> onAccordionOpen={onAccordionOpen} <mask> onAccordionClose={onAccordionClose} <mask> /> <mask> )} <mask> {...this.props} <mask> /> <mask> ); <mask> } </s> Revert "Revert "Feat/accordian disable row"" </s> remove : { color: variables.iconStyle } </s> add : { color: disable ? variable.disableRow : variables.iconStyle }, </s> remove title={item.title} </s> add disable={disable} </s> remove selected </s> add selected: props.expanded, </s> remove <Text> {title}</Text> </s> add <Text style={{ color: disable ? variable.disableRow : null }}> {' '} {title} </Text>
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2de1a1b93b185ab6772718a67e5ddef4667f16ec
src/basic/Accordion.js
disableRow: '#a9a9a9',
<mask> expandedIconStyle: '#000', <mask> accordionBorderColor: '#d3d3d3', <mask> <mask> // ActionSheet <mask> elevation: 4, <mask> containerTouchableBackgroundColor: 'rgba(0,0,0,0.4)', <mask> innerTouchableBackgroundColor: '#fff', </s> Revert "Revert "Feat/accordian disable row"" </s> remove selected </s> add selected: props.expanded,
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2de1a1b93b185ab6772718a67e5ddef4667f16ec
src/theme/variables/commonColor.js
disableRow: '#a9a9a9',
<mask> contentStyle: '#f5f4f5', <mask> expandedIconStyle: '#000', <mask> headerStyle: '#edebed', <mask> iconStyle: '#000', <mask> <mask> // ActionSheet <mask> elevation: 4, <mask> containerTouchableBackgroundColor: 'rgba(0,0,0,0.4)', </s> Revert "Revert "Feat/accordian disable row"" </s> remove selected </s> add selected: props.expanded,
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2de1a1b93b185ab6772718a67e5ddef4667f16ec
src/theme/variables/platform.js
Object.defineProperty(exports,"__esModule",{value:true});exports.Text=undefined;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 _jsxFileName='src/basic/Text.js';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;};}();var _react=require('react');var _react2=_interopRequireDefault(_react); var _reactNative=require('react-native'); var _lodash=require('lodash');var _lodash2=_interopRequireDefault(_lodash);
<mask> Object.defineProperty(exports,"__esModule",{value:true});exports.Text=undefined;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 _jsxFileName="src/basic/Text.js";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;};}();var _react=require("react");var _react2=_interopRequireDefault(_react); <mask> var _reactNative=require("react-native"); <mask> var _lodash=require("lodash");var _lodash2=_interopRequireDefault(_lodash); <mask> <mask> var _nativeBaseShoutemTheme=require("native-base-shoutem-theme"); <mask> var _animation=require("@shoutem/animation"); <mask> var _mapPropsToStyleNames=require("../Utils/mapPropsToStyleNames");var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames);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> </s> Text component Android comma bug fixed </s> remove var _nativeBaseShoutemTheme=require("native-base-shoutem-theme"); var _animation=require("@shoutem/animation"); var _mapPropsToStyleNames=require("../Utils/mapPropsToStyleNames");var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames);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 _nativeBaseShoutemTheme=require('native-base-shoutem-theme'); var _animation=require('@shoutem/animation'); var _mapPropsToStyleNames=require('../Utils/mapPropsToStyleNames');var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames);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 Text=function(_Component){_inherits(Text,_Component);function Text(){_classCallCheck(this,Text);return _possibleConstructorReturn(this,(Text.__proto__||Object.getPrototypeOf(Text)).apply(this,arguments));}_createClass(Text,[{key:'render',value:function render() {var _this2=this;var _props= this.props,uppercase=_props.uppercase,children=_props.children; var text=void 0; if(_lodash2.default.isArray(children)&&!_lodash2.default.some(children,_lodash2.default.isObject)){ text=_lodash2.default.join(children,''); }else{ text=children; } if(uppercase){ text=_lodash2.default.toUpper(text); } </s> remove Text=function(_Component){_inherits(Text,_Component);function Text(){_classCallCheck(this,Text);return _possibleConstructorReturn(this,(Text.__proto__||Object.getPrototypeOf(Text)).apply(this,arguments));}_createClass(Text,[{key:"render",value:function render() {var _this2=this; </s> add </s> remove var StyledText=(0,_nativeBaseShoutemTheme.connectStyle)("NativeBase.Text",{},_mapPropsToStyleNames2.default)( </s> add var StyledText=(0,_nativeBaseShoutemTheme.connectStyle)('NativeBase.Text',{},_mapPropsToStyleNames2.default)( </s> remove import React, { Component } from "react"; import { Text as RNText } from "react-native"; </s> add import React, { Component } from 'react'; import { Text as RNText } from 'react-native'; </s> remove import { connectStyle } from "native-base-shoutem-theme"; import { connectAnimation } from "@shoutem/animation"; import mapPropsToStyleNames from "../Utils/mapPropsToStyleNames"; </s> add import { connectStyle } from 'native-base-shoutem-theme'; import { connectAnimation } from '@shoutem/animation'; import mapPropsToStyleNames from '../Utils/mapPropsToStyleNames';
[ "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2e8cb63690a68b03eb2b91aa7b35bed0101095e0
dist/src/basic/Text.js
var _nativeBaseShoutemTheme=require('native-base-shoutem-theme'); var _animation=require('@shoutem/animation'); var _mapPropsToStyleNames=require('../Utils/mapPropsToStyleNames');var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames);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 Text=function(_Component){_inherits(Text,_Component);function Text(){_classCallCheck(this,Text);return _possibleConstructorReturn(this,(Text.__proto__||Object.getPrototypeOf(Text)).apply(this,arguments));}_createClass(Text,[{key:'render',value:function render() {var _this2=this;var _props= this.props,uppercase=_props.uppercase,children=_props.children; var text=void 0; if(_lodash2.default.isArray(children)&&!_lodash2.default.some(children,_lodash2.default.isObject)){ text=_lodash2.default.join(children,''); }else{ text=children; } if(uppercase){ text=_lodash2.default.toUpper(text); }
<mask> Object.defineProperty(exports,"__esModule",{value:true});exports.Text=undefined;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 _jsxFileName="src/basic/Text.js";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;};}();var _react=require("react");var _react2=_interopRequireDefault(_react); <mask> var _reactNative=require("react-native"); <mask> var _lodash=require("lodash");var _lodash2=_interopRequireDefault(_lodash); <mask> <mask> var _nativeBaseShoutemTheme=require("native-base-shoutem-theme"); <mask> var _animation=require("@shoutem/animation"); <mask> var _mapPropsToStyleNames=require("../Utils/mapPropsToStyleNames");var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames);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> Text=function(_Component){_inherits(Text,_Component);function Text(){_classCallCheck(this,Text);return _possibleConstructorReturn(this,(Text.__proto__||Object.getPrototypeOf(Text)).apply(this,arguments));}_createClass(Text,[{key:"render",value:function render() <mask> {var _this2=this; <mask> return( <mask> _react2.default.createElement(_reactNative.Text,_extends({ref:function ref(c){return _this2._root=c;}},this.props,{__source:{fileName:_jsxFileName,lineNumber:12}}), </s> Text component Android comma bug fixed </s> remove Object.defineProperty(exports,"__esModule",{value:true});exports.Text=undefined;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 _jsxFileName="src/basic/Text.js";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;};}();var _react=require("react");var _react2=_interopRequireDefault(_react); var _reactNative=require("react-native"); var _lodash=require("lodash");var _lodash2=_interopRequireDefault(_lodash); </s> add Object.defineProperty(exports,"__esModule",{value:true});exports.Text=undefined;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 _jsxFileName='src/basic/Text.js';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;};}();var _react=require('react');var _react2=_interopRequireDefault(_react); var _reactNative=require('react-native'); var _lodash=require('lodash');var _lodash2=_interopRequireDefault(_lodash); </s> remove Text=function(_Component){_inherits(Text,_Component);function Text(){_classCallCheck(this,Text);return _possibleConstructorReturn(this,(Text.__proto__||Object.getPrototypeOf(Text)).apply(this,arguments));}_createClass(Text,[{key:"render",value:function render() {var _this2=this; </s> add </s> remove _react2.default.createElement(_reactNative.Text,_extends({ref:function ref(c){return _this2._root=c;}},this.props,{__source:{fileName:_jsxFileName,lineNumber:12}}), this.props.uppercase? _lodash2.default.toUpper(this.props.children): this.props.children)); </s> add _react2.default.createElement(_reactNative.Text,_extends({ref:function ref(c){return _this2._root=c;}},this.props,{__source:{fileName:_jsxFileName,lineNumber:30}}), text)); </s> remove var StyledText=(0,_nativeBaseShoutemTheme.connectStyle)("NativeBase.Text",{},_mapPropsToStyleNames2.default)( </s> add var StyledText=(0,_nativeBaseShoutemTheme.connectStyle)('NativeBase.Text',{},_mapPropsToStyleNames2.default)( </s> remove import { connectStyle } from "native-base-shoutem-theme"; import { connectAnimation } from "@shoutem/animation"; import mapPropsToStyleNames from "../Utils/mapPropsToStyleNames"; </s> add import { connectStyle } from 'native-base-shoutem-theme'; import { connectAnimation } from '@shoutem/animation'; import mapPropsToStyleNames from '../Utils/mapPropsToStyleNames';
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2e8cb63690a68b03eb2b91aa7b35bed0101095e0
dist/src/basic/Text.js
<mask> var _nativeBaseShoutemTheme=require("native-base-shoutem-theme"); <mask> var _animation=require("@shoutem/animation"); <mask> var _mapPropsToStyleNames=require("../Utils/mapPropsToStyleNames");var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames);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> Text=function(_Component){_inherits(Text,_Component);function Text(){_classCallCheck(this,Text);return _possibleConstructorReturn(this,(Text.__proto__||Object.getPrototypeOf(Text)).apply(this,arguments));}_createClass(Text,[{key:"render",value:function render() <mask> {var _this2=this; <mask> return( <mask> _react2.default.createElement(_reactNative.Text,_extends({ref:function ref(c){return _this2._root=c;}},this.props,{__source:{fileName:_jsxFileName,lineNumber:12}}), <mask> this.props.uppercase? <mask> _lodash2.default.toUpper(this.props.children): <mask> this.props.children)); </s> Text component Android comma bug fixed </s> remove var _nativeBaseShoutemTheme=require("native-base-shoutem-theme"); var _animation=require("@shoutem/animation"); var _mapPropsToStyleNames=require("../Utils/mapPropsToStyleNames");var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames);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 _nativeBaseShoutemTheme=require('native-base-shoutem-theme'); var _animation=require('@shoutem/animation'); var _mapPropsToStyleNames=require('../Utils/mapPropsToStyleNames');var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames);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 Text=function(_Component){_inherits(Text,_Component);function Text(){_classCallCheck(this,Text);return _possibleConstructorReturn(this,(Text.__proto__||Object.getPrototypeOf(Text)).apply(this,arguments));}_createClass(Text,[{key:'render',value:function render() {var _this2=this;var _props= this.props,uppercase=_props.uppercase,children=_props.children; var text=void 0; if(_lodash2.default.isArray(children)&&!_lodash2.default.some(children,_lodash2.default.isObject)){ text=_lodash2.default.join(children,''); }else{ text=children; } if(uppercase){ text=_lodash2.default.toUpper(text); } </s> remove Object.defineProperty(exports,"__esModule",{value:true});exports.Text=undefined;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 _jsxFileName="src/basic/Text.js";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;};}();var _react=require("react");var _react2=_interopRequireDefault(_react); var _reactNative=require("react-native"); var _lodash=require("lodash");var _lodash2=_interopRequireDefault(_lodash); </s> add Object.defineProperty(exports,"__esModule",{value:true});exports.Text=undefined;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 _jsxFileName='src/basic/Text.js';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;};}();var _react=require('react');var _react2=_interopRequireDefault(_react); var _reactNative=require('react-native'); var _lodash=require('lodash');var _lodash2=_interopRequireDefault(_lodash); </s> remove _react2.default.createElement(_reactNative.Text,_extends({ref:function ref(c){return _this2._root=c;}},this.props,{__source:{fileName:_jsxFileName,lineNumber:12}}), this.props.uppercase? _lodash2.default.toUpper(this.props.children): this.props.children)); </s> add _react2.default.createElement(_reactNative.Text,_extends({ref:function ref(c){return _this2._root=c;}},this.props,{__source:{fileName:_jsxFileName,lineNumber:30}}), text)); </s> remove var StyledText=(0,_nativeBaseShoutemTheme.connectStyle)("NativeBase.Text",{},_mapPropsToStyleNames2.default)( </s> add var StyledText=(0,_nativeBaseShoutemTheme.connectStyle)('NativeBase.Text',{},_mapPropsToStyleNames2.default)( </s> remove import { connectStyle } from "native-base-shoutem-theme"; import { connectAnimation } from "@shoutem/animation"; import mapPropsToStyleNames from "../Utils/mapPropsToStyleNames"; </s> add import { connectStyle } from 'native-base-shoutem-theme'; import { connectAnimation } from '@shoutem/animation'; import mapPropsToStyleNames from '../Utils/mapPropsToStyleNames';
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2e8cb63690a68b03eb2b91aa7b35bed0101095e0
dist/src/basic/Text.js
_react2.default.createElement(_reactNative.Text,_extends({ref:function ref(c){return _this2._root=c;}},this.props,{__source:{fileName:_jsxFileName,lineNumber:30}}), text));
<mask> <mask> Text=function(_Component){_inherits(Text,_Component);function Text(){_classCallCheck(this,Text);return _possibleConstructorReturn(this,(Text.__proto__||Object.getPrototypeOf(Text)).apply(this,arguments));}_createClass(Text,[{key:"render",value:function render() <mask> {var _this2=this; <mask> return( <mask> _react2.default.createElement(_reactNative.Text,_extends({ref:function ref(c){return _this2._root=c;}},this.props,{__source:{fileName:_jsxFileName,lineNumber:12}}), <mask> this.props.uppercase? <mask> _lodash2.default.toUpper(this.props.children): <mask> this.props.children)); <mask> <mask> <mask> }}]);return Text;}(_react.Component); <mask> <mask> </s> Text component Android comma bug fixed </s> remove Text=function(_Component){_inherits(Text,_Component);function Text(){_classCallCheck(this,Text);return _possibleConstructorReturn(this,(Text.__proto__||Object.getPrototypeOf(Text)).apply(this,arguments));}_createClass(Text,[{key:"render",value:function render() {var _this2=this; </s> add </s> remove var _nativeBaseShoutemTheme=require("native-base-shoutem-theme"); var _animation=require("@shoutem/animation"); var _mapPropsToStyleNames=require("../Utils/mapPropsToStyleNames");var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames);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 _nativeBaseShoutemTheme=require('native-base-shoutem-theme'); var _animation=require('@shoutem/animation'); var _mapPropsToStyleNames=require('../Utils/mapPropsToStyleNames');var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames);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 Text=function(_Component){_inherits(Text,_Component);function Text(){_classCallCheck(this,Text);return _possibleConstructorReturn(this,(Text.__proto__||Object.getPrototypeOf(Text)).apply(this,arguments));}_createClass(Text,[{key:'render',value:function render() {var _this2=this;var _props= this.props,uppercase=_props.uppercase,children=_props.children; var text=void 0; if(_lodash2.default.isArray(children)&&!_lodash2.default.some(children,_lodash2.default.isObject)){ text=_lodash2.default.join(children,''); }else{ text=children; } if(uppercase){ text=_lodash2.default.toUpper(text); } </s> remove {this.props.uppercase ? _.toUpper(this.props.children) : this.props.children} </s> add {text} </s> remove import { connectStyle } from "native-base-shoutem-theme"; import { connectAnimation } from "@shoutem/animation"; import mapPropsToStyleNames from "../Utils/mapPropsToStyleNames"; </s> add import { connectStyle } from 'native-base-shoutem-theme'; import { connectAnimation } from '@shoutem/animation'; import mapPropsToStyleNames from '../Utils/mapPropsToStyleNames'; </s> remove const StyledText = connectStyle("NativeBase.Text", {}, mapPropsToStyleNames)( </s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2e8cb63690a68b03eb2b91aa7b35bed0101095e0
dist/src/basic/Text.js
var StyledText=(0,_nativeBaseShoutemTheme.connectStyle)('NativeBase.Text',{},_mapPropsToStyleNames2.default)(
<mask> uppercase:false}; <mask> <mask> <mask> var AnimatedText=(0,_animation.connectAnimation)(Text); <mask> var StyledText=(0,_nativeBaseShoutemTheme.connectStyle)("NativeBase.Text",{},_mapPropsToStyleNames2.default)( <mask> Text);exports. <mask> <mask> <mask> Text=StyledText; <mask> //# sourceMappingURL=Text.js.map </s> Text component Android comma bug fixed </s> remove Object.defineProperty(exports,"__esModule",{value:true});exports.Text=undefined;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 _jsxFileName="src/basic/Text.js";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;};}();var _react=require("react");var _react2=_interopRequireDefault(_react); var _reactNative=require("react-native"); var _lodash=require("lodash");var _lodash2=_interopRequireDefault(_lodash); </s> add Object.defineProperty(exports,"__esModule",{value:true});exports.Text=undefined;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 _jsxFileName='src/basic/Text.js';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;};}();var _react=require('react');var _react2=_interopRequireDefault(_react); var _reactNative=require('react-native'); var _lodash=require('lodash');var _lodash2=_interopRequireDefault(_lodash); </s> remove var _nativeBaseShoutemTheme=require("native-base-shoutem-theme"); var _animation=require("@shoutem/animation"); var _mapPropsToStyleNames=require("../Utils/mapPropsToStyleNames");var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames);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 _nativeBaseShoutemTheme=require('native-base-shoutem-theme'); var _animation=require('@shoutem/animation'); var _mapPropsToStyleNames=require('../Utils/mapPropsToStyleNames');var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames);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 Text=function(_Component){_inherits(Text,_Component);function Text(){_classCallCheck(this,Text);return _possibleConstructorReturn(this,(Text.__proto__||Object.getPrototypeOf(Text)).apply(this,arguments));}_createClass(Text,[{key:'render',value:function render() {var _this2=this;var _props= this.props,uppercase=_props.uppercase,children=_props.children; var text=void 0; if(_lodash2.default.isArray(children)&&!_lodash2.default.some(children,_lodash2.default.isObject)){ text=_lodash2.default.join(children,''); }else{ text=children; } if(uppercase){ text=_lodash2.default.toUpper(text); } </s> remove Text=function(_Component){_inherits(Text,_Component);function Text(){_classCallCheck(this,Text);return _possibleConstructorReturn(this,(Text.__proto__||Object.getPrototypeOf(Text)).apply(this,arguments));}_createClass(Text,[{key:"render",value:function render() {var _this2=this; </s> add </s> remove const StyledText = connectStyle("NativeBase.Text", {}, mapPropsToStyleNames)( </s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)( </s> remove uppercase: false </s> add uppercase: false,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2e8cb63690a68b03eb2b91aa7b35bed0101095e0
dist/src/basic/Text.js
import React, { Component } from 'react'; import { Text as RNText } from 'react-native';
<mask> import React, { Component } from "react"; <mask> import { Text as RNText } from "react-native"; <mask> import _ from 'lodash'; <mask> <mask> import { connectStyle } from "native-base-shoutem-theme"; <mask> import { connectAnimation } from "@shoutem/animation"; <mask> import mapPropsToStyleNames from "../Utils/mapPropsToStyleNames"; </s> Text component Android comma bug fixed </s> remove import { connectStyle } from "native-base-shoutem-theme"; import { connectAnimation } from "@shoutem/animation"; import mapPropsToStyleNames from "../Utils/mapPropsToStyleNames"; </s> add import { connectStyle } from 'native-base-shoutem-theme'; import { connectAnimation } from '@shoutem/animation'; import mapPropsToStyleNames from '../Utils/mapPropsToStyleNames'; </s> remove {this.props.uppercase ? _.toUpper(this.props.children) : this.props.children} </s> add {text} </s> remove style: React.PropTypes.object </s> add style: React.PropTypes.object, </s> remove const StyledText = connectStyle("NativeBase.Text", {}, mapPropsToStyleNames)( </s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)( </s> remove var _nativeBaseShoutemTheme=require("native-base-shoutem-theme"); var _animation=require("@shoutem/animation"); var _mapPropsToStyleNames=require("../Utils/mapPropsToStyleNames");var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames);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 _nativeBaseShoutemTheme=require('native-base-shoutem-theme'); var _animation=require('@shoutem/animation'); var _mapPropsToStyleNames=require('../Utils/mapPropsToStyleNames');var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames);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 Text=function(_Component){_inherits(Text,_Component);function Text(){_classCallCheck(this,Text);return _possibleConstructorReturn(this,(Text.__proto__||Object.getPrototypeOf(Text)).apply(this,arguments));}_createClass(Text,[{key:'render',value:function render() {var _this2=this;var _props= this.props,uppercase=_props.uppercase,children=_props.children; var text=void 0; if(_lodash2.default.isArray(children)&&!_lodash2.default.some(children,_lodash2.default.isObject)){ text=_lodash2.default.join(children,''); }else{ text=children; } if(uppercase){ text=_lodash2.default.toUpper(text); }
[ "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2e8cb63690a68b03eb2b91aa7b35bed0101095e0
src/basic/Text.js
import { connectStyle } from 'native-base-shoutem-theme'; import { connectAnimation } from '@shoutem/animation'; import mapPropsToStyleNames from '../Utils/mapPropsToStyleNames';
<mask> import React, { Component } from "react"; <mask> import { Text as RNText } from "react-native"; <mask> import _ from 'lodash'; <mask> <mask> import { connectStyle } from "native-base-shoutem-theme"; <mask> import { connectAnimation } from "@shoutem/animation"; <mask> import mapPropsToStyleNames from "../Utils/mapPropsToStyleNames"; <mask> <mask> class Text extends Component { <mask> render() { <mask> return ( <mask> <RNText ref={c => (this._root = c)} {...this.props}> </s> Text component Android comma bug fixed </s> remove import React, { Component } from "react"; import { Text as RNText } from "react-native"; </s> add import React, { Component } from 'react'; import { Text as RNText } from 'react-native'; </s> remove {this.props.uppercase ? _.toUpper(this.props.children) : this.props.children} </s> add {text} </s> remove style: React.PropTypes.object </s> add style: React.PropTypes.object, </s> remove const StyledText = connectStyle("NativeBase.Text", {}, mapPropsToStyleNames)( </s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)( </s> remove uppercase: false </s> add uppercase: false,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2e8cb63690a68b03eb2b91aa7b35bed0101095e0
src/basic/Text.js
{text}
<mask> class Text extends Component { <mask> render() { <mask> return ( <mask> <RNText ref={c => (this._root = c)} {...this.props}> <mask> {this.props.uppercase <mask> ? _.toUpper(this.props.children) <mask> : this.props.children} <mask> </RNText> <mask> ); <mask> } <mask> } <mask> </s> Text component Android comma bug fixed </s> remove import { connectStyle } from "native-base-shoutem-theme"; import { connectAnimation } from "@shoutem/animation"; import mapPropsToStyleNames from "../Utils/mapPropsToStyleNames"; </s> add import { connectStyle } from 'native-base-shoutem-theme'; import { connectAnimation } from '@shoutem/animation'; import mapPropsToStyleNames from '../Utils/mapPropsToStyleNames'; </s> remove import React, { Component } from "react"; import { Text as RNText } from "react-native"; </s> add import React, { Component } from 'react'; import { Text as RNText } from 'react-native'; </s> remove const StyledText = connectStyle("NativeBase.Text", {}, mapPropsToStyleNames)( </s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)( </s> remove style: React.PropTypes.object </s> add style: React.PropTypes.object, </s> remove uppercase: false </s> add uppercase: false,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2e8cb63690a68b03eb2b91aa7b35bed0101095e0
src/basic/Text.js
style: React.PropTypes.object,
<mask> <mask> Text.propTypes = { <mask> ...RNText.propTypes, <mask> uppercase: React.PropTypes.bool, <mask> style: React.PropTypes.object <mask> }; <mask> <mask> Text.defaultProps = { <mask> uppercase: false <mask> }; </s> Text component Android comma bug fixed </s> remove uppercase: false </s> add uppercase: false, </s> remove const StyledText = connectStyle("NativeBase.Text", {}, mapPropsToStyleNames)( </s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)( </s> remove import { connectStyle } from "native-base-shoutem-theme"; import { connectAnimation } from "@shoutem/animation"; import mapPropsToStyleNames from "../Utils/mapPropsToStyleNames"; </s> add import { connectStyle } from 'native-base-shoutem-theme'; import { connectAnimation } from '@shoutem/animation'; import mapPropsToStyleNames from '../Utils/mapPropsToStyleNames'; </s> remove {this.props.uppercase ? _.toUpper(this.props.children) : this.props.children} </s> add {text} </s> remove import React, { Component } from "react"; import { Text as RNText } from "react-native"; </s> add import React, { Component } from 'react'; import { Text as RNText } from 'react-native';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2e8cb63690a68b03eb2b91aa7b35bed0101095e0
src/basic/Text.js
uppercase: false,
<mask> style: React.PropTypes.object <mask> }; <mask> <mask> Text.defaultProps = { <mask> uppercase: false <mask> }; <mask> <mask> const AnimatedText = connectAnimation(Text); <mask> const StyledText = connectStyle("NativeBase.Text", {}, mapPropsToStyleNames)( <mask> Text </s> Text component Android comma bug fixed </s> remove const StyledText = connectStyle("NativeBase.Text", {}, mapPropsToStyleNames)( </s> add const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)( </s> remove style: React.PropTypes.object </s> add style: React.PropTypes.object, </s> remove {this.props.uppercase ? _.toUpper(this.props.children) : this.props.children} </s> add {text} </s> remove import { connectStyle } from "native-base-shoutem-theme"; import { connectAnimation } from "@shoutem/animation"; import mapPropsToStyleNames from "../Utils/mapPropsToStyleNames"; </s> add import { connectStyle } from 'native-base-shoutem-theme'; import { connectAnimation } from '@shoutem/animation'; import mapPropsToStyleNames from '../Utils/mapPropsToStyleNames'; </s> remove import React, { Component } from "react"; import { Text as RNText } from "react-native"; </s> add import React, { Component } from 'react'; import { Text as RNText } from 'react-native';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2e8cb63690a68b03eb2b91aa7b35bed0101095e0
src/basic/Text.js
const StyledText = connectStyle('NativeBase.Text', {}, mapPropsToStyleNames)(
<mask> uppercase: false <mask> }; <mask> <mask> const AnimatedText = connectAnimation(Text); <mask> const StyledText = connectStyle("NativeBase.Text", {}, mapPropsToStyleNames)( <mask> Text <mask> ); <mask> <mask> export { StyledText as Text }; </s> Text component Android comma bug fixed </s> remove uppercase: false </s> add uppercase: false, </s> remove style: React.PropTypes.object </s> add style: React.PropTypes.object, </s> remove {this.props.uppercase ? _.toUpper(this.props.children) : this.props.children} </s> add {text} </s> remove import { connectStyle } from "native-base-shoutem-theme"; import { connectAnimation } from "@shoutem/animation"; import mapPropsToStyleNames from "../Utils/mapPropsToStyleNames"; </s> add import { connectStyle } from 'native-base-shoutem-theme'; import { connectAnimation } from '@shoutem/animation'; import mapPropsToStyleNames from '../Utils/mapPropsToStyleNames'; </s> remove import React, { Component } from "react"; import { Text as RNText } from "react-native"; </s> add import React, { Component } from 'react'; import { Text as RNText } from 'react-native';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2e8cb63690a68b03eb2b91aa7b35bed0101095e0
src/basic/Text.js
module.exports = Button; //export default Button;
<mask> </TouchableNativeFeedback> <mask> ); <mask> }; <mask> <mask> export default Button; </s> Fix - Red screen - check the render method of DefaultTabBar </s> remove export default StaticContainer; </s> add module.exports = StaticContainer; //export default StaticContainer; </s> remove export default SceneComponent; </s> add module.exports = SceneComponent; //export default SceneComponent; </s> remove export default Button; </s> add module.exports = Button; //export default Button; </s> remove export default Button; </s> add module.exports = Button; //export default Button;
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/2eba6d577a184c6f4813473d2b41382698fe7e89
src/basic/Tabs/Button.android.js
module.exports = Button; //export default Button;
<mask> </TouchableOpacity> <mask> ); <mask> }; <mask> <mask> export default Button; </s> Fix - Red screen - check the render method of DefaultTabBar </s> remove export default StaticContainer; </s> add module.exports = StaticContainer; //export default StaticContainer; </s> remove export default Button; </s> add module.exports = Button; //export default Button; </s> remove export default SceneComponent; </s> add module.exports = SceneComponent; //export default SceneComponent; </s> remove export default Button; </s> add module.exports = Button; //export default Button;
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/2eba6d577a184c6f4813473d2b41382698fe7e89
src/basic/Tabs/Button.ios.js
module.exports = Button; //export default Button;
<mask> </TouchableOpacity> <mask> ); <mask> }; <mask> <mask> export default Button; </s> Fix - Red screen - check the render method of DefaultTabBar
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/2eba6d577a184c6f4813473d2b41382698fe7e89
src/basic/Tabs/Button.windows.js
module.exports = SceneComponent; //export default SceneComponent;
<mask> </View> <mask> ); <mask> }; <mask> <mask> export default SceneComponent; </s> Fix - Red screen - check the render method of DefaultTabBar </s> remove export default StaticContainer; </s> add module.exports = StaticContainer; //export default StaticContainer; </s> remove export default Button; </s> add module.exports = Button; //export default Button; </s> remove export default Button; </s> add module.exports = Button; //export default Button; </s> remove export default Button; </s> add module.exports = Button; //export default Button;
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/2eba6d577a184c6f4813473d2b41382698fe7e89
src/basic/Tabs/SceneComponent.js
module.exports = StaticContainer; //export default StaticContainer;
<mask> return React.Children.only(child); <mask> } <mask> } <mask> <mask> export default StaticContainer; </s> Fix - Red screen - check the render method of DefaultTabBar </s> remove export default SceneComponent; </s> add module.exports = SceneComponent; //export default SceneComponent; </s> remove export default Button; </s> add module.exports = Button; //export default Button; </s> remove export default Button; </s> add module.exports = Button; //export default Button; </s> remove export default Button; </s> add module.exports = Button; //export default Button;
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/2eba6d577a184c6f4813473d2b41382698fe7e89
src/basic/Tabs/StaticContainer.js
segmentBackgroundColor: platform === "ios" ? "#F8F8F8" : "#3F51B5", segmentActiveBackgroundColor: platform === "ios" ? "#007aff" : "#fff", segmentTextColor: platform === "ios" ? "#007aff" : "#fff", segmentActiveTextColor: platform === "ios" ? "#fff" : "#3F51B5", segmentBorderColor: platform === "ios" ? "#007aff" : "#fff", segmentBorderColorMain: platform === "ios" ? "#a7a6ab" : "#3F51B5",
<mask> checkboxSize: 20, <mask> checkboxTickColor: "#fff", <mask> <mask> // Segment <mask> segmentBackgroundColor: "#3F51B5", <mask> segmentActiveBackgroundColor: "#fff", <mask> segmentTextColor: "#fff", <mask> segmentActiveTextColor: "#3F51B5", <mask> segmentBorderColor: "#fff", <mask> segmentBorderColorMain: "#3F51B5", <mask> <mask> // New Variable <mask> get defaultTextColor() { <mask> return this.textColor; <mask> }, </s> Modified variable values of commonColor.js </s> remove toolbarBtnTextColor: "#fff", iosStatusbar: "light-content", toolbarDefaultBorder: "#2874F0", </s> add toolbarBtnTextColor: platform === "ios" ? "#000" : "#fff", iosStatusbar: "dark-content", toolbarDefaultBorder: platform === "ios" ? "#a7a6ab" : "#3F51B5", </s> remove titleFontColor: "#FFF", </s> add titleFontColor: platform === "ios" ? "#000" : "#fff", </s> remove subtitleColor: "#FFF", </s> add subtitleColor: platform === "ios" ? "#000" : "#fff", </s> remove tabDefaultBg: "#2874F0", topTabBarTextColor: "#b3c7f9", topTabBarActiveTextColor: "#fff", topTabBarBorderColor: "#fff", topTabBarActiveBorderColor: "#fff", </s> add tabDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", topTabBarTextColor: platform === "ios" ? "#6b6b6b" : "#b3c7f9", topTabBarActiveTextColor: platform === "ios" ? "#007aff" : "#fff", topTabBarBorderColor: platform === "ios" ? "#a7a6ab" : "#fff", topTabBarActiveBorderColor: platform === "ios" ? "#007aff" : "#fff", </s> remove brandPrimary: "#2874F0", </s> add brandPrimary: platform === "ios" ? "#007aff" : "#3F51B5",
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2ec0f1024d7132f48d25a1112b294a26f06b6eb0
src/theme/variables/commonColor.js
brandPrimary: platform === "ios" ? "#007aff" : "#3F51B5",
<mask> // Card <mask> cardDefaultBg: "#fff", <mask> <mask> // Color <mask> brandPrimary: "#2874F0", <mask> brandInfo: "#62B1F6", <mask> brandSuccess: "#5cb85c", <mask> brandDanger: "#d9534f", <mask> brandWarning: "#f0ad4e", <mask> brandDark: "#000", </s> Modified variable values of commonColor.js </s> remove tabDefaultBg: "#2874F0", topTabBarTextColor: "#b3c7f9", topTabBarActiveTextColor: "#fff", topTabBarBorderColor: "#fff", topTabBarActiveBorderColor: "#fff", </s> add tabDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", topTabBarTextColor: platform === "ios" ? "#6b6b6b" : "#b3c7f9", topTabBarActiveTextColor: platform === "ios" ? "#007aff" : "#fff", topTabBarBorderColor: platform === "ios" ? "#a7a6ab" : "#fff", topTabBarActiveBorderColor: platform === "ios" ? "#007aff" : "#fff", </s> remove tabBarActiveTextColor: "#fff", tabActiveBgColor: platform === "ios" ? "#1569f4" : undefined, </s> add tabBarActiveTextColor: platform === "ios" ? "#2874F0" : "#fff", tabActiveBgColor: platform === "ios" ? "#cde1f9" : "#3F51B5", </s> remove tabBarTextColor: "#8bb3f4", </s> add tabBarTextColor: platform === "ios" ? "#737373" : "#bfc6ea", </s> remove subtitleColor: "#FFF", </s> add subtitleColor: platform === "ios" ? "#000" : "#fff", </s> remove segmentBackgroundColor: "#3F51B5", segmentActiveBackgroundColor: "#fff", segmentTextColor: "#fff", segmentActiveTextColor: "#3F51B5", segmentBorderColor: "#fff", segmentBorderColorMain: "#3F51B5", </s> add segmentBackgroundColor: platform === "ios" ? "#F8F8F8" : "#3F51B5", segmentActiveBackgroundColor: platform === "ios" ? "#007aff" : "#fff", segmentTextColor: platform === "ios" ? "#007aff" : "#fff", segmentActiveTextColor: platform === "ios" ? "#fff" : "#3F51B5", segmentBorderColor: platform === "ios" ? "#007aff" : "#fff", segmentBorderColorMain: platform === "ios" ? "#a7a6ab" : "#3F51B5",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2ec0f1024d7132f48d25a1112b294a26f06b6eb0
src/theme/variables/commonColor.js
footerDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
<mask> }, <mask> <mask> // Footer <mask> footerHeight: isIphoneX ? 89 : 55, <mask> footerDefaultBg: "#2874F0", <mask> footerPaddingBottom: isIphoneX ? 34 : 0, <mask> <mask> // FooterTab <mask> tabBarTextColor: "#8bb3f4", <mask> tabBarTextSize: platform === "ios" ? 14 : 11, </s> Modified variable values of commonColor.js </s> remove tabBarTextColor: "#8bb3f4", </s> add tabBarTextColor: platform === "ios" ? "#737373" : "#bfc6ea", </s> remove tabBarActiveTextColor: "#fff", tabActiveBgColor: platform === "ios" ? "#1569f4" : undefined, </s> add tabBarActiveTextColor: platform === "ios" ? "#2874F0" : "#fff", tabActiveBgColor: platform === "ios" ? "#cde1f9" : "#3F51B5", </s> remove segmentBackgroundColor: "#3F51B5", segmentActiveBackgroundColor: "#fff", segmentTextColor: "#fff", segmentActiveTextColor: "#3F51B5", segmentBorderColor: "#fff", segmentBorderColorMain: "#3F51B5", </s> add segmentBackgroundColor: platform === "ios" ? "#F8F8F8" : "#3F51B5", segmentActiveBackgroundColor: platform === "ios" ? "#007aff" : "#fff", segmentTextColor: platform === "ios" ? "#007aff" : "#fff", segmentActiveTextColor: platform === "ios" ? "#fff" : "#3F51B5", segmentBorderColor: platform === "ios" ? "#007aff" : "#fff", segmentBorderColorMain: platform === "ios" ? "#a7a6ab" : "#3F51B5", </s> remove tabDefaultBg: "#2874F0", topTabBarTextColor: "#b3c7f9", topTabBarActiveTextColor: "#fff", topTabBarBorderColor: "#fff", topTabBarActiveBorderColor: "#fff", </s> add tabDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", topTabBarTextColor: platform === "ios" ? "#6b6b6b" : "#b3c7f9", topTabBarActiveTextColor: platform === "ios" ? "#007aff" : "#fff", topTabBarBorderColor: platform === "ios" ? "#a7a6ab" : "#fff", topTabBarActiveBorderColor: platform === "ios" ? "#007aff" : "#fff", </s> remove toolbarBtnColor: "#fff", toolbarDefaultBg: "#2874F0", </s> add toolbarBtnColor: platform === "ios" ? "#007aff" : "#fff", toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2ec0f1024d7132f48d25a1112b294a26f06b6eb0
src/theme/variables/commonColor.js
tabBarTextColor: platform === "ios" ? "#737373" : "#bfc6ea",
<mask> footerDefaultBg: "#2874F0", <mask> footerPaddingBottom: isIphoneX ? 34 : 0, <mask> <mask> // FooterTab <mask> tabBarTextColor: "#8bb3f4", <mask> tabBarTextSize: platform === "ios" ? 14 : 11, <mask> activeTab: platform === "ios" ? "#007aff" : "#fff", <mask> sTabBarActiveTextColor: "#007aff", <mask> tabBarActiveTextColor: "#fff", <mask> tabActiveBgColor: platform === "ios" ? "#1569f4" : undefined, </s> Modified variable values of commonColor.js </s> remove footerDefaultBg: "#2874F0", </s> add footerDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", </s> remove tabBarActiveTextColor: "#fff", tabActiveBgColor: platform === "ios" ? "#1569f4" : undefined, </s> add tabBarActiveTextColor: platform === "ios" ? "#2874F0" : "#fff", tabActiveBgColor: platform === "ios" ? "#cde1f9" : "#3F51B5", </s> remove tabDefaultBg: "#2874F0", topTabBarTextColor: "#b3c7f9", topTabBarActiveTextColor: "#fff", topTabBarBorderColor: "#fff", topTabBarActiveBorderColor: "#fff", </s> add tabDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", topTabBarTextColor: platform === "ios" ? "#6b6b6b" : "#b3c7f9", topTabBarActiveTextColor: platform === "ios" ? "#007aff" : "#fff", topTabBarBorderColor: platform === "ios" ? "#a7a6ab" : "#fff", topTabBarActiveBorderColor: platform === "ios" ? "#007aff" : "#fff", </s> remove toolbarBtnColor: "#fff", toolbarDefaultBg: "#2874F0", </s> add toolbarBtnColor: platform === "ios" ? "#007aff" : "#fff", toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", </s> remove segmentBackgroundColor: "#3F51B5", segmentActiveBackgroundColor: "#fff", segmentTextColor: "#fff", segmentActiveTextColor: "#3F51B5", segmentBorderColor: "#fff", segmentBorderColorMain: "#3F51B5", </s> add segmentBackgroundColor: platform === "ios" ? "#F8F8F8" : "#3F51B5", segmentActiveBackgroundColor: platform === "ios" ? "#007aff" : "#fff", segmentTextColor: platform === "ios" ? "#007aff" : "#fff", segmentActiveTextColor: platform === "ios" ? "#fff" : "#3F51B5", segmentBorderColor: platform === "ios" ? "#007aff" : "#fff", segmentBorderColorMain: platform === "ios" ? "#a7a6ab" : "#3F51B5",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2ec0f1024d7132f48d25a1112b294a26f06b6eb0
src/theme/variables/commonColor.js
tabBarActiveTextColor: platform === "ios" ? "#2874F0" : "#fff", tabActiveBgColor: platform === "ios" ? "#cde1f9" : "#3F51B5",
<mask> tabBarTextColor: "#8bb3f4", <mask> tabBarTextSize: platform === "ios" ? 14 : 11, <mask> activeTab: platform === "ios" ? "#007aff" : "#fff", <mask> sTabBarActiveTextColor: "#007aff", <mask> tabBarActiveTextColor: "#fff", <mask> tabActiveBgColor: platform === "ios" ? "#1569f4" : undefined, <mask> <mask> // Tab <mask> tabDefaultBg: "#2874F0", <mask> topTabBarTextColor: "#b3c7f9", <mask> topTabBarActiveTextColor: "#fff", </s> Modified variable values of commonColor.js </s> remove tabBarTextColor: "#8bb3f4", </s> add tabBarTextColor: platform === "ios" ? "#737373" : "#bfc6ea", </s> remove tabDefaultBg: "#2874F0", topTabBarTextColor: "#b3c7f9", topTabBarActiveTextColor: "#fff", topTabBarBorderColor: "#fff", topTabBarActiveBorderColor: "#fff", </s> add tabDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", topTabBarTextColor: platform === "ios" ? "#6b6b6b" : "#b3c7f9", topTabBarActiveTextColor: platform === "ios" ? "#007aff" : "#fff", topTabBarBorderColor: platform === "ios" ? "#a7a6ab" : "#fff", topTabBarActiveBorderColor: platform === "ios" ? "#007aff" : "#fff", </s> remove footerDefaultBg: "#2874F0", </s> add footerDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", </s> remove toolbarBtnColor: "#fff", toolbarDefaultBg: "#2874F0", </s> add toolbarBtnColor: platform === "ios" ? "#007aff" : "#fff", toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", </s> remove segmentBackgroundColor: "#3F51B5", segmentActiveBackgroundColor: "#fff", segmentTextColor: "#fff", segmentActiveTextColor: "#3F51B5", segmentBorderColor: "#fff", segmentBorderColorMain: "#3F51B5", </s> add segmentBackgroundColor: platform === "ios" ? "#F8F8F8" : "#3F51B5", segmentActiveBackgroundColor: platform === "ios" ? "#007aff" : "#fff", segmentTextColor: platform === "ios" ? "#007aff" : "#fff", segmentActiveTextColor: platform === "ios" ? "#fff" : "#3F51B5", segmentBorderColor: platform === "ios" ? "#007aff" : "#fff", segmentBorderColorMain: platform === "ios" ? "#a7a6ab" : "#3F51B5",
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2ec0f1024d7132f48d25a1112b294a26f06b6eb0
src/theme/variables/commonColor.js
tabDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", topTabBarTextColor: platform === "ios" ? "#6b6b6b" : "#b3c7f9", topTabBarActiveTextColor: platform === "ios" ? "#007aff" : "#fff", topTabBarBorderColor: platform === "ios" ? "#a7a6ab" : "#fff", topTabBarActiveBorderColor: platform === "ios" ? "#007aff" : "#fff",
<mask> tabBarActiveTextColor: "#fff", <mask> tabActiveBgColor: platform === "ios" ? "#1569f4" : undefined, <mask> <mask> // Tab <mask> tabDefaultBg: "#2874F0", <mask> topTabBarTextColor: "#b3c7f9", <mask> topTabBarActiveTextColor: "#fff", <mask> topTabBarBorderColor: "#fff", <mask> topTabBarActiveBorderColor: "#fff", <mask> <mask> // Header <mask> toolbarBtnColor: "#fff", <mask> toolbarDefaultBg: "#2874F0", <mask> toolbarHeight: platform === "ios" ? (isIphoneX ? 88 : 64) : 56, </s> Modified variable values of commonColor.js </s> remove toolbarBtnColor: "#fff", toolbarDefaultBg: "#2874F0", </s> add toolbarBtnColor: platform === "ios" ? "#007aff" : "#fff", toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", </s> remove tabBarActiveTextColor: "#fff", tabActiveBgColor: platform === "ios" ? "#1569f4" : undefined, </s> add tabBarActiveTextColor: platform === "ios" ? "#2874F0" : "#fff", tabActiveBgColor: platform === "ios" ? "#cde1f9" : "#3F51B5", </s> remove tabBarTextColor: "#8bb3f4", </s> add tabBarTextColor: platform === "ios" ? "#737373" : "#bfc6ea", </s> remove segmentBackgroundColor: "#3F51B5", segmentActiveBackgroundColor: "#fff", segmentTextColor: "#fff", segmentActiveTextColor: "#3F51B5", segmentBorderColor: "#fff", segmentBorderColorMain: "#3F51B5", </s> add segmentBackgroundColor: platform === "ios" ? "#F8F8F8" : "#3F51B5", segmentActiveBackgroundColor: platform === "ios" ? "#007aff" : "#fff", segmentTextColor: platform === "ios" ? "#007aff" : "#fff", segmentActiveTextColor: platform === "ios" ? "#fff" : "#3F51B5", segmentBorderColor: platform === "ios" ? "#007aff" : "#fff", segmentBorderColorMain: platform === "ios" ? "#a7a6ab" : "#3F51B5", </s> remove toolbarBtnTextColor: "#fff", iosStatusbar: "light-content", toolbarDefaultBorder: "#2874F0", </s> add toolbarBtnTextColor: platform === "ios" ? "#000" : "#fff", iosStatusbar: "dark-content", toolbarDefaultBorder: platform === "ios" ? "#a7a6ab" : "#3F51B5",
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2ec0f1024d7132f48d25a1112b294a26f06b6eb0
src/theme/variables/commonColor.js
toolbarBtnColor: platform === "ios" ? "#007aff" : "#fff", toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
<mask> topTabBarBorderColor: "#fff", <mask> topTabBarActiveBorderColor: "#fff", <mask> <mask> // Header <mask> toolbarBtnColor: "#fff", <mask> toolbarDefaultBg: "#2874F0", <mask> toolbarHeight: platform === "ios" ? (isIphoneX ? 88 : 64) : 56, <mask> toolbarSearchIconSize: platform === "ios" ? 20 : 23, <mask> toolbarInputColor: platform === "ios" ? "#CECDD2" : "#fff", <mask> searchBarHeight: platform === "ios" ? 30 : 40, <mask> searchBarInputHeight: platform === "ios" ? 30 : 50, </s> Modified variable values of commonColor.js </s> remove toolbarBtnTextColor: "#fff", iosStatusbar: "light-content", toolbarDefaultBorder: "#2874F0", </s> add toolbarBtnTextColor: platform === "ios" ? "#000" : "#fff", iosStatusbar: "dark-content", toolbarDefaultBorder: platform === "ios" ? "#a7a6ab" : "#3F51B5", </s> remove tabDefaultBg: "#2874F0", topTabBarTextColor: "#b3c7f9", topTabBarActiveTextColor: "#fff", topTabBarBorderColor: "#fff", topTabBarActiveBorderColor: "#fff", </s> add tabDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", topTabBarTextColor: platform === "ios" ? "#6b6b6b" : "#b3c7f9", topTabBarActiveTextColor: platform === "ios" ? "#007aff" : "#fff", topTabBarBorderColor: platform === "ios" ? "#a7a6ab" : "#fff", topTabBarActiveBorderColor: platform === "ios" ? "#007aff" : "#fff", </s> remove tabBarActiveTextColor: "#fff", tabActiveBgColor: platform === "ios" ? "#1569f4" : undefined, </s> add tabBarActiveTextColor: platform === "ios" ? "#2874F0" : "#fff", tabActiveBgColor: platform === "ios" ? "#cde1f9" : "#3F51B5", </s> remove segmentBackgroundColor: "#3F51B5", segmentActiveBackgroundColor: "#fff", segmentTextColor: "#fff", segmentActiveTextColor: "#3F51B5", segmentBorderColor: "#fff", segmentBorderColorMain: "#3F51B5", </s> add segmentBackgroundColor: platform === "ios" ? "#F8F8F8" : "#3F51B5", segmentActiveBackgroundColor: platform === "ios" ? "#007aff" : "#fff", segmentTextColor: platform === "ios" ? "#007aff" : "#fff", segmentActiveTextColor: platform === "ios" ? "#fff" : "#3F51B5", segmentBorderColor: platform === "ios" ? "#007aff" : "#fff", segmentBorderColorMain: platform === "ios" ? "#a7a6ab" : "#3F51B5", </s> remove tabBarTextColor: "#8bb3f4", </s> add tabBarTextColor: platform === "ios" ? "#737373" : "#bfc6ea",
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2ec0f1024d7132f48d25a1112b294a26f06b6eb0
src/theme/variables/commonColor.js
toolbarBtnTextColor: platform === "ios" ? "#000" : "#fff", iosStatusbar: "dark-content", toolbarDefaultBorder: platform === "ios" ? "#a7a6ab" : "#3F51B5",
<mask> toolbarSearchIconSize: platform === "ios" ? 20 : 23, <mask> toolbarInputColor: platform === "ios" ? "#CECDD2" : "#fff", <mask> searchBarHeight: platform === "ios" ? 30 : 40, <mask> searchBarInputHeight: platform === "ios" ? 30 : 50, <mask> toolbarBtnTextColor: "#fff", <mask> iosStatusbar: "light-content", <mask> toolbarDefaultBorder: "#2874F0", <mask> get statusBarColor() { <mask> return color(this.toolbarDefaultBg) <mask> .darken(0.2) <mask> .hex(); <mask> }, </s> Modified variable values of commonColor.js </s> remove toolbarBtnColor: "#fff", toolbarDefaultBg: "#2874F0", </s> add toolbarBtnColor: platform === "ios" ? "#007aff" : "#fff", toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", </s> remove segmentBackgroundColor: "#3F51B5", segmentActiveBackgroundColor: "#fff", segmentTextColor: "#fff", segmentActiveTextColor: "#3F51B5", segmentBorderColor: "#fff", segmentBorderColorMain: "#3F51B5", </s> add segmentBackgroundColor: platform === "ios" ? "#F8F8F8" : "#3F51B5", segmentActiveBackgroundColor: platform === "ios" ? "#007aff" : "#fff", segmentTextColor: platform === "ios" ? "#007aff" : "#fff", segmentActiveTextColor: platform === "ios" ? "#fff" : "#3F51B5", segmentBorderColor: platform === "ios" ? "#007aff" : "#fff", segmentBorderColorMain: platform === "ios" ? "#a7a6ab" : "#3F51B5", </s> remove tabDefaultBg: "#2874F0", topTabBarTextColor: "#b3c7f9", topTabBarActiveTextColor: "#fff", topTabBarBorderColor: "#fff", topTabBarActiveBorderColor: "#fff", </s> add tabDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", topTabBarTextColor: platform === "ios" ? "#6b6b6b" : "#b3c7f9", topTabBarActiveTextColor: platform === "ios" ? "#007aff" : "#fff", topTabBarBorderColor: platform === "ios" ? "#a7a6ab" : "#fff", topTabBarActiveBorderColor: platform === "ios" ? "#007aff" : "#fff", </s> remove tabBarActiveTextColor: "#fff", tabActiveBgColor: platform === "ios" ? "#1569f4" : undefined, </s> add tabBarActiveTextColor: platform === "ios" ? "#2874F0" : "#fff", tabActiveBgColor: platform === "ios" ? "#cde1f9" : "#3F51B5", </s> remove tabBarTextColor: "#8bb3f4", </s> add tabBarTextColor: platform === "ios" ? "#737373" : "#bfc6ea",
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2ec0f1024d7132f48d25a1112b294a26f06b6eb0
src/theme/variables/commonColor.js
subtitleColor: platform === "ios" ? "#000" : "#fff",
<mask> // Title <mask> titleFontfamily: platform === "ios" ? "System" : "Roboto_medium", <mask> titleFontSize: platform === "ios" ? 17 : 19, <mask> subTitleFontSize: platform === "ios" ? 12 : 14, <mask> subtitleColor: "#FFF", <mask> <mask> // New Variable <mask> titleFontColor: "#FFF", <mask> <mask> // Other </s> Modified variable values of commonColor.js </s> remove titleFontColor: "#FFF", </s> add titleFontColor: platform === "ios" ? "#000" : "#fff", </s> remove segmentBackgroundColor: "#3F51B5", segmentActiveBackgroundColor: "#fff", segmentTextColor: "#fff", segmentActiveTextColor: "#3F51B5", segmentBorderColor: "#fff", segmentBorderColorMain: "#3F51B5", </s> add segmentBackgroundColor: platform === "ios" ? "#F8F8F8" : "#3F51B5", segmentActiveBackgroundColor: platform === "ios" ? "#007aff" : "#fff", segmentTextColor: platform === "ios" ? "#007aff" : "#fff", segmentActiveTextColor: platform === "ios" ? "#fff" : "#3F51B5", segmentBorderColor: platform === "ios" ? "#007aff" : "#fff", segmentBorderColorMain: platform === "ios" ? "#a7a6ab" : "#3F51B5", </s> remove tabDefaultBg: "#2874F0", topTabBarTextColor: "#b3c7f9", topTabBarActiveTextColor: "#fff", topTabBarBorderColor: "#fff", topTabBarActiveBorderColor: "#fff", </s> add tabDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", topTabBarTextColor: platform === "ios" ? "#6b6b6b" : "#b3c7f9", topTabBarActiveTextColor: platform === "ios" ? "#007aff" : "#fff", topTabBarBorderColor: platform === "ios" ? "#a7a6ab" : "#fff", topTabBarActiveBorderColor: platform === "ios" ? "#007aff" : "#fff", </s> remove toolbarBtnColor: "#fff", toolbarDefaultBg: "#2874F0", </s> add toolbarBtnColor: platform === "ios" ? "#007aff" : "#fff", toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", </s> remove tabBarActiveTextColor: "#fff", tabActiveBgColor: platform === "ios" ? "#1569f4" : undefined, </s> add tabBarActiveTextColor: platform === "ios" ? "#2874F0" : "#fff", tabActiveBgColor: platform === "ios" ? "#cde1f9" : "#3F51B5",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2ec0f1024d7132f48d25a1112b294a26f06b6eb0
src/theme/variables/commonColor.js
titleFontColor: platform === "ios" ? "#000" : "#fff",
<mask> subTitleFontSize: platform === "ios" ? 12 : 14, <mask> subtitleColor: "#FFF", <mask> <mask> // New Variable <mask> titleFontColor: "#FFF", <mask> <mask> // Other <mask> borderRadiusBase: platform === "ios" ? 5 : 2, <mask> borderWidth: 1 / PixelRatio.getPixelSizeForLayoutSize(1), <mask> contentPadding: 10, </s> Modified variable values of commonColor.js </s> remove subtitleColor: "#FFF", </s> add subtitleColor: platform === "ios" ? "#000" : "#fff", </s> remove segmentBackgroundColor: "#3F51B5", segmentActiveBackgroundColor: "#fff", segmentTextColor: "#fff", segmentActiveTextColor: "#3F51B5", segmentBorderColor: "#fff", segmentBorderColorMain: "#3F51B5", </s> add segmentBackgroundColor: platform === "ios" ? "#F8F8F8" : "#3F51B5", segmentActiveBackgroundColor: platform === "ios" ? "#007aff" : "#fff", segmentTextColor: platform === "ios" ? "#007aff" : "#fff", segmentActiveTextColor: platform === "ios" ? "#fff" : "#3F51B5", segmentBorderColor: platform === "ios" ? "#007aff" : "#fff", segmentBorderColorMain: platform === "ios" ? "#a7a6ab" : "#3F51B5", </s> remove tabDefaultBg: "#2874F0", topTabBarTextColor: "#b3c7f9", topTabBarActiveTextColor: "#fff", topTabBarBorderColor: "#fff", topTabBarActiveBorderColor: "#fff", </s> add tabDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", topTabBarTextColor: platform === "ios" ? "#6b6b6b" : "#b3c7f9", topTabBarActiveTextColor: platform === "ios" ? "#007aff" : "#fff", topTabBarBorderColor: platform === "ios" ? "#a7a6ab" : "#fff", topTabBarActiveBorderColor: platform === "ios" ? "#007aff" : "#fff", </s> remove toolbarBtnColor: "#fff", toolbarDefaultBg: "#2874F0", </s> add toolbarBtnColor: platform === "ios" ? "#007aff" : "#fff", toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5", </s> remove tabBarActiveTextColor: "#fff", tabActiveBgColor: platform === "ios" ? "#1569f4" : undefined, </s> add tabBarActiveTextColor: platform === "ios" ? "#2874F0" : "#fff", tabActiveBgColor: platform === "ios" ? "#cde1f9" : "#3F51B5",
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2ec0f1024d7132f48d25a1112b294a26f06b6eb0
src/theme/variables/commonColor.js
getSelectedItem() { return _.find(this.props.children, child => child.props.value === this.props.selectedValue); }
<mask> } <mask> <mask> modifyHeader() { <mask> const childrenArray = React.Children.toArray(this.props.headerComponent.props.children); <mask> const newChildren = []; <mask> childrenArray.forEach((child) => { </s> Added selectedItem to props.renderButton args. Combined args into single object so users can use argument destructing instead of having to track all method arguments. Added getSelectedItem helper function. Added propType for renderButton. </s> remove return this.props.renderButton(onPress, text, this); </s> add return this.props.renderButton({ onPress, text, picker: this, selectedItem: this.getSelectedItem() });
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2fe5c13b8e3928d3b871074875de081f02154dab
src/basic/Picker.ios.js
return this.props.renderButton({ onPress, text, picker: this, selectedItem: this.getSelectedItem() });
<mask> renderButton() { <mask> const onPress = () => { this._setModalVisible(true); }; <mask> const text = this.state.currentLabel ? this.state.currentLabel : this.props.defaultLabel; <mask> if (this.props.renderButton) { <mask> return this.props.renderButton(onPress, text, this); <mask> } <mask> return <Button <mask> style={this.props.style} <mask> dark <mask> picker </s> Added selectedItem to props.renderButton args. Combined args into single object so users can use argument destructing instead of having to track all method arguments. Added getSelectedItem helper function. Added propType for renderButton.
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2fe5c13b8e3928d3b871074875de081f02154dab
src/basic/Picker.ios.js
renderButton: React.PropTypes.func
<mask> }); <mask> <mask> PickerNB.propTypes = { <mask> ...View.propTypes, <mask> }; <mask> <mask> const StyledPickerNB = connectStyle('NativeBase.PickerNB', {}, mapPropsToStyleNames)(PickerNB); <mask> <mask> export { <mask> StyledPickerNB as PickerNB, </s> Added selectedItem to props.renderButton args. Combined args into single object so users can use argument destructing instead of having to track all method arguments. Added getSelectedItem helper function. Added propType for renderButton. </s> remove return this.props.renderButton(onPress, text, this); </s> add return this.props.renderButton({ onPress, text, picker: this, selectedItem: this.getSelectedItem() });
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/2fe5c13b8e3928d3b871074875de081f02154dab
src/basic/Picker.ios.js