docstring_tokens
stringlengths
0
76.5k
code_tokens
stringlengths
75
1.81M
label_window
sequencelengths
4
2.12k
html_url
stringlengths
74
116
file_name
stringlengths
3
311
onRequestClose={() => { }}
<mask> <Modal <mask> animationType={this.props.animationType} <mask> transparent={this.props.modalTransparent} //from api <mask> visible={this.state.modalVisible} <mask> onRequestClose={() => {}} <mask> > <mask> <Text <mask> onPress={() => this.setState({ modalVisible: false })} <mask> style={{ backgroundColor: variables.datePickerBg, flex: 1 }} <mask> /> </s> Shows default date instead of "Select Date" if placeHolderText prop isn't specified. Enhancement based on issue #2086 </s> remove "/" + (this.state.chosenDate.getMonth() + 1) + "/" + +this.state.chosenDate.getFullYear() : this.props.placeHolderText ? this.props.placeHolderText : "Select Date"} </s> add "/" + (this.state.chosenDate.getMonth() + 1) + "/" + +this.state.chosenDate.getFullYear() : this.props.placeHolderText ? this.props.placeHolderText : "Select Date"}
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd6e79800eecba6763aaf14f58b84463972a3af8
src/basic/DatePicker.js
}, }, _dark: { _focusVisible: { _web: {
<mask> _focusVisible: { <mask> _web: { <mask> outlineWidth: '0', <mask> style: { boxShadow: `${primary[400]} 0px 0px 0px 2px` }, <mask> _dark: { <mask> outlineWidth: '0', <mask> style: { boxShadow: `${primary[500]} 0px 0px 0px 2px` }, <mask> }, <mask> }, <mask> }, </s> fix: removing _light from theme </s> remove _web: { style: { ...focusRing, outlineWidth: 0 } }, </s> add _web: { style: { outlineWidth: 0, boxShadow: `${primary[400]} 0px 0px 0px 2px`, }, }, }, _dark: { _focusVisible: { _web: { style: { outlineWidth: 0, boxShadow: `${primary[500]} 0px 0px 0px 2px`, }, }, }, </s> remove const focusRing = mode( { boxShadow: `${primary[400]} 0px 0px 0px 2px`, }, { boxShadow: `${primary[500]} 0px 0px 0px 2px`, } )(props); </s> add </s> remove import { mode } from '../tools'; </s> add </s> remove _light: { placeholderTextColor: 'text.400', color: 'text.900', borderColor: 'muted.300', _hover: { borderColor: 'primary.600', }, _focus: { borderColor: 'primary.600', _hover: { borderColor: 'primary.600' }, _stack: { style: { outlineWidth: '0', boxShadow: `0 0 0 1px ${primary[600]}`, }, </s> add placeholderTextColor: 'text.400', color: 'text.900', borderColor: 'muted.300', _hover: { borderColor: 'primary.600', }, _focus: { borderColor: 'primary.600', _hover: { borderColor: 'primary.600' }, _stack: { flexDirection: 'row', alignItems: 'center', // justifyContent: 'space-between', overflow: 'hidden', style: { outlineWidth: '0', boxShadow: `0 0 0 1px ${primary[600]}`,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/button.ts
color: 'text.900',
<mask> const baseStyle = () => { <mask> return { <mask> _light: { <mask> color: 'text.900', <mask> }, <mask> _dark: { <mask> color: 'text.50', <mask> }, <mask> fontWeight: 'bold', <mask> lineHeight: 'sm', </s> fix: removing _light from theme </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _stack: { flexDirection: 'row', alignItems: 'center', // justifyContent: 'space-between', overflow: 'hidden', }, </s> add
[ "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/heading.ts
placeholderTextColor: 'text.400', color: 'text.900', borderColor: 'muted.300', _hover: { borderColor: 'primary.600', }, _focus: { borderColor: 'primary.600', _hover: { borderColor: 'primary.600' }, _stack: { flexDirection: 'row', alignItems: 'center', // justifyContent: 'space-between', overflow: 'hidden', style: { outlineWidth: '0', boxShadow: `0 0 0 1px ${primary[600]}`,
<mask> flex: 1, <mask> w: '100%', <mask> h: '100%', <mask> }, <mask> _light: { <mask> placeholderTextColor: 'text.400', <mask> color: 'text.900', <mask> borderColor: 'muted.300', <mask> _hover: { <mask> borderColor: 'primary.600', <mask> }, <mask> _focus: { <mask> borderColor: 'primary.600', <mask> _hover: { borderColor: 'primary.600' }, <mask> _stack: { <mask> style: { <mask> outlineWidth: '0', <mask> boxShadow: `0 0 0 1px ${primary[600]}`, <mask> }, <mask> }, <mask> }, <mask> _invalid: { <mask> borderColor: 'error.600', <mask> _hover: { borderColor: 'error.600' }, </s> fix: removing _light from theme </s> remove _light: { offTrackColor: 'muted.300', onTrackColor: `${c}.600`, _hover: { offTrackColor: 'muted.400', onTrackColor: `${c}.700`, }, _invalid: { borderColor: 'error.600', }, </s> add offTrackColor: 'muted.300', onTrackColor: `${c}.600`, _hover: { offTrackColor: 'muted.400', onTrackColor: `${c}.700`, </s> remove _stack: { flexDirection: 'row', alignItems: 'center', // justifyContent: 'space-between', overflow: 'hidden', }, </s> add </s> remove _web: { style: { ...focusRing, outlineWidth: 0 } }, </s> add _web: { style: { outlineWidth: 0, boxShadow: `${primary[400]} 0px 0px 0px 2px`, }, }, }, _dark: { _focusVisible: { _web: { style: { outlineWidth: 0, boxShadow: `${primary[500]} 0px 0px 0px 2px`, }, }, }, </s> remove _dark: { </s> add }, }, _dark: { _focusVisible: { _web: { </s> remove const focusRing = mode( { boxShadow: `${primary[400]} 0px 0px 0px 2px`, }, { boxShadow: `${primary[500]} 0px 0px 0px 2px`, } )(props); </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/input.ts
<mask> _hover: { <mask> borderColor: 'muted.300', <mask> }, <mask> }, <mask> _stack: { <mask> flexDirection: 'row', <mask> alignItems: 'center', <mask> // justifyContent: 'space-between', <mask> overflow: 'hidden', <mask> }, <mask> }, <mask> _dark: { <mask> placeholderTextColor: 'text.600', <mask> color: 'text.50', <mask> borderColor: 'muted.700', </s> fix: removing _light from theme </s> remove _light: { placeholderTextColor: 'text.400', color: 'text.900', borderColor: 'muted.300', _hover: { borderColor: 'primary.600', }, _focus: { borderColor: 'primary.600', _hover: { borderColor: 'primary.600' }, _stack: { style: { outlineWidth: '0', boxShadow: `0 0 0 1px ${primary[600]}`, }, </s> add placeholderTextColor: 'text.400', color: 'text.900', borderColor: 'muted.300', _hover: { borderColor: 'primary.600', }, _focus: { borderColor: 'primary.600', _hover: { borderColor: 'primary.600' }, _stack: { flexDirection: 'row', alignItems: 'center', // justifyContent: 'space-between', overflow: 'hidden', style: { outlineWidth: '0', boxShadow: `0 0 0 1px ${primary[600]}`, </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _light: { offTrackColor: 'muted.300', onTrackColor: `${c}.600`, _hover: { offTrackColor: 'muted.400', onTrackColor: `${c}.700`, }, _invalid: { borderColor: 'error.600', }, </s> add offTrackColor: 'muted.300', onTrackColor: `${c}.600`, _hover: { offTrackColor: 'muted.400', onTrackColor: `${c}.700`,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/input.ts
color: 'text.900',
<mask> borderWidth: '1', <mask> borderRightWidth: '0', <mask> borderLeftRadius: 'sm', <mask> _text: { <mask> fontWeight: 400, <mask> }, <mask> alignItems: 'center', <mask> justifyContent: 'center', <mask> bg: 'muted.50', <mask> borderColor: 'muted.300', </s> fix: removing _light from theme </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _stack: { flexDirection: 'row', alignItems: 'center', // justifyContent: 'space-between', overflow: 'hidden', }, </s> add </s> remove _light: { placeholderTextColor: 'text.400', color: 'text.900', borderColor: 'muted.300', _hover: { borderColor: 'primary.600', }, _focus: { borderColor: 'primary.600', _hover: { borderColor: 'primary.600' }, _stack: { style: { outlineWidth: '0', boxShadow: `0 0 0 1px ${primary[600]}`, }, </s> add placeholderTextColor: 'text.400', color: 'text.900', borderColor: 'muted.300', _hover: { borderColor: 'primary.600', }, _focus: { borderColor: 'primary.600', _hover: { borderColor: 'primary.600' }, _stack: { flexDirection: 'row', alignItems: 'center', // justifyContent: 'space-between', overflow: 'hidden', style: { outlineWidth: '0', boxShadow: `0 0 0 1px ${primary[600]}`,
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/inputleftaddon.ts
bg: 'muted.50', borderColor: 'muted.300',
<mask> fontWeight: 400, <mask> }, <mask> alignItems: 'center', <mask> justifyContent: 'center', <mask> _light: { <mask> bg: 'muted.50', <mask> borderColor: 'muted.300', <mask> _text: { <mask> color: 'text.900', <mask> }, <mask> }, <mask> _dark: { <mask> bg: 'muted.800', <mask> borderColor: 'muted.700', <mask> _text: { <mask> color: 'text.50', </s> fix: removing _light from theme </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _stack: { flexDirection: 'row', alignItems: 'center', // justifyContent: 'space-between', overflow: 'hidden', }, </s> add </s> remove _light: { color: 'text.900', }, </s> add color: 'text.900',
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/inputleftaddon.ts
color: 'text.900',
<mask> borderWidth: '1', <mask> borderLeftWidth: '0', <mask> borderRightRadius: 'sm', <mask> _text: { <mask> fontWeight: 400, <mask> }, <mask> alignItems: 'center', <mask> justifyContent: 'center', <mask> bg: 'muted.50', <mask> borderColor: 'muted.300', </s> fix: removing _light from theme </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _stack: { flexDirection: 'row', alignItems: 'center', // justifyContent: 'space-between', overflow: 'hidden', }, </s> add </s> remove _light: { placeholderTextColor: 'text.400', color: 'text.900', borderColor: 'muted.300', _hover: { borderColor: 'primary.600', }, _focus: { borderColor: 'primary.600', _hover: { borderColor: 'primary.600' }, _stack: { style: { outlineWidth: '0', boxShadow: `0 0 0 1px ${primary[600]}`, }, </s> add placeholderTextColor: 'text.400', color: 'text.900', borderColor: 'muted.300', _hover: { borderColor: 'primary.600', }, _focus: { borderColor: 'primary.600', _hover: { borderColor: 'primary.600' }, _stack: { flexDirection: 'row', alignItems: 'center', // justifyContent: 'space-between', overflow: 'hidden', style: { outlineWidth: '0', boxShadow: `0 0 0 1px ${primary[600]}`,
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/inputrightaddon.ts
bg: 'muted.50', borderColor: 'muted.300',
<mask> fontWeight: 400, <mask> }, <mask> alignItems: 'center', <mask> justifyContent: 'center', <mask> _light: { <mask> bg: 'muted.50', <mask> borderColor: 'muted.300', <mask> _text: { <mask> color: 'text.900', <mask> }, <mask> }, <mask> _dark: { <mask> bg: 'muted.800', <mask> borderColor: 'muted.700', <mask> _text: { <mask> color: 'text.50', </s> fix: removing _light from theme
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/inputrightaddon.ts
<mask> import { mode } from '../tools'; <mask> <mask> const baseStyle = (props: any) => { <mask> const { primary } = props.theme.colors; <mask> const focusRing = mode( <mask> { <mask> boxShadow: `${primary[400]} 0px 0px 0px 2px`, </s> fix: removing _light from theme </s> remove const focusRing = mode( { boxShadow: `${primary[400]} 0px 0px 0px 2px`, }, { boxShadow: `${primary[500]} 0px 0px 0px 2px`, } )(props); </s> add </s> remove _web: { style: { ...focusRing, outlineWidth: 0 } }, </s> add _web: { style: { outlineWidth: 0, boxShadow: `${primary[400]} 0px 0px 0px 2px`, }, }, }, _dark: { _focusVisible: { _web: { style: { outlineWidth: 0, boxShadow: `${primary[500]} 0px 0px 0px 2px`, }, }, }, </s> remove import { mode } from '../tools'; </s> add </s> remove _dark: { </s> add }, }, _dark: { _focusVisible: { _web: { </s> remove baseStyle: (props: Record<string, any>) => { </s> add baseStyle: () => {
[ "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/pressable.ts
<mask> import { mode } from '../tools'; <mask> <mask> const baseStyle = (props: any) => { <mask> const { primary } = props.theme.colors; <mask> const focusRing = mode( <mask> { <mask> boxShadow: `${primary[400]} 0px 0px 0px 2px`, <mask> }, <mask> { <mask> boxShadow: `${primary[500]} 0px 0px 0px 2px`, <mask> } <mask> )(props); <mask> <mask> return { <mask> _focusVisible: { <mask> _web: { style: { ...focusRing, outlineWidth: 0 } }, <mask> }, </s> fix: removing _light from theme </s> remove import { mode } from '../tools'; </s> add </s> remove _web: { style: { ...focusRing, outlineWidth: 0 } }, </s> add _web: { style: { outlineWidth: 0, boxShadow: `${primary[400]} 0px 0px 0px 2px`, }, }, }, _dark: { _focusVisible: { _web: { style: { outlineWidth: 0, boxShadow: `${primary[500]} 0px 0px 0px 2px`, }, }, }, </s> remove _dark: { </s> add }, }, _dark: { _focusVisible: { _web: { </s> remove import { mode } from '../tools'; </s> add </s> remove baseStyle: (props: Record<string, any>) => { </s> add baseStyle: () => {
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/pressable.ts
_web: { style: { outlineWidth: 0, boxShadow: `${primary[400]} 0px 0px 0px 2px`, }, }, }, _dark: { _focusVisible: { _web: { style: { outlineWidth: 0, boxShadow: `${primary[500]} 0px 0px 0px 2px`, }, }, },
<mask> )(props); <mask> <mask> return { <mask> _focusVisible: { <mask> _web: { style: { ...focusRing, outlineWidth: 0 } }, <mask> }, <mask> }; <mask> }; <mask> <mask> export default { </s> fix: removing _light from theme </s> remove const focusRing = mode( { boxShadow: `${primary[400]} 0px 0px 0px 2px`, }, { boxShadow: `${primary[500]} 0px 0px 0px 2px`, } )(props); </s> add </s> remove _dark: { </s> add }, }, _dark: { _focusVisible: { _web: { </s> remove _light: { placeholderTextColor: 'text.400', color: 'text.900', borderColor: 'muted.300', _hover: { borderColor: 'primary.600', }, _focus: { borderColor: 'primary.600', _hover: { borderColor: 'primary.600' }, _stack: { style: { outlineWidth: '0', boxShadow: `0 0 0 1px ${primary[600]}`, }, </s> add placeholderTextColor: 'text.400', color: 'text.900', borderColor: 'muted.300', _hover: { borderColor: 'primary.600', }, _focus: { borderColor: 'primary.600', _hover: { borderColor: 'primary.600' }, _stack: { flexDirection: 'row', alignItems: 'center', // justifyContent: 'space-between', overflow: 'hidden', style: { outlineWidth: '0', boxShadow: `0 0 0 1px ${primary[600]}`, </s> remove baseStyle: (props: Record<string, any>) => { </s> add baseStyle: () => { </s> remove import { mode } from '../tools'; </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/pressable.ts
<mask> import { mode } from '../tools'; <mask> <mask> // Skeleton <mask> export const Skeleton = { <mask> baseStyle: (props: Record<string, any>) => { <mask> return { <mask> startColor: mode('muted.200', 'muted.600')(props), </s> fix: removing _light from theme </s> remove baseStyle: (props: Record<string, any>) => { </s> add baseStyle: () => { </s> remove startColor: mode('muted.200', 'muted.600')(props), </s> add startColor: 'muted.200', _dark: { startColor: 'muted.600', }, </s> remove baseStyle: (props: Record<string, any>) => { </s> add baseStyle: () => { </s> remove startColor: mode('muted.200', 'muted.600')(props), </s> add startColor: 'muted.200', _dark: { startColor: 'muted.600', }, </s> remove import { mode } from '../tools'; </s> add
[ "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/skeleton.ts
baseStyle: () => {
<mask> import { mode } from '../tools'; <mask> <mask> // Skeleton <mask> export const Skeleton = { <mask> baseStyle: (props: Record<string, any>) => { <mask> return { <mask> startColor: mode('muted.200', 'muted.600')(props), <mask> endColor: 'transparent', <mask> overflow: 'hidden', <mask> fadeDuration: 0.1, </s> fix: removing _light from theme </s> remove import { mode } from '../tools'; </s> add </s> remove startColor: mode('muted.200', 'muted.600')(props), </s> add startColor: 'muted.200', _dark: { startColor: 'muted.600', }, </s> remove baseStyle: (props: Record<string, any>) => { </s> add baseStyle: () => { </s> remove startColor: mode('muted.200', 'muted.600')(props), </s> add startColor: 'muted.200', _dark: { startColor: 'muted.600', }, </s> remove import { mode } from '../tools'; </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/skeleton.ts
startColor: 'muted.200', _dark: { startColor: 'muted.600', },
<mask> // Skeleton <mask> export const Skeleton = { <mask> baseStyle: (props: Record<string, any>) => { <mask> return { <mask> startColor: mode('muted.200', 'muted.600')(props), <mask> endColor: 'transparent', <mask> overflow: 'hidden', <mask> fadeDuration: 0.1, <mask> speed: 1.0, <mask> h: '10', </s> fix: removing _light from theme </s> remove baseStyle: (props: Record<string, any>) => { </s> add baseStyle: () => { </s> remove startColor: mode('muted.200', 'muted.600')(props), </s> add startColor: 'muted.200', _dark: { startColor: 'muted.600', }, </s> remove baseStyle: (props: Record<string, any>) => { </s> add baseStyle: () => { </s> remove import { mode } from '../tools'; </s> add </s> remove _stack: { flexDirection: 'row', alignItems: 'center', // justifyContent: 'space-between', overflow: 'hidden', }, </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/skeleton.ts
baseStyle: () => {
<mask> }; <mask> <mask> // SkeletonText <mask> export const SkeletonText = { <mask> baseStyle: (props: Record<string, any>) => { <mask> return { <mask> startColor: mode('muted.200', 'muted.600')(props), <mask> endColor: 'transparent', <mask> fadeDuration: 0.1, <mask> w: '100%', </s> fix: removing _light from theme </s> remove startColor: mode('muted.200', 'muted.600')(props), </s> add startColor: 'muted.200', _dark: { startColor: 'muted.600', }, </s> remove baseStyle: (props: Record<string, any>) => { </s> add baseStyle: () => { </s> remove startColor: mode('muted.200', 'muted.600')(props), </s> add startColor: 'muted.200', _dark: { startColor: 'muted.600', }, </s> remove import { mode } from '../tools'; </s> add </s> remove _web: { style: { ...focusRing, outlineWidth: 0 } }, </s> add _web: { style: { outlineWidth: 0, boxShadow: `${primary[400]} 0px 0px 0px 2px`, }, }, }, _dark: { _focusVisible: { _web: { style: { outlineWidth: 0, boxShadow: `${primary[500]} 0px 0px 0px 2px`, }, }, },
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/skeleton.ts
startColor: 'muted.200', _dark: { startColor: 'muted.600', },
<mask> // SkeletonText <mask> export const SkeletonText = { <mask> baseStyle: (props: Record<string, any>) => { <mask> return { <mask> startColor: mode('muted.200', 'muted.600')(props), <mask> endColor: 'transparent', <mask> fadeDuration: 0.1, <mask> w: '100%', <mask> speed: 1.0, <mask> flexDirection: 'column', </s> fix: removing _light from theme </s> remove baseStyle: (props: Record<string, any>) => { </s> add baseStyle: () => { </s> remove startColor: mode('muted.200', 'muted.600')(props), </s> add startColor: 'muted.200', _dark: { startColor: 'muted.600', }, </s> remove baseStyle: (props: Record<string, any>) => { </s> add baseStyle: () => { </s> remove import { mode } from '../tools'; </s> add </s> remove _light: { placeholderTextColor: 'text.400', color: 'text.900', borderColor: 'muted.300', _hover: { borderColor: 'primary.600', }, _focus: { borderColor: 'primary.600', _hover: { borderColor: 'primary.600' }, _stack: { style: { outlineWidth: '0', boxShadow: `0 0 0 1px ${primary[600]}`, }, </s> add placeholderTextColor: 'text.400', color: 'text.900', borderColor: 'muted.300', _hover: { borderColor: 'primary.600', }, _focus: { borderColor: 'primary.600', _hover: { borderColor: 'primary.600' }, _stack: { flexDirection: 'row', alignItems: 'center', // justifyContent: 'space-between', overflow: 'hidden', style: { outlineWidth: '0', boxShadow: `0 0 0 1px ${primary[600]}`,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/skeleton.ts
borderColor: 'error.600',
<mask> _disabled: { <mask> opacity: 0.4, <mask> }, <mask> _invalid: { <mask> borderWidth: 2, <mask> borderRadius: 12, <mask> }, <mask> onThumbColor: 'muted.50', <mask> offThumbColor: 'muted.50', </s> fix: removing _light from theme </s> remove _light: { offTrackColor: 'muted.300', onTrackColor: `${c}.600`, _hover: { offTrackColor: 'muted.400', onTrackColor: `${c}.700`, }, _invalid: { borderColor: 'error.600', }, </s> add offTrackColor: 'muted.300', onTrackColor: `${c}.600`, _hover: { offTrackColor: 'muted.400', onTrackColor: `${c}.700`, </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300',
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/switch.ts
offTrackColor: 'muted.300', onTrackColor: `${c}.600`, _hover: { offTrackColor: 'muted.400', onTrackColor: `${c}.700`,
<mask> borderRadius: 12, <mask> }, <mask> onThumbColor: 'muted.50', <mask> offThumbColor: 'muted.50', <mask> _light: { <mask> offTrackColor: 'muted.300', <mask> onTrackColor: `${c}.600`, <mask> _hover: { <mask> offTrackColor: 'muted.400', <mask> onTrackColor: `${c}.700`, <mask> }, <mask> _invalid: { <mask> borderColor: 'error.600', <mask> }, <mask> }, <mask> _dark: { <mask> offTrackColor: 'muted.700', <mask> onTrackColor: `${c}.500`, <mask> _hover: { </s> fix: removing _light from theme </s> remove _light: { placeholderTextColor: 'text.400', color: 'text.900', borderColor: 'muted.300', _hover: { borderColor: 'primary.600', }, _focus: { borderColor: 'primary.600', _hover: { borderColor: 'primary.600' }, _stack: { style: { outlineWidth: '0', boxShadow: `0 0 0 1px ${primary[600]}`, }, </s> add placeholderTextColor: 'text.400', color: 'text.900', borderColor: 'muted.300', _hover: { borderColor: 'primary.600', }, _focus: { borderColor: 'primary.600', _hover: { borderColor: 'primary.600' }, _stack: { flexDirection: 'row', alignItems: 'center', // justifyContent: 'space-between', overflow: 'hidden', style: { outlineWidth: '0', boxShadow: `0 0 0 1px ${primary[600]}`, </s> remove _stack: { flexDirection: 'row', alignItems: 'center', // justifyContent: 'space-between', overflow: 'hidden', }, </s> add </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300',
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/dd7a2be3aeb702ee84d0d6f35dcd482850ebf467
src/theme/components/switch.ts
<View ref={c => this._root = c} style={{position: 'relative', flexDirection: 'column'}}>{(this.state.selectedItem)===undefined ? (<View />) :
<mask> render() { <mask> <mask> <mask> return( <mask> <View style={{position: 'relative', flexDirection: 'column'}}>{(this.state.selectedItem)===undefined ? (<View />) : <mask> (<View> <mask> <Animated.View style={[this.getCardStyles()[1],{opacity: this.state.fadeAnim}]} {...this._panResponder.panHandlers}> <mask> {this.props.renderItem(this.state.selectedItem2)} <mask> </Animated.View> <mask> <Animated.View style={[ this.getCardStyles()[0], this.getInitialStyle().topCard] } {...this._panResponder.panHandlers} > </s> add _root ref to all components </s> remove <TouchableOpacity {...this.props} > </s> add <TouchableOpacity ref={c => this._root = c} {...this.props} > </s> remove var type = { color: this.getTheme().toolbarTextColor, fontSize: this.getTheme().titleFontSize, fontFamily: this.getTheme().btnFontFamily, fontWeight: (Platform.OS === 'ios') ? '500' : undefined, alignSelf: (Platform.OS === 'ios' ) ? 'center' : 'flex-start' } </s> add var type = { color: this.getTheme().toolbarTextColor, fontSize: this.getTheme().titleFontSize, fontFamily: this.getTheme().btnFontFamily, fontWeight: (Platform.OS === 'ios') ? '500' : undefined, alignSelf: (Platform.OS === 'ios' ) ? 'center' : 'flex-start' }
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/de8f468fdc43e26eb7ba5f12fede97aa977678e4
Components/Widgets/DeckSwiper.js
<TouchableOpacity ref={c => this._root = c} {...this.props} >
<mask> } <mask> <mask> render() { <mask> return( <mask> <TouchableOpacity {...this.props} > <mask> {(Platform.OS === 'ios') ? <mask> <Icon name={this.props.selected ? 'ios-radio-button-on' : 'ios-radio-button-off-outline'} style={{color: this.props.selected ? this.getTheme().radioSelectedColor : this.getTheme().radioColor, lineHeight: this.getTheme().radioBtnSize+4, fontSize: this.getTheme().radioBtnSize}} /> <mask> : <mask> <Icon name={this.props.selected ? 'md-radio-button-on' : 'md-radio-button-off'} style={{color: this.props.selected ? this.getTheme().radioSelectedColor : this.getTheme().radioColor, lineHeight: this.getTheme().radioBtnSize+1, fontSize: this.getTheme().radioBtnSize}} /> <mask> } </s> add _root ref to all components </s> remove var type = { color: this.getTheme().toolbarTextColor, fontSize: this.getTheme().titleFontSize, fontFamily: this.getTheme().btnFontFamily, fontWeight: (Platform.OS === 'ios') ? '500' : undefined, alignSelf: (Platform.OS === 'ios' ) ? 'center' : 'flex-start' } </s> add var type = { color: this.getTheme().toolbarTextColor, fontSize: this.getTheme().titleFontSize, fontFamily: this.getTheme().btnFontFamily, fontWeight: (Platform.OS === 'ios') ? '500' : undefined, alignSelf: (Platform.OS === 'ios' ) ? 'center' : 'flex-start' } </s> remove <View style={{position: 'relative', flexDirection: 'column'}}>{(this.state.selectedItem)===undefined ? (<View />) : </s> add <View ref={c => this._root = c} style={{position: 'relative', flexDirection: 'column'}}>{(this.state.selectedItem)===undefined ? (<View />) :
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/de8f468fdc43e26eb7ba5f12fede97aa977678e4
Components/Widgets/Radio.js
var type = { color: this.getTheme().toolbarTextColor, fontSize: this.getTheme().titleFontSize, fontFamily: this.getTheme().btnFontFamily, fontWeight: (Platform.OS === 'ios') ? '500' : undefined, alignSelf: (Platform.OS === 'ios' ) ? 'center' : 'flex-start' }
<mask> } <mask> <mask> prepareRootProps() { <mask> <mask> var type = { <mask> color: this.getTheme().toolbarTextColor, <mask> fontSize: this.getTheme().titleFontSize, <mask> fontFamily: this.getTheme().btnFontFamily, <mask> fontWeight: (Platform.OS === 'ios') ? '500' : undefined, <mask> alignSelf: (Platform.OS === 'ios' ) ? 'center' : 'flex-start' <mask> } <mask> <mask> var defaultProps = { <mask> style: type <mask> } <mask> </s> add _root ref to all components </s> remove <TouchableOpacity {...this.props} > </s> add <TouchableOpacity ref={c => this._root = c} {...this.props} > </s> remove <View style={{position: 'relative', flexDirection: 'column'}}>{(this.state.selectedItem)===undefined ? (<View />) : </s> add <View ref={c => this._root = c} style={{position: 'relative', flexDirection: 'column'}}>{(this.state.selectedItem)===undefined ? (<View />) :
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/de8f468fdc43e26eb7ba5f12fede97aa977678e4
Components/Widgets/Title.js
<mask> }},{key:'renderButtons',value:function renderButtons() <mask> <mask> {var _this3=this; <mask> var childrenArray=_react2.default.Children.toArray(this.props.children); <mask> var icon=_lodash2.default.remove(childrenArray,function(item){ <mask> if(item.type.displayName==="Styled(Icon)"||item.type.displayName==="Styled(IconNB)"){ <mask> return true; <mask> } <mask> }); <mask> <mask> var newChildren=[]; <mask> <mask> {childrenArray.map(function(child,i){ <mask> newChildren.push(_react2.default.createElement(AnimatedFab,_extends({ </s> fix for FAB in production #677 </s> remove {childrenArray.map(function(child,i){ </s> add { childrenArray.slice(1).map(function(child,i){ </s> remove // this.setState({ // buttons: icon.length // }); </s> add // this.setState({ // buttons: icon.length // }); </s> remove key:i,__source:{fileName:_jsxFileName,lineNumber:212}}), </s> add key:i,__source:{fileName:_jsxFileName,lineNumber:213}}), </s> remove const icon = _.remove(childrenArray, (item) => { if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { return true; } }); </s> add // const icon = _.remove(childrenArray, (item) => { // if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { // return true; // } // }); </s> remove { childrenArray.map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i)} fabButton key={i} >{child.props.children} </AnimatedFab>); </s> add { childrenArray.slice(1).map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i) } fabButton key={i} >{child.props.children} </AnimatedFab>); } );
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
dist/src/basic/Fab.js
{ childrenArray.slice(1).map(function(child,i){
<mask> }); <mask> <mask> var newChildren=[]; <mask> <mask> {childrenArray.map(function(child,i){ <mask> newChildren.push(_react2.default.createElement(AnimatedFab,_extends({ <mask> style:_this3.getOtherButtonStyle(child,i)}, <mask> _this3.prepareButtonProps(child,i),{ <mask> fabButton:true, <mask> key:i,__source:{fileName:_jsxFileName,lineNumber:212}}), </s> fix for FAB in production #677 </s> remove key:i,__source:{fileName:_jsxFileName,lineNumber:212}}), </s> add key:i,__source:{fileName:_jsxFileName,lineNumber:213}}), </s> remove var icon=_lodash2.default.remove(childrenArray,function(item){ if(item.type.displayName==="Styled(Icon)"||item.type.displayName==="Styled(IconNB)"){ return true; } }); </s> add </s> remove // this.setState({ // buttons: icon.length // }); </s> add // this.setState({ // buttons: icon.length // }); </s> remove const icon = _.remove(childrenArray, (item) => { if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { return true; } }); </s> add // const icon = _.remove(childrenArray, (item) => { // if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { // return true; // } // }); </s> remove { childrenArray.map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i)} fabButton key={i} >{child.props.children} </AnimatedFab>); </s> add { childrenArray.slice(1).map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i) } fabButton key={i} >{child.props.children} </AnimatedFab>); } );
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
dist/src/basic/Fab.js
key:i,__source:{fileName:_jsxFileName,lineNumber:213}}),
<mask> newChildren.push(_react2.default.createElement(AnimatedFab,_extends({ <mask> style:_this3.getOtherButtonStyle(child,i)}, <mask> _this3.prepareButtonProps(child,i),{ <mask> fabButton:true, <mask> key:i,__source:{fileName:_jsxFileName,lineNumber:212}}), <mask> child.props.children)); <mask> <mask> }); <mask> } <mask> return newChildren; </s> fix for FAB in production #677 </s> remove {childrenArray.map(function(child,i){ </s> add { childrenArray.slice(1).map(function(child,i){ </s> remove var icon=_lodash2.default.remove(childrenArray,function(item){ if(item.type.displayName==="Styled(Icon)"||item.type.displayName==="Styled(IconNB)"){ return true; } }); </s> add </s> remove ); } </s> add </s> remove // this.setState({ // buttons: icon.length // }); </s> add // this.setState({ // buttons: icon.length // }); </s> remove { childrenArray.map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i)} fabButton key={i} >{child.props.children} </AnimatedFab>); </s> add { childrenArray.slice(1).map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i) } fabButton key={i} >{child.props.children} </AnimatedFab>); } );
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
dist/src/basic/Fab.js
_react2.default.createElement(_reactNative.Animated.View,{style:this.getContainerStyle(),__source:{fileName:_jsxFileName,lineNumber:342}},
<mask> this.containerWidth=this.containerWidth||new _reactNative.Animated.Value(0); <mask> this.buttonScale=this.buttonScale||new _reactNative.Animated.Value(0); <mask> } <mask> return( <mask> _react2.default.createElement(_reactNative.Animated.View,{style:this.getContainerStyle(),__source:{fileName:_jsxFileName,lineNumber:340}}, <mask> this.renderButtons(), <mask> _react2.default.createElement(_reactNative.TouchableOpacity,_extends({ <mask> onPress:function onPress(){return _this4.fabOnPress();}}, <mask> this.prepareFabProps(),{activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:342}}), <mask> </s> fix for FAB in production #677 </s> remove this.prepareFabProps(),{activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:342}}), </s> add this.prepareFabProps(),{activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:344}}), </s> remove ); } </s> add </s> remove import { Content as TabContent } from './basic/Content'; </s> add </s> remove { childrenArray.map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i)} fabButton key={i} >{child.props.children} </AnimatedFab>); </s> add { childrenArray.slice(1).map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i) } fabButton key={i} >{child.props.children} </AnimatedFab>); } ); </s> remove if(JSON.stringify(this.props.tabs)!==JSON.stringify(nextProps.tabs)&&this.state._containerWidth){ </s> add if(!_lodash2.default.isEqual(this.props.tabs,nextProps.tabs)&&this.state._containerWidth){
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
dist/src/basic/Fab.js
this.prepareFabProps(),{activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:344}}),
<mask> _react2.default.createElement(_reactNative.Animated.View,{style:this.getContainerStyle(),__source:{fileName:_jsxFileName,lineNumber:340}}, <mask> this.renderButtons(), <mask> _react2.default.createElement(_reactNative.TouchableOpacity,_extends({ <mask> onPress:function onPress(){return _this4.fabOnPress();}}, <mask> this.prepareFabProps(),{activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:342}}), <mask> <mask> this.renderFab()))); <mask> <mask> <mask> </s> fix for FAB in production #677 </s> remove _react2.default.createElement(_reactNative.Animated.View,{style:this.getContainerStyle(),__source:{fileName:_jsxFileName,lineNumber:340}}, </s> add _react2.default.createElement(_reactNative.Animated.View,{style:this.getContainerStyle(),__source:{fileName:_jsxFileName,lineNumber:342}}, </s> remove Segment </s> add Segment, </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex(); </s> remove {childrenArray.map(function(child,i){ </s> add { childrenArray.slice(1).map(function(child,i){ </s> remove key:i,__source:{fileName:_jsxFileName,lineNumber:212}}), </s> add key:i,__source:{fileName:_jsxFileName,lineNumber:213}}),
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
dist/src/basic/Fab.js
if(!_lodash2.default.isEqual(this.props.tabs,nextProps.tabs)&&this.state._containerWidth){
<mask> }, <mask> <mask> componentWillReceiveProps:function componentWillReceiveProps(nextProps){ <mask> <mask> if(JSON.stringify(this.props.tabs)!==JSON.stringify(nextProps.tabs)&&this.state._containerWidth){ <mask> this.setState({_containerWidth:null}); <mask> } <mask> }, <mask> <mask> onTabContainerLayout:function onTabContainerLayout(e){ </s> fix for FAB in production #677 </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hex();
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
dist/src/basic/Tabs/ScrollableTabBar.js
return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hex();
<mask> toolbarTextColor:'#fff', <mask> iosStatusbar:'light-content', <mask> toolbarDefaultBorder:'#2874F0', <mask> get statusBarColor(){ <mask> return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hexString(); <mask> }, <mask> <mask> <mask> <mask> iconFamily:'Ionicons', </s> fix for FAB in production #677 </s> remove return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex();
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
dist/src/theme/variables/commonColor.js
return(0,_color2.default)(this.radioColor).darken(0.2).hex();
<mask> <mask> radioColor:'#7e7e7e', <mask> <mask> get radioSelectedColor(){ <mask> return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); <mask> }, <mask> <mask> <mask> <mask> defaultSpinnerColor:'#45D56E', </s> fix for FAB in production #677 </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hex();
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
dist/src/theme/variables/commonColor.js
return(0,_color2.default)(this.tabBgColor).darken(0.03).hex();
<mask> borderWidth:1/_reactNative.PixelRatio.getPixelSizeForLayoutSize(1), <mask> contentPadding:10, <mask> <mask> get darkenHeader(){ <mask> return(0,_color2.default)(this.tabBgColor).darken(0.03).hexString(); <mask> }, <mask> <mask> dropdownBg:'#000', <mask> dropdownLinkColor:'#414142', <mask> inputLineHeight:24, </s> fix for FAB in production #677 </s> remove return(0,_color2.default)(this.tabBgColor).darken(0.03).hexString(); </s> add return(0,_color2.default)(this.tabBgColor).darken(0.03).hex(); </s> remove return(0,_color2.default)(this.tabBgColor).darken(0.03).hexString(); </s> add return(0,_color2.default)(this.tabBgColor).darken(0.03).hex(); </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex();
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
dist/src/theme/variables/commonColor.js
return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hex();
<mask> toolbarTextColor:'#fff', <mask> toolbarDefaultBorder:'#3F51B5', <mask> iosStatusbar:'light-content', <mask> get statusBarColor(){ <mask> return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hexString(); <mask> }, <mask> <mask> <mask> <mask> iconFamily:'Ionicons', </s> fix for FAB in production #677 </s> remove return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex();
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
dist/src/theme/variables/material.js
return(0,_color2.default)(this.radioColor).darken(0.2).hex();
<mask> <mask> radioColor:'#7e7e7e', <mask> <mask> get radioSelectedColor(){ <mask> return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); <mask> }, <mask> <mask> <mask> <mask> defaultSpinnerColor:'#45D56E', </s> fix for FAB in production #677
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
dist/src/theme/variables/material.js
return(0,_color2.default)(this.tabBgColor).darken(0.03).hex();
<mask> borderWidth:1/_reactNative.PixelRatio.getPixelSizeForLayoutSize(1), <mask> contentPadding:10, <mask> <mask> get darkenHeader(){ <mask> return(0,_color2.default)(this.tabBgColor).darken(0.03).hexString(); <mask> }, <mask> <mask> dropdownBg:'#000', <mask> dropdownLinkColor:'#414142', <mask> inputLineHeight:24, </s> fix for FAB in production #677
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
dist/src/theme/variables/material.js
return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hex();
<mask> toolbarTextColor:platform==='ios'?'#000':'#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).darken(0.2).hexString(); <mask> }, <mask> <mask> <mask> <mask> iconFamily:'Ionicons', </s> fix for FAB in production #677 </s> remove return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex(); </s> remove return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.radioColor).darken(0.2).hex();
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
dist/src/theme/variables/platform.js
return(0,_color2.default)(this.radioColor).darken(0.2).hex();
<mask> <mask> radioColor:'#7e7e7e', <mask> <mask> get radioSelectedColor(){ <mask> return(0,_color2.default)(this.radioColor).darken(0.2).hexString(); <mask> }, <mask> <mask> <mask> <mask> defaultSpinnerColor:'#45D56E', </s> fix for FAB in production #677
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
dist/src/theme/variables/platform.js
return(0,_color2.default)(this.tabBgColor).darken(0.03).hex();
<mask> borderWidth:1/_reactNative.PixelRatio.getPixelSizeForLayoutSize(1), <mask> contentPadding:10, <mask> <mask> get darkenHeader(){ <mask> return(0,_color2.default)(this.tabBgColor).darken(0.03).hexString(); <mask> }, <mask> <mask> dropdownBg:'#000', <mask> dropdownLinkColor:'#414142', <mask> inputLineHeight:24, </s> fix for FAB in production #677
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
dist/src/theme/variables/platform.js
// this.setState({ // buttons: icon.length // });
<mask> if (item.type === Button) { <mask> return true; <mask> } <mask> }); <mask> // this.setState({ <mask> // buttons: icon.length <mask> // }); <mask> return React.cloneElement(childrenArray[0], { style: this.getInitialStyle(childrenArray[0].props.style).iconStyle }); <mask> } <mask> <mask> renderButtons() { <mask> const childrenArray = React.Children.toArray(this.props.children); </s> fix for FAB in production #677 </s> remove const icon = _.remove(childrenArray, (item) => { if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { return true; } }); </s> add // const icon = _.remove(childrenArray, (item) => { // if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { // return true; // } // }); </s> remove var icon=_lodash2.default.remove(childrenArray,function(item){ if(item.type.displayName==="Styled(Icon)"||item.type.displayName==="Styled(IconNB)"){ return true; } }); </s> add </s> remove { childrenArray.map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i)} fabButton key={i} >{child.props.children} </AnimatedFab>); </s> add { childrenArray.slice(1).map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i) } fabButton key={i} >{child.props.children} </AnimatedFab>); } ); </s> remove ); } </s> add </s> remove import { Content as TabContent } from './basic/Content'; </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
src/basic/Fab.js
// const icon = _.remove(childrenArray, (item) => { // if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { // return true; // } // });
<mask> } <mask> <mask> renderButtons() { <mask> const childrenArray = React.Children.toArray(this.props.children); <mask> const icon = _.remove(childrenArray, (item) => { <mask> if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { <mask> return true; <mask> } <mask> }); <mask> <mask> const newChildren = []; <mask> <mask> { childrenArray.map((child, i) => { <mask> newChildren.push(<AnimatedFab </s> fix for FAB in production #677 </s> remove { childrenArray.map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i)} fabButton key={i} >{child.props.children} </AnimatedFab>); </s> add { childrenArray.slice(1).map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i) } fabButton key={i} >{child.props.children} </AnimatedFab>); } ); </s> remove // this.setState({ // buttons: icon.length // }); </s> add // this.setState({ // buttons: icon.length // }); </s> remove Segment </s> add Segment, </s> remove ); } </s> add </s> remove import { Content as TabContent } from './basic/Content'; </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
src/basic/Fab.js
{ childrenArray.slice(1).map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i) } fabButton key={i} >{child.props.children} </AnimatedFab>); } );
<mask> }); <mask> <mask> const newChildren = []; <mask> <mask> { childrenArray.map((child, i) => { <mask> newChildren.push(<AnimatedFab <mask> style={this.getOtherButtonStyle(child, i)} <mask> {...this.prepareButtonProps(child, i)} <mask> fabButton <mask> key={i} <mask> >{child.props.children} <mask> </AnimatedFab>); <mask> } <mask> ); } <mask> return newChildren; <mask> } <mask> upAnimate() { </s> fix for FAB in production #677 </s> remove ); } </s> add </s> remove const icon = _.remove(childrenArray, (item) => { if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { return true; } }); </s> add // const icon = _.remove(childrenArray, (item) => { // if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { // return true; // } // }); </s> remove // this.setState({ // buttons: icon.length // }); </s> add // this.setState({ // buttons: icon.length // }); </s> remove Segment </s> add Segment, </s> remove key:i,__source:{fileName:_jsxFileName,lineNumber:212}}), </s> add key:i,__source:{fileName:_jsxFileName,lineNumber:213}}),
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
src/basic/Fab.js
<mask> key={i} <mask> >{child.props.children} <mask> </AnimatedFab>); <mask> } <mask> ); } <mask> return newChildren; <mask> } <mask> upAnimate() { <mask> if (!this.props.active) { <mask> Animated.spring(this.containerHeight, { </s> fix for FAB in production #677 </s> remove { childrenArray.map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i)} fabButton key={i} >{child.props.children} </AnimatedFab>); </s> add { childrenArray.slice(1).map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i) } fabButton key={i} >{child.props.children} </AnimatedFab>); } ); </s> remove const icon = _.remove(childrenArray, (item) => { if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { return true; } }); </s> add // const icon = _.remove(childrenArray, (item) => { // if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { // return true; // } // }); </s> remove // this.setState({ // buttons: icon.length // }); </s> add // this.setState({ // buttons: icon.length // }); </s> remove import { Content as TabContent } from './basic/Content'; </s> add </s> remove key:i,__source:{fileName:_jsxFileName,lineNumber:212}}), </s> add key:i,__source:{fileName:_jsxFileName,lineNumber:213}}),
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
src/basic/Fab.js
{...this.prepareFabProps() } activeOpacity={1}
<mask> <Animated.View style={this.getContainerStyle()}> <mask> {this.renderButtons()} <mask> <TouchableOpacity <mask> onPress={() => this.fabOnPress()} <mask> {...this.prepareFabProps()} activeOpacity={1} <mask> > <mask> {this.renderFab()} <mask> </TouchableOpacity> <mask> </Animated.View> <mask> ); </s> fix for FAB in production #677 </s> remove { childrenArray.map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i)} fabButton key={i} >{child.props.children} </AnimatedFab>); </s> add { childrenArray.slice(1).map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i) } fabButton key={i} >{child.props.children} </AnimatedFab>); } ); </s> remove ); } </s> add </s> remove const icon = _.remove(childrenArray, (item) => { if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { return true; } }); </s> add // const icon = _.remove(childrenArray, (item) => { // if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { // return true; // } // }); </s> remove Segment </s> add Segment, </s> remove return(0,_color2.default)(this.tabBgColor).darken(0.03).hexString(); </s> add return(0,_color2.default)(this.tabBgColor).darken(0.03).hex();
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
src/basic/Fab.js
<mask> import ScrollableTabView from './basic/Tabs'; <mask> import { DefaultTabBar } from './basic/Tabs/DefaultTabBar'; <mask> import { ScrollableTab } from './basic/Tabs/ScrollableTabBar'; <mask> import { STabs } from './smart/STabs'; <mask> import { Content as TabContent } from './basic/Content'; <mask> import { Subtitle } from './backward/Widgets/Subtitle'; <mask> <mask> setDefaultThemeStyle(); <mask> // Theme <mask> export { </s> fix for FAB in production #677 </s> remove const icon = _.remove(childrenArray, (item) => { if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { return true; } }); </s> add // const icon = _.remove(childrenArray, (item) => { // if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { // return true; // } // }); </s> remove // this.setState({ // buttons: icon.length // }); </s> add // this.setState({ // buttons: icon.length // }); </s> remove ); } </s> add </s> remove { childrenArray.map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i)} fabButton key={i} >{child.props.children} </AnimatedFab>); </s> add { childrenArray.slice(1).map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i) } fabButton key={i} >{child.props.children} </AnimatedFab>); } ); </s> remove Segment </s> add Segment,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
src/index.js
Content as TabContent,
<mask> Row, <mask> Grid, <mask> Text, <mask> STabs, <mask> TabContent, <mask> View, <mask> ToastContainer as Toast, <mask> ScrollableTab, <mask> ActionSheetContainer as ActionSheet, <mask> TabHeading, </s> fix for FAB in production #677 </s> remove Segment </s> add Segment, </s> remove import { Content as TabContent } from './basic/Content'; </s> add </s> remove return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hexString(); </s> add return(0,_color2.default)(this.toolbarDefaultBg).darken(0.2).hex(); </s> remove {childrenArray.map(function(child,i){ </s> add { childrenArray.slice(1).map(function(child,i){ </s> remove key:i,__source:{fileName:_jsxFileName,lineNumber:212}}), </s> add key:i,__source:{fileName:_jsxFileName,lineNumber:213}}),
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
src/index.js
Segment,
<mask> ActionSheetContainer as ActionSheet, <mask> TabHeading, <mask> TabContainer, <mask> DefaultTabBar, <mask> Segment <mask> }; <mask> <mask> const mapPropsToStyleNames = (styleNames, props) => keys(props); <mask> <mask> export { mapPropsToStyleNames }; </s> fix for FAB in production #677 </s> remove TabContent, </s> add Content as TabContent, </s> remove const icon = _.remove(childrenArray, (item) => { if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { return true; } }); </s> add // const icon = _.remove(childrenArray, (item) => { // if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { // return true; // } // }); </s> remove { childrenArray.map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i)} fabButton key={i} >{child.props.children} </AnimatedFab>); </s> add { childrenArray.slice(1).map((child, i) => { newChildren.push(<AnimatedFab style={this.getOtherButtonStyle(child, i)} {...this.prepareButtonProps(child, i) } fabButton key={i} >{child.props.children} </AnimatedFab>); } ); </s> remove import { Content as TabContent } from './basic/Content'; </s> add </s> remove // this.setState({ // buttons: icon.length // }); </s> add // this.setState({ // buttons: icon.length // });
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/decae81865791425987e22a68e18af56b13d86ee
src/index.js
"node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils)/)"
<mask> "<rootDir>/example/node_modules", <mask> "<rootDir>/lib/" <mask> ], <mask> "transformIgnorePatterns": [ <mask> "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch)/)" <mask> ], <mask> "setupFiles": [ <mask> "<rootDir>/src/jest/mock.ts" <mask> ] <mask> }, </s> Added aria packages to ignore </s> remove it('can be disabled', () => { let { getAllByRole } = render( <NativeBaseProvider> <Switch isDisabled /> </NativeBaseProvider> ); let switches = getAllByRole('switch'); expect(switches[0].props.accessibilityState.disabled).toBe(true); }); </s> add // it('can be disabled', () => { // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch isDisabled /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.disabled).toBe(true); // }); </s> remove it('can be default checked', () => { let { getAllByRole } = render( <NativeBaseProvider> <Switch defaultIsChecked /> </NativeBaseProvider> ); let switches = getAllByRole('switch'); expect(switches[0].props.accessibilityState.checked).toBe(true); }); </s> add // it('can be default checked', () => { // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch defaultIsChecked /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.checked).toBe(true); // }); </s> remove let { getAllByRole } = render( <NativeBaseProvider> <Switch /> </NativeBaseProvider> ); let switches = getAllByRole('switch'); expect(switches[0].props.accessibilityState.checked).toBe(false); fireEvent.press(switches[0]); expect(switches[0].props.accessibilityState.checked).toBe(true); </s> add expect(1).toBe(1); // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.checked).toBe(false); // fireEvent.press(switches[0]); // expect(switches[0].props.accessibilityState.checked).toBe(true); </s> remove import { Switch } from '../..'; </s> add // import { Switch } from '../..'; </s> remove import React from 'react'; import { fireEvent, render } from '@testing-library/react-native'; import { NativeBaseProvider } from 'native-base'; </s> add // import React from 'react'; // import { fireEvent, render } from '@testing-library/react-native'; // import { NativeBaseProvider } from 'native-base';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e056b40c11bd79293911ad0c987b3277eca197f5
package.json
// import React from 'react'; // import { fireEvent, render } from '@testing-library/react-native'; // import { NativeBaseProvider } from 'native-base';
<mask> import React from 'react'; <mask> import { fireEvent, render } from '@testing-library/react-native'; <mask> import { NativeBaseProvider } from 'native-base'; <mask> <mask> import { Switch } from '../..'; <mask> jest.useFakeTimers(); <mask> describe('Switch', () => { <mask> it('onToggle on Switch', () => { </s> Added aria packages to ignore </s> remove import { Switch } from '../..'; </s> add // import { Switch } from '../..'; </s> remove let { getAllByRole } = render( <NativeBaseProvider> <Switch /> </NativeBaseProvider> ); let switches = getAllByRole('switch'); expect(switches[0].props.accessibilityState.checked).toBe(false); fireEvent.press(switches[0]); expect(switches[0].props.accessibilityState.checked).toBe(true); </s> add expect(1).toBe(1); // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.checked).toBe(false); // fireEvent.press(switches[0]); // expect(switches[0].props.accessibilityState.checked).toBe(true); </s> remove it('can be default checked', () => { let { getAllByRole } = render( <NativeBaseProvider> <Switch defaultIsChecked /> </NativeBaseProvider> ); let switches = getAllByRole('switch'); expect(switches[0].props.accessibilityState.checked).toBe(true); }); </s> add // it('can be default checked', () => { // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch defaultIsChecked /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.checked).toBe(true); // }); </s> remove it('can be disabled', () => { let { getAllByRole } = render( <NativeBaseProvider> <Switch isDisabled /> </NativeBaseProvider> ); let switches = getAllByRole('switch'); expect(switches[0].props.accessibilityState.disabled).toBe(true); }); </s> add // it('can be disabled', () => { // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch isDisabled /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.disabled).toBe(true); // }); </s> remove "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch)/)" </s> add "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils)/)"
[ "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e056b40c11bd79293911ad0c987b3277eca197f5
src/components/primitives/Switch/test/switch.test.tsx
// import { Switch } from '../..';
<mask> import React from 'react'; <mask> import { fireEvent, render } from '@testing-library/react-native'; <mask> import { NativeBaseProvider } from 'native-base'; <mask> <mask> import { Switch } from '../..'; <mask> jest.useFakeTimers(); <mask> describe('Switch', () => { <mask> it('onToggle on Switch', () => { <mask> let { getAllByRole } = render( <mask> <NativeBaseProvider> </s> Added aria packages to ignore </s> remove import React from 'react'; import { fireEvent, render } from '@testing-library/react-native'; import { NativeBaseProvider } from 'native-base'; </s> add // import React from 'react'; // import { fireEvent, render } from '@testing-library/react-native'; // import { NativeBaseProvider } from 'native-base'; </s> remove let { getAllByRole } = render( <NativeBaseProvider> <Switch /> </NativeBaseProvider> ); let switches = getAllByRole('switch'); expect(switches[0].props.accessibilityState.checked).toBe(false); fireEvent.press(switches[0]); expect(switches[0].props.accessibilityState.checked).toBe(true); </s> add expect(1).toBe(1); // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.checked).toBe(false); // fireEvent.press(switches[0]); // expect(switches[0].props.accessibilityState.checked).toBe(true); </s> remove it('can be default checked', () => { let { getAllByRole } = render( <NativeBaseProvider> <Switch defaultIsChecked /> </NativeBaseProvider> ); let switches = getAllByRole('switch'); expect(switches[0].props.accessibilityState.checked).toBe(true); }); </s> add // it('can be default checked', () => { // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch defaultIsChecked /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.checked).toBe(true); // }); </s> remove it('can be disabled', () => { let { getAllByRole } = render( <NativeBaseProvider> <Switch isDisabled /> </NativeBaseProvider> ); let switches = getAllByRole('switch'); expect(switches[0].props.accessibilityState.disabled).toBe(true); }); </s> add // it('can be disabled', () => { // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch isDisabled /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.disabled).toBe(true); // }); </s> remove "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch)/)" </s> add "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils)/)"
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e056b40c11bd79293911ad0c987b3277eca197f5
src/components/primitives/Switch/test/switch.test.tsx
expect(1).toBe(1); // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.checked).toBe(false); // fireEvent.press(switches[0]); // expect(switches[0].props.accessibilityState.checked).toBe(true);
<mask> import { Switch } from '../..'; <mask> jest.useFakeTimers(); <mask> describe('Switch', () => { <mask> it('onToggle on Switch', () => { <mask> let { getAllByRole } = render( <mask> <NativeBaseProvider> <mask> <Switch /> <mask> </NativeBaseProvider> <mask> ); <mask> let switches = getAllByRole('switch'); <mask> expect(switches[0].props.accessibilityState.checked).toBe(false); <mask> fireEvent.press(switches[0]); <mask> expect(switches[0].props.accessibilityState.checked).toBe(true); <mask> }); <mask> <mask> it('can be default checked', () => { <mask> let { getAllByRole } = render( <mask> <NativeBaseProvider> </s> Added aria packages to ignore </s> remove it('can be default checked', () => { let { getAllByRole } = render( <NativeBaseProvider> <Switch defaultIsChecked /> </NativeBaseProvider> ); let switches = getAllByRole('switch'); expect(switches[0].props.accessibilityState.checked).toBe(true); }); </s> add // it('can be default checked', () => { // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch defaultIsChecked /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.checked).toBe(true); // }); </s> remove it('can be disabled', () => { let { getAllByRole } = render( <NativeBaseProvider> <Switch isDisabled /> </NativeBaseProvider> ); let switches = getAllByRole('switch'); expect(switches[0].props.accessibilityState.disabled).toBe(true); }); </s> add // it('can be disabled', () => { // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch isDisabled /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.disabled).toBe(true); // }); </s> remove import { Switch } from '../..'; </s> add // import { Switch } from '../..'; </s> remove import React from 'react'; import { fireEvent, render } from '@testing-library/react-native'; import { NativeBaseProvider } from 'native-base'; </s> add // import React from 'react'; // import { fireEvent, render } from '@testing-library/react-native'; // import { NativeBaseProvider } from 'native-base'; </s> remove "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch)/)" </s> add "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils)/)"
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e056b40c11bd79293911ad0c987b3277eca197f5
src/components/primitives/Switch/test/switch.test.tsx
// it('can be default checked', () => { // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch defaultIsChecked /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.checked).toBe(true); // });
<mask> fireEvent.press(switches[0]); <mask> expect(switches[0].props.accessibilityState.checked).toBe(true); <mask> }); <mask> <mask> it('can be default checked', () => { <mask> let { getAllByRole } = render( <mask> <NativeBaseProvider> <mask> <Switch defaultIsChecked /> <mask> </NativeBaseProvider> <mask> ); <mask> let switches = getAllByRole('switch'); <mask> expect(switches[0].props.accessibilityState.checked).toBe(true); <mask> }); <mask> <mask> it('can be disabled', () => { <mask> let { getAllByRole } = render( <mask> <NativeBaseProvider> <mask> <Switch isDisabled /> </s> Added aria packages to ignore </s> remove let { getAllByRole } = render( <NativeBaseProvider> <Switch /> </NativeBaseProvider> ); let switches = getAllByRole('switch'); expect(switches[0].props.accessibilityState.checked).toBe(false); fireEvent.press(switches[0]); expect(switches[0].props.accessibilityState.checked).toBe(true); </s> add expect(1).toBe(1); // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.checked).toBe(false); // fireEvent.press(switches[0]); // expect(switches[0].props.accessibilityState.checked).toBe(true); </s> remove it('can be disabled', () => { let { getAllByRole } = render( <NativeBaseProvider> <Switch isDisabled /> </NativeBaseProvider> ); let switches = getAllByRole('switch'); expect(switches[0].props.accessibilityState.disabled).toBe(true); }); </s> add // it('can be disabled', () => { // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch isDisabled /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.disabled).toBe(true); // }); </s> remove import { Switch } from '../..'; </s> add // import { Switch } from '../..'; </s> remove import React from 'react'; import { fireEvent, render } from '@testing-library/react-native'; import { NativeBaseProvider } from 'native-base'; </s> add // import React from 'react'; // import { fireEvent, render } from '@testing-library/react-native'; // import { NativeBaseProvider } from 'native-base'; </s> remove "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch)/)" </s> add "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils)/)"
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e056b40c11bd79293911ad0c987b3277eca197f5
src/components/primitives/Switch/test/switch.test.tsx
// it('can be disabled', () => { // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch isDisabled /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.disabled).toBe(true); // });
<mask> let switches = getAllByRole('switch'); <mask> expect(switches[0].props.accessibilityState.checked).toBe(true); <mask> }); <mask> <mask> it('can be disabled', () => { <mask> let { getAllByRole } = render( <mask> <NativeBaseProvider> <mask> <Switch isDisabled /> <mask> </NativeBaseProvider> <mask> ); <mask> let switches = getAllByRole('switch'); <mask> expect(switches[0].props.accessibilityState.disabled).toBe(true); <mask> }); <mask> }); </s> Added aria packages to ignore </s> remove it('can be default checked', () => { let { getAllByRole } = render( <NativeBaseProvider> <Switch defaultIsChecked /> </NativeBaseProvider> ); let switches = getAllByRole('switch'); expect(switches[0].props.accessibilityState.checked).toBe(true); }); </s> add // it('can be default checked', () => { // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch defaultIsChecked /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.checked).toBe(true); // }); </s> remove let { getAllByRole } = render( <NativeBaseProvider> <Switch /> </NativeBaseProvider> ); let switches = getAllByRole('switch'); expect(switches[0].props.accessibilityState.checked).toBe(false); fireEvent.press(switches[0]); expect(switches[0].props.accessibilityState.checked).toBe(true); </s> add expect(1).toBe(1); // let { getAllByRole } = render( // <NativeBaseProvider> // <Switch /> // </NativeBaseProvider> // ); // let switches = getAllByRole('switch'); // expect(switches[0].props.accessibilityState.checked).toBe(false); // fireEvent.press(switches[0]); // expect(switches[0].props.accessibilityState.checked).toBe(true); </s> remove import { Switch } from '../..'; </s> add // import { Switch } from '../..'; </s> remove import React from 'react'; import { fireEvent, render } from '@testing-library/react-native'; import { NativeBaseProvider } from 'native-base'; </s> add // import React from 'react'; // import { fireEvent, render } from '@testing-library/react-native'; // import { NativeBaseProvider } from 'native-base'; </s> remove "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch)/)" </s> add "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils)/)"
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e056b40c11bd79293911ad0c987b3277eca197f5
src/components/primitives/Switch/test/switch.test.tsx
import { Picker } from '@react-native-picker/picker';
<mask> /* eslint-disable react/prefer-stateless-function */ <mask> /* eslint-disable react/prefer-es6-class */ <mask> import React, { Component } from 'react'; <mask> import createReactClass from 'create-react-class'; <mask> import { Picker } from '@react-native-community/picker'; <mask> import { connectStyle } from 'native-base-shoutem-theme'; <mask> <mask> import mapPropsToStyleNames from '../utils/mapPropsToStyleNames'; <mask> <mask> export default class PickerNB extends Component { </s> Change imports for react native picker to reference updated package </s> remove import { Picker } from '@react-native-community/picker'; </s> add import { Picker } from '@react-native-picker/picker'; </s> remove import { Picker } from '@react-native-community/picker'; </s> add import { Picker } from '@react-native-picker/picker'; </s> remove import { Picker } from '@react-native-community/picker'; </s> add import { Picker } from '@react-native-picker/picker';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e0fb6e61a20df169fb79bf567a1023011d183d2c
src/basic/Picker.android.js
import { Picker } from '@react-native-picker/picker';
<mask> import React, { Component } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import createReactClass from 'create-react-class'; <mask> import { FlatList, Modal, View, ViewPropTypes } from 'react-native'; <mask> import { Picker } from '@react-native-community/picker'; <mask> import { connectStyle } from 'native-base-shoutem-theme'; <mask> import { find, get } from 'lodash'; <mask> <mask> import computeProps from '../utils/computeProps'; <mask> import mapPropsToStyleNames from '../utils/mapPropsToStyleNames'; </s> Change imports for react native picker to reference updated package </s> remove import { Picker } from '@react-native-community/picker'; </s> add import { Picker } from '@react-native-picker/picker'; </s> remove import { Picker } from '@react-native-community/picker'; </s> add import { Picker } from '@react-native-picker/picker'; </s> remove import { Picker } from '@react-native-community/picker'; </s> add import { Picker } from '@react-native-picker/picker';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e0fb6e61a20df169fb79bf567a1023011d183d2c
src/basic/Picker.ios.js
import { Picker } from '@react-native-picker/picker';
<mask> /* eslint-disable react/prefer-stateless-function */ <mask> /* eslint-disable react/prefer-es6-class */ <mask> import React, { Component } from 'react'; <mask> import createReactClass from 'create-react-class'; <mask> import { Picker } from '@react-native-community/picker'; <mask> import { connectStyle } from 'native-base-shoutem-theme'; <mask> <mask> import mapPropsToStyleNames from '../utils/mapPropsToStyleNames'; <mask> <mask> export default class PickerNB extends Component { </s> Change imports for react native picker to reference updated package
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e0fb6e61a20df169fb79bf567a1023011d183d2c
src/basic/Picker.js
import { Picker } from '@react-native-picker/picker';
<mask> import React, { Component } from 'react'; <mask> import { Picker } from '@react-native-community/picker'; <mask> import { connectStyle } from 'native-base-shoutem-theme'; <mask> <mask> import mapPropsToStyleNames from '../utils/mapPropsToStyleNames'; <mask> <mask> class Item extends Component { </s> Change imports for react native picker to reference updated package </s> remove import { Picker } from '@react-native-community/picker'; </s> add import { Picker } from '@react-native-picker/picker'; </s> remove import { Picker } from '@react-native-community/picker'; </s> add import { Picker } from '@react-native-picker/picker'; </s> remove import { Picker } from '@react-native-community/picker'; </s> add import { Picker } from '@react-native-picker/picker';
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e0fb6e61a20df169fb79bf567a1023011d183d2c
src/basic/PickerItem.js
<mask> import { connectStyle } from 'native-base-shoutem-theme'; <mask> <mask> import variable from '../theme/variables/platform'; <mask> import { PLATFORM } from '../theme/variables/commonColor'; <mask> import computeProps from '../utils/computeProps'; <mask> import mapPropsToStyleNames from '../utils/mapPropsToStyleNames'; <mask> <mask> import { Text } from './Text'; <mask> <mask> </s> use RN's style merger instead of all this obscure magic </s> remove return computeProps(this.props, defaultProps); </s> add </s> remove const defaultProps = { style: this.getInitialStyle().borderedBtn }; </s> add </s> remove if (Array.isArray(this.props.style)) { const flattenedStyle = this.props.style.reduce( (accumulator, currentValue) => accumulator.concat(currentValue), [] ); return computeProps( { ...this.props, style: flattenedStyle }, defaultProps ); </s> add const {style, ...others} = this.props; return { style: StyleSheet.compose(this.getInitialStyle().borderedBtn, style), ...others
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e1369714e026c13f1538b0a4f1ae82fa2826822c
src/basic/Button.js
<mask> }; <mask> } <mask> <mask> prepareRootProps() { <mask> const defaultProps = { <mask> style: this.getInitialStyle().borderedBtn <mask> }; <mask> <mask> if (Array.isArray(this.props.style)) { <mask> const flattenedStyle = this.props.style.reduce( <mask> (accumulator, currentValue) => accumulator.concat(currentValue), <mask> [] </s> use RN's style merger instead of all this obscure magic </s> remove if (Array.isArray(this.props.style)) { const flattenedStyle = this.props.style.reduce( (accumulator, currentValue) => accumulator.concat(currentValue), [] ); return computeProps( { ...this.props, style: flattenedStyle }, defaultProps ); </s> add const {style, ...others} = this.props; return { style: StyleSheet.compose(this.getInitialStyle().borderedBtn, style), ...others </s> remove return computeProps(this.props, defaultProps); </s> add </s> remove import computeProps from '../utils/computeProps'; </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e1369714e026c13f1538b0a4f1ae82fa2826822c
src/basic/Button.js
const {style, ...others} = this.props; return { style: StyleSheet.compose(this.getInitialStyle().borderedBtn, style), ...others
<mask> const defaultProps = { <mask> style: this.getInitialStyle().borderedBtn <mask> }; <mask> <mask> if (Array.isArray(this.props.style)) { <mask> const flattenedStyle = this.props.style.reduce( <mask> (accumulator, currentValue) => accumulator.concat(currentValue), <mask> [] <mask> ); <mask> return computeProps( <mask> { ...this.props, style: flattenedStyle }, <mask> defaultProps <mask> ); <mask> } <mask> <mask> return computeProps(this.props, defaultProps); <mask> } <mask> </s> use RN's style merger instead of all this obscure magic </s> remove const defaultProps = { style: this.getInitialStyle().borderedBtn }; </s> add </s> remove return computeProps(this.props, defaultProps); </s> add </s> remove import computeProps from '../utils/computeProps'; </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e1369714e026c13f1538b0a4f1ae82fa2826822c
src/basic/Button.js
<mask> defaultProps <mask> ); <mask> } <mask> <mask> return computeProps(this.props, defaultProps); <mask> } <mask> <mask> render() { <mask> const variables = this.context.theme <mask> ? this.context.theme['@@shoutem.theme/themeStyle'].variables </s> use RN's style merger instead of all this obscure magic </s> remove if (Array.isArray(this.props.style)) { const flattenedStyle = this.props.style.reduce( (accumulator, currentValue) => accumulator.concat(currentValue), [] ); return computeProps( { ...this.props, style: flattenedStyle }, defaultProps ); </s> add const {style, ...others} = this.props; return { style: StyleSheet.compose(this.getInitialStyle().borderedBtn, style), ...others </s> remove const defaultProps = { style: this.getInitialStyle().borderedBtn }; </s> add </s> remove import computeProps from '../utils/computeProps'; </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e1369714e026c13f1538b0a4f1ae82fa2826822c
src/basic/Button.js
<mask> } <mask> ); <mask> } <mask> <mask> const boxChildren = isLoading && isLoadingText ? isLoadingText : children; <mask> <mask> const spinnerElement = spinner ? ( <mask> spinner <mask> ) : ( <mask> <Spinner color={_text?.color} {..._spinner} /> <mask> ); </s> fix: isloadingtext not showing option </s> remove <HStack {..._stack}> </s> add <HStack {..._stack} space={isLoading && !isLoadingText ? 0 : 2}> </s> remove {boxChildren ? ( <Box _text={_text}> {isLoading && isLoadingText ? isLoadingText : children} </Box> ) : null} </s> add <Box _text={_text}> {isLoading ? (isLoadingText ? isLoadingText : null) : children} </Box>
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e13babd743025b937847fc3c5557484165bf2dd3
src/components/primitives/Button/Button.tsx
<HStack {..._stack} space={isLoading && !isLoadingText ? 0 : 2}>
<mask> )} <mask> {...resolvedProps} <mask> accessibilityRole={props.accessibilityRole ?? 'button'} <mask> > <mask> <HStack {..._stack}> <mask> {startIcon && !isLoading ? startIcon : null} <mask> {isLoading && spinnerPlacement === 'start' ? spinnerElement : null} <mask> {boxChildren ? ( <mask> <Box _text={_text}> <mask> {isLoading && isLoadingText ? isLoadingText : children} </s> fix: isloadingtext not showing option </s> remove const boxChildren = isLoading && isLoadingText ? isLoadingText : children; </s> add </s> remove {boxChildren ? ( <Box _text={_text}> {isLoading && isLoadingText ? isLoadingText : children} </Box> ) : null} </s> add <Box _text={_text}> {isLoading ? (isLoadingText ? isLoadingText : null) : children} </Box>
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e13babd743025b937847fc3c5557484165bf2dd3
src/components/primitives/Button/Button.tsx
<Box _text={_text}> {isLoading ? (isLoadingText ? isLoadingText : null) : children} </Box>
<mask> > <mask> <HStack {..._stack}> <mask> {startIcon && !isLoading ? startIcon : null} <mask> {isLoading && spinnerPlacement === 'start' ? spinnerElement : null} <mask> {boxChildren ? ( <mask> <Box _text={_text}> <mask> {isLoading && isLoadingText ? isLoadingText : children} <mask> </Box> <mask> ) : null} <mask> {endIcon && !isLoading ? endIcon : null} <mask> {isLoading && spinnerPlacement === 'end' ? spinnerElement : null} <mask> </HStack> <mask> </Pressable> <mask> ); </s> fix: isloadingtext not showing option </s> remove const boxChildren = isLoading && isLoadingText ? isLoadingText : children; </s> add </s> remove <HStack {..._stack}> </s> add <HStack {..._stack} space={isLoading && !isLoadingText ? 0 : 2}>
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e13babd743025b937847fc3c5557484165bf2dd3
src/components/primitives/Button/Button.tsx
it('a11y test in when required', async () => {
<mask> <TextInput ref={ref} {...inputProps} /> <mask> ); <mask> }); <mask> <mask> it('passes a11y test in when required', async () => { <mask> let { getByPlaceholderText } = render( <mask> <Wrapper> <mask> <FormControl nativeID="name" isRequired> <mask> <FormControl.Label>Name</FormControl.Label> <mask> <Input placeholder="Name" /> </s> feat: add form label test case </s> remove it('passes a11y test when helper text is present', async () => { </s> add it('a11y test when helper text is present', async () => { </s> remove it('passes a11y test in when readOnly', async () => { </s> add it('a11y test in when readOnly', async () => { </s> remove it('passes a11y test in when disabled', async () => { </s> add it('a11y test in when disabled', async () => { </s> remove it('passes a11y test in when invalid', async () => { </s> add it('a11y test in when invalid', async () => {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e14877451c3f255dd41cf5567775bedd3070e2be
src/components/composites/FormControl/test/FormControl.test.tsx
it('a11y test in when invalid', async () => {
<mask> expect(textInput.props.accessibilityRequired).toBe(true); <mask> expect(textInput.props.required).toBe(true); <mask> }); <mask> <mask> it('passes a11y test in when invalid', async () => { <mask> let { getByPlaceholderText } = render( <mask> <Wrapper> <mask> <FormControl nativeID="name" isInvalid> <mask> <FormControl.Label>Name</FormControl.Label> <mask> <Input placeholder="Name" /> </s> feat: add form label test case </s> remove it('passes a11y test when helper text is present', async () => { </s> add it('a11y test when helper text is present', async () => { </s> remove it('passes a11y test in when readOnly', async () => { </s> add it('a11y test in when readOnly', async () => { </s> remove it('passes a11y test in when required', async () => { </s> add it('a11y test in when required', async () => { </s> remove it('passes a11y test in when disabled', async () => { </s> add it('a11y test in when disabled', async () => {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e14877451c3f255dd41cf5567775bedd3070e2be
src/components/composites/FormControl/test/FormControl.test.tsx
it('a11y test in when readOnly', async () => {
<mask> const textInput = getByPlaceholderText('Name'); <mask> expect(textInput.props.accessibilityInvalid).toBe(true); <mask> }); <mask> <mask> it('passes a11y test in when readOnly', async () => { <mask> let { getByPlaceholderText } = render( <mask> <Wrapper> <mask> <FormControl nativeID="name" isReadOnly> <mask> <FormControl.Label>Name</FormControl.Label> <mask> <Input placeholder="Name" /> </s> feat: add form label test case </s> remove it('passes a11y test when helper text is present', async () => { </s> add it('a11y test when helper text is present', async () => { </s> remove it('passes a11y test in when required', async () => { </s> add it('a11y test in when required', async () => { </s> remove it('passes a11y test in when disabled', async () => { </s> add it('a11y test in when disabled', async () => { </s> remove it('passes a11y test in when invalid', async () => { </s> add it('a11y test in when invalid', async () => {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e14877451c3f255dd41cf5567775bedd3070e2be
src/components/composites/FormControl/test/FormControl.test.tsx
it('a11y test in when disabled', async () => {
<mask> expect(textInput.props.accessibilityReadOnly).toBe(true); <mask> expect(textInput.props.readOnly).toBe(true); <mask> }); <mask> <mask> it('passes a11y test in when disabled', async () => { <mask> let { getByPlaceholderText } = render( <mask> <Wrapper> <mask> <FormControl nativeID="name" isDisabled> <mask> <FormControl.Label>Name</FormControl.Label> <mask> <Input placeholder="Name" /> </s> feat: add form label test case </s> remove it('passes a11y test when helper text is present', async () => { </s> add it('a11y test when helper text is present', async () => { </s> remove it('passes a11y test in when readOnly', async () => { </s> add it('a11y test in when readOnly', async () => { </s> remove it('passes a11y test in when required', async () => { </s> add it('a11y test in when required', async () => { </s> remove it('passes a11y test in when invalid', async () => { </s> add it('a11y test in when invalid', async () => {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e14877451c3f255dd41cf5567775bedd3070e2be
src/components/composites/FormControl/test/FormControl.test.tsx
it('a11y test when helper text is present', async () => {
<mask> const textInput = getByPlaceholderText('Name'); <mask> expect(textInput.props.disabled).toBe(true); <mask> }); <mask> <mask> it('passes a11y test when helper text is present', async () => { <mask> let { getByPlaceholderText } = render( <mask> <Wrapper> <mask> <FormControl nativeID="name" isDisabled> <mask> <FormControl.Label>Name</FormControl.Label> <mask> <Input placeholder="Name" /> </s> feat: add form label test case </s> remove it('passes a11y test in when readOnly', async () => { </s> add it('a11y test in when readOnly', async () => { </s> remove it('passes a11y test in when disabled', async () => { </s> add it('a11y test in when disabled', async () => { </s> remove it('passes a11y test in when required', async () => { </s> add it('a11y test in when required', async () => { </s> remove it('passes a11y test in when invalid', async () => { </s> add it('a11y test in when invalid', async () => {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e14877451c3f255dd41cf5567775bedd3070e2be
src/components/composites/FormControl/test/FormControl.test.tsx
CustomProps,
<mask> SafeAreaProps, <mask> PlatformProps, <mask> ResponsiveValue, <mask> ColorType, <mask> } from '../../types'; <mask> import type { ITextProps } from './../Text/types'; <mask> <mask> export interface ILinearGradientProps { <mask> linearGradient?: { </s> fix: custom prop typing fixes </s> remove import type { VariantType } from '../../../components/types/utils'; </s> add import type { CustomProps, VariantType, // VariantType, // VariantTypeTest, } from '../../../components/types/utils'; </s> remove export interface IButtonProps extends IPressableProps<IButtonProps> { </s> add interface ButtonProps extends IPressableProps<IButtonProps> { </s> remove export interface IBoxProps<T = null> </s> add interface BoxProps<T = null>
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e21a3db91f3dd4aef9debf52b4a1c91cc9ca468a
src/components/primitives/Box/types.ts
interface BoxProps<T = null>
<mask> location?: Array<number>; <mask> }; <mask> } <mask> <mask> export interface IBoxProps<T = null> <mask> extends ViewProps, <mask> SafeAreaProps, <mask> PlatformProps<T extends null ? IBoxProps<any> : T>, <mask> Omit<StyledProps, 'bgColor' | 'background' | 'bg' | 'backgroundColor'> { <mask> /** </s> fix: custom prop typing fixes </s> remove export interface IButtonProps extends IPressableProps<IButtonProps> { </s> add interface ButtonProps extends IPressableProps<IButtonProps> { </s> remove import type { VariantType } from '../../../components/types/utils'; </s> add import type { CustomProps, VariantType, // VariantType, // VariantTypeTest, } from '../../../components/types/utils';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e21a3db91f3dd4aef9debf52b4a1c91cc9ca468a
src/components/primitives/Box/types.ts
import type { CustomProps, VariantType, // VariantType, // VariantTypeTest, } from '../../../components/types/utils';
<mask> import type { IStackProps } from '../Stack'; <mask> import type { ResponsiveValue } from '../../types'; <mask> import type { MutableRefObject } from 'react'; <mask> import type { ISizes } from '../../../theme/base/sizes'; <mask> import type { VariantType } from '../../../components/types/utils'; <mask> import type { ISpinnerProps } from '../Spinner/types'; <mask> <mask> // Todo: Create underscore Props section on docs. <mask> // _hover?: IButtonProps; <mask> export interface IButtonProps extends IPressableProps<IButtonProps> { </s> fix: custom prop typing fixes </s> remove export interface IButtonProps extends IPressableProps<IButtonProps> { </s> add interface ButtonProps extends IPressableProps<IButtonProps> { </s> remove export interface IBoxProps<T = null> </s> add interface BoxProps<T = null>
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e21a3db91f3dd4aef9debf52b4a1c91cc9ca468a
src/components/primitives/Button/types.ts
// const myFunction = ({ a, b }) => { // return { a: a, b: b }; // }; // type returnType = ReturnType<typeof myFunction>; // type parameter = Parameters<typeof myFunction>[0]; // type newparameter = keyof parameter; // const a: parameter = // type parameter = Para<typeof myFunction>; // type buttonVariant = VariantTypeTest<'Button'>;
<mask> import type { ISpinnerProps } from '../Spinner/types'; <mask> <mask> // Todo: Create underscore Props section on docs. <mask> // _hover?: IButtonProps; <mask> interface ButtonProps extends IPressableProps<IButtonProps> { <mask> /** <mask> * The color of the radio when it's checked. This should be one of the color keys in the theme (e.g."green", "red"). <mask> * @default 'primary' </s> fix: custom prop typing fixes </s> remove export interface IButtonProps extends IPressableProps<IButtonProps> { </s> add interface ButtonProps extends IPressableProps<IButtonProps> { </s> remove import type { VariantType } from '../../../components/types/utils'; </s> add import type { CustomProps, VariantType, // VariantType, // VariantTypeTest, } from '../../../components/types/utils'; </s> remove export interface IBoxProps<T = null> </s> add interface BoxProps<T = null>
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e21a3db91f3dd4aef9debf52b4a1c91cc9ca468a
src/components/primitives/Button/types.ts
interface ButtonProps extends IPressableProps<IButtonProps> {
<mask> import type { ISpinnerProps } from '../Spinner/types'; <mask> <mask> // Todo: Create underscore Props section on docs. <mask> // _hover?: IButtonProps; <mask> export interface IButtonProps extends IPressableProps<IButtonProps> { <mask> /** <mask> * The color of the radio when it's checked. This should be one of the color keys in the theme (e.g."green", "red"). <mask> * @default 'primary' <mask> */ <mask> colorScheme?: string; </s> fix: custom prop typing fixes </s> remove import type { VariantType } from '../../../components/types/utils'; </s> add import type { CustomProps, VariantType, // VariantType, // VariantTypeTest, } from '../../../components/types/utils'; </s> remove export interface IBoxProps<T = null> </s> add interface BoxProps<T = null>
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e21a3db91f3dd4aef9debf52b4a1c91cc9ca468a
src/components/primitives/Button/types.ts
export type IButtonProps = ButtonProps | CustomProps<'Button'>;
<mask> Group: React.MemoExoticComponent< <mask> (props: IButtonGroupProps & { ref?: MutableRefObject<any> }) => JSX.Element <mask> >; <mask> }; </s> fix: custom prop typing fixes </s> remove import type { VariantType } from '../../../components/types/utils'; </s> add import type { CustomProps, VariantType, // VariantType, // VariantTypeTest, } from '../../../components/types/utils'; </s> remove export interface IButtonProps extends IPressableProps<IButtonProps> { </s> add interface ButtonProps extends IPressableProps<IButtonProps> { </s> remove export interface IBoxProps<T = null> </s> add interface BoxProps<T = null>
[ "keep", "keep", "keep", "add" ]
https://github.com/GeekyAnts/NativeBase/commit/e21a3db91f3dd4aef9debf52b4a1c91cc9ca468a
src/components/primitives/Button/types.ts
headerIconFontSize: (Platform.OS === 'ios' ) ? 34 : 30, headerIconLineHeight: (Platform.OS === 'ios' ) ? 36 : 32,
<mask> // Icon <mask> iconFamily: 'Ionicons', <mask> iconFontSize: (Platform.OS === 'ios' ) ? 30 : 28, <mask> iconMargin: 7, <mask> <mask> <mask> // InputGroup <mask> inputFontSize: 15, <mask> inputBorderColor: '#D9D5DC', </s> variable changed for header icon </s> remove this.props.header?this.getTheme().iconFontSize+4:this.getTheme().iconFontSize-5, lineHeight:this.props.large?52:this.props.small||this.props.inputButton?22:this.props.header?36:this.getTheme().iconLineHeight-9}; </s> add this.props.header?this.getTheme().headerIconFontSize:this.getTheme().iconFontSize-5, lineHeight:this.props.large?52:this.props.small||this.props.inputButton?22:this.props.header?this.getTheme().headerIconLineHeight:this.getTheme().iconLineHeight-9}; </s> remove (this.props.header) ? this.getTheme().iconFontSize+4 : this.getTheme().iconFontSize-5, lineHeight: (this.props.large) ? 52 : (this.props.small || this.props.inputButton) ? 22 : (this.props.header) ? 36 : this.getTheme().iconLineHeight-9 </s> add (this.props.header) ? this.getTheme().headerIconFontSize : this.getTheme().iconFontSize-5, lineHeight: (this.props.large) ? 52 : (this.props.small || this.props.inputButton) ? 22 : (this.props.header) ? this.getTheme().headerIconLineHeight : this.getTheme().iconLineHeight-9
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e2ff0be608789bc2b1a17b6d961ef4425d6541ee
Components/Themes/light.js
(this.props.header) ? this.getTheme().headerIconFontSize : this.getTheme().iconFontSize-5, lineHeight: (this.props.large) ? 52 : (this.props.small || this.props.inputButton) ? 22 : (this.props.header) ? this.getTheme().headerIconLineHeight : this.getTheme().iconLineHeight-9
<mask> fontSize: (this.props.large) ? this.getTheme().iconSizeLarge : <mask> (this.props.small) ? this.getTheme().iconSizeSmall : <mask> (this.props.inputButton) ? this.getTheme().toolbarIconSize : <mask> (this.props.fabButton) ? 22 : <mask> (this.props.header) ? this.getTheme().iconFontSize+4 : this.getTheme().iconFontSize-5, <mask> lineHeight: (this.props.large) ? 52 : (this.props.small || this.props.inputButton) ? 22 : (this.props.header) ? 36 : this.getTheme().iconLineHeight-9 <mask> } <mask> <mask> var defaultProps = { <mask> style: defaultStyle <mask> } </s> variable changed for header icon </s> remove this.props.header?this.getTheme().iconFontSize+4:this.getTheme().iconFontSize-5, lineHeight:this.props.large?52:this.props.small||this.props.inputButton?22:this.props.header?36:this.getTheme().iconLineHeight-9}; </s> add this.props.header?this.getTheme().headerIconFontSize:this.getTheme().iconFontSize-5, lineHeight:this.props.large?52:this.props.small||this.props.inputButton?22:this.props.header?this.getTheme().headerIconLineHeight:this.getTheme().iconLineHeight-9};
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e2ff0be608789bc2b1a17b6d961ef4425d6541ee
Components/Widgets/Button/index.js
headerIconFontSize:_reactNative.Platform.OS==='ios'?34:30, headerIconLineHeight:_reactNative.Platform.OS==='ios'?36:32,
<mask> iconFamily:'Ionicons', <mask> iconFontSize:_reactNative.Platform.OS==='ios'?30:28, <mask> iconMargin:7, <mask> <mask> <mask> <mask> inputFontSize:15, </s> variable changed for header icon </s> remove this.props.header?this.getTheme().iconFontSize+4:this.getTheme().iconFontSize-5, lineHeight:this.props.large?52:this.props.small||this.props.inputButton?22:this.props.header?36:this.getTheme().iconLineHeight-9}; </s> add this.props.header?this.getTheme().headerIconFontSize:this.getTheme().iconFontSize-5, lineHeight:this.props.large?52:this.props.small||this.props.inputButton?22:this.props.header?this.getTheme().headerIconLineHeight:this.getTheme().iconLineHeight-9}; </s> remove (this.props.header) ? this.getTheme().iconFontSize+4 : this.getTheme().iconFontSize-5, lineHeight: (this.props.large) ? 52 : (this.props.small || this.props.inputButton) ? 22 : (this.props.header) ? 36 : this.getTheme().iconLineHeight-9 </s> add (this.props.header) ? this.getTheme().headerIconFontSize : this.getTheme().iconFontSize-5, lineHeight: (this.props.large) ? 52 : (this.props.small || this.props.inputButton) ? 22 : (this.props.header) ? this.getTheme().headerIconLineHeight : this.getTheme().iconLineHeight-9
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e2ff0be608789bc2b1a17b6d961ef4425d6541ee
dist/Components/Themes/light.js
this.props.header?this.getTheme().headerIconFontSize:this.getTheme().iconFontSize-5, lineHeight:this.props.large?52:this.props.small||this.props.inputButton?22:this.props.header?this.getTheme().headerIconLineHeight:this.getTheme().iconLineHeight-9};
<mask> fontSize:this.props.large?this.getTheme().iconSizeLarge: <mask> this.props.small?this.getTheme().iconSizeSmall: <mask> this.props.inputButton?this.getTheme().toolbarIconSize: <mask> this.props.fabButton?22: <mask> this.props.header?this.getTheme().iconFontSize+4:this.getTheme().iconFontSize-5, <mask> lineHeight:this.props.large?52:this.props.small||this.props.inputButton?22:this.props.header?36:this.getTheme().iconLineHeight-9}; <mask> <mask> <mask> var defaultProps={ <mask> style:defaultStyle}; <mask> </s> variable changed for header icon </s> remove (this.props.header) ? this.getTheme().iconFontSize+4 : this.getTheme().iconFontSize-5, lineHeight: (this.props.large) ? 52 : (this.props.small || this.props.inputButton) ? 22 : (this.props.header) ? 36 : this.getTheme().iconLineHeight-9 </s> add (this.props.header) ? this.getTheme().headerIconFontSize : this.getTheme().iconFontSize-5, lineHeight: (this.props.large) ? 52 : (this.props.small || this.props.inputButton) ? 22 : (this.props.header) ? this.getTheme().headerIconLineHeight : this.getTheme().iconLineHeight-9
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e2ff0be608789bc2b1a17b6d961ef4425d6541ee
dist/Components/Widgets/Button/index.js
RNBareExample/ios/Pods
<mask> android.iml <mask> <mask> # Cocoapods <mask> # <mask> example/ios/Pods <mask> <mask> # node.js <mask> # <mask> node_modules/ <mask> npm-debug.log </s> fix: icon ref fix (#3718) </s> remove export const Svg = (props: any) => unstable_createElement('svg', props); export const G = (props: any) => unstable_createElement('g', props); export const Path = (props: any) => unstable_createElement('path', props); export const Polygon = (props: any) => unstable_createElement('polygon', props); export const Line = (props: any) => unstable_createElement('line', props); export const Circle = (props: any) => unstable_createElement('circle', props); export const Rect = (props: any) => unstable_createElement('rect', props); </s> add export const Svg = forwardRef((props: any, ref: any) => unstable_createElement('svg', { ...props, ref }) ); export const G = forwardRef((props: any, ref: any) => unstable_createElement('g', { ...props, ref }) ); export const Path = forwardRef((props: any, ref: any) => unstable_createElement('path', { ...props, ref }) ); export const Polygon = forwardRef((props: any, ref: any) => unstable_createElement('polygon', { ...props, ref }) ); export const Line = forwardRef((props: any, ref: any) => unstable_createElement('line', { ...props, ref }) ); export const Circle = forwardRef((props: any, ref: any) => unstable_createElement('circle', { ...props, ref }) ); export const Rect = forwardRef((props: any, ref: any) => unstable_createElement('rect', { ...props, ref }) ); </s> remove return <Box {...resolvedProps}>{asWithProps}</Box>; </s> add return ( <Box {...resolvedProps} ref={ref}> {asWithProps} </Box> );
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e314b7388e5d6e41bc8fedd62a8cac3625656598
.gitignore
return ( <Box {...resolvedProps} ref={ref}> {asWithProps} </Box> );
<mask> color: hexColor, <mask> size: themeSize, <mask> }); <mask> <mask> return <Box {...resolvedProps}>{asWithProps}</Box>; <mask> }; <mask> <mask> export default memo(forwardRef(Icon)); </s> fix: icon ref fix (#3718) </s> remove export const Svg = (props: any) => unstable_createElement('svg', props); export const G = (props: any) => unstable_createElement('g', props); export const Path = (props: any) => unstable_createElement('path', props); export const Polygon = (props: any) => unstable_createElement('polygon', props); export const Line = (props: any) => unstable_createElement('line', props); export const Circle = (props: any) => unstable_createElement('circle', props); export const Rect = (props: any) => unstable_createElement('rect', props); </s> add export const Svg = forwardRef((props: any, ref: any) => unstable_createElement('svg', { ...props, ref }) ); export const G = forwardRef((props: any, ref: any) => unstable_createElement('g', { ...props, ref }) ); export const Path = forwardRef((props: any, ref: any) => unstable_createElement('path', { ...props, ref }) ); export const Polygon = forwardRef((props: any, ref: any) => unstable_createElement('polygon', { ...props, ref }) ); export const Line = forwardRef((props: any, ref: any) => unstable_createElement('line', { ...props, ref }) ); export const Circle = forwardRef((props: any, ref: any) => unstable_createElement('circle', { ...props, ref }) ); export const Rect = forwardRef((props: any, ref: any) => unstable_createElement('rect', { ...props, ref }) ); </s> remove example/ios/Pods </s> add RNBareExample/ios/Pods
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e314b7388e5d6e41bc8fedd62a8cac3625656598
src/components/primitives/Icon/Icon.tsx
import { forwardRef } from 'react';
<mask> //@ts-ignore <mask> import { unstable_createElement } from 'react-native-web'; <mask> <mask> export const Svg = forwardRef((props: any, ref: any) => <mask> unstable_createElement('svg', { ...props, ref }) <mask> ); </s> fix: icon ref fix (#3718) </s> remove export const Svg = (props: any) => unstable_createElement('svg', props); export const G = (props: any) => unstable_createElement('g', props); export const Path = (props: any) => unstable_createElement('path', props); export const Polygon = (props: any) => unstable_createElement('polygon', props); export const Line = (props: any) => unstable_createElement('line', props); export const Circle = (props: any) => unstable_createElement('circle', props); export const Rect = (props: any) => unstable_createElement('rect', props); </s> add export const Svg = forwardRef((props: any, ref: any) => unstable_createElement('svg', { ...props, ref }) ); export const G = forwardRef((props: any, ref: any) => unstable_createElement('g', { ...props, ref }) ); export const Path = forwardRef((props: any, ref: any) => unstable_createElement('path', { ...props, ref }) ); export const Polygon = forwardRef((props: any, ref: any) => unstable_createElement('polygon', { ...props, ref }) ); export const Line = forwardRef((props: any, ref: any) => unstable_createElement('line', { ...props, ref }) ); export const Circle = forwardRef((props: any, ref: any) => unstable_createElement('circle', { ...props, ref }) ); export const Rect = forwardRef((props: any, ref: any) => unstable_createElement('rect', { ...props, ref }) ); </s> remove return <Box {...resolvedProps}>{asWithProps}</Box>; </s> add return ( <Box {...resolvedProps} ref={ref}> {asWithProps} </Box> ); </s> remove example/ios/Pods </s> add RNBareExample/ios/Pods
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e314b7388e5d6e41bc8fedd62a8cac3625656598
src/components/primitives/Icon/nbSvg.web.tsx
export const Svg = forwardRef((props: any, ref: any) => unstable_createElement('svg', { ...props, ref }) ); export const G = forwardRef((props: any, ref: any) => unstable_createElement('g', { ...props, ref }) ); export const Path = forwardRef((props: any, ref: any) => unstable_createElement('path', { ...props, ref }) ); export const Polygon = forwardRef((props: any, ref: any) => unstable_createElement('polygon', { ...props, ref }) ); export const Line = forwardRef((props: any, ref: any) => unstable_createElement('line', { ...props, ref }) ); export const Circle = forwardRef((props: any, ref: any) => unstable_createElement('circle', { ...props, ref }) ); export const Rect = forwardRef((props: any, ref: any) => unstable_createElement('rect', { ...props, ref }) );
<mask> //@ts-ignore <mask> import { unstable_createElement } from 'react-native-web'; <mask> <mask> export const Svg = (props: any) => unstable_createElement('svg', props); <mask> export const G = (props: any) => unstable_createElement('g', props); <mask> export const Path = (props: any) => unstable_createElement('path', props); <mask> export const Polygon = (props: any) => unstable_createElement('polygon', props); <mask> export const Line = (props: any) => unstable_createElement('line', props); <mask> export const Circle = (props: any) => unstable_createElement('circle', props); <mask> export const Rect = (props: any) => unstable_createElement('rect', props); </s> fix: icon ref fix (#3718) </s> remove return <Box {...resolvedProps}>{asWithProps}</Box>; </s> add return ( <Box {...resolvedProps} ref={ref}> {asWithProps} </Box> ); </s> remove example/ios/Pods </s> add RNBareExample/ios/Pods
[ "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/e314b7388e5d6e41bc8fedd62a8cac3625656598
src/components/primitives/Icon/nbSvg.web.tsx
const { in: animationState, ...resolvedProps } = usePropsResolution( 'Fade', props );
<mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps'; <mask> import { usePropsResolution } from '../../../hooks/'; <mask> <mask> const Fade = ({ children, ...props }: IFadeProps, ref?: any) => { <mask> const { <mask> in: animationState, <mask> entryDuration, <mask> exitDuration, <mask> delay, <mask> ...resolvedProps <mask> } = usePropsResolution('Fade', props); <mask> <mask> // Need to have similar API for all animations <mask> <mask> // Temporary fix <mask> const animationStyle = { <mask> style: { <mask> initial: { opacity: 0 }, <mask> animate: { opacity: 1, transition: { duration: entryDuration, delay } }, <mask> exit: { opacity: 0, transition: { duration: exitDuration, delay } }, <mask> }, <mask> }; <mask> <mask> //TODO: refactor for responsive prop <mask> if (useHasResponsiveProps(props)) { <mask> return null; <mask> } <mask> return ( </s> Revert "fix: fade animation props" </s> remove entryDuration: 500, exitDuration: 500, delay: 0, </s> add initial: { opacity: 0 }, animate: { opacity: 1, transition: { duration: 500 } }, exit: { opacity: 0, transition: { duration: 500 } }, </s> remove <PresenceTransition visible={animationState} {...animationStyle.style} {...resolvedProps} ref={ref} > </s> add <PresenceTransition visible={animationState} {...resolvedProps} ref={ref}>
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e46ad36df5bb563fccb34030eda813b5ba1c8b41
src/components/composites/Transitions/Fade.tsx
<PresenceTransition visible={animationState} {...resolvedProps} ref={ref}>
<mask> if (useHasResponsiveProps(props)) { <mask> return null; <mask> } <mask> return ( <mask> <PresenceTransition <mask> visible={animationState} <mask> {...animationStyle.style} <mask> {...resolvedProps} <mask> ref={ref} <mask> > <mask> {children} <mask> </PresenceTransition> <mask> ); <mask> }; <mask> </s> Revert "fix: fade animation props" </s> remove entryDuration: 500, exitDuration: 500, delay: 0, </s> add initial: { opacity: 0 }, animate: { opacity: 1, transition: { duration: 500 } }, exit: { opacity: 0, transition: { duration: 500 } }, </s> remove const { in: animationState, entryDuration, exitDuration, delay, ...resolvedProps } = usePropsResolution('Fade', props); // Need to have similar API for all animations // Temporary fix const animationStyle = { style: { initial: { opacity: 0 }, animate: { opacity: 1, transition: { duration: entryDuration, delay } }, exit: { opacity: 0, transition: { duration: exitDuration, delay } }, }, }; </s> add const { in: animationState, ...resolvedProps } = usePropsResolution( 'Fade', props );
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e46ad36df5bb563fccb34030eda813b5ba1c8b41
src/components/composites/Transitions/Fade.tsx
// const fadeDefaultProps = { // entryDuration: 500, // exitDuration: 500, // };
<mask> //Fade <mask> export const fadeBaseStyle = { <mask> initial: { opacity: 0 }, <mask> animate: { opacity: 1, transition: { duration: 500 } }, <mask> exit: { opacity: 0, transition: { duration: 500 } }, <mask> }; <mask> export const Fade = { </s> Revert "fix: fade animation props" </s> remove entryDuration: 500, exitDuration: 500, delay: 0, </s> add initial: { opacity: 0 }, animate: { opacity: 1, transition: { duration: 500 } }, exit: { opacity: 0, transition: { duration: 500 } }, </s> remove const { in: animationState, entryDuration, exitDuration, delay, ...resolvedProps } = usePropsResolution('Fade', props); // Need to have similar API for all animations // Temporary fix const animationStyle = { style: { initial: { opacity: 0 }, animate: { opacity: 1, transition: { duration: entryDuration, delay } }, exit: { opacity: 0, transition: { duration: exitDuration, delay } }, }, }; </s> add const { in: animationState, ...resolvedProps } = usePropsResolution( 'Fade', props ); </s> remove <PresenceTransition visible={animationState} {...animationStyle.style} {...resolvedProps} ref={ref} > </s> add <PresenceTransition visible={animationState} {...resolvedProps} ref={ref}>
[ "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e46ad36df5bb563fccb34030eda813b5ba1c8b41
src/theme/components/transitions.ts
initial: { opacity: 0 }, animate: { opacity: 1, transition: { duration: 500 } }, exit: { opacity: 0, transition: { duration: 500 } },
<mask> //Fade <mask> export const fadeBaseStyle = { <mask> entryDuration: 500, <mask> exitDuration: 500, <mask> delay: 0, <mask> }; <mask> export const Fade = { <mask> baseStyle: fadeBaseStyle, <mask> }; <mask> </s> Revert "fix: fade animation props" </s> remove const { in: animationState, entryDuration, exitDuration, delay, ...resolvedProps } = usePropsResolution('Fade', props); // Need to have similar API for all animations // Temporary fix const animationStyle = { style: { initial: { opacity: 0 }, animate: { opacity: 1, transition: { duration: entryDuration, delay } }, exit: { opacity: 0, transition: { duration: exitDuration, delay } }, }, }; </s> add const { in: animationState, ...resolvedProps } = usePropsResolution( 'Fade', props ); </s> remove <PresenceTransition visible={animationState} {...animationStyle.style} {...resolvedProps} ref={ref} > </s> add <PresenceTransition visible={animationState} {...resolvedProps} ref={ref}>
[ "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e46ad36df5bb563fccb34030eda813b5ba1c8b41
src/theme/components/transitions.ts
return ( <Button _pressed={{ bg: 'red.400' }} onPress={() => console.log('hello world')} > PRIMARY </Button> );
<mask> import React from 'react'; <mask> import { Button } from 'native-base'; <mask> <mask> export const Example = () => { <mask> return <Button onPress={() => console.log('hello world')}>PRIMARY</Button>; <mask> }; </s> feat: new prop resolution changes in button </s> remove const { isDisabled, isLoading } = props; </s> add </s> remove const pressableProps = { ...resolvedProps, _hover, _pressed, _focus, _focusVisible, }; </s> add // const pressableProps = { // ...resolvedProps, // _hover, // _pressed, // _focus, // _focusVisible, // }; </s> remove let { theme, colorScheme, status, variant } = props; </s> add const { theme, status, variant } = props; let { colorScheme } = props;
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e4957044a998e750991b4ecf852025d3a99681ee
example/storybook/stories/components/primitives/Button/basic.tsx
import { composeEventHandlers } from '../../../utils'; import { useHover, useFocus, useIsPressed, } from '../../primitives/Pressable/Pressable';
<mask> import { Pressable } from '../Pressable'; <mask> import type { IButtonProps } from './types'; <mask> <mask> const Button = ( <mask> { <mask> children, <mask> isLoadingText, </s> feat: new prop resolution changes in button </s> remove return <Button onPress={() => console.log('hello world')}>PRIMARY</Button>; </s> add return ( <Button _pressed={{ bg: 'red.400' }} onPress={() => console.log('hello world')} > PRIMARY </Button> ); </s> remove const { isDisabled, isLoading } = props; </s> add </s> remove let { theme, colorScheme, status, variant } = props; </s> add const { theme, status, variant } = props; let { colorScheme } = props; </s> remove const pressableProps = { ...resolvedProps, _hover, _pressed, _focus, _focusVisible, }; </s> add // const pressableProps = { // ...resolvedProps, // _hover, // _pressed, // _focus, // _focusVisible, // };
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e4957044a998e750991b4ecf852025d3a99681ee
src/components/primitives/Button/Button.tsx
isDisabled, isLoading,
<mask> endIcon, <mask> spinner, <mask> spinnerPlacement = 'start', <mask> ...props <mask> }: IButtonProps & IBoxProps, <mask> ref: any </s> feat: new prop resolution changes in button </s> remove _disabled, _focus, _hover, _pressed, _focusVisible, </s> add </s> remove const { isDisabled, isLoading } = props; </s> add </s> remove {endIcon && !isLoading ? endIcon : null} {isLoading && spinnerPlacement === 'end' ? spinnerElement : null} </HStack> ); }} </s> add {endIcon && !isLoading ? endIcon : null} {isLoading && spinnerPlacement === 'end' ? spinnerElement : null} </HStack>
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e4957044a998e750991b4ecf852025d3a99681ee
src/components/primitives/Button/Button.tsx
const { hoverProps, isHovered } = useHover(); const { pressableProps, isPressed } = useIsPressed(); const { focusProps, isFocused } = useFocus();
<mask> }: IButtonProps & IBoxProps, <mask> ref: any <mask> ) => { <mask> const { <mask> onPressIn, <mask> onPressOut, <mask> onHoverIn, <mask> onHoverOut, <mask> onFocus, </s> feat: new prop resolution changes in button </s> remove _disabled, _focus, _hover, _pressed, _focusVisible, </s> add </s> remove const { isDisabled, isLoading } = props; </s> add
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e4957044a998e750991b4ecf852025d3a99681ee
src/components/primitives/Button/Button.tsx
onPressIn, onPressOut, onHoverIn, onHoverOut, onFocus, onBlur,
<mask> const { focusProps, isFocused } = useFocus(); <mask> const { <mask> _text, <mask> _stack, <mask> _spinner, <mask> ...resolvedProps </s> feat: new prop resolution changes in button </s> remove _disabled, _focus, _hover, _pressed, _focusVisible, </s> add </s> remove spinnerProps, </s> add </s> remove // { isDisabled, isLoading, isHovered, isFocusVisible, isFocused }, {}, </s> add { isDisabled, isLoading, isHovered, isFocused, isPressed }, </s> remove _loading, </s> add
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e4957044a998e750991b4ecf852025d3a99681ee
src/components/primitives/Button/Button.tsx
<mask> ref: any <mask> ) => { <mask> const { <mask> _text, <mask> _disabled, <mask> _focus, <mask> _hover, <mask> _pressed, <mask> _focusVisible, <mask> _stack, <mask> _loading, <mask> _spinner, <mask> spinnerProps, <mask> ...resolvedProps </s> feat: new prop resolution changes in button </s> remove _loading, </s> add </s> remove spinnerProps, </s> add </s> remove const pressableProps = { ...resolvedProps, _hover, _pressed, _focus, _focusVisible, }; </s> add // const pressableProps = { // ...resolvedProps, // _hover, // _pressed, // _focus, // _focusVisible, // };
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e4957044a998e750991b4ecf852025d3a99681ee
src/components/primitives/Button/Button.tsx
<mask> _hover, <mask> _pressed, <mask> _focusVisible, <mask> _stack, <mask> _loading, <mask> _spinner, <mask> spinnerProps, <mask> ...resolvedProps <mask> } = usePropsResolution( <mask> 'Button', </s> feat: new prop resolution changes in button </s> remove spinnerProps, </s> add </s> remove _disabled, _focus, _hover, _pressed, _focusVisible, </s> add </s> remove const pressableProps = { ...resolvedProps, _hover, _pressed, _focus, _focusVisible, }; </s> add // const pressableProps = { // ...resolvedProps, // _hover, // _pressed, // _focus, // _focusVisible, // }; </s> remove // { isDisabled, isLoading, isHovered, isFocusVisible, isFocused }, {}, </s> add { isDisabled, isLoading, isHovered, isFocused, isPressed },
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e4957044a998e750991b4ecf852025d3a99681ee
src/components/primitives/Button/Button.tsx
<mask> _focusVisible, <mask> _stack, <mask> _loading, <mask> _spinner, <mask> spinnerProps, <mask> ...resolvedProps <mask> } = usePropsResolution( <mask> 'Button', <mask> props, <mask> // { isDisabled, isLoading, isHovered, isFocusVisible, isFocused }, </s> feat: new prop resolution changes in button </s> remove // { isDisabled, isLoading, isHovered, isFocusVisible, isFocused }, {}, </s> add { isDisabled, isLoading, isHovered, isFocused, isPressed }, </s> remove _loading, </s> add </s> remove _disabled, _focus, _hover, _pressed, _focusVisible, </s> add </s> remove const pressableProps = { ...resolvedProps, _hover, _pressed, _focus, _focusVisible, }; </s> add // const pressableProps = { // ...resolvedProps, // _hover, // _pressed, // _focus, // _focusVisible, // };
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e4957044a998e750991b4ecf852025d3a99681ee
src/components/primitives/Button/Button.tsx
{ isDisabled, isLoading, isHovered, isFocused, isPressed },
<mask> ...resolvedProps <mask> } = usePropsResolution( <mask> 'Button', <mask> props, <mask> // { isDisabled, isLoading, isHovered, isFocusVisible, isFocused }, <mask> {}, <mask> { ignoreProps: ['_spinner'] } <mask> ); <mask> <mask> const pressableProps = { <mask> ...resolvedProps, </s> feat: new prop resolution changes in button </s> remove spinnerProps, </s> add </s> remove const pressableProps = { ...resolvedProps, _hover, _pressed, _focus, _focusVisible, }; </s> add // const pressableProps = { // ...resolvedProps, // _hover, // _pressed, // _focus, // _focusVisible, // }; </s> remove let { theme, colorScheme, status, variant } = props; </s> add const { theme, status, variant } = props; let { colorScheme } = props; </s> remove _loading, </s> add </s> remove const { isDisabled, isLoading } = props; </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e4957044a998e750991b4ecf852025d3a99681ee
src/components/primitives/Button/Button.tsx
// const pressableProps = { // ...resolvedProps, // _hover, // _pressed, // _focus, // _focusVisible, // };
<mask> {}, <mask> { ignoreProps: ['_spinner'] } <mask> ); <mask> <mask> const pressableProps = { <mask> ...resolvedProps, <mask> _hover, <mask> _pressed, <mask> _focus, <mask> _focusVisible, <mask> }; <mask> if (leftIcon) { <mask> startIcon = leftIcon; <mask> } <mask> if (rightIcon) { <mask> endIcon = rightIcon; </s> feat: new prop resolution changes in button </s> remove const { isDisabled, isLoading } = props; </s> add </s> remove // { isDisabled, isLoading, isHovered, isFocusVisible, isFocused }, {}, </s> add { isDisabled, isLoading, isHovered, isFocused, isPressed }, </s> remove _disabled, _focus, _hover, _pressed, _focusVisible, </s> add </s> remove _loading, </s> add </s> remove let { theme, colorScheme, status, variant } = props; </s> add const { theme, status, variant } = props; let { colorScheme } = props;
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e4957044a998e750991b4ecf852025d3a99681ee
src/components/primitives/Button/Button.tsx
<mask> } <mask> if (rightIcon) { <mask> endIcon = rightIcon; <mask> } <mask> const { isDisabled, isLoading } = props; <mask> <mask> if (endIcon && React.isValidElement(endIcon)) { <mask> endIcon = React.Children.map( <mask> endIcon, <mask> (child: JSX.Element, index: number) => { <mask> return React.cloneElement(child, { </s> feat: new prop resolution changes in button </s> remove const pressableProps = { ...resolvedProps, _hover, _pressed, _focus, _focusVisible, }; </s> add // const pressableProps = { // ...resolvedProps, // _hover, // _pressed, // _focus, // _focusVisible, // }; </s> remove let { theme, colorScheme, status, variant } = props; </s> add const { theme, status, variant } = props; let { colorScheme } = props; </s> remove // { isDisabled, isLoading, isHovered, isFocusVisible, isFocused }, {}, </s> add { isDisabled, isLoading, isHovered, isFocused, isPressed },
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e4957044a998e750991b4ecf852025d3a99681ee
src/components/primitives/Button/Button.tsx
const boxChildren = isLoading && isLoadingText ? isLoadingText : children; const spinnerElement = spinner ? spinner : <Spinner {..._spinner} />;
<mask> }); <mask> } <mask> ); <mask> } <mask> return ( <mask> <Pressable <mask> disabled={isDisabled || isLoading} <mask> ref={ref} <mask> onPressIn={composeEventHandlers(onPressIn, pressableProps.onPressIn)} </s> feat: new prop resolution changes in button </s> remove {...pressableProps} {...(isLoading && _loading)} {...(isDisabled && _disabled)} </s> add onPressIn={composeEventHandlers(onPressIn, pressableProps.onPressIn)} onPressOut={composeEventHandlers(onPressOut, pressableProps.onPressOut)} // @ts-ignore - web only onHoverIn={composeEventHandlers(onHoverIn, hoverProps.onHoverIn)} // @ts-ignore - web only onHoverOut={composeEventHandlers(onHoverOut, hoverProps.onHoverOut)} // @ts-ignore - web only onFocus={composeEventHandlers( composeEventHandlers(onFocus, focusProps.onFocus) // focusRingProps.onFocu )} // @ts-ignore - web only onBlur={composeEventHandlers( composeEventHandlers(onBlur, focusProps.onBlur) // focusRingProps.onBlur )} {...resolvedProps} </s> remove return <Button onPress={() => console.log('hello world')}>PRIMARY</Button>; </s> add return ( <Button _pressed={{ bg: 'red.400' }} onPress={() => console.log('hello world')} > PRIMARY </Button> ); </s> remove let { theme, colorScheme, status, variant } = props; </s> add const { theme, status, variant } = props; let { colorScheme } = props; </s> remove const { isDisabled, isLoading } = props; </s> add
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e4957044a998e750991b4ecf852025d3a99681ee
src/components/primitives/Button/Button.tsx
onPressIn={composeEventHandlers(onPressIn, pressableProps.onPressIn)} onPressOut={composeEventHandlers(onPressOut, pressableProps.onPressOut)} // @ts-ignore - web only onHoverIn={composeEventHandlers(onHoverIn, hoverProps.onHoverIn)} // @ts-ignore - web only onHoverOut={composeEventHandlers(onHoverOut, hoverProps.onHoverOut)} // @ts-ignore - web only onFocus={composeEventHandlers( composeEventHandlers(onFocus, focusProps.onFocus) // focusRingProps.onFocu )} // @ts-ignore - web only onBlur={composeEventHandlers( composeEventHandlers(onBlur, focusProps.onBlur) // focusRingProps.onBlur )} {...resolvedProps}
<mask> return ( <mask> <Pressable <mask> disabled={isDisabled || isLoading} <mask> ref={ref} <mask> {...pressableProps} <mask> {...(isLoading && _loading)} <mask> {...(isDisabled && _disabled)} <mask> accessibilityRole={props.accessibilityRole ?? 'button'} <mask> > <mask> {/* TODO: Replace Render props with Context Hook */} <mask> {/* TODO: Can look for a simpler wat to do this */} <mask> {({ isPressed, isHovered, isFocused }) => { </s> feat: new prop resolution changes in button </s> remove {/* TODO: Replace Render props with Context Hook */} {/* TODO: Can look for a simpler wat to do this */} {({ isPressed, isHovered, isFocused }) => { const focusTextProps = isFocused && _focus?._text && { ..._focus._text }; const hoverTextProps = isHovered && _hover?._text && { ..._hover._text }; const pressedTextProps = isPressed && _pressed?._text && { ..._pressed._text }; const disabledTextProps = isDisabled && _disabled?._text && { ..._disabled._text }; const focusVisibleTextProps = isFocused && _focusVisible?._text && { ..._focusVisible._text }; const loadingTextProps = isLoading && _loading?._text && { ..._loading._text }; const boxChildren = isLoading && isLoadingText ? isLoadingText : children; const spinnerElement = spinner ? ( spinner ) : ( <Spinner color={loadingTextProps?.color || _text?.color} {...spinnerProps} {..._spinner} /> ); return ( <HStack {..._stack}> {startIcon && !isLoading ? startIcon : null} {isLoading && spinnerPlacement === 'start' ? spinnerElement : null} {boxChildren ? ( <Box _text={{ ..._text, ...hoverTextProps, ...focusTextProps, ...focusVisibleTextProps, ...pressedTextProps, ...loadingTextProps, ...disabledTextProps, }} > {isLoading && isLoadingText ? isLoadingText : children} </Box> ) : null} </s> add <HStack {..._stack}> {startIcon && !isLoading ? startIcon : null} {isLoading && spinnerPlacement === 'start' ? spinnerElement : null} {boxChildren ? ( <Box _text={{ ..._text, // ...hoverTextProps, // ...focusTextProps, // ...focusVisibleTextProps, // ...pressedTextProps, // ...loadingTextProps, // ...disabledTextProps, }} > {isLoading && isLoadingText ? isLoadingText : children} </Box> ) : null} </s> remove return <Button onPress={() => console.log('hello world')}>PRIMARY</Button>; </s> add return ( <Button _pressed={{ bg: 'red.400' }} onPress={() => console.log('hello world')} > PRIMARY </Button> ); </s> remove const { isDisabled, isLoading } = props; </s> add </s> remove // { isDisabled, isLoading, isHovered, isFocusVisible, isFocused }, {}, </s> add { isDisabled, isLoading, isHovered, isFocused, isPressed },
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e4957044a998e750991b4ecf852025d3a99681ee
src/components/primitives/Button/Button.tsx
<HStack {..._stack}> {startIcon && !isLoading ? startIcon : null} {isLoading && spinnerPlacement === 'start' ? spinnerElement : null} {boxChildren ? ( <Box _text={{ ..._text, // ...hoverTextProps, // ...focusTextProps, // ...focusVisibleTextProps, // ...pressedTextProps, // ...loadingTextProps, // ...disabledTextProps, }} > {isLoading && isLoadingText ? isLoadingText : children} </Box> ) : null}
<mask> {...(isLoading && _loading)} <mask> {...(isDisabled && _disabled)} <mask> accessibilityRole={props.accessibilityRole ?? 'button'} <mask> > <mask> {/* TODO: Replace Render props with Context Hook */} <mask> {/* TODO: Can look for a simpler wat to do this */} <mask> {({ isPressed, isHovered, isFocused }) => { <mask> const focusTextProps = isFocused && <mask> _focus?._text && { ..._focus._text }; <mask> const hoverTextProps = isHovered && <mask> _hover?._text && { ..._hover._text }; <mask> const pressedTextProps = isPressed && <mask> _pressed?._text && { ..._pressed._text }; <mask> const disabledTextProps = isDisabled && <mask> _disabled?._text && { ..._disabled._text }; <mask> const focusVisibleTextProps = isFocused && <mask> _focusVisible?._text && { ..._focusVisible._text }; <mask> const loadingTextProps = isLoading && <mask> _loading?._text && { ..._loading._text }; <mask> <mask> const boxChildren = <mask> isLoading && isLoadingText ? isLoadingText : children; <mask> <mask> const spinnerElement = spinner ? ( <mask> spinner <mask> ) : ( <mask> <Spinner <mask> color={loadingTextProps?.color || _text?.color} <mask> {...spinnerProps} <mask> {..._spinner} <mask> /> <mask> ); <mask> <mask> return ( <mask> <HStack {..._stack}> <mask> {startIcon && !isLoading ? startIcon : null} <mask> {isLoading && spinnerPlacement === 'start' ? spinnerElement : null} <mask> {boxChildren ? ( <mask> <Box <mask> _text={{ <mask> ..._text, <mask> ...hoverTextProps, <mask> ...focusTextProps, <mask> ...focusVisibleTextProps, <mask> ...pressedTextProps, <mask> ...loadingTextProps, <mask> ...disabledTextProps, <mask> }} <mask> > <mask> {isLoading && isLoadingText ? isLoadingText : children} <mask> </Box> <mask> ) : null} <mask> <mask> {endIcon && !isLoading ? endIcon : null} <mask> {isLoading && spinnerPlacement === 'end' ? spinnerElement : null} <mask> </HStack> <mask> ); </s> feat: new prop resolution changes in button </s> remove {endIcon && !isLoading ? endIcon : null} {isLoading && spinnerPlacement === 'end' ? spinnerElement : null} </HStack> ); }} </s> add {endIcon && !isLoading ? endIcon : null} {isLoading && spinnerPlacement === 'end' ? spinnerElement : null} </HStack> </s> remove {...pressableProps} {...(isLoading && _loading)} {...(isDisabled && _disabled)} </s> add onPressIn={composeEventHandlers(onPressIn, pressableProps.onPressIn)} onPressOut={composeEventHandlers(onPressOut, pressableProps.onPressOut)} // @ts-ignore - web only onHoverIn={composeEventHandlers(onHoverIn, hoverProps.onHoverIn)} // @ts-ignore - web only onHoverOut={composeEventHandlers(onHoverOut, hoverProps.onHoverOut)} // @ts-ignore - web only onFocus={composeEventHandlers( composeEventHandlers(onFocus, focusProps.onFocus) // focusRingProps.onFocu )} // @ts-ignore - web only onBlur={composeEventHandlers( composeEventHandlers(onBlur, focusProps.onBlur) // focusRingProps.onBlur )} {...resolvedProps} </s> remove const { isDisabled, isLoading } = props; </s> add </s> remove let { theme, colorScheme, status, variant } = props; </s> add const { theme, status, variant } = props; let { colorScheme } = props;
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e4957044a998e750991b4ecf852025d3a99681ee
src/components/primitives/Button/Button.tsx
{endIcon && !isLoading ? endIcon : null} {isLoading && spinnerPlacement === 'end' ? spinnerElement : null} </HStack>
<mask> {isLoading && isLoadingText ? isLoadingText : children} <mask> </Box> <mask> ) : null} <mask> <mask> {endIcon && !isLoading ? endIcon : null} <mask> {isLoading && spinnerPlacement === 'end' ? spinnerElement : null} <mask> </HStack> <mask> ); <mask> }} <mask> </Pressable> <mask> ); <mask> }; <mask> <mask> export default memo(forwardRef(Button)); </s> feat: new prop resolution changes in button </s> remove {/* TODO: Replace Render props with Context Hook */} {/* TODO: Can look for a simpler wat to do this */} {({ isPressed, isHovered, isFocused }) => { const focusTextProps = isFocused && _focus?._text && { ..._focus._text }; const hoverTextProps = isHovered && _hover?._text && { ..._hover._text }; const pressedTextProps = isPressed && _pressed?._text && { ..._pressed._text }; const disabledTextProps = isDisabled && _disabled?._text && { ..._disabled._text }; const focusVisibleTextProps = isFocused && _focusVisible?._text && { ..._focusVisible._text }; const loadingTextProps = isLoading && _loading?._text && { ..._loading._text }; const boxChildren = isLoading && isLoadingText ? isLoadingText : children; const spinnerElement = spinner ? ( spinner ) : ( <Spinner color={loadingTextProps?.color || _text?.color} {...spinnerProps} {..._spinner} /> ); return ( <HStack {..._stack}> {startIcon && !isLoading ? startIcon : null} {isLoading && spinnerPlacement === 'start' ? spinnerElement : null} {boxChildren ? ( <Box _text={{ ..._text, ...hoverTextProps, ...focusTextProps, ...focusVisibleTextProps, ...pressedTextProps, ...loadingTextProps, ...disabledTextProps, }} > {isLoading && isLoadingText ? isLoadingText : children} </Box> ) : null} </s> add <HStack {..._stack}> {startIcon && !isLoading ? startIcon : null} {isLoading && spinnerPlacement === 'start' ? spinnerElement : null} {boxChildren ? ( <Box _text={{ ..._text, // ...hoverTextProps, // ...focusTextProps, // ...focusVisibleTextProps, // ...pressedTextProps, // ...loadingTextProps, // ...disabledTextProps, }} > {isLoading && isLoadingText ? isLoadingText : children} </Box> ) : null} </s> remove let { theme, colorScheme, status, variant } = props; </s> add const { theme, status, variant } = props; let { colorScheme } = props; </s> remove const { isDisabled, isLoading } = props; </s> add </s> remove return <Button onPress={() => console.log('hello world')}>PRIMARY</Button>; </s> add return ( <Button _pressed={{ bg: 'red.400' }} onPress={() => console.log('hello world')} > PRIMARY </Button> );
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/e4957044a998e750991b4ecf852025d3a99681ee
src/components/primitives/Button/Button.tsx