docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
listlengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
/**
* props to be passed to underlying ActionSheet. Select uses ActionSheet underneath.
*/
_actionSheet?: Partial<IActionsheetProps>;
|
<mask> * Callback to be invoked when Select Dropdown or BottomSheet is closed.
<mask> */
<mask> onClose?: (nativeEvent: any) => void;
<mask> /**
<mask> * props to be passed to underlying ActionSheet.Content. Select uses ActionSheet underneath.
<mask> */
<mask> _actionSheetContent?: Partial<IActionsheetContentProps>;
<mask> /**
</s> feat: adding new prop usernmodal for overlay </s> remove import { Modal } from 'react-native';
</s> add import { Modal, Platform } from 'react-native'; </s> remove import type { IActionsheetContentProps } from '../../composites/Actionsheet/types';
</s> add import type {
IActionsheetContentProps,
IActionsheetProps,
} from '../../composites/Actionsheet/types';
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6bf7a866bbbd2f3160ba4dde16c6db231649c5e2
|
src/components/primitives/Select/types.ts
|
if (process.env.NODE_ENV === 'development' && debug) {
|
<mask> } else {
<mask> return { style: styleSheet.box, restProps };
<mask> }
<mask> }, [props, theme, debug, currentBreakpoint, strictMode, propStyle]);
<mask> if (debug) {
<mask> /* eslint-disable-next-line */
<mask> console.log('style,resprops', currentBreakpoint);
<mask> }
<mask>
<mask> return [style, restProps];
</s> feat: added support for debug prop in usePropResolution </s> remove if (debug) {
</s> add if (process.env.NODE_ENV === 'development' && debug) { </s> remove if (debug) {
</s> add if (process.env.NODE_ENV === 'development' && debug) {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useStyledSystemPropsResolver.ts
|
_loading: {
dependentOn: 'state',
respondTo: 'isLoading',
priority: SPECIFICITY_110,
},
|
<mask> priority: SPECIFICITY_30,
<mask> },
<mask> // Add new pseudeo props in between -------
<mask> _readOnly: {
<mask> dependentOn: 'state',
<mask> respondTo: 'isReadOnly',
<mask> priority: SPECIFICITY_30,
</s> feat: added support for debug prop in usePropResolution </s> remove _loading: {
dependentOn: 'state',
respondTo: 'isLoading',
priority: SPECIFICITY_110,
},
</s> add </s> remove if (debug) {
</s> add if (process.env.NODE_ENV === 'development' && debug) { </s> remove // merging internal props (like, _text, _checked, ...)
</s> add // merging internal props (like, _text, _stack ...)
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/propsFlattener.tsx
|
<mask> dependentOn: 'state',
<mask> respondTo: 'isDisabled',
<mask> priority: SPECIFICITY_100,
<mask> },
<mask> _loading: {
<mask> dependentOn: 'state',
<mask> respondTo: 'isLoading',
<mask> priority: SPECIFICITY_110,
<mask> },
<mask> } as const;
<mask>
<mask> type IPseudoPropsMap = typeof pseudoPropsMap;
<mask> type ExtractState<T extends IPseudoPropsMap> = {
<mask> // @ts-ignore
</s> feat: added support for debug prop in usePropResolution </s> remove if (debug) {
</s> add if (process.env.NODE_ENV === 'development' && debug) {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/propsFlattener.tsx
|
|
// NOTE: Handling (state driven) props like _web, _ios, _android, _dark, _light, _disabled, _focus, _focusVisible, _hover, _pressed, _readOnly, _invalid, .... Only when they are true.
if (process.env.NODE_ENV === 'development' && props.debug) {
/* eslint-disable-next-line */
console.log(
`%c ${property}`,
'color: #67e8f9;',
'recursively resolving'
);
}
|
<mask> ['_dark', '_light', '_web', '_ios', '_android'].includes(property)
<mask> ) {
<mask> // @ts-ignore
<mask> if (shouldResolvePseudoProp({ property, state, platform, colormode })) {
<mask> // @ts-ignore
<mask> propertySpecity[pseudoPropsMap[property].priority]++;
<mask> simplifyProps(
<mask> {
</s> feat: added support for debug prop in usePropResolution </s> remove _loading: {
dependentOn: 'state',
respondTo: 'isLoading',
priority: SPECIFICITY_110,
},
</s> add </s> remove // merging internal props (like, _text, _checked, ...)
</s> add // merging internal props (like, _text, _stack ...)
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/propsFlattener.tsx
|
// NOTE: Handling (internal) props like _text, _stack, ....
|
<mask> } else if (state[pseudoPropsMap[property]?.respondTo] === undefined) {
<mask> if (property.startsWith('_')) {
<mask> if (
<mask> compareSpecificity(specificityMap[property], propertySpecity, false)
<mask> ) {
<mask> if (process.env.NODE_ENV === 'development' && props.debug) {
</s> feat: added support for debug prop in usePropResolution </s> remove // merging internal props (like, _text, _checked, ...)
</s> add // merging internal props (like, _text, _stack ...) </s> remove if (debug) {
</s> add if (process.env.NODE_ENV === 'development' && debug) {
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/propsFlattener.tsx
|
if (process.env.NODE_ENV === 'development' && props.debug) {
/* eslint-disable-next-line */
console.log(
`%c ${property}`,
'color: #67e8f9;',
'updated as internal prop with higher specificity'
);
}
|
<mask> compareSpecificity(specificityMap[property], propertySpecity, false)
<mask> ) {
<mask> specificityMap[property] = propertySpecity;
<mask> // merging internal props (like, _text, _stack ...)
<mask> flattenProps[property] = merge(
<mask> {},
<mask> flattenProps[property],
</s> feat: added support for debug prop in usePropResolution </s> remove // merging internal props (like, _text, _checked, ...)
</s> add // merging internal props (like, _text, _stack ...)
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/propsFlattener.tsx
|
// merging internal props (like, _text, _stack ...)
|
<mask> if (
<mask> compareSpecificity(specificityMap[property], propertySpecity, false)
<mask> ) {
<mask> specificityMap[property] = propertySpecity;
<mask> // merging internal props (like, _text, _checked, ...)
<mask> flattenProps[property] = merge(
<mask> {},
<mask> flattenProps[property],
<mask> props[property]
<mask> );
</s> feat: added support for debug prop in usePropResolution
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/propsFlattener.tsx
|
if (process.env.NODE_ENV === 'development' && props.debug) {
/* eslint-disable-next-line */
console.log(
`%c ${property}`,
'color: #67e8f9;',
'updated as internal prop with lower specificity'
);
}
|
<mask> props[property]
<mask> );
<mask> } else {
<mask> flattenProps[property] = merge(
<mask> {},
<mask> props[property],
<mask> flattenProps[property]
</s> feat: added support for debug prop in usePropResolution </s> remove // merging internal props (like, _text, _checked, ...)
</s> add // merging internal props (like, _text, _stack ...) </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening sizeStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
}
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/propsFlattener.tsx
|
if (process.env.NODE_ENV === 'development' && props.debug) {
/* eslint-disable-next-line */
console.log(
`%c ${property}`,
'color: #67e8f9;',
'updated as simple prop'
);
}
|
<mask> compareSpecificity(specificityMap[property], propertySpecity, false)
<mask> ) {
<mask> specificityMap[property] = propertySpecity;
<mask> // replacing simple props (like, p, m, bg, color, ...)
<mask> flattenProps[property] = props[property];
<mask> } else {
<mask> if (process.env.NODE_ENV === 'development' && props.debug) {
</s> feat: added support for debug prop in usePropResolution </s> remove // merging internal props (like, _text, _checked, ...)
</s> add // merging internal props (like, _text, _stack ...)
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/propsFlattener.tsx
|
} else {
if (process.env.NODE_ENV === 'development' && props.debug) {
/* eslint-disable-next-line */
console.log(`%c ${property}`, 'color: #67e8f9;', 'ignored');
}
|
<mask> specificityMap[property] = propertySpecity;
<mask> // replacing simple props (like, p, m, bg, color, ...)
<mask> flattenProps[property] = props[property];
<mask> }
<mask> }
<mask> } else {
<mask> // Can delete unused props
<mask> delete flattenProps[property];
<mask> if (process.env.NODE_ENV === 'development' && props.debug) {
</s> feat: added support for debug prop in usePropResolution </s> remove // merging internal props (like, _text, _checked, ...)
</s> add // merging internal props (like, _text, _stack ...)
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/propsFlattener.tsx
|
} else {
// Can delete unused props
delete flattenProps[property];
if (process.env.NODE_ENV === 'development' && props.debug) {
/* eslint-disable-next-line */
console.log(`%c ${property}`, 'color: #67e8f9;', 'deleted');
}
|
<mask> console.log(`%c ${property}`, 'color: #67e8f9;', 'ignored');
<mask> }
<mask> }
<mask> }
<mask> }
<mask> }
<mask> };
<mask>
</s> feat: added support for debug prop in usePropResolution </s> remove if (debug) {
</s> add if (process.env.NODE_ENV === 'development' && debug) {
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/propsFlattener.tsx
|
if (process.env.NODE_ENV === 'development' && incomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c ${component}`,
'background: #374151; color: #FBBF24; font-weight: 700; padding: 2px 8px;'
);
/* eslint-disable-next-line */
console.log('incomingProps: ', incomingProps);
/* eslint-disable-next-line */
console.log('componentTheme: ', componentTheme);
}
const resolvedProps = usePropsResolutionWithComponentTheme(
|
<mask> const { theme } = useNativeBase();
<mask> const componentTheme =
<mask> config?.componentTheme ?? get(theme, `components.${component}`, {});
<mask>
<mask> return usePropsResolutionWithComponentTheme(
<mask> componentTheme,
<mask> incomingProps,
<mask> state,
<mask> config
<mask> );
</s> feat: added support for debug prop in usePropResolution </s> remove if (debug) {
</s> add if (process.env.NODE_ENV === 'development' && debug) { </s> remove if (debug) {
</s> add if (process.env.NODE_ENV === 'development' && debug) { </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening sizeStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
if (process.env.NODE_ENV === 'development' && incomingProps.debug) {
/* eslint-disable-next-line */
console.log('resolvedProps: ', resolvedProps);
}
return resolvedProps;
|
<mask> config
<mask> );
<mask> }
<mask>
<mask> export const usePropsResolutionWithComponentTheme = (
<mask> componentTheme: ComponentTheme,
<mask> incomingProps: any,
<mask> state?: IStateProps,
</s> feat: added support for debug prop in usePropResolution </s> remove if (debug) {
</s> add if (process.env.NODE_ENV === 'development' && debug) { </s> remove return usePropsResolutionWithComponentTheme(
</s> add if (process.env.NODE_ENV === 'development' && incomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c ${component}`,
'background: #374151; color: #FBBF24; font-weight: 700; padding: 2px 8px;'
);
/* eslint-disable-next-line */
console.log('incomingProps: ', incomingProps);
/* eslint-disable-next-line */
console.log('componentTheme: ', componentTheme);
}
const resolvedProps = usePropsResolutionWithComponentTheme( </s> remove // merging internal props (like, _text, _checked, ...)
</s> add // merging internal props (like, _text, _stack ...) </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening sizeStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
}
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening incoming and Default`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
}
|
<mask> componentTheme.defaultProps || {},
<mask> cleanIncomingProps
<mask> );
<mask> // STEP 2: flatten them
<mask>
<mask> let [flattenProps, specificityMap] = propsFlattener(
<mask> {
<mask> props: incomingWithDefaultProps,
<mask> platform: Platform.OS,
<mask> colormode: colorModeProps.colorMode,
</s> feat: added support for debug prop in usePropResolution </s> remove props: componentSizeProps,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentSizeProps, debug: true }
: componentSizeProps, </s> remove props: componentBaseStyle,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentBaseStyle, debug: true }
: componentBaseStyle, </s> remove props: componentVariantProps,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentVariantProps, debug: true }
: componentVariantProps, </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening sizeStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
} </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening baseStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening baseStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
}
|
<mask> theme,
<mask> ...flattenProps,
<mask> ...colorModeProps,
<mask> });
<mask>
<mask> [flattenBaseStyle, baseSpecificityMap] = propsFlattener(
<mask> {
<mask> props: componentBaseStyle,
<mask> platform: Platform.OS,
<mask> colormode: colorModeProps.colorMode,
</s> feat: added support for debug prop in usePropResolution </s> remove props: componentBaseStyle,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentBaseStyle, debug: true }
: componentBaseStyle, </s> remove props: componentVariantProps,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentVariantProps, debug: true }
: componentVariantProps, </s> remove props: componentSizeProps,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentSizeProps, debug: true }
: componentSizeProps, </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening sizeStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentBaseStyle, debug: true }
: componentBaseStyle,
|
<mask> });
<mask>
<mask> [flattenBaseStyle, baseSpecificityMap] = propsFlattener(
<mask> {
<mask> props: componentBaseStyle,
<mask> platform: Platform.OS,
<mask> colormode: colorModeProps.colorMode,
<mask> state: state || {},
<mask> currentSpecificityMap: specificityMap,
<mask> previouslyFlattenProps: flattenProps,
</s> feat: added support for debug prop in usePropResolution </s> remove props: componentSizeProps,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentSizeProps, debug: true }
: componentSizeProps, </s> remove props: componentVariantProps,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentVariantProps, debug: true }
: componentVariantProps, </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening baseStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
} </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening incoming and Default`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
} </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening sizeStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening variantStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
}
|
<mask> ...colorModeProps,
<mask> });
<mask>
<mask> [flattenVariantStyle, variantSpecificityMap] = propsFlattener(
<mask> {
<mask> props:
<mask> process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
<mask> ? { ...componentVariantProps, debug: true }
</s> feat: added support for debug prop in usePropResolution </s> remove props: componentVariantProps,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentVariantProps, debug: true }
: componentVariantProps, </s> remove props: componentBaseStyle,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentBaseStyle, debug: true }
: componentBaseStyle, </s> remove props: componentSizeProps,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentSizeProps, debug: true }
: componentSizeProps, </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening baseStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
} </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening sizeStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
}
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentVariantProps, debug: true }
: componentVariantProps,
|
<mask> });
<mask>
<mask> [flattenVariantStyle, variantSpecificityMap] = propsFlattener(
<mask> {
<mask> props: componentVariantProps,
<mask> platform: Platform.OS,
<mask> colormode: colorModeProps.colorMode,
<mask> state: state || {},
<mask> currentSpecificityMap: baseSpecificityMap || specificityMap,
<mask> // NOTE: Ideally flattenBaseStyle and flattenProps should be deeply merged to create previouslyFlattenProps.
</s> feat: added support for debug prop in usePropResolution </s> remove props: componentSizeProps,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentSizeProps, debug: true }
: componentSizeProps, </s> remove props: componentBaseStyle,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentBaseStyle, debug: true }
: componentBaseStyle, </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening incoming and Default`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
} </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening baseStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening sizeStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
}
|
<mask> else {
<mask> flattenProps.size = undefined;
<mask> componentSizeProps = componentTheme.sizes[size];
<mask> }
<mask>
<mask> [flattenSizeStyle, sizeSpecificityMap] = propsFlattener(
<mask> {
<mask> props: componentSizeProps,
<mask> platform: Platform.OS,
<mask> colormode: colorModeProps.colorMode,
</s> feat: added support for debug prop in usePropResolution </s> remove props: componentSizeProps,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentSizeProps, debug: true }
: componentSizeProps, </s> remove props: componentBaseStyle,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentBaseStyle, debug: true }
: componentBaseStyle, </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening baseStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
} </s> remove props: componentVariantProps,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentVariantProps, debug: true }
: componentVariantProps, </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening incoming and Default`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentSizeProps, debug: true }
: componentSizeProps,
|
<mask> }
<mask>
<mask> [flattenSizeStyle, sizeSpecificityMap] = propsFlattener(
<mask> {
<mask> props: componentSizeProps,
<mask> platform: Platform.OS,
<mask> colormode: colorModeProps.colorMode,
<mask> state: state || {},
<mask> currentSpecificityMap:
<mask> variantSpecificityMap || baseSpecificityMap || specificityMap,
</s> feat: added support for debug prop in usePropResolution </s> remove props: componentVariantProps,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentVariantProps, debug: true }
: componentVariantProps, </s> remove props: componentBaseStyle,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentBaseStyle, debug: true }
: componentBaseStyle, </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening sizeStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
} </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening incoming and Default`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
} </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening baseStyle`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
if (process.env.NODE_ENV === 'development' && resolvedProps.debug) {
delete resolvedProps.debug;
}
|
<mask> // STEP 6: Return
<mask>
<mask> // flattenProps = {};
<mask> // propertyDepth = {};
<mask>
<mask> return resolvedProps;
<mask> };
</s> feat: added support for debug prop in usePropResolution </s> remove props: componentVariantProps,
</s> add props:
process.env.NODE_ENV === 'development' && cleanIncomingProps.debug
? { ...componentVariantProps, debug: true }
: componentVariantProps, </s> remove
</s> add if (process.env.NODE_ENV === 'development' && cleanIncomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c Flattening incoming and Default`,
'background: #374151; color: #FFF; font-weight: 700; padding: 2px 8px;'
);
} </s> remove // merging internal props (like, _text, _checked, ...)
</s> add // merging internal props (like, _text, _stack ...)
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
if (process.env.NODE_ENV === 'development' && debug) {
|
<mask> restProps[key] = rawValue;
<mask> }
<mask> }
<mask>
<mask> if (debug) {
<mask> /* eslint-disable-next-line */
<mask> console.log('style ', debug + ' :: ', styleFromProps, style, props);
<mask> }
<mask>
<mask> return {
</s> feat: added support for debug prop in usePropResolution </s> remove if (debug) {
</s> add if (process.env.NODE_ENV === 'development' && debug) { </s> remove return usePropsResolutionWithComponentTheme(
</s> add if (process.env.NODE_ENV === 'development' && incomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c ${component}`,
'background: #374151; color: #FBBF24; font-weight: 700; padding: 2px 8px;'
);
/* eslint-disable-next-line */
console.log('incomingProps: ', incomingProps);
/* eslint-disable-next-line */
console.log('componentTheme: ', componentTheme);
}
const resolvedProps = usePropsResolutionWithComponentTheme( </s> remove if (debug) {
</s> add if (process.env.NODE_ENV === 'development' && debug) {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/theme/styled-system.ts
|
if (process.env.NODE_ENV === 'development' && debug) {
|
<mask>
<mask> export const makeStyledComponent = (Comp: any) => {
<mask> return React.forwardRef(({ debug, ...props }: any, ref: any) => {
<mask> const [style, restProps] = useStyledSystemPropsResolver(props);
<mask> if (debug) {
<mask> /* eslint-disable-next-line */
<mask> console.log('style:: => ', style, ' restProps:: => ', restProps);
<mask> }
<mask> return (
<mask> <Comp {...restProps} style={style} ref={ref}>
</s> feat: added support for debug prop in usePropResolution </s> remove if (debug) {
</s> add if (process.env.NODE_ENV === 'development' && debug) { </s> remove return usePropsResolutionWithComponentTheme(
</s> add if (process.env.NODE_ENV === 'development' && incomingProps.debug) {
/* eslint-disable-next-line */
console.log(
`%c ${component}`,
'background: #374151; color: #FBBF24; font-weight: 700; padding: 2px 8px;'
);
/* eslint-disable-next-line */
console.log('incomingProps: ', incomingProps);
/* eslint-disable-next-line */
console.log('componentTheme: ', componentTheme);
}
const resolvedProps = usePropsResolutionWithComponentTheme( </s> remove if (debug) {
</s> add if (process.env.NODE_ENV === 'development' && debug) {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6c3ee262334847561b8c86f90e0e4f36697d7ffc
|
src/utils/styled.tsx
|
var _lodash=require("lodash");var _lodash2=_interopRequireDefault(_lodash);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _defineProperty(obj,key,value){if(key in obj){Object.defineProperty(obj,key,{value:value,enumerable:true,configurable:true,writable:true});}else{obj[key]=value;}return obj;}var React=require("react");var Component=React.Component;var ReactNative=require("react-native");var Dimensions=ReactNative.Dimensions,View=ReactNative.View,Animated=ReactNative.Animated,ScrollView=ReactNative.ScrollView,StyleSheet=ReactNative.StyleSheet,InteractionManager=ReactNative.InteractionManager,Platform=ReactNative.Platform;var TimerMixin=require("react-timer-mixin");
|
<mask>
<mask>
<mask> var _Utils=require("../../Utils");
<mask>
<mask> var _lodash=require("lodash");var _lodash2=_interopRequireDefault(_lodash);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _defineProperty(obj,key,value){if(key in obj){Object.defineProperty(obj,key,{value:value,enumerable:true,configurable:true,writable:true});}else{obj[key]=value;}return obj;}var React=require("react");var Component=React.Component;var ReactNative=require("react-native");var Dimensions=ReactNative.Dimensions,View=ReactNative.View,Animated=ReactNative.Animated,ScrollView=ReactNative.ScrollView,StyleSheet=ReactNative.StyleSheet,Platform=ReactNative.Platform;var TimerMixin=require("react-timer-mixin");
<mask>
<mask> var SceneComponent=require("./SceneComponent");var _require=
<mask> require("./DefaultTabBar"),DefaultTabBar=_require.DefaultTabBar;var _require2=
<mask> require("./ScrollableTabBar"),ScrollableTabBar=_require2.ScrollableTabBar;
<mask>
</s> Reset dist directory to master version </s> remove React.createElement(View,{style:[styles.container,this.props.style],onLayout:this._handleLayout,__source:{fileName:_jsxFileName,lineNumber:296}},
</s> add React.createElement(View,{style:[styles.container,this.props.style],onLayout:this._handleLayout,__source:{fileName:_jsxFileName,lineNumber:299}}, </s> remove React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:194}})));
</s> add React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:197}}))); </s> remove style:{width:_this4.state.containerWidth},__source:{fileName:_jsxFileName,lineNumber:186}},
</s> add style:{width:_this4.state.containerWidth},__source:{fileName:_jsxFileName,lineNumber:189}}, </s> remove this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:152}}),
</s> add this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:155}}), </s> remove return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:112}}));
</s> add return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:115}}));
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6cd60e450fcfec87fe8c64c23187b92877adc3d5
|
dist/src/basic/Tabs/index.js
|
if(_this.scrollView&&Platform.OS==="android"){
|
<mask> },
<mask>
<mask> componentDidMount:function componentDidMount(){var _this=this;
<mask> var scrollFn=function scrollFn(){
<mask> if(_this.scrollView){
<mask> var x=_this.props.initialPage*_this.state.containerWidth;
<mask> _this.scrollView.scrollTo({x:x,animated:false});
<mask> }
<mask> };
<mask> _Utils.InteractionManager.runAfterInteractions(scrollFn);
</s> Reset dist directory to master version </s> remove _Utils.InteractionManager.runAfterInteractions(scrollFn);
</s> add this.setTimeout(function(){
InteractionManager.runAfterInteractions(scrollFn);
},0); </s> remove React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:194}})));
</s> add React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:197}}))); </s> remove this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:152}}),
</s> add this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:155}}), </s> remove return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:112}}));
</s> add return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:115}})); </s> remove React.createElement(View,{style:[styles.container,this.props.style],onLayout:this._handleLayout,__source:{fileName:_jsxFileName,lineNumber:296}},
</s> add React.createElement(View,{style:[styles.container,this.props.style],onLayout:this._handleLayout,__source:{fileName:_jsxFileName,lineNumber:299}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6cd60e450fcfec87fe8c64c23187b92877adc3d5
|
dist/src/basic/Tabs/index.js
|
this.setTimeout(function(){
InteractionManager.runAfterInteractions(scrollFn);
},0);
|
<mask> var x=_this.props.initialPage*_this.state.containerWidth;
<mask> _this.scrollView.scrollTo({x:x,animated:false});
<mask> }
<mask> };
<mask> _Utils.InteractionManager.runAfterInteractions(scrollFn);
<mask> },
<mask>
<mask> componentWillReceiveProps:function componentWillReceiveProps(props){
<mask> if(props.children!==this.props.children){
<mask> this.updateSceneKeys({
</s> Reset dist directory to master version </s> remove if(_this.scrollView){
</s> add if(_this.scrollView&&Platform.OS==="android"){ </s> remove React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:194}})));
</s> add React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:197}}))); </s> remove this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:152}}),
</s> add this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:155}}), </s> remove return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:112}}));
</s> add return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:115}})); </s> remove React.createElement(View,{style:[styles.container,this.props.style],onLayout:this._handleLayout,__source:{fileName:_jsxFileName,lineNumber:296}},
</s> add React.createElement(View,{style:[styles.container,this.props.style],onLayout:this._handleLayout,__source:{fileName:_jsxFileName,lineNumber:299}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6cd60e450fcfec87fe8c64c23187b92877adc3d5
|
dist/src/basic/Tabs/index.js
|
return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:115}}));
|
<mask> return null;
<mask> }else if(this.props.renderTabBar){
<mask> return React.cloneElement(this.props.renderTabBar(props),props);
<mask> }else{
<mask> return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:112}}));
<mask> }
<mask> },
<mask>
<mask> updateSceneKeys:function updateSceneKeys(_ref){var page=_ref.page,_ref$children=_ref.children,children=_ref$children===undefined?this.props.children:_ref$children,_ref$callback=_ref.callback,callback=_ref$callback===undefined?function(){}:_ref$callback;
<mask> var newKeys=this.newSceneKeys({
</s> Reset dist directory to master version </s> remove React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:194}})));
</s> add React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:197}}))); </s> remove this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:152}}),
</s> add this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:155}}), </s> remove _Utils.InteractionManager.runAfterInteractions(scrollFn);
</s> add this.setTimeout(function(){
InteractionManager.runAfterInteractions(scrollFn);
},0); </s> remove if(_this.scrollView){
</s> add if(_this.scrollView&&Platform.OS==="android"){ </s> remove React.createElement(View,{style:[styles.container,this.props.style],onLayout:this._handleLayout,__source:{fileName:_jsxFileName,lineNumber:296}},
</s> add React.createElement(View,{style:[styles.container,this.props.style],onLayout:this._handleLayout,__source:{fileName:_jsxFileName,lineNumber:299}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6cd60e450fcfec87fe8c64c23187b92877adc3d5
|
dist/src/basic/Tabs/index.js
|
this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:155}}),
|
<mask> scrollEnabled:!this.props.locked,
<mask> directionalLockEnabled:true,
<mask> alwaysBounceVertical:false,
<mask> keyboardDismissMode:"on-drag"},
<mask> this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:152}}),
<mask>
<mask> scenes));
<mask>
<mask>
<mask> },
</s> Reset dist directory to master version </s> remove React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:194}})));
</s> add React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:197}}))); </s> remove _Utils.InteractionManager.runAfterInteractions(scrollFn);
</s> add this.setTimeout(function(){
InteractionManager.runAfterInteractions(scrollFn);
},0); </s> remove if(_this.scrollView){
</s> add if(_this.scrollView&&Platform.OS==="android"){ </s> remove return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:112}}));
</s> add return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:115}})); </s> remove React.createElement(View,{style:[styles.container,this.props.style],onLayout:this._handleLayout,__source:{fileName:_jsxFileName,lineNumber:296}},
</s> add React.createElement(View,{style:[styles.container,this.props.style],onLayout:this._handleLayout,__source:{fileName:_jsxFileName,lineNumber:299}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6cd60e450fcfec87fe8c64c23187b92877adc3d5
|
dist/src/basic/Tabs/index.js
|
style:{width:_this4.state.containerWidth},__source:{fileName:_jsxFileName,lineNumber:189}},
|
<mask> return(
<mask> React.createElement(SceneComponent,{
<mask> key:child.key,
<mask> shouldUpdated:_this4._shouldRenderSceneKey(idx,_this4.state.currentPage),
<mask> style:{width:_this4.state.containerWidth},__source:{fileName:_jsxFileName,lineNumber:186}},
<mask>
<mask> _this4._keyExists(_this4.state.sceneKeys,key)?
<mask> child:
<mask>
<mask> React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:194}})));
</s> Reset dist directory to master version </s> remove React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:194}})));
</s> add React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:197}}))); </s> remove React.createElement(View,{style:[styles.container,this.props.style],onLayout:this._handleLayout,__source:{fileName:_jsxFileName,lineNumber:296}},
</s> add React.createElement(View,{style:[styles.container,this.props.style],onLayout:this._handleLayout,__source:{fileName:_jsxFileName,lineNumber:299}}, </s> remove this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:152}}),
</s> add this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:155}}), </s> remove return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:112}}));
</s> add return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:115}})); </s> remove _Utils.InteractionManager.runAfterInteractions(scrollFn);
</s> add this.setTimeout(function(){
InteractionManager.runAfterInteractions(scrollFn);
},0);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6cd60e450fcfec87fe8c64c23187b92877adc3d5
|
dist/src/basic/Tabs/index.js
|
React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:197}})));
|
<mask>
<mask> _this4._keyExists(_this4.state.sceneKeys,key)?
<mask> child:
<mask>
<mask> React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:194}})));
<mask>
<mask>
<mask>
<mask> });
<mask> },
</s> Reset dist directory to master version </s> remove style:{width:_this4.state.containerWidth},__source:{fileName:_jsxFileName,lineNumber:186}},
</s> add style:{width:_this4.state.containerWidth},__source:{fileName:_jsxFileName,lineNumber:189}}, </s> remove this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:152}}),
</s> add this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:155}}), </s> remove _Utils.InteractionManager.runAfterInteractions(scrollFn);
</s> add this.setTimeout(function(){
InteractionManager.runAfterInteractions(scrollFn);
},0); </s> remove if(_this.scrollView){
</s> add if(_this.scrollView&&Platform.OS==="android"){ </s> remove return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:112}}));
</s> add return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:115}}));
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6cd60e450fcfec87fe8c64c23187b92877adc3d5
|
dist/src/basic/Tabs/index.js
|
React.createElement(View,{style:[styles.container,this.props.style],onLayout:this._handleLayout,__source:{fileName:_jsxFileName,lineNumber:299}},
|
<mask>
<mask> }
<mask>
<mask> return(
<mask> React.createElement(View,{style:[styles.container,this.props.style],onLayout:this._handleLayout,__source:{fileName:_jsxFileName,lineNumber:296}},
<mask> this.props.tabBarPosition==="top"&&this.renderTabBar(tabBarProps),
<mask> this.renderScrollableContent(),
<mask> (this.props.tabBarPosition==="bottom"||overlayTabs)&&this.renderTabBar(tabBarProps)));
<mask>
<mask>
</s> Reset dist directory to master version </s> remove style:{width:_this4.state.containerWidth},__source:{fileName:_jsxFileName,lineNumber:186}},
</s> add style:{width:_this4.state.containerWidth},__source:{fileName:_jsxFileName,lineNumber:189}}, </s> remove React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:194}})));
</s> add React.createElement(View,{heading:child.props.heading,__source:{fileName:_jsxFileName,lineNumber:197}}))); </s> remove this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:152}}),
</s> add this.props.contentProps,{__source:{fileName:_jsxFileName,lineNumber:155}}), </s> remove return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:112}}));
</s> add return React.createElement(DefaultTabBar,_extends({},props,{__source:{fileName:_jsxFileName,lineNumber:115}})); </s> remove _Utils.InteractionManager.runAfterInteractions(scrollFn);
</s> add this.setTimeout(function(){
InteractionManager.runAfterInteractions(scrollFn);
},0);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6cd60e450fcfec87fe8c64c23187b92877adc3d5
|
dist/src/basic/Tabs/index.js
|
orientation: themeProps.orientation,
isReversed: themeProps.isReversed,
colorScheme: themeProps.colorScheme,
|
<mask> <SliderContext.Provider
<mask> value={{
<mask> trackLayout,
<mask> state,
<mask> orientation: props.orientation,
<mask> isReversed: props.isReversed,
<mask> colorScheme: props.colorScheme,
<mask> trackProps,
<mask> onTrackLayout: onLayout,
<mask> thumbSize: themeProps.thumbSize,
<mask> sliderSize: themeProps.sliderSize,
<mask> }}
</s> fix: useresposivepropshook and slider colorscheme </s> remove if (isNil(windowDimensions.width) || isNil(windowDimensions.height)) {
</s> add if (!windowDimensions.width || !windowDimensions.height) { </s> remove import isNil from 'lodash.isnil';
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6db5b58c1229d207b4a19fc9f116bef633638e38
|
src/components/primitives/Slider/Slider.tsx
|
<mask> import { useWindowDimensions } from 'react-native';
<mask> import { isResponsiveAnyProp } from '../theme/tools';
<mask> import isNil from 'lodash.isnil';
<mask>
<mask> export function useHasResponsiveProps(props: any) {
<mask> const windowDimensions = useWindowDimensions();
<mask> if (isNil(windowDimensions.width) || isNil(windowDimensions.height)) {
<mask> const responsivePropsExists = isResponsiveAnyProp(props);
</s> fix: useresposivepropshook and slider colorscheme </s> remove if (isNil(windowDimensions.width) || isNil(windowDimensions.height)) {
</s> add if (!windowDimensions.width || !windowDimensions.height) { </s> remove orientation: props.orientation,
isReversed: props.isReversed,
colorScheme: props.colorScheme,
</s> add orientation: themeProps.orientation,
isReversed: themeProps.isReversed,
colorScheme: themeProps.colorScheme,
|
[
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6db5b58c1229d207b4a19fc9f116bef633638e38
|
src/hooks/useHasResponsiveProps.ts
|
|
if (!windowDimensions.width || !windowDimensions.height) {
|
<mask> import isNil from 'lodash.isnil';
<mask>
<mask> export function useHasResponsiveProps(props: any) {
<mask> const windowDimensions = useWindowDimensions();
<mask> if (isNil(windowDimensions.width) || isNil(windowDimensions.height)) {
<mask> const responsivePropsExists = isResponsiveAnyProp(props);
<mask> if (responsivePropsExists) {
<mask> return true;
<mask> }
<mask> }
</s> fix: useresposivepropshook and slider colorscheme </s> remove import isNil from 'lodash.isnil';
</s> add </s> remove orientation: props.orientation,
isReversed: props.isReversed,
colorScheme: props.colorScheme,
</s> add orientation: themeProps.orientation,
isReversed: themeProps.isReversed,
colorScheme: themeProps.colorScheme,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6db5b58c1229d207b4a19fc9f116bef633638e38
|
src/hooks/useHasResponsiveProps.ts
|
const getAbsoluteChildren = (children: JSX.Element[] | JSX.Element, reverse?: boolean) => {
|
<mask> import React from 'react';
<mask> import { Platform } from 'react-native';
<mask> export default (children: JSX.Element[] | JSX.Element, reverse?: boolean) => {
<mask> let childrenArray = React.Children.toArray(children);
<mask> if (reverse) {
<mask> childrenArray = childrenArray.reverse();
<mask> }
<mask> /*
</s> fix: anonymous arrow function
Signed-off-by: Egi Ginting <[email protected]> </s> remove export default (children: any) => {
</s> add const getAttachedChildren = (children: any) => { </s> remove export default (children: React.ReactNode, startingIndex?: number) => {
</s> add const getIndexedChildren = (children: React.ReactNode, startingIndex?: number) => { </s> remove export default (
</s> add const getSpacedChildren = (
|
[
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6dfa6a5522aea051c4fa481eda00e4ef9371a0f0
|
src/utils/getAbsoluteChildren.ts
|
const getAttachedChildren = (children: any) => {
|
<mask> import React from 'react';
<mask>
<mask> export default (children: any) => {
<mask> const childrenArray: any = React.Children.toArray(children);
<mask> /*
<mask> | Separate the trailing (not first) children from the children array
<mask> */
<mask>
</s> fix: anonymous arrow function
Signed-off-by: Egi Ginting <[email protected]> </s> remove export default (children: JSX.Element[] | JSX.Element, reverse?: boolean) => {
</s> add const getAbsoluteChildren = (children: JSX.Element[] | JSX.Element, reverse?: boolean) => { </s> remove export default (children: React.ReactNode, startingIndex?: number) => {
</s> add const getIndexedChildren = (children: React.ReactNode, startingIndex?: number) => { </s> remove export default (
</s> add const getSpacedChildren = (
|
[
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6dfa6a5522aea051c4fa481eda00e4ef9371a0f0
|
src/utils/getAttachedChildren.ts
|
export default getAttachedChildren;
|
<mask> childrenArray[childrenArray.length - 1].props.children
<mask> ),
<mask> ];
<mask> };
</s> fix: anonymous arrow function
Signed-off-by: Egi Ginting <[email protected]> </s> remove export default (children: React.ReactNode, startingIndex?: number) => {
</s> add const getIndexedChildren = (children: React.ReactNode, startingIndex?: number) => { </s> remove export default (
</s> add const getSpacedChildren = ( </s> remove export default (children: any) => {
</s> add const getAttachedChildren = (children: any) => { </s> remove export default (children: JSX.Element[] | JSX.Element, reverse?: boolean) => {
</s> add const getAbsoluteChildren = (children: JSX.Element[] | JSX.Element, reverse?: boolean) => {
|
[
"keep",
"keep",
"keep",
"add"
] |
https://github.com/GeekyAnts/NativeBase/commit/6dfa6a5522aea051c4fa481eda00e4ef9371a0f0
|
src/utils/getAttachedChildren.ts
|
const getIndexedChildren = (children: React.ReactNode, startingIndex?: number) => {
|
<mask> import React from 'react';
<mask>
<mask> export default (children: React.ReactNode, startingIndex?: number) => {
<mask> let counter = startingIndex ? startingIndex - 1 : -1;
<mask> const indexedChildren = React.Children.map(children, (child: any) => {
<mask> counter++;
<mask> return React.cloneElement(
<mask> child,
</s> fix: anonymous arrow function
Signed-off-by: Egi Ginting <[email protected]> </s> remove export default (children: any) => {
</s> add const getAttachedChildren = (children: any) => { </s> remove export default (children: JSX.Element[] | JSX.Element, reverse?: boolean) => {
</s> add const getAbsoluteChildren = (children: JSX.Element[] | JSX.Element, reverse?: boolean) => { </s> remove export default (
</s> add const getSpacedChildren = (
|
[
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6dfa6a5522aea051c4fa481eda00e4ef9371a0f0
|
src/utils/getIndexedChildren.ts
|
const getSpacedChildren = (
|
<mask> | 'xl'
<mask> | '2xl'
<mask> | ThemeSpaceType;
<mask>
<mask> export default (
<mask> children: JSX.Element[] | JSX.Element,
<mask> space: undefined | SpaceType,
<mask> axis: 'X' | 'Y',
<mask> reverse: string,
<mask> divider: JSX.Element | undefined
</s> fix: anonymous arrow function
Signed-off-by: Egi Ginting <[email protected]> </s> remove export default (children: JSX.Element[] | JSX.Element, reverse?: boolean) => {
</s> add const getAbsoluteChildren = (children: JSX.Element[] | JSX.Element, reverse?: boolean) => { </s> remove export default (children: any) => {
</s> add const getAttachedChildren = (children: any) => { </s> remove export default (children: React.ReactNode, startingIndex?: number) => {
</s> add const getIndexedChildren = (children: React.ReactNode, startingIndex?: number) => {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6dfa6a5522aea051c4fa481eda00e4ef9371a0f0
|
src/utils/getSpacedChildren.tsx
|
import { extractInObject, stylingProps } from '../../../theme/tools/utils';
|
<mask> import { useCheckbox, useCheckboxGroupItem } from '@react-native-aria/checkbox';
<mask> import { CheckIcon } from '../Icon/Icons';
<mask>
<mask> const Checkbox = (
<mask> { icon, children, wrapperRef, ...props }: ICheckboxProps,
<mask> ref: any
<mask> ) => {
<mask> const formControlContext = useFormControlContext();
</s> fix: added interaction styling props </s> remove _interactionBox: {
_hover: _iterationBoxHover,
_focus: _iterationBoxFocus,
_disabled: _iterationBoxDisabled,
..._interactionBox
},
_checkbox: {
_checked: _checkboxChecked,
_disabled: _checkboxDisabled,
_invalid: _checkboxInvalid,
..._checkbox
},
</s> add _interactionBox,
_disabled,
_invalid,
_focus,
_hover,
_checked,
_unchecked,
_indeterminate, </s> remove _interactionBox: { _pressed: _iterationBoxPressed, ..._interactionBox },
_checkbox: {
_checked: _checboxChecked,
_disabled: _checkboxDisabled,
_invalid: _checkboxInvalid,
..._checkbox
},
</s> add _interactionBox,
_disabled,
_invalid,
_pressed,
_checked,
_unchecked,
_indeterminate, </s> remove const { checked, disabled } = inputProps;
</s> add const { checked: isChecked, disabled: isDisabled } = inputProps;
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
);
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.tsx
|
_interactionBox,
_disabled,
_invalid,
_pressed,
_checked,
_unchecked,
_indeterminate,
|
<mask> const formControlContext = useFormControlContext();
<mask>
<mask> const checkboxGroupContext = React.useContext(CheckboxGroupContext);
<mask> const {
<mask> _interactionBox: { _pressed: _iterationBoxPressed, ..._interactionBox },
<mask> _checkbox: {
<mask> _checked: _checboxChecked,
<mask> _disabled: _checkboxDisabled,
<mask> _invalid: _checkboxInvalid,
<mask> ..._checkbox
<mask> },
<mask> _icon,
<mask> isInvalid,
<mask> ...themedProps
<mask> } = usePropsResolution('Checkbox', {
<mask> ...checkboxGroupContext,
</s> fix: added interaction styling props </s> remove _interactionBox: {
_hover: _iterationBoxHover,
_focus: _iterationBoxFocus,
_disabled: _iterationBoxDisabled,
..._interactionBox
},
_checkbox: {
_checked: _checkboxChecked,
_disabled: _checkboxDisabled,
_invalid: _checkboxInvalid,
..._checkbox
},
</s> add _interactionBox,
_disabled,
_invalid,
_focus,
_hover,
_checked,
_unchecked,
_indeterminate, </s> remove _pressed: {
</s> add opacity: 0.4,
},
_pressed: {
_interactionBox: {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.tsx
|
_readOnly,
|
<mask> _indeterminate,
<mask> _icon,
<mask> isInvalid,
<mask> isReadOnly,
<mask> isIndeterminate,
<mask> ...themedProps
<mask> } = usePropsResolution('Checkbox', {
<mask> ...checkboxGroupContext,
</s> fix: added interaction styling props </s> remove _interactionBox: { _pressed: _iterationBoxPressed, ..._interactionBox },
_checkbox: {
_checked: _checboxChecked,
_disabled: _checkboxDisabled,
_invalid: _checkboxInvalid,
..._checkbox
},
</s> add _interactionBox,
_disabled,
_invalid,
_pressed,
_checked,
_unchecked,
_indeterminate, </s> remove _interactionBox: {
_hover: _iterationBoxHover,
_focus: _iterationBoxFocus,
_disabled: _iterationBoxDisabled,
..._interactionBox
},
_checkbox: {
_checked: _checkboxChecked,
_disabled: _checkboxDisabled,
_invalid: _checkboxInvalid,
..._checkbox
},
</s> add _interactionBox,
_disabled,
_invalid,
_focus,
_hover,
_checked,
_unchecked,
_indeterminate,
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.tsx
|
isReadOnly,
isIndeterminate,
|
<mask> _indeterminate,
<mask> _icon,
<mask> _readOnly,
<mask> isInvalid,
<mask> ...themedProps
<mask> } = usePropsResolution('Checkbox', {
<mask> ...checkboxGroupContext,
<mask> ...formControlContext,
<mask> ...props,
<mask> });
</s> fix: added interaction styling props </s> remove _interactionBox: { _pressed: _iterationBoxPressed, ..._interactionBox },
_checkbox: {
_checked: _checboxChecked,
_disabled: _checkboxDisabled,
_invalid: _checkboxInvalid,
..._checkbox
},
</s> add _interactionBox,
_disabled,
_invalid,
_pressed,
_checked,
_unchecked,
_indeterminate, </s> remove _interactionBox: {
_hover: _iterationBoxHover,
_focus: _iterationBoxFocus,
_disabled: _iterationBoxDisabled,
..._interactionBox
},
_checkbox: {
_checked: _checkboxChecked,
_disabled: _checkboxDisabled,
_invalid: _checkboxInvalid,
..._checkbox
},
</s> add _interactionBox,
_disabled,
_invalid,
_focus,
_hover,
_checked,
_unchecked,
_indeterminate,
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.tsx
|
const [layoutProps, nonLayoutProps] = extractInObject(themedProps, [
...stylingProps.margin,
...stylingProps.layout,
...stylingProps.flexbox,
...stylingProps.position,
]);
|
<mask> isSelected: props.isChecked,
<mask> });
<mask> const groupState = useContext(CheckboxGroupContext);
<mask>
<mask> // Swap hooks depending on whether this checkbox is inside a CheckboxGroup.
<mask> // This is a bit unorthodox. Typically, hooks cannot be called in a conditional,
<mask> // but since the checkbox won't move in and out of a group, it should be safe.
<mask> const { inputProps } = groupState
</s> fix: added interaction styling props </s> remove * If true, the checkbox will be disabled
</s> add * If true, the checkbox will be disabled. </s> remove * If true, the checkbox is marked as invalid. Changes style of unchecked state.
</s> add * If true, the checkbox is marked as invalid. </s> remove ...themedProps,
</s> add ...nonLayoutProps, </s> remove ...themedProps,
</s> add ...nonLayoutProps,
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.tsx
|
...nonLayoutProps,
|
<mask> const { inputProps } = groupState
<mask> ? // eslint-disable-next-line react-hooks/rules-of-hooks
<mask> useCheckboxGroupItem(
<mask> {
<mask> ...themedProps,
<mask> value: themedProps.value,
<mask> },
<mask> groupState.state,
<mask> ref
<mask> )
</s> fix: added interaction styling props </s> remove ...themedProps,
</s> add ...nonLayoutProps, </s> remove useCheckbox(themedProps, state, ref);
</s> add useCheckbox(nonLayoutProps, state, ref);
const [, pressableProps] = extractInObject(inputProps, [
...stylingProps.border,
...stylingProps.background,
...stylingProps.flexbox,
...stylingProps.layout,
...stylingProps.padding,
...stylingProps.margin,
]);
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
); </s> remove { ...themedProps, 'aria-label': themedProps.accessibilityLabel },
</s> add {
...nonLayoutProps,
'aria-label': themedProps.accessibilityLabel,
}, </s> remove const { checked, disabled } = inputProps;
</s> add const { checked: isChecked, disabled: isDisabled } = inputProps;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.tsx
|
useCheckbox(nonLayoutProps, state, ref);
const [, pressableProps] = extractInObject(inputProps, [
...stylingProps.border,
...stylingProps.background,
...stylingProps.flexbox,
...stylingProps.layout,
...stylingProps.padding,
...stylingProps.margin,
]);
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
);
|
<mask> groupState.state,
<mask> ref
<mask> )
<mask> : // eslint-disable-next-line react-hooks/rules-of-hooks
<mask> useCheckbox(themedProps, state, ref);
<mask>
<mask> const { checked, disabled } = inputProps;
<mask>
<mask> const sizedIcon = icon
<mask> ? () =>
</s> fix: added interaction styling props </s> remove const { checked, disabled } = inputProps;
</s> add const { checked: isChecked, disabled: isDisabled } = inputProps; </s> remove const { checked, disabled } = inputProps;
</s> add const { checked: isChecked, disabled: isDisabled } = inputProps;
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
); </s> remove ...themedProps,
</s> add ...nonLayoutProps, </s> remove ...themedProps,
</s> add ...nonLayoutProps, </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
</s> add function iconResolver(isPressed?: any) {
if (sizedIcon) {
if (isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (isPressed && _pressed?.icon) {
return sizedIcon(_pressed?.icon, {
..._icon,
..._pressed?._icon,
});
} else if (!isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
}
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.tsx
|
const { checked: isChecked, disabled: isDisabled } = inputProps;
|
<mask> )
<mask> : // eslint-disable-next-line react-hooks/rules-of-hooks
<mask> useCheckbox(themedProps, state, ref);
<mask>
<mask> const { checked, disabled } = inputProps;
<mask>
<mask> const sizedIcon = icon
<mask> ? () =>
<mask> React.cloneElement(
<mask> icon,
</s> fix: added interaction styling props </s> remove useCheckbox(themedProps, state, ref);
</s> add useCheckbox(nonLayoutProps, state, ref);
const [, pressableProps] = extractInObject(inputProps, [
...stylingProps.border,
...stylingProps.background,
...stylingProps.flexbox,
...stylingProps.layout,
...stylingProps.padding,
...stylingProps.margin,
]);
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
); </s> remove const { checked, disabled } = inputProps;
</s> add const { checked: isChecked, disabled: isDisabled } = inputProps;
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
); </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
</s> add function iconResolver(isPressed?: any) {
if (sizedIcon) {
if (isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (isPressed && _pressed?.icon) {
return sizedIcon(_pressed?.icon, {
..._icon,
..._pressed?._icon,
});
} else if (!isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
}
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
} </s> remove ...themedProps,
</s> add ...nonLayoutProps, </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
const { focusProps, isFocusVisible } = useFocusRing();
</s> add function iconResolver() {
if (sizedIcon && isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (sizedIcon && isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (sizedIcon && isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (sizedIcon && isHovered && _hover?.icon) {
return sizedIcon(_hover?.icon, {
..._icon,
..._hover?._icon,
});
} else if (sizedIcon && !isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (sizedIcon && isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (sizedIcon && isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
} else if (sizedIcon && isFocusVisible && _focus?.icon) {
return sizedIcon(_focus?.icon, {
..._icon,
..._focus?._icon,
});
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.tsx
|
function iconResolver(isPressed?: any) {
if (sizedIcon) {
if (isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (isPressed && _pressed?.icon) {
return sizedIcon(_pressed?.icon, {
..._icon,
..._pressed?._icon,
});
} else if (!isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
}
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
}
|
<mask> useCheckbox(themedProps, state, ref);
<mask>
<mask> const { checked, disabled } = inputProps;
<mask>
<mask> const sizedIcon = icon
<mask> ? () =>
<mask> React.cloneElement(
<mask> icon,
<mask> {
<mask> ..._icon,
<mask> },
<mask> icon.props.children
<mask> )
<mask> : null;
<mask> return (
<mask> <Pressable
<mask> {...(inputProps as IPressableProps)}
<mask> ref={mergeRefs([ref, wrapperRef])}
<mask> accessibilityRole="checkbox"
</s> fix: added interaction styling props </s> remove {...(inputProps as IPressableProps)}
</s> add {...(pressableProps as IPressableProps)} </s> remove useCheckbox(themedProps, state, ref);
</s> add useCheckbox(nonLayoutProps, state, ref);
const [, pressableProps] = extractInObject(inputProps, [
...stylingProps.border,
...stylingProps.background,
...stylingProps.flexbox,
...stylingProps.layout,
...stylingProps.padding,
...stylingProps.margin,
]);
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
); </s> remove const { checked, disabled } = inputProps;
</s> add const { checked: isChecked, disabled: isDisabled } = inputProps; </s> remove const { checked, disabled } = inputProps;
</s> add const { checked: isChecked, disabled: isDisabled } = inputProps;
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
); </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
const { focusProps, isFocusVisible } = useFocusRing();
</s> add function iconResolver() {
if (sizedIcon && isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (sizedIcon && isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (sizedIcon && isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (sizedIcon && isHovered && _hover?.icon) {
return sizedIcon(_hover?.icon, {
..._icon,
..._hover?._icon,
});
} else if (sizedIcon && !isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (sizedIcon && isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (sizedIcon && isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
} else if (sizedIcon && isFocusVisible && _focus?.icon) {
return sizedIcon(_focus?.icon, {
..._icon,
..._focus?._icon,
});
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
}
|
[
"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/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.tsx
|
{...(pressableProps as IPressableProps)}
|
<mask> )
<mask> : null;
<mask> return (
<mask> <Pressable
<mask> {...(inputProps as IPressableProps)}
<mask> ref={mergeRefs([ref, wrapperRef])}
<mask> accessibilityRole="checkbox"
<mask> >
<mask> {({ isPressed }: any) => {
<mask> return (
</s> fix: added interaction styling props </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
</s> add function iconResolver(isPressed?: any) {
if (sizedIcon) {
if (isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (isPressed && _pressed?.icon) {
return sizedIcon(_pressed?.icon, {
..._icon,
..._pressed?._icon,
});
} else if (!isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
}
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
} </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
const { focusProps, isFocusVisible } = useFocusRing();
</s> add function iconResolver() {
if (sizedIcon && isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (sizedIcon && isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (sizedIcon && isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (sizedIcon && isHovered && _hover?.icon) {
return sizedIcon(_hover?.icon, {
..._icon,
..._hover?._icon,
});
} else if (sizedIcon && !isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (sizedIcon && isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (sizedIcon && isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
} else if (sizedIcon && isFocusVisible && _focus?.icon) {
return sizedIcon(_focus?.icon, {
..._icon,
..._focus?._icon,
});
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.tsx
|
{...layoutProps}
|
<mask> {({ isPressed }: any) => {
<mask> return (
<mask> <Center
<mask> flexDirection="row"
<mask> justifyContent="center "
<mask> alignItems="center"
<mask> borderRadius="full"
<mask> >
<mask> <Center>
</s> fix: added interaction styling props </s> remove {...themedProps}
</s> add </s> remove {...(inputProps as IPressableProps)}
</s> add {...(pressableProps as IPressableProps)} </s> remove {...themedProps}
opacity={disabled ? 0.4 : 1}
cursor={disabled ? 'not-allowed' : 'pointer'}
</s> add opacity={isDisabled ? 0.4 : 1}
cursor={isDisabled ? 'not-allowed' : 'pointer'} </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
const { focusProps, isFocusVisible } = useFocusRing();
</s> add function iconResolver() {
if (sizedIcon && isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (sizedIcon && isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (sizedIcon && isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (sizedIcon && isHovered && _hover?.icon) {
return sizedIcon(_hover?.icon, {
..._icon,
..._hover?._icon,
});
} else if (sizedIcon && !isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (sizedIcon && isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (sizedIcon && isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
} else if (sizedIcon && isFocusVisible && _focus?.icon) {
return sizedIcon(_focus?.icon, {
..._icon,
..._focus?._icon,
});
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
}
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.tsx
|
<mask> flexDirection="row"
<mask> justifyContent="center "
<mask> alignItems="center"
<mask> borderRadius="full"
<mask> {...themedProps}
<mask> >
<mask> <Center>
<mask> {/* Interaction Wrapper */}
<mask> <Box
<mask> {..._interactionBox}
</s> fix: added interaction styling props </s> remove {...themedProps}
opacity={disabled ? 0.4 : 1}
cursor={disabled ? 'not-allowed' : 'pointer'}
</s> add opacity={isDisabled ? 0.4 : 1}
cursor={isDisabled ? 'not-allowed' : 'pointer'} </s> remove {...(isPressed && _iterationBoxPressed)}
</s> add {...(!isChecked && _unchecked?._interactionBox)}
{...(isChecked && _checked?._interactionBox)}
{...(isIndeterminate && _indeterminate?._interactionBox)}
{...(isPressed && _pressed._interactionBox)}
{...(isInvalid && _invalid?._interactionBox)}
{...(isReadOnly && _readOnly?._interactionBox)}
{...(isDisabled && _disabled?._interactionBox)} </s> remove {...(isFocusVisible && _iterationBoxFocus)}
{...(isHovered && _iterationBoxHover)}
{...(disabled && _iterationBoxDisabled)}
{...(disabled && _iterationBoxDisabled)}
</s> add {...(!isChecked && _unchecked?._interactionBox)}
{...(isChecked && _checked?._interactionBox)}
{...(isIndeterminate && _indeterminate?._interactionBox)}
{...(isFocusVisible && _focus?._interactionBox)}
{...(isHovered && _hover?._interactionBox)}
{...(isInvalid && _invalid?._interactionBox)}
{...(isReadOnly && _readOnly?._interactionBox)}
{...(isDisabled && _disabled?._interactionBox)}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.tsx
|
|
{...(!isChecked && _unchecked?._interactionBox)}
{...(isChecked && _checked?._interactionBox)}
{...(isIndeterminate && _indeterminate?._interactionBox)}
{...(isPressed && _pressed._interactionBox)}
{...(isInvalid && _invalid?._interactionBox)}
{...(isReadOnly && _readOnly?._interactionBox)}
{...(isDisabled && _disabled?._interactionBox)}
|
<mask> <Center>
<mask> {/* Interaction Wrapper */}
<mask> <Box
<mask> {..._interactionBox}
<mask> {...(isPressed && _iterationBoxPressed)}
<mask> p={5}
<mask> w="100%"
<mask> height="100%"
<mask> zIndex={-1}
<mask> />
</s> fix: added interaction styling props </s> remove {...themedProps}
</s> add </s> remove {..._checkbox}
{...(checked && _checboxChecked)}
{...(disabled && _checkboxDisabled)}
{...(isInvalid && _checkboxInvalid)}
</s> add {...nonLayoutProps}
{...(!isChecked && _unchecked)}
{...(isChecked && _checked)}
{...(isPressed && _pressed)}
{...(isIndeterminate && _indeterminate)}
{...(isInvalid && _invalid)}
{...(isReadOnly && _readOnly)}
{...(isDisabled && _disabled)} </s> remove {...themedProps}
opacity={disabled ? 0.4 : 1}
cursor={disabled ? 'not-allowed' : 'pointer'}
</s> add opacity={isDisabled ? 0.4 : 1}
cursor={isDisabled ? 'not-allowed' : 'pointer'} </s> remove {...(isFocusVisible && _iterationBoxFocus)}
{...(isHovered && _iterationBoxHover)}
{...(disabled && _iterationBoxDisabled)}
{...(disabled && _iterationBoxDisabled)}
</s> add {...(!isChecked && _unchecked?._interactionBox)}
{...(isChecked && _checked?._interactionBox)}
{...(isIndeterminate && _indeterminate?._interactionBox)}
{...(isFocusVisible && _focus?._interactionBox)}
{...(isHovered && _hover?._interactionBox)}
{...(isInvalid && _invalid?._interactionBox)}
{...(isReadOnly && _readOnly?._interactionBox)}
{...(isDisabled && _disabled?._interactionBox)} </s> remove {..._checkbox}
{...(checked && _checkboxChecked)}
{...(disabled && _checkboxDisabled)}
{...(isInvalid && _checkboxInvalid)}
</s> add {...nonLayoutProps}
{...(!isChecked && _unchecked)}
{...(isChecked && _checked)}
{...(isIndeterminate && _indeterminate)}
{...(isFocusVisible && _focus)}
{...(isHovered && _hover)}
{...(isInvalid && _invalid)}
{...(isReadOnly && _readOnly)}
{...(isDisabled && _disabled)}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.tsx
|
{...nonLayoutProps}
{...(!isChecked && _unchecked)}
{...(isChecked && _checked)}
{...(isPressed && _pressed)}
{...(isIndeterminate && _indeterminate)}
{...(isInvalid && _invalid)}
{...(isReadOnly && _readOnly)}
{...(isDisabled && _disabled)}
|
<mask> zIndex={-1}
<mask> />
<mask> {/* Checkbox */}
<mask> <Center
<mask> {..._checkbox}
<mask> {...(checked && _checboxChecked)}
<mask> {...(disabled && _checkboxDisabled)}
<mask> {...(isInvalid && _checkboxInvalid)}
<mask> >
<mask> {icon && sizedIcon && checked ? (
<mask> sizedIcon()
<mask> ) : (
<mask> <CheckIcon {..._icon} opacity={checked ? 1 : 0} />
</s> fix: added interaction styling props </s> remove {icon && sizedIcon && checked ? (
sizedIcon()
) : (
<CheckIcon {..._icon} opacity={checked ? 1 : 0} />
)}
</s> add {iconResolver(isPressed)} </s> remove {..._checkbox}
{...(checked && _checkboxChecked)}
{...(disabled && _checkboxDisabled)}
{...(isInvalid && _checkboxInvalid)}
</s> add {...nonLayoutProps}
{...(!isChecked && _unchecked)}
{...(isChecked && _checked)}
{...(isIndeterminate && _indeterminate)}
{...(isFocusVisible && _focus)}
{...(isHovered && _hover)}
{...(isInvalid && _invalid)}
{...(isReadOnly && _readOnly)}
{...(isDisabled && _disabled)} </s> remove {icon && sizedIcon && checked ? (
sizedIcon()
) : (
<CheckIcon name="check" {..._icon} opacity={checked ? 1 : 0} />
)}
</s> add {iconResolver()} </s> remove {...(isPressed && _iterationBoxPressed)}
</s> add {...(!isChecked && _unchecked?._interactionBox)}
{...(isChecked && _checked?._interactionBox)}
{...(isIndeterminate && _indeterminate?._interactionBox)}
{...(isPressed && _pressed._interactionBox)}
{...(isInvalid && _invalid?._interactionBox)}
{...(isReadOnly && _readOnly?._interactionBox)}
{...(isDisabled && _disabled?._interactionBox)} </s> remove {...(isFocusVisible && _iterationBoxFocus)}
{...(isHovered && _iterationBoxHover)}
{...(disabled && _iterationBoxDisabled)}
{...(disabled && _iterationBoxDisabled)}
</s> add {...(!isChecked && _unchecked?._interactionBox)}
{...(isChecked && _checked?._interactionBox)}
{...(isIndeterminate && _indeterminate?._interactionBox)}
{...(isFocusVisible && _focus?._interactionBox)}
{...(isHovered && _hover?._interactionBox)}
{...(isInvalid && _invalid?._interactionBox)}
{...(isReadOnly && _readOnly?._interactionBox)}
{...(isDisabled && _disabled?._interactionBox)}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.tsx
|
{iconResolver(isPressed)}
|
<mask> {...(checked && _checboxChecked)}
<mask> {...(disabled && _checkboxDisabled)}
<mask> {...(isInvalid && _checkboxInvalid)}
<mask> >
<mask> {icon && sizedIcon && checked ? (
<mask> sizedIcon()
<mask> ) : (
<mask> <CheckIcon {..._icon} opacity={checked ? 1 : 0} />
<mask> )}
<mask> </Center>
<mask> </Center>
<mask> {/* Label */}
<mask> {children}
<mask> </Center>
</s> fix: added interaction styling props </s> remove {icon && sizedIcon && checked ? (
sizedIcon()
) : (
<CheckIcon name="check" {..._icon} opacity={checked ? 1 : 0} />
)}
</s> add {iconResolver()} </s> remove {..._checkbox}
{...(checked && _checboxChecked)}
{...(disabled && _checkboxDisabled)}
{...(isInvalid && _checkboxInvalid)}
</s> add {...nonLayoutProps}
{...(!isChecked && _unchecked)}
{...(isChecked && _checked)}
{...(isPressed && _pressed)}
{...(isIndeterminate && _indeterminate)}
{...(isInvalid && _invalid)}
{...(isReadOnly && _readOnly)}
{...(isDisabled && _disabled)} </s> remove {..._checkbox}
{...(checked && _checkboxChecked)}
{...(disabled && _checkboxDisabled)}
{...(isInvalid && _checkboxInvalid)}
</s> add {...nonLayoutProps}
{...(!isChecked && _unchecked)}
{...(isChecked && _checked)}
{...(isIndeterminate && _indeterminate)}
{...(isFocusVisible && _focus)}
{...(isHovered && _hover)}
{...(isInvalid && _invalid)}
{...(isReadOnly && _readOnly)}
{...(isDisabled && _disabled)} </s> remove {...(isFocusVisible && _iterationBoxFocus)}
{...(isHovered && _iterationBoxHover)}
{...(disabled && _iterationBoxDisabled)}
{...(disabled && _iterationBoxDisabled)}
</s> add {...(!isChecked && _unchecked?._interactionBox)}
{...(isChecked && _checked?._interactionBox)}
{...(isIndeterminate && _indeterminate?._interactionBox)}
{...(isFocusVisible && _focus?._interactionBox)}
{...(isHovered && _hover?._interactionBox)}
{...(isInvalid && _invalid?._interactionBox)}
{...(isReadOnly && _readOnly?._interactionBox)}
{...(isDisabled && _disabled?._interactionBox)}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.tsx
|
import { extractInObject, stylingProps } from '../../../theme/tools/utils';
|
<mask> import { useHover } from '@react-native-aria/interactions';
<mask> import { useCheckbox, useCheckboxGroupItem } from '@react-native-aria/checkbox';
<mask> import { useFocusRing } from '@react-native-aria/focus';
<mask> import { CheckIcon } from '../Icon/Icons';
<mask>
<mask> const Checkbox = (
<mask> { children, icon, wrapperRef, ...props }: ICheckboxProps,
<mask> ref: any
</s> fix: added interaction styling props </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
const { focusProps, isFocusVisible } = useFocusRing();
</s> add function iconResolver() {
if (sizedIcon && isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (sizedIcon && isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (sizedIcon && isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (sizedIcon && isHovered && _hover?.icon) {
return sizedIcon(_hover?.icon, {
..._icon,
..._hover?._icon,
});
} else if (sizedIcon && !isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (sizedIcon && isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (sizedIcon && isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
} else if (sizedIcon && isFocusVisible && _focus?.icon) {
return sizedIcon(_focus?.icon, {
..._icon,
..._focus?._icon,
});
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
} </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
</s> add function iconResolver(isPressed?: any) {
if (sizedIcon) {
if (isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (isPressed && _pressed?.icon) {
return sizedIcon(_pressed?.icon, {
..._icon,
..._pressed?._icon,
});
} else if (!isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
}
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
} </s> remove const { checked, disabled } = inputProps;
</s> add const { checked: isChecked, disabled: isDisabled } = inputProps;
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
);
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
_interactionBox,
_disabled,
_invalid,
_focus,
_hover,
_checked,
_unchecked,
_indeterminate,
|
<mask> ) => {
<mask> const formControlContext = useFormControlContext();
<mask> const checkboxGroupContext = React.useContext(CheckboxGroupContext);
<mask> const {
<mask> _interactionBox: {
<mask> _hover: _iterationBoxHover,
<mask> _focus: _iterationBoxFocus,
<mask> _disabled: _iterationBoxDisabled,
<mask> ..._interactionBox
<mask> },
<mask> _checkbox: {
<mask> _checked: _checkboxChecked,
<mask> _disabled: _checkboxDisabled,
<mask> _invalid: _checkboxInvalid,
<mask> ..._checkbox
<mask> },
<mask> _icon,
<mask> isInvalid,
<mask> ...themedProps
<mask> } = usePropsResolution('Checkbox', {
<mask> ...checkboxGroupContext,
</s> fix: added interaction styling props </s> remove _interactionBox: { _pressed: _iterationBoxPressed, ..._interactionBox },
_checkbox: {
_checked: _checboxChecked,
_disabled: _checkboxDisabled,
_invalid: _checkboxInvalid,
..._checkbox
},
</s> add _interactionBox,
_disabled,
_invalid,
_pressed,
_checked,
_unchecked,
_indeterminate, </s> remove _focus: {
</s> add },
_focus: {
_interactionBox: {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
_readOnly,
|
<mask> _unchecked,
<mask> _indeterminate,
<mask> _icon,
<mask> isInvalid,
<mask> isReadOnly,
<mask> isIndeterminate,
<mask> ...themedProps
<mask> } = usePropsResolution('Checkbox', {
<mask> ...checkboxGroupContext,
</s> fix: added interaction styling props </s> remove _interactionBox: { _pressed: _iterationBoxPressed, ..._interactionBox },
_checkbox: {
_checked: _checboxChecked,
_disabled: _checkboxDisabled,
_invalid: _checkboxInvalid,
..._checkbox
},
</s> add _interactionBox,
_disabled,
_invalid,
_pressed,
_checked,
_unchecked,
_indeterminate, </s> remove _interactionBox: {
_hover: _iterationBoxHover,
_focus: _iterationBoxFocus,
_disabled: _iterationBoxDisabled,
..._interactionBox
},
_checkbox: {
_checked: _checkboxChecked,
_disabled: _checkboxDisabled,
_invalid: _checkboxInvalid,
..._checkbox
},
</s> add _interactionBox,
_disabled,
_invalid,
_focus,
_hover,
_checked,
_unchecked,
_indeterminate,
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
isReadOnly,
isIndeterminate,
|
<mask> _readOnly,
<mask> isInvalid,
<mask> ...themedProps
<mask> } = usePropsResolution('Checkbox', {
<mask> ...checkboxGroupContext,
<mask> ...formControlContext,
<mask> ...props,
</s> fix: added interaction styling props </s> remove _interactionBox: { _pressed: _iterationBoxPressed, ..._interactionBox },
_checkbox: {
_checked: _checboxChecked,
_disabled: _checkboxDisabled,
_invalid: _checkboxInvalid,
..._checkbox
},
</s> add _interactionBox,
_disabled,
_invalid,
_pressed,
_checked,
_unchecked,
_indeterminate, </s> remove _interactionBox: {
_hover: _iterationBoxHover,
_focus: _iterationBoxFocus,
_disabled: _iterationBoxDisabled,
..._interactionBox
},
_checkbox: {
_checked: _checkboxChecked,
_disabled: _checkboxDisabled,
_invalid: _checkboxInvalid,
..._checkbox
},
</s> add _interactionBox,
_disabled,
_invalid,
_focus,
_hover,
_checked,
_unchecked,
_indeterminate,
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
const [layoutProps, nonLayoutProps] = extractInObject(themedProps, [
...stylingProps.margin,
...stylingProps.layout,
...stylingProps.flexbox,
...stylingProps.position,
]);
|
<mask> });
<mask> const groupState = useContext(CheckboxGroupContext);
<mask> const { isHovered } = useHover({}, _ref);
<mask>
<mask> // Swap hooks depending on whether this checkbox is inside a CheckboxGroup.
<mask> // This is a bit unorthodox. Typically, hooks cannot be called in a conditional,
<mask> // but since the checkbox won't move in and out of a group, it should be safe.
<mask> const { inputProps } = groupState
<mask> ? // eslint-disable-next-line react-hooks/rules-of-hooks
<mask> useCheckboxGroupItem(
</s> fix: added interaction styling props </s> remove * If true, the checkbox will be disabled
</s> add * If true, the checkbox will be disabled. </s> remove ...themedProps,
</s> add ...nonLayoutProps, </s> remove ...themedProps,
</s> add ...nonLayoutProps, </s> remove * If true, the checkbox is marked as invalid. Changes style of unchecked state.
</s> add * If true, the checkbox is marked as invalid.
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
...nonLayoutProps,
|
<mask> const { inputProps } = groupState
<mask> ? // eslint-disable-next-line react-hooks/rules-of-hooks
<mask> useCheckboxGroupItem(
<mask> {
<mask> ...themedProps,
<mask> 'aria-label': themedProps.accessibilityLabel,
<mask> 'value': themedProps.value,
<mask> },
<mask> groupState.state,
<mask> //@ts-ignore
</s> fix: added interaction styling props </s> remove ...themedProps,
</s> add ...nonLayoutProps, </s> remove { ...themedProps, 'aria-label': themedProps.accessibilityLabel },
</s> add {
...nonLayoutProps,
'aria-label': themedProps.accessibilityLabel,
}, </s> remove useCheckbox(themedProps, state, ref);
</s> add useCheckbox(nonLayoutProps, state, ref);
const [, pressableProps] = extractInObject(inputProps, [
...stylingProps.border,
...stylingProps.background,
...stylingProps.flexbox,
...stylingProps.layout,
...stylingProps.padding,
...stylingProps.margin,
]);
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
); </s> remove const { checked, disabled } = inputProps;
</s> add const { checked: isChecked, disabled: isDisabled } = inputProps;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
{
...nonLayoutProps,
'aria-label': themedProps.accessibilityLabel,
},
|
<mask> mergedRef
<mask> )
<mask> : // eslint-disable-next-line react-hooks/rules-of-hooks
<mask> useCheckbox(
<mask> { ...themedProps, 'aria-label': themedProps.accessibilityLabel },
<mask> state,
<mask> //@ts-ignore
<mask> mergedRef
<mask> );
<mask>
</s> fix: added interaction styling props </s> remove ...themedProps,
</s> add ...nonLayoutProps, </s> remove const { checked, disabled } = inputProps;
</s> add const { checked: isChecked, disabled: isDisabled } = inputProps;
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
); </s> remove ...themedProps,
</s> add ...nonLayoutProps, </s> remove useCheckbox(themedProps, state, ref);
</s> add useCheckbox(nonLayoutProps, state, ref);
const [, pressableProps] = extractInObject(inputProps, [
...stylingProps.border,
...stylingProps.background,
...stylingProps.flexbox,
...stylingProps.layout,
...stylingProps.padding,
...stylingProps.margin,
]);
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
); </s> remove const { checked, disabled } = inputProps;
</s> add const { checked: isChecked, disabled: isDisabled } = inputProps;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
const { checked: isChecked, disabled: isDisabled } = inputProps;
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
);
|
<mask> //@ts-ignore
<mask> mergedRef
<mask> );
<mask>
<mask> const { checked, disabled } = inputProps;
<mask>
<mask> const sizedIcon = icon
<mask> ? () =>
<mask> React.cloneElement(
<mask> icon,
</s> fix: added interaction styling props </s> remove const { checked, disabled } = inputProps;
</s> add const { checked: isChecked, disabled: isDisabled } = inputProps; </s> remove useCheckbox(themedProps, state, ref);
</s> add useCheckbox(nonLayoutProps, state, ref);
const [, pressableProps] = extractInObject(inputProps, [
...stylingProps.border,
...stylingProps.background,
...stylingProps.flexbox,
...stylingProps.layout,
...stylingProps.padding,
...stylingProps.margin,
]);
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
); </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
const { focusProps, isFocusVisible } = useFocusRing();
</s> add function iconResolver() {
if (sizedIcon && isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (sizedIcon && isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (sizedIcon && isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (sizedIcon && isHovered && _hover?.icon) {
return sizedIcon(_hover?.icon, {
..._icon,
..._hover?._icon,
});
} else if (sizedIcon && !isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (sizedIcon && isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (sizedIcon && isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
} else if (sizedIcon && isFocusVisible && _focus?.icon) {
return sizedIcon(_focus?.icon, {
..._icon,
..._focus?._icon,
});
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
} </s> remove { ...themedProps, 'aria-label': themedProps.accessibilityLabel },
</s> add {
...nonLayoutProps,
'aria-label': themedProps.accessibilityLabel,
}, </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
</s> add function iconResolver(isPressed?: any) {
if (sizedIcon) {
if (isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (isPressed && _pressed?.icon) {
return sizedIcon(_pressed?.icon, {
..._icon,
..._pressed?._icon,
});
} else if (!isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
}
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
function iconResolver() {
if (sizedIcon && isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (sizedIcon && isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (sizedIcon && isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (sizedIcon && isHovered && _hover?.icon) {
return sizedIcon(_hover?.icon, {
..._icon,
..._hover?._icon,
});
} else if (sizedIcon && !isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (sizedIcon && isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (sizedIcon && isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
} else if (sizedIcon && isFocusVisible && _focus?.icon) {
return sizedIcon(_focus?.icon, {
..._icon,
..._focus?._icon,
});
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
}
|
<mask> );
<mask>
<mask> const { checked, disabled } = inputProps;
<mask>
<mask> const sizedIcon = icon
<mask> ? () =>
<mask> React.cloneElement(
<mask> icon,
<mask> {
<mask> ..._icon,
<mask> },
<mask> icon.props.children
<mask> )
<mask> : null;
<mask> const { focusProps, isFocusVisible } = useFocusRing();
<mask>
<mask> const component = (
<mask> <Box
<mask> flexDirection="row"
<mask> alignItems="center"
</s> fix: added interaction styling props </s> remove const { checked, disabled } = inputProps;
</s> add const { checked: isChecked, disabled: isDisabled } = inputProps;
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
); </s> remove useCheckbox(themedProps, state, ref);
</s> add useCheckbox(nonLayoutProps, state, ref);
const [, pressableProps] = extractInObject(inputProps, [
...stylingProps.border,
...stylingProps.background,
...stylingProps.flexbox,
...stylingProps.layout,
...stylingProps.padding,
...stylingProps.margin,
]);
const sizedIcon = (icon: JSX.Element, _icon: any) =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
); </s> remove const { checked, disabled } = inputProps;
</s> add const { checked: isChecked, disabled: isDisabled } = inputProps;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
const { focusProps, isFocusVisible } = useFocusRing();
|
<mask> }
<mask>
<mask> const component = (
<mask> <Box
<mask> {...layoutProps}
<mask> flexDirection="row"
</s> fix: added interaction styling props </s> remove {...themedProps}
opacity={disabled ? 0.4 : 1}
cursor={disabled ? 'not-allowed' : 'pointer'}
</s> add opacity={isDisabled ? 0.4 : 1}
cursor={isDisabled ? 'not-allowed' : 'pointer'} </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
const { focusProps, isFocusVisible } = useFocusRing();
</s> add function iconResolver() {
if (sizedIcon && isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (sizedIcon && isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (sizedIcon && isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (sizedIcon && isHovered && _hover?.icon) {
return sizedIcon(_hover?.icon, {
..._icon,
..._hover?._icon,
});
} else if (sizedIcon && !isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (sizedIcon && isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (sizedIcon && isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
} else if (sizedIcon && isFocusVisible && _focus?.icon) {
return sizedIcon(_focus?.icon, {
..._icon,
..._focus?._icon,
});
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
} </s> remove {...themedProps}
</s> add
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
{...layoutProps}
|
<mask>
<mask> const { focusProps, isFocusVisible } = useFocusRing();
<mask> const component = (
<mask> <Box
<mask> flexDirection="row"
<mask> alignItems="center"
<mask> opacity={isDisabled ? 0.4 : 1}
<mask> cursor={isDisabled ? 'not-allowed' : 'pointer'}
<mask> >
<mask> <Center>
</s> fix: added interaction styling props </s> remove {...themedProps}
opacity={disabled ? 0.4 : 1}
cursor={disabled ? 'not-allowed' : 'pointer'}
</s> add opacity={isDisabled ? 0.4 : 1}
cursor={isDisabled ? 'not-allowed' : 'pointer'} </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
const { focusProps, isFocusVisible } = useFocusRing();
</s> add function iconResolver() {
if (sizedIcon && isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (sizedIcon && isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (sizedIcon && isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (sizedIcon && isHovered && _hover?.icon) {
return sizedIcon(_hover?.icon, {
..._icon,
..._hover?._icon,
});
} else if (sizedIcon && !isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (sizedIcon && isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (sizedIcon && isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
} else if (sizedIcon && isFocusVisible && _focus?.icon) {
return sizedIcon(_focus?.icon, {
..._icon,
..._focus?._icon,
});
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
} </s> remove {...themedProps}
</s> add
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
opacity={isDisabled ? 0.4 : 1}
cursor={isDisabled ? 'not-allowed' : 'pointer'}
|
<mask> const component = (
<mask> <Box
<mask> flexDirection="row"
<mask> alignItems="center"
<mask> {...themedProps}
<mask> opacity={disabled ? 0.4 : 1}
<mask> cursor={disabled ? 'not-allowed' : 'pointer'}
<mask> >
<mask> <Center>
<mask> {/* Interaction Box */}
<mask> <Box
<mask> {..._interactionBox}
</s> fix: added interaction styling props </s> remove {...themedProps}
</s> add </s> remove {...(isFocusVisible && _iterationBoxFocus)}
{...(isHovered && _iterationBoxHover)}
{...(disabled && _iterationBoxDisabled)}
{...(disabled && _iterationBoxDisabled)}
</s> add {...(!isChecked && _unchecked?._interactionBox)}
{...(isChecked && _checked?._interactionBox)}
{...(isIndeterminate && _indeterminate?._interactionBox)}
{...(isFocusVisible && _focus?._interactionBox)}
{...(isHovered && _hover?._interactionBox)}
{...(isInvalid && _invalid?._interactionBox)}
{...(isReadOnly && _readOnly?._interactionBox)}
{...(isDisabled && _disabled?._interactionBox)} </s> remove {...(isPressed && _iterationBoxPressed)}
</s> add {...(!isChecked && _unchecked?._interactionBox)}
{...(isChecked && _checked?._interactionBox)}
{...(isIndeterminate && _indeterminate?._interactionBox)}
{...(isPressed && _pressed._interactionBox)}
{...(isInvalid && _invalid?._interactionBox)}
{...(isReadOnly && _readOnly?._interactionBox)}
{...(isDisabled && _disabled?._interactionBox)}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
{...(!isChecked && _unchecked?._interactionBox)}
{...(isChecked && _checked?._interactionBox)}
{...(isIndeterminate && _indeterminate?._interactionBox)}
{...(isFocusVisible && _focus?._interactionBox)}
{...(isHovered && _hover?._interactionBox)}
{...(isInvalid && _invalid?._interactionBox)}
{...(isReadOnly && _readOnly?._interactionBox)}
{...(isDisabled && _disabled?._interactionBox)}
|
<mask> <Center>
<mask> {/* Interaction Box */}
<mask> <Box
<mask> {..._interactionBox}
<mask> {...(isFocusVisible && _iterationBoxFocus)}
<mask> {...(isHovered && _iterationBoxHover)}
<mask> {...(disabled && _iterationBoxDisabled)}
<mask> {...(disabled && _iterationBoxDisabled)}
<mask> style={{
<mask> // @ts-ignore - only for web"
<mask> transition: 'height 200ms, width 200ms',
<mask> }}
<mask> h={isFocusVisible || isHovered ? '200%' : '100%'}
</s> fix: added interaction styling props </s> remove h={isFocusVisible || isHovered ? '200%' : '100%'}
w={isFocusVisible || isHovered ? '200%' : '100%'}
</s> add h={
isFocusVisible || isHovered || isChecked || isInvalid
? '200%'
: '100%'
}
w={
isFocusVisible || isHovered || isChecked || isInvalid
? '200%'
: '100%'
} </s> remove {..._checkbox}
{...(checked && _checkboxChecked)}
{...(disabled && _checkboxDisabled)}
{...(isInvalid && _checkboxInvalid)}
</s> add {...nonLayoutProps}
{...(!isChecked && _unchecked)}
{...(isChecked && _checked)}
{...(isIndeterminate && _indeterminate)}
{...(isFocusVisible && _focus)}
{...(isHovered && _hover)}
{...(isInvalid && _invalid)}
{...(isReadOnly && _readOnly)}
{...(isDisabled && _disabled)} </s> remove {...(isPressed && _iterationBoxPressed)}
</s> add {...(!isChecked && _unchecked?._interactionBox)}
{...(isChecked && _checked?._interactionBox)}
{...(isIndeterminate && _indeterminate?._interactionBox)}
{...(isPressed && _pressed._interactionBox)}
{...(isInvalid && _invalid?._interactionBox)}
{...(isReadOnly && _readOnly?._interactionBox)}
{...(isDisabled && _disabled?._interactionBox)} </s> remove {icon && sizedIcon && checked ? (
sizedIcon()
) : (
<CheckIcon {..._icon} opacity={checked ? 1 : 0} />
)}
</s> add {iconResolver(isPressed)} </s> remove {..._checkbox}
{...(checked && _checboxChecked)}
{...(disabled && _checkboxDisabled)}
{...(isInvalid && _checkboxInvalid)}
</s> add {...nonLayoutProps}
{...(!isChecked && _unchecked)}
{...(isChecked && _checked)}
{...(isPressed && _pressed)}
{...(isIndeterminate && _indeterminate)}
{...(isInvalid && _invalid)}
{...(isReadOnly && _readOnly)}
{...(isDisabled && _disabled)}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
h={
isFocusVisible || isHovered || isChecked || isInvalid
? '200%'
: '100%'
}
w={
isFocusVisible || isHovered || isChecked || isInvalid
? '200%'
: '100%'
}
|
<mask> style={{
<mask> // @ts-ignore - only for web"
<mask> transition: 'height 200ms, width 200ms',
<mask> }}
<mask> h={isFocusVisible || isHovered ? '200%' : '100%'}
<mask> w={isFocusVisible || isHovered ? '200%' : '100%'}
<mask> zIndex={-1}
<mask> />
<mask> {/* Checkbox */}
<mask> <Center
<mask> {..._checkbox}
</s> fix: added interaction styling props </s> remove {...(isFocusVisible && _iterationBoxFocus)}
{...(isHovered && _iterationBoxHover)}
{...(disabled && _iterationBoxDisabled)}
{...(disabled && _iterationBoxDisabled)}
</s> add {...(!isChecked && _unchecked?._interactionBox)}
{...(isChecked && _checked?._interactionBox)}
{...(isIndeterminate && _indeterminate?._interactionBox)}
{...(isFocusVisible && _focus?._interactionBox)}
{...(isHovered && _hover?._interactionBox)}
{...(isInvalid && _invalid?._interactionBox)}
{...(isReadOnly && _readOnly?._interactionBox)}
{...(isDisabled && _disabled?._interactionBox)} </s> remove {..._checkbox}
{...(checked && _checboxChecked)}
{...(disabled && _checkboxDisabled)}
{...(isInvalid && _checkboxInvalid)}
</s> add {...nonLayoutProps}
{...(!isChecked && _unchecked)}
{...(isChecked && _checked)}
{...(isPressed && _pressed)}
{...(isIndeterminate && _indeterminate)}
{...(isInvalid && _invalid)}
{...(isReadOnly && _readOnly)}
{...(isDisabled && _disabled)} </s> remove {..._checkbox}
{...(checked && _checkboxChecked)}
{...(disabled && _checkboxDisabled)}
{...(isInvalid && _checkboxInvalid)}
</s> add {...nonLayoutProps}
{...(!isChecked && _unchecked)}
{...(isChecked && _checked)}
{...(isIndeterminate && _indeterminate)}
{...(isFocusVisible && _focus)}
{...(isHovered && _hover)}
{...(isInvalid && _invalid)}
{...(isReadOnly && _readOnly)}
{...(isDisabled && _disabled)} </s> remove {icon && sizedIcon && checked ? (
sizedIcon()
) : (
<CheckIcon {..._icon} opacity={checked ? 1 : 0} />
)}
</s> add {iconResolver(isPressed)} </s> remove {...themedProps}
opacity={disabled ? 0.4 : 1}
cursor={disabled ? 'not-allowed' : 'pointer'}
</s> add opacity={isDisabled ? 0.4 : 1}
cursor={isDisabled ? 'not-allowed' : 'pointer'}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
{...nonLayoutProps}
{...(!isChecked && _unchecked)}
{...(isChecked && _checked)}
{...(isIndeterminate && _indeterminate)}
{...(isFocusVisible && _focus)}
{...(isHovered && _hover)}
{...(isInvalid && _invalid)}
{...(isReadOnly && _readOnly)}
{...(isDisabled && _disabled)}
|
<mask> zIndex={-1}
<mask> />
<mask> {/* Checkbox */}
<mask> <Center
<mask> {..._checkbox}
<mask> {...(checked && _checkboxChecked)}
<mask> {...(disabled && _checkboxDisabled)}
<mask> {...(isInvalid && _checkboxInvalid)}
<mask> >
<mask> {icon && sizedIcon && checked ? (
<mask> sizedIcon()
<mask> ) : (
<mask> <CheckIcon name="check" {..._icon} opacity={checked ? 1 : 0} />
</s> fix: added interaction styling props </s> remove {..._checkbox}
{...(checked && _checboxChecked)}
{...(disabled && _checkboxDisabled)}
{...(isInvalid && _checkboxInvalid)}
</s> add {...nonLayoutProps}
{...(!isChecked && _unchecked)}
{...(isChecked && _checked)}
{...(isPressed && _pressed)}
{...(isIndeterminate && _indeterminate)}
{...(isInvalid && _invalid)}
{...(isReadOnly && _readOnly)}
{...(isDisabled && _disabled)} </s> remove {icon && sizedIcon && checked ? (
sizedIcon()
) : (
<CheckIcon name="check" {..._icon} opacity={checked ? 1 : 0} />
)}
</s> add {iconResolver()} </s> remove {icon && sizedIcon && checked ? (
sizedIcon()
) : (
<CheckIcon {..._icon} opacity={checked ? 1 : 0} />
)}
</s> add {iconResolver(isPressed)} </s> remove {...(isPressed && _iterationBoxPressed)}
</s> add {...(!isChecked && _unchecked?._interactionBox)}
{...(isChecked && _checked?._interactionBox)}
{...(isIndeterminate && _indeterminate?._interactionBox)}
{...(isPressed && _pressed._interactionBox)}
{...(isInvalid && _invalid?._interactionBox)}
{...(isReadOnly && _readOnly?._interactionBox)}
{...(isDisabled && _disabled?._interactionBox)} </s> remove {...(isFocusVisible && _iterationBoxFocus)}
{...(isHovered && _iterationBoxHover)}
{...(disabled && _iterationBoxDisabled)}
{...(disabled && _iterationBoxDisabled)}
</s> add {...(!isChecked && _unchecked?._interactionBox)}
{...(isChecked && _checked?._interactionBox)}
{...(isIndeterminate && _indeterminate?._interactionBox)}
{...(isFocusVisible && _focus?._interactionBox)}
{...(isHovered && _hover?._interactionBox)}
{...(isInvalid && _invalid?._interactionBox)}
{...(isReadOnly && _readOnly?._interactionBox)}
{...(isDisabled && _disabled?._interactionBox)}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
{iconResolver()}
|
<mask> {...(checked && _checkboxChecked)}
<mask> {...(disabled && _checkboxDisabled)}
<mask> {...(isInvalid && _checkboxInvalid)}
<mask> >
<mask> {icon && sizedIcon && checked ? (
<mask> sizedIcon()
<mask> ) : (
<mask> <CheckIcon name="check" {..._icon} opacity={checked ? 1 : 0} />
<mask> )}
<mask> </Center>
<mask> </Center>
<mask> {children}
<mask> </Box>
<mask> );
</s> fix: added interaction styling props </s> remove {icon && sizedIcon && checked ? (
sizedIcon()
) : (
<CheckIcon {..._icon} opacity={checked ? 1 : 0} />
)}
</s> add {iconResolver(isPressed)} </s> remove {..._checkbox}
{...(checked && _checkboxChecked)}
{...(disabled && _checkboxDisabled)}
{...(isInvalid && _checkboxInvalid)}
</s> add {...nonLayoutProps}
{...(!isChecked && _unchecked)}
{...(isChecked && _checked)}
{...(isIndeterminate && _indeterminate)}
{...(isFocusVisible && _focus)}
{...(isHovered && _hover)}
{...(isInvalid && _invalid)}
{...(isReadOnly && _readOnly)}
{...(isDisabled && _disabled)} </s> remove {..._checkbox}
{...(checked && _checboxChecked)}
{...(disabled && _checkboxDisabled)}
{...(isInvalid && _checkboxInvalid)}
</s> add {...nonLayoutProps}
{...(!isChecked && _unchecked)}
{...(isChecked && _checked)}
{...(isPressed && _pressed)}
{...(isIndeterminate && _indeterminate)}
{...(isInvalid && _invalid)}
{...(isReadOnly && _readOnly)}
{...(isDisabled && _disabled)} </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
const { focusProps, isFocusVisible } = useFocusRing();
</s> add function iconResolver() {
if (sizedIcon && isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (sizedIcon && isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (sizedIcon && isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (sizedIcon && isHovered && _hover?.icon) {
return sizedIcon(_hover?.icon, {
..._icon,
..._hover?._icon,
});
} else if (sizedIcon && !isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (sizedIcon && isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (sizedIcon && isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
} else if (sizedIcon && isFocusVisible && _focus?.icon) {
return sizedIcon(_focus?.icon, {
..._icon,
..._focus?._icon,
});
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
{/* Label */}
|
<mask> >
<mask> {iconResolver()}
<mask> </Center>
<mask> </Center>
<mask> {children}
<mask> </Box>
<mask> );
<mask>
<mask> return (
<mask> <Box
</s> fix: added interaction styling props </s> remove {icon && sizedIcon && checked ? (
sizedIcon()
) : (
<CheckIcon name="check" {..._icon} opacity={checked ? 1 : 0} />
)}
</s> add {iconResolver()} </s> remove {icon && sizedIcon && checked ? (
sizedIcon()
) : (
<CheckIcon {..._icon} opacity={checked ? 1 : 0} />
)}
</s> add {iconResolver(isPressed)} </s> remove {...(inputProps as IPressableProps)}
</s> add {...(pressableProps as IPressableProps)} </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
const { focusProps, isFocusVisible } = useFocusRing();
</s> add function iconResolver() {
if (sizedIcon && isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (sizedIcon && isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (sizedIcon && isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (sizedIcon && isHovered && _hover?.icon) {
return sizedIcon(_hover?.icon, {
..._icon,
..._hover?._icon,
});
} else if (sizedIcon && !isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (sizedIcon && isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (sizedIcon && isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
} else if (sizedIcon && isFocusVisible && _focus?.icon) {
return sizedIcon(_focus?.icon, {
..._icon,
..._focus?._icon,
});
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
}
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/Checkbox.web.tsx
|
import type { IIconProps } from '../Icon';
|
<mask> import type { TouchableOpacityProps } from 'react-native';
<mask> import type { IFormControlContext } from '../../composites/FormControl';
<mask> import type { IBoxProps } from '../Box';
<mask>
<mask> export type ICheckboxValue = string;
<mask>
<mask> export interface ICheckboxProps extends IBoxProps {
<mask> /**
</s> fix: added interaction styling props </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
const { focusProps, isFocusVisible } = useFocusRing();
</s> add function iconResolver() {
if (sizedIcon && isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (sizedIcon && isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (sizedIcon && isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (sizedIcon && isHovered && _hover?.icon) {
return sizedIcon(_hover?.icon, {
..._icon,
..._hover?._icon,
});
} else if (sizedIcon && !isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (sizedIcon && isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (sizedIcon && isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
} else if (sizedIcon && isFocusVisible && _focus?.icon) {
return sizedIcon(_focus?.icon, {
..._icon,
..._focus?._icon,
});
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
} </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
</s> add function iconResolver(isPressed?: any) {
if (sizedIcon) {
if (isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (isPressed && _pressed?.icon) {
return sizedIcon(_pressed?.icon, {
..._icon,
..._pressed?._icon,
});
} else if (!isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
}
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
}
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/types.tsx
|
* If true, the checkbox will be disabled.
|
<mask> * If true, the checkbox will be indeterminate. This only affects the icon shown inside checkbox.
<mask> */
<mask> isIndeterminate?: boolean;
<mask> /**
<mask> * If true, the checkbox will be disabled
<mask> */
<mask> // isFullWidth?: boolean;
<mask> isDisabled?: boolean;
<mask> /**
<mask> * If true, the checkbox is marked as invalid. Changes style of unchecked state.
</s> fix: added interaction styling props </s> remove * If true, the checkbox is marked as invalid. Changes style of unchecked state.
</s> add * If true, the checkbox is marked as invalid. </s> remove const { checked, disabled } = inputProps;
</s> add const { checked: isChecked, disabled: isDisabled } = inputProps;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/types.tsx
|
* If true, the checkbox is marked as invalid.
|
<mask> */
<mask> // isFullWidth?: boolean;
<mask> isDisabled?: boolean;
<mask> /**
<mask> * If true, the checkbox is marked as invalid. Changes style of unchecked state.
<mask> */
<mask> isInvalid?: boolean;
<mask> /**
<mask> * The size (width and height) of the checkbox.
<mask> * @default 'md'
</s> fix: added interaction styling props </s> remove * If true, the checkbox will be disabled
</s> add * If true, the checkbox will be disabled.
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/types.tsx
|
/**
* If true, the checkbox is marked as readonly.
*/
isReadOnly?: boolean;
|
<mask> */
<mask> isInvalid?: boolean;
<mask> /**
<mask> * The size (width and height) of the checkbox.
<mask> * @default 'md'
<mask> */
<mask> size?: 'sm' | 'md' | 'lg';
<mask> /**
</s> fix: added interaction styling props </s> remove * If true, the checkbox is marked as invalid. Changes style of unchecked state.
</s> add * If true, the checkbox is marked as invalid. </s> remove * If true, the checkbox will be disabled
</s> add * If true, the checkbox will be disabled.
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/components/primitives/Checkbox/types.tsx
|
borderWidth: 2,
borderRadius: 'sm',
borderColor: mode('muted.300', 'muted.600')(props),
bg: mode('muted.50', 'muted.700')(props), // matching background color
|
<mask> const baseStyle = (props: Record<string, any>) => {
<mask> const { colorScheme, theme } = props;
<mask>
<mask> return {
<mask> _text: {
<mask> ml: 3,
<mask> },
<mask> _interactionBox: {
<mask> position: 'absolute',
</s> fix: added interaction styling props </s> remove _hover: {
</s> add },
_hover: {
_interactionBox: { </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
const { focusProps, isFocusVisible } = useFocusRing();
</s> add function iconResolver() {
if (sizedIcon && isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (sizedIcon && isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (sizedIcon && isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (sizedIcon && isHovered && _hover?.icon) {
return sizedIcon(_hover?.icon, {
..._icon,
..._hover?._icon,
});
} else if (sizedIcon && !isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (sizedIcon && isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (sizedIcon && isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
} else if (sizedIcon && isFocusVisible && _focus?.icon) {
return sizedIcon(_focus?.icon, {
..._icon,
..._focus?._icon,
});
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
} </s> remove _interactionBox: {
_hover: _iterationBoxHover,
_focus: _iterationBoxFocus,
_disabled: _iterationBoxDisabled,
..._interactionBox
},
_checkbox: {
_checked: _checkboxChecked,
_disabled: _checkboxDisabled,
_invalid: _checkboxInvalid,
..._checkbox
},
</s> add _interactionBox,
_disabled,
_invalid,
_focus,
_hover,
_checked,
_unchecked,
_indeterminate, </s> remove const sizedIcon = icon
? () =>
React.cloneElement(
icon,
{
..._icon,
},
icon.props.children
)
: null;
</s> add function iconResolver(isPressed?: any) {
if (sizedIcon) {
if (isDisabled && _disabled?.icon) {
return sizedIcon(_disabled?.icon, {
..._icon,
..._disabled?._icon,
});
} else if (isReadOnly && _readOnly?.icon) {
return sizedIcon(_readOnly?.icon, {
..._icon,
..._readOnly?._icon,
});
} else if (isInvalid && _invalid?.icon) {
return sizedIcon(_invalid?.icon, {
..._icon,
..._invalid?._icon,
});
} else if (isPressed && _pressed?.icon) {
return sizedIcon(_pressed?.icon, {
..._icon,
..._pressed?._icon,
});
} else if (!isChecked && _unchecked?.icon) {
return sizedIcon(_unchecked?.icon, { ..._icon, ..._unchecked?._icon });
} else if (isChecked) {
if (_checked?.icon) {
return sizedIcon(_checked?.icon, { ..._icon, ..._checked?._icon });
} else if (icon) {
return sizedIcon(icon, { ..._icon });
} else {
return <CheckIcon name="check" {..._icon} opacity={1} />;
}
} else if (isIndeterminate && _indeterminate?.icon) {
return sizedIcon(_indeterminate?.icon, {
..._icon,
..._indeterminate?._icon,
});
}
}
return <CheckIcon name="check" {..._icon} opacity={isChecked ? 1 : 0} />;
} </s> remove _interactionBox: { _pressed: _iterationBoxPressed, ..._interactionBox },
_checkbox: {
_checked: _checboxChecked,
_disabled: _checkboxDisabled,
_invalid: _checkboxInvalid,
..._checkbox
},
</s> add _interactionBox,
_disabled,
_invalid,
_pressed,
_checked,
_unchecked,
_indeterminate,
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/theme/components/checkbox.ts
|
},
_hover: {
_interactionBox: {
|
<mask> },
<mask> _interactionBox: {
<mask> position: 'absolute',
<mask> borderRadius: 'full',
<mask> _hover: {
<mask> bg: transparentize('muted.200', 0.3)(theme),
<mask> },
<mask> _focus: {
<mask> bg: transparentize(`${colorScheme}.200`, 0.5)(theme),
<mask> },
</s> fix: added interaction styling props </s> remove _focus: {
</s> add },
_focus: {
_interactionBox: { </s> remove _disabled: {
</s> add },
_disabled: {
_interactionBox: { </s> remove _pressed: {
</s> add opacity: 0.4,
},
_pressed: {
_interactionBox: { </s> remove _checkbox: {
borderWidth: 2,
borderRadius: 'sm',
borderColor: mode('muted.300', 'muted.600')(props),
bg: mode('muted.50', 'muted.700')(props), // matching background color
_checked: {
borderColor: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
bg: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
},
_disabled: {
opacity: 0.4,
},
_invalid: {
borderColor: mode('error.600', 'error.400')(props),
},
</s> add _checked: {
borderColor: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
bg: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
},
_invalid: {
borderColor: mode('error.600', 'error.400')(props),
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/theme/components/checkbox.ts
|
},
_focus: {
_interactionBox: {
|
<mask> borderRadius: 'full',
<mask> _hover: {
<mask> bg: transparentize('muted.200', 0.3)(theme),
<mask> },
<mask> _focus: {
<mask> bg: transparentize(`${colorScheme}.200`, 0.5)(theme),
<mask> },
<mask> _disabled: {
<mask> bg: 'transaprarent',
<mask> },
</s> fix: added interaction styling props </s> remove _hover: {
</s> add },
_hover: {
_interactionBox: { </s> remove _disabled: {
</s> add },
_disabled: {
_interactionBox: { </s> remove _pressed: {
</s> add opacity: 0.4,
},
_pressed: {
_interactionBox: { </s> remove _checkbox: {
borderWidth: 2,
borderRadius: 'sm',
borderColor: mode('muted.300', 'muted.600')(props),
bg: mode('muted.50', 'muted.700')(props), // matching background color
_checked: {
borderColor: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
bg: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
},
_disabled: {
opacity: 0.4,
},
_invalid: {
borderColor: mode('error.600', 'error.400')(props),
},
</s> add _checked: {
borderColor: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
bg: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
},
_invalid: {
borderColor: mode('error.600', 'error.400')(props),
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/theme/components/checkbox.ts
|
},
_disabled: {
_interactionBox: {
|
<mask> },
<mask> _focus: {
<mask> bg: transparentize(`${colorScheme}.200`, 0.5)(theme),
<mask> },
<mask> _disabled: {
<mask> bg: 'transaprarent',
<mask> },
<mask> _pressed: {
<mask> bg: transparentize(`${colorScheme}.200`, 0.5)(theme),
<mask> },
</s> fix: added interaction styling props </s> remove _focus: {
</s> add },
_focus: {
_interactionBox: { </s> remove _pressed: {
</s> add opacity: 0.4,
},
_pressed: {
_interactionBox: { </s> remove _hover: {
</s> add },
_hover: {
_interactionBox: { </s> remove _checkbox: {
borderWidth: 2,
borderRadius: 'sm',
borderColor: mode('muted.300', 'muted.600')(props),
bg: mode('muted.50', 'muted.700')(props), // matching background color
_checked: {
borderColor: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
bg: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
},
_disabled: {
opacity: 0.4,
},
_invalid: {
borderColor: mode('error.600', 'error.400')(props),
},
</s> add _checked: {
borderColor: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
bg: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
},
_invalid: {
borderColor: mode('error.600', 'error.400')(props),
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/theme/components/checkbox.ts
|
opacity: 0.4,
},
_pressed: {
_interactionBox: {
|
<mask> },
<mask> _disabled: {
<mask> bg: 'transaprarent',
<mask> },
<mask> _pressed: {
<mask> bg: transparentize(`${colorScheme}.200`, 0.5)(theme),
<mask> },
<mask> },
<mask> _checkbox: {
<mask> borderWidth: 2,
</s> fix: added interaction styling props </s> remove _disabled: {
</s> add },
_disabled: {
_interactionBox: { </s> remove _checkbox: {
borderWidth: 2,
borderRadius: 'sm',
borderColor: mode('muted.300', 'muted.600')(props),
bg: mode('muted.50', 'muted.700')(props), // matching background color
_checked: {
borderColor: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
bg: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
},
_disabled: {
opacity: 0.4,
},
_invalid: {
borderColor: mode('error.600', 'error.400')(props),
},
</s> add _checked: {
borderColor: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
bg: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
},
_invalid: {
borderColor: mode('error.600', 'error.400')(props), </s> remove _focus: {
</s> add },
_focus: {
_interactionBox: { </s> remove _hover: {
</s> add },
_hover: {
_interactionBox: {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/theme/components/checkbox.ts
|
_checked: {
borderColor: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
bg: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
},
_invalid: {
borderColor: mode('error.600', 'error.400')(props),
|
<mask> _pressed: {
<mask> bg: transparentize(`${colorScheme}.200`, 0.5)(theme),
<mask> },
<mask> },
<mask> _checkbox: {
<mask> borderWidth: 2,
<mask> borderRadius: 'sm',
<mask> borderColor: mode('muted.300', 'muted.600')(props),
<mask> bg: mode('muted.50', 'muted.700')(props), // matching background color
<mask> _checked: {
<mask> borderColor: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
<mask> bg: mode(`${colorScheme}.600`, `${colorScheme}.200`)(props),
<mask> },
<mask> _disabled: {
<mask> opacity: 0.4,
<mask> },
<mask> _invalid: {
<mask> borderColor: mode('error.600', 'error.400')(props),
<mask> },
<mask> },
<mask> _icon: {
<mask> color: mode(`muted.50`, `muted.800`)(props), // matching background color
<mask> },
<mask> };
</s> fix: added interaction styling props </s> remove _pressed: {
</s> add opacity: 0.4,
},
_pressed: {
_interactionBox: { </s> remove _disabled: {
</s> add },
_disabled: {
_interactionBox: { </s> remove _focus: {
</s> add },
_focus: {
_interactionBox: { </s> remove _hover: {
</s> add },
_hover: {
_interactionBox: {
|
[
"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/6ea1638d28cbb2fa2cd4d712dfaec55a1cd80824
|
src/theme/components/checkbox.ts
|
<mask> <AccordionContext.Provider
<mask> value={{
<mask> index: index,
<mask> changeHandler,
<mask> TotalChildren: children.length,
<mask> AccordionProps: newProps,
<mask> AnimationProps: {
<mask> endingHeight,
<mask> startingHeight,
<mask> duration,
<mask> isOpen,
</s> fix: code cleanup and overflow added </s> remove IAccordionContextProps,
</s> add </s> remove import { AccordionContext, AccordionItemContext } from './Context';
</s> add import { AccordionItemContext } from './Context'; </s> remove borderWidth: 1,
borderColor: 'transparent',
</s> add borderTopWidth: 1, </s> remove const accordionButtonBaseStyle = (props: Record<string, any>) => {
</s> add const accordionSummaryBaseStyle = (props: Record<string, any>) => { </s> remove baseStyle: accordionButtonBaseStyle,
</s> add baseStyle: accordionSummaryBaseStyle,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fac68050bc9b75d13a887bd8eacfc7da6cf25f5
|
src/components/composites/Accordion/Accordion.tsx
|
|
<Box overflow="hidden" {...newProps} ref={ref}>
|
<mask> onAnimationStart,
<mask> },
<mask> }}
<mask> >
<mask> <Box {...newProps} ref={ref}>
<mask> {getIndexedChildren(children)}
<mask> </Box>
<mask> </AccordionContext.Provider>
<mask> );
<mask> };
</s> fix: code cleanup and overflow added </s> remove baseStyle: accordionButtonBaseStyle,
</s> add baseStyle: accordionSummaryBaseStyle, </s> remove {...edgeItemsProps}
{...newProps}
</s> add {...themedProps} </s> remove const {
AccordionProps,
TotalChildren,
}: IAccordionContextProps = React.useContext(AccordionContext);
</s> add </s> remove borderWidth: 1,
borderColor: 'transparent',
</s> add borderTopWidth: 1,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fac68050bc9b75d13a887bd8eacfc7da6cf25f5
|
src/components/composites/Accordion/Accordion.tsx
|
<mask> import Box from '../../primitives/Box';
<mask> import type {
<mask> IAccordionSummaryProps,
<mask> IAccordionItemContextProps,
<mask> IAccordionContextProps,
<mask> } from './types';
<mask> import { AccordionContext, AccordionItemContext } from './Context';
<mask> import { useThemeProps } from '../../../hooks';
<mask> import { mergeRefs } from '../../../utils';
<mask> import { useHover } from '@react-native-aria/interactions';
</s> fix: code cleanup and overflow added </s> remove import { AccordionContext, AccordionItemContext } from './Context';
</s> add import { AccordionItemContext } from './Context'; </s> remove const { _hover, _expanded, _disabled, ...newProps } = useThemeProps(
</s> add const { _hover, _expanded, _disabled, ...themedProps } = useThemeProps( </s> remove const {
AccordionProps,
TotalChildren,
}: IAccordionContextProps = React.useContext(AccordionContext);
</s> add </s> remove AccordionProps?: any;
TotalChildren?: number;
</s> add </s> remove borderWidth: 1,
borderColor: 'transparent',
</s> add borderTopWidth: 1,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fac68050bc9b75d13a887bd8eacfc7da6cf25f5
|
src/components/composites/Accordion/AccordionSummary.tsx
|
|
import { AccordionItemContext } from './Context';
|
<mask> IAccordionSummaryProps,
<mask> IAccordionItemContextProps,
<mask> IAccordionContextProps,
<mask> } from './types';
<mask> import { AccordionContext, AccordionItemContext } from './Context';
<mask> import { useThemeProps } from '../../../hooks';
<mask> import { mergeRefs } from '../../../utils';
<mask> import { useHover } from '@react-native-aria/interactions';
<mask>
<mask> const AccordionSummary = (
</s> fix: code cleanup and overflow added </s> remove IAccordionContextProps,
</s> add </s> remove const { _hover, _expanded, _disabled, ...newProps } = useThemeProps(
</s> add const { _hover, _expanded, _disabled, ...themedProps } = useThemeProps( </s> remove const {
AccordionProps,
TotalChildren,
}: IAccordionContextProps = React.useContext(AccordionContext);
</s> add </s> remove baseStyle: accordionButtonBaseStyle,
</s> add baseStyle: accordionSummaryBaseStyle, </s> remove const accordionButtonBaseStyle = (props: Record<string, any>) => {
</s> add const accordionSummaryBaseStyle = (props: Record<string, any>) => {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fac68050bc9b75d13a887bd8eacfc7da6cf25f5
|
src/components/composites/Accordion/AccordionSummary.tsx
|
<mask> isDisabled,
<mask> onOpen,
<mask> onClose,
<mask> }: IAccordionItemContextProps = React.useContext(AccordionItemContext);
<mask> const {
<mask> AccordionProps,
<mask> TotalChildren,
<mask> }: IAccordionContextProps = React.useContext(AccordionContext);
<mask>
<mask> const { _hover, _expanded, _disabled, ...newProps } = useThemeProps(
<mask> 'AccordionSummary',
<mask> props
<mask> );
</s> fix: code cleanup and overflow added </s> remove const { _hover, _expanded, _disabled, ...newProps } = useThemeProps(
</s> add const { _hover, _expanded, _disabled, ...themedProps } = useThemeProps( </s> remove AccordionProps?: any;
TotalChildren?: number;
</s> add </s> remove const accordionButtonBaseStyle = (props: Record<string, any>) => {
</s> add const accordionSummaryBaseStyle = (props: Record<string, any>) => { </s> remove baseStyle: accordionButtonBaseStyle,
</s> add baseStyle: accordionSummaryBaseStyle, </s> remove import { AccordionContext, AccordionItemContext } from './Context';
</s> add import { AccordionItemContext } from './Context';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fac68050bc9b75d13a887bd8eacfc7da6cf25f5
|
src/components/composites/Accordion/AccordionSummary.tsx
|
|
const { _hover, _expanded, _disabled, ...themedProps } = useThemeProps(
|
<mask> AccordionProps,
<mask> TotalChildren,
<mask> }: IAccordionContextProps = React.useContext(AccordionContext);
<mask>
<mask> const { _hover, _expanded, _disabled, ...newProps } = useThemeProps(
<mask> 'AccordionSummary',
<mask> props
<mask> );
<mask> const pressHandler = () => {
<mask> isOpen ? onClose && onClose() : onOpen && onOpen();
</s> fix: code cleanup and overflow added </s> remove const {
AccordionProps,
TotalChildren,
}: IAccordionContextProps = React.useContext(AccordionContext);
</s> add </s> remove // Find the first and last Item and add borderRadius matching to the accordion over all borderRadius
const firstItem = index === 0 ? true : false;
const lastItem = TotalChildren
? index === TotalChildren - 1
? true
: false
: false;
const edgeItemsProps = {
borderTopLeftRadius: firstItem ? AccordionProps.borderRadius : 0,
borderTopRightRadius: firstItem ? AccordionProps.borderRadius : 0,
borderBottomLeftRadius: lastItem
? !isOpen
? AccordionProps.borderRadius
: 0
: 0,
borderBottomRightRadius: lastItem
? !isOpen
? AccordionProps.borderRadius
: 0
: 0,
};
</s> add </s> remove const accordionButtonBaseStyle = (props: Record<string, any>) => {
</s> add const accordionSummaryBaseStyle = (props: Record<string, any>) => { </s> remove baseStyle: accordionButtonBaseStyle,
</s> add baseStyle: accordionSummaryBaseStyle, </s> remove AccordionProps?: any;
TotalChildren?: number;
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fac68050bc9b75d13a887bd8eacfc7da6cf25f5
|
src/components/composites/Accordion/AccordionSummary.tsx
|
<mask> const pressHandler = () => {
<mask> isOpen ? onClose && onClose() : onOpen && onOpen();
<mask> };
<mask>
<mask> // Find the first and last Item and add borderRadius matching to the accordion over all borderRadius
<mask> const firstItem = index === 0 ? true : false;
<mask> const lastItem = TotalChildren
<mask> ? index === TotalChildren - 1
<mask> ? true
<mask> : false
<mask> : false;
<mask> const edgeItemsProps = {
<mask> borderTopLeftRadius: firstItem ? AccordionProps.borderRadius : 0,
<mask> borderTopRightRadius: firstItem ? AccordionProps.borderRadius : 0,
<mask> borderBottomLeftRadius: lastItem
<mask> ? !isOpen
<mask> ? AccordionProps.borderRadius
<mask> : 0
<mask> : 0,
<mask> borderBottomRightRadius: lastItem
<mask> ? !isOpen
<mask> ? AccordionProps.borderRadius
<mask> : 0
<mask> : 0,
<mask> };
<mask> const _ref = React.useRef(null);
<mask> const { isHovered } = useHover({}, _ref);
<mask>
<mask> return (
<mask> <TouchableOpacity
</s> fix: code cleanup and overflow added </s> remove const { _hover, _expanded, _disabled, ...newProps } = useThemeProps(
</s> add const { _hover, _expanded, _disabled, ...themedProps } = useThemeProps( </s> remove baseStyle: accordionButtonBaseStyle,
</s> add baseStyle: accordionSummaryBaseStyle, </s> remove const accordionButtonBaseStyle = (props: Record<string, any>) => {
</s> add const accordionSummaryBaseStyle = (props: Record<string, any>) => { </s> remove const {
AccordionProps,
TotalChildren,
}: IAccordionContextProps = React.useContext(AccordionContext);
</s> add </s> remove borderWidth: 1,
borderColor: 'transparent',
</s> add borderTopWidth: 1,
|
[
"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",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fac68050bc9b75d13a887bd8eacfc7da6cf25f5
|
src/components/composites/Accordion/AccordionSummary.tsx
|
|
{...themedProps}
|
<mask> display="flex"
<mask> flexDirection="row"
<mask> justifyContent="space-between"
<mask> alignItems="center"
<mask> {...edgeItemsProps}
<mask> {...newProps}
<mask> {...(isHovered && _hover)}
<mask> {...(isOpen && _expanded)}
<mask> {...(isDisabled && _disabled)}
<mask> {...(!index && { borderTopColor: 'transparent' })}
<mask> {...(Platform.OS === 'web'
</s> fix: code cleanup and overflow added </s> remove const { _hover, _expanded, _disabled, ...newProps } = useThemeProps(
</s> add const { _hover, _expanded, _disabled, ...themedProps } = useThemeProps( </s> remove // Find the first and last Item and add borderRadius matching to the accordion over all borderRadius
const firstItem = index === 0 ? true : false;
const lastItem = TotalChildren
? index === TotalChildren - 1
? true
: false
: false;
const edgeItemsProps = {
borderTopLeftRadius: firstItem ? AccordionProps.borderRadius : 0,
borderTopRightRadius: firstItem ? AccordionProps.borderRadius : 0,
borderBottomLeftRadius: lastItem
? !isOpen
? AccordionProps.borderRadius
: 0
: 0,
borderBottomRightRadius: lastItem
? !isOpen
? AccordionProps.borderRadius
: 0
: 0,
};
</s> add </s> remove <Box {...newProps} ref={ref}>
</s> add <Box overflow="hidden" {...newProps} ref={ref}> </s> remove borderWidth: 1,
borderColor: 'transparent',
</s> add borderTopWidth: 1,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fac68050bc9b75d13a887bd8eacfc7da6cf25f5
|
src/components/composites/Accordion/AccordionSummary.tsx
|
<mask> export type IAccordionDetailsProps = ICollapseProps & {};
<mask> export type IAccordionContextProps = {
<mask> index?: number[];
<mask> changeHandler?: (isOpening: boolean, id: number) => void;
<mask> AccordionProps?: any;
<mask> TotalChildren?: number;
<mask> AnimationProps?: any;
<mask> };
<mask> export type IAccordionItemContextProps = {
<mask> index?: number;
<mask> isOpen?: boolean;
</s> fix: code cleanup and overflow added </s> remove const accordionButtonBaseStyle = (props: Record<string, any>) => {
</s> add const accordionSummaryBaseStyle = (props: Record<string, any>) => { </s> remove baseStyle: accordionButtonBaseStyle,
</s> add baseStyle: accordionSummaryBaseStyle, </s> remove const {
AccordionProps,
TotalChildren,
}: IAccordionContextProps = React.useContext(AccordionContext);
</s> add </s> remove IAccordionContextProps,
</s> add </s> remove const { _hover, _expanded, _disabled, ...newProps } = useThemeProps(
</s> add const { _hover, _expanded, _disabled, ...themedProps } = useThemeProps(
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fac68050bc9b75d13a887bd8eacfc7da6cf25f5
|
src/components/composites/Accordion/types.ts
|
|
overflow="hidden"
|
<mask> return (
<mask> <Box
<mask> display="flex"
<mask> flexDirection="row"
<mask> {...layoutProps}
<mask> {...(isHovered && _hover)}
<mask> {...(isFocused && _focus)}
<mask> {...(isDisabled && _disabled)}
<mask> {...(isInvalid && _invalid)}
<mask> ref={_ref}
</s> fix: code cleanup and overflow added </s> remove {...edgeItemsProps}
{...newProps}
</s> add {...themedProps} </s> remove const { _hover, _expanded, _disabled, ...newProps } = useThemeProps(
</s> add const { _hover, _expanded, _disabled, ...themedProps } = useThemeProps( </s> remove // Find the first and last Item and add borderRadius matching to the accordion over all borderRadius
const firstItem = index === 0 ? true : false;
const lastItem = TotalChildren
? index === TotalChildren - 1
? true
: false
: false;
const edgeItemsProps = {
borderTopLeftRadius: firstItem ? AccordionProps.borderRadius : 0,
borderTopRightRadius: firstItem ? AccordionProps.borderRadius : 0,
borderBottomLeftRadius: lastItem
? !isOpen
? AccordionProps.borderRadius
: 0
: 0,
borderBottomRightRadius: lastItem
? !isOpen
? AccordionProps.borderRadius
: 0
: 0,
};
</s> add </s> remove <Box {...newProps} ref={ref}>
</s> add <Box overflow="hidden" {...newProps} ref={ref}> </s> remove import { AccordionContext, AccordionItemContext } from './Context';
</s> add import { AccordionItemContext } from './Context';
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fac68050bc9b75d13a887bd8eacfc7da6cf25f5
|
src/components/primitives/Input/InputAdvanced.tsx
|
const accordionSummaryBaseStyle = (props: Record<string, any>) => {
|
<mask> // AccordionIcon
<mask> export const AccordionIcon = {};
<mask>
<mask> // AccordionSummary
<mask> const accordionButtonBaseStyle = (props: Record<string, any>) => {
<mask> return {
<mask> borderWidth: 1,
<mask> borderColor: 'transparent',
<mask> borderTopColor: mode('gray.300', 'gray.600')(props),
<mask> p: 3,
</s> fix: code cleanup and overflow added </s> remove borderWidth: 1,
borderColor: 'transparent',
</s> add borderTopWidth: 1, </s> remove baseStyle: accordionButtonBaseStyle,
</s> add baseStyle: accordionSummaryBaseStyle, </s> remove AccordionProps?: any;
TotalChildren?: number;
</s> add </s> remove // Find the first and last Item and add borderRadius matching to the accordion over all borderRadius
const firstItem = index === 0 ? true : false;
const lastItem = TotalChildren
? index === TotalChildren - 1
? true
: false
: false;
const edgeItemsProps = {
borderTopLeftRadius: firstItem ? AccordionProps.borderRadius : 0,
borderTopRightRadius: firstItem ? AccordionProps.borderRadius : 0,
borderBottomLeftRadius: lastItem
? !isOpen
? AccordionProps.borderRadius
: 0
: 0,
borderBottomRightRadius: lastItem
? !isOpen
? AccordionProps.borderRadius
: 0
: 0,
};
</s> add </s> remove const { _hover, _expanded, _disabled, ...newProps } = useThemeProps(
</s> add const { _hover, _expanded, _disabled, ...themedProps } = useThemeProps(
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fac68050bc9b75d13a887bd8eacfc7da6cf25f5
|
src/theme/components/accordion.ts
|
borderTopWidth: 1,
|
<mask>
<mask> // AccordionSummary
<mask> const accordionButtonBaseStyle = (props: Record<string, any>) => {
<mask> return {
<mask> borderWidth: 1,
<mask> borderColor: 'transparent',
<mask> borderTopColor: mode('gray.300', 'gray.600')(props),
<mask> p: 3,
<mask> _hover: {
<mask> bg: mode('primary.200', 'primary.300')(props),
<mask> },
</s> fix: code cleanup and overflow added </s> remove const accordionButtonBaseStyle = (props: Record<string, any>) => {
</s> add const accordionSummaryBaseStyle = (props: Record<string, any>) => { </s> remove baseStyle: accordionButtonBaseStyle,
</s> add baseStyle: accordionSummaryBaseStyle, </s> remove import { AccordionContext, AccordionItemContext } from './Context';
</s> add import { AccordionItemContext } from './Context'; </s> remove const { _hover, _expanded, _disabled, ...newProps } = useThemeProps(
</s> add const { _hover, _expanded, _disabled, ...themedProps } = useThemeProps( </s> remove // Find the first and last Item and add borderRadius matching to the accordion over all borderRadius
const firstItem = index === 0 ? true : false;
const lastItem = TotalChildren
? index === TotalChildren - 1
? true
: false
: false;
const edgeItemsProps = {
borderTopLeftRadius: firstItem ? AccordionProps.borderRadius : 0,
borderTopRightRadius: firstItem ? AccordionProps.borderRadius : 0,
borderBottomLeftRadius: lastItem
? !isOpen
? AccordionProps.borderRadius
: 0
: 0,
borderBottomRightRadius: lastItem
? !isOpen
? AccordionProps.borderRadius
: 0
: 0,
};
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fac68050bc9b75d13a887bd8eacfc7da6cf25f5
|
src/theme/components/accordion.ts
|
baseStyle: accordionSummaryBaseStyle,
|
<mask> },
<mask> };
<mask> };
<mask> export const AccordionSummary = {
<mask> baseStyle: accordionButtonBaseStyle,
<mask> };
<mask>
<mask> // AccordionDetails
<mask> const accordionPanelBaseStyle = {
<mask> p: 3,
</s> fix: code cleanup and overflow added </s> remove const accordionButtonBaseStyle = (props: Record<string, any>) => {
</s> add const accordionSummaryBaseStyle = (props: Record<string, any>) => { </s> remove borderWidth: 1,
borderColor: 'transparent',
</s> add borderTopWidth: 1, </s> remove AccordionProps?: any;
TotalChildren?: number;
</s> add </s> remove // Find the first and last Item and add borderRadius matching to the accordion over all borderRadius
const firstItem = index === 0 ? true : false;
const lastItem = TotalChildren
? index === TotalChildren - 1
? true
: false
: false;
const edgeItemsProps = {
borderTopLeftRadius: firstItem ? AccordionProps.borderRadius : 0,
borderTopRightRadius: firstItem ? AccordionProps.borderRadius : 0,
borderBottomLeftRadius: lastItem
? !isOpen
? AccordionProps.borderRadius
: 0
: 0,
borderBottomRightRadius: lastItem
? !isOpen
? AccordionProps.borderRadius
: 0
: 0,
};
</s> add </s> remove <Box {...newProps} ref={ref}>
</s> add <Box overflow="hidden" {...newProps} ref={ref}>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fac68050bc9b75d13a887bd8eacfc7da6cf25f5
|
src/theme/components/accordion.ts
|
...resolvedProps
|
<mask> const {
<mask> isOpen,
<mask> disableOverlay,
<mask> onClose,
<mask> ...remainingProps
<mask> } = usePropsResolution('Actionsheet', props);
<mask>
<mask> //TODO: refactor for responsive prop
<mask> if (useHasResponsiveProps(props)) {
<mask> return null;
</s> fix: padding fixes and alias prop fix </s> remove const ActionsheetFooter = (
{ children, ...props }: IActionsheetFooterProps,
ref?: any
) => {
const newProps = usePropsResolution('ActionsheetFooter', props);
</s> add const ActionsheetFooter = (props: IActionsheetFooterProps, ref?: any) => {
const resolvedProps = usePropsResolution('ActionsheetFooter', props); </s> remove const ActionsheetHeader = (
{ children, ...props }: IActionsheetHeaderProps,
ref?: any
) => {
const newProps = usePropsResolution('ActionsheetHeader', props);
</s> add const ActionsheetHeader = (props: IActionsheetHeaderProps, ref?: any) => {
const resolvedProps = usePropsResolution('ActionsheetHeader', props); </s> remove const ActionsheetItem = (
{ children, startIcon, endIcon, spinner, ...props }: IActionsheetItemProps,
ref?: any
) => {
const newProps = usePropsResolution('ActionsheetItem', props);
</s> add const ActionsheetItem = (props: IActionsheetItemProps, ref?: any) => {
const resolvedProps = usePropsResolution('ActionsheetItem', props); </s> remove return (
<Modal.Content {...newProps} ref={ref}>
{children}
</Modal.Content>
);
</s> add return <Modal.Content {...resolvedProps} ref={ref} />; </s> remove return (
<Button
startIcon={startIcon}
endIcon={endIcon}
spinner={spinner}
{...newProps}
ref={ref}
>
{children}
</Button>
);
</s> add return <Button {...resolvedProps} ref={ref} />;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/components/composites/Actionsheet/Actionsheet.tsx
|
{...resolvedProps}
|
<mask> onClose={onClose}
<mask> justifyContent="flex-end"
<mask> //@ts-ignore - internal use only
<mask> animationPreset="slide"
<mask> {...remainingProps}
<mask> overlayVisible={disableOverlay ? false : true}
<mask> closeOnOverlayClick={disableOverlay ? false : true}
<mask> ref={ref}
<mask> >
<mask> <ActionSheetContext.Provider value={{ hideDragIndicator }}>
</s> fix: padding fixes and alias prop fix </s> remove <Modal.Content {...newProps} ref={ref} safeAreaBottom>
</s> add <Modal.Content {...resolvedProps} ref={ref} safeAreaBottom> </s> remove [SPECIFICITY_100]: 0,
[SPECIFICITY_70]: 0,
[SPECIFICITY_60]: 0,
[SPECIFICITY_50]: 0,
[SPECIFICITY_55]: 0,
[SPECIFICITY_40]: 0,
[SPECIFICITY_30]: 0,
[SPECIFICITY_10]: 0,
</s> add ...INITIAL_PROP_SPECIFICITY, </s> remove // focusRingProps.onFocu
</s> add // focusRingProps.onFocus </s> remove return (
<Button
startIcon={startIcon}
endIcon={endIcon}
spinner={spinner}
{...newProps}
ref={ref}
>
{children}
</Button>
);
</s> add return <Button {...resolvedProps} ref={ref} />;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/components/composites/Actionsheet/Actionsheet.tsx
|
const { _dragIndicator, ...resolvedProps } = usePropsResolution(
|
<mask> const ActionsheetContent = (
<mask> { children, ...props }: IActionsheetContentProps,
<mask> ref?: any
<mask> ) => {
<mask> const { _dragIndicator, ...newProps } = usePropsResolution(
<mask> 'ActionsheetContent',
<mask> props
<mask> );
<mask> const { handleClose } = React.useContext(ModalContext);
<mask> const { hideDragIndicator } = React.useContext(ActionSheetContext);
</s> fix: padding fixes and alias prop fix </s> remove let pan = React.useRef(new Animated.ValueXY()).current;
let sheetHeight = React.useRef(0);
</s> add const pan = React.useRef(new Animated.ValueXY()).current;
const sheetHeight = React.useRef(0); </s> remove const ActionsheetFooter = (
{ children, ...props }: IActionsheetFooterProps,
ref?: any
) => {
const newProps = usePropsResolution('ActionsheetFooter', props);
</s> add const ActionsheetFooter = (props: IActionsheetFooterProps, ref?: any) => {
const resolvedProps = usePropsResolution('ActionsheetFooter', props); </s> remove const ActionsheetHeader = (
{ children, ...props }: IActionsheetHeaderProps,
ref?: any
) => {
const newProps = usePropsResolution('ActionsheetHeader', props);
</s> add const ActionsheetHeader = (props: IActionsheetHeaderProps, ref?: any) => {
const resolvedProps = usePropsResolution('ActionsheetHeader', props); </s> remove const ActionsheetItem = (
{ children, startIcon, endIcon, spinner, ...props }: IActionsheetItemProps,
ref?: any
) => {
const newProps = usePropsResolution('ActionsheetItem', props);
</s> add const ActionsheetItem = (props: IActionsheetItemProps, ref?: any) => {
const resolvedProps = usePropsResolution('ActionsheetItem', props); </s> remove export const propsFlattenerTest = (
</s> add export const propsFlattener = (
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/components/composites/Actionsheet/ActionsheetContent.tsx
|
const pan = React.useRef(new Animated.ValueXY()).current;
const sheetHeight = React.useRef(0);
|
<mask> props
<mask> );
<mask> const { handleClose } = React.useContext(ModalContext);
<mask> const { hideDragIndicator } = React.useContext(ActionSheetContext);
<mask> let pan = React.useRef(new Animated.ValueXY()).current;
<mask> let sheetHeight = React.useRef(0);
<mask>
<mask> const panResponder = React.useRef(
<mask> PanResponder.create({
<mask> onStartShouldSetPanResponder: () => true,
<mask> onMoveShouldSetPanResponder: (_evt, gestureState) => {
</s> fix: padding fixes and alias prop fix </s> remove const { _dragIndicator, ...newProps } = usePropsResolution(
</s> add const { _dragIndicator, ...resolvedProps } = usePropsResolution( </s> remove // const windowWidth = useWindowDimensions()?.width;
// const currentBreakpoint = React.useMemo(
// () => getClosestBreakpoint(theme.breakpoints, windowWidth),
// [windowWidth, theme.breakpoints]
// );
</s> add </s> remove const val = flattenedDefaultProps[prop];
delete flattenedDefaultProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedDefaultProps[newProp] = val;
</s> add const val = incomingProps[prop] || flattenedDefaultProps[prop];
if (!FINAL_SPREAD_PROPS.includes(prop)) {
delete flattenedDefaultProps[prop];
specificity[prop] = incomingSpecifity[prop];
}
SPREAD_PROP_SPECIFICITY_MAP[prop].forEach((newProp: string) => {
if (compareSpecificity(specificity[newProp], specificity[prop])) {
specificity[newProp] = incomingSpecifity[prop];
flattenedDefaultProps[newProp] = val;
} </s> remove export const propsFlattenerTest = (
</s> add export const propsFlattener = ( </s> remove const ActionsheetFooter = (
{ children, ...props }: IActionsheetFooterProps,
ref?: any
) => {
const newProps = usePropsResolution('ActionsheetFooter', props);
</s> add const ActionsheetFooter = (props: IActionsheetFooterProps, ref?: any) => {
const resolvedProps = usePropsResolution('ActionsheetFooter', props);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/components/composites/Actionsheet/ActionsheetContent.tsx
|
<Modal.Content {...resolvedProps} ref={ref} safeAreaBottom>
|
<mask> <Box py={5} {...panResponder.panHandlers} collapsable={false} />
<mask> </>
<mask> ) : null}
<mask>
<mask> <Modal.Content {...newProps} ref={ref} safeAreaBottom>
<mask> {!hideDragIndicator ? (
<mask> <>
<mask> {/* Hack. Fix later. Add -2 negative margin to remove the padding added by ActionSheetContent */}
<mask> <Box
<mask> py={5}
</s> fix: padding fixes and alias prop fix </s> remove <Box justifyContent="center" alignItems="center" {...newProps} ref={ref}>
{children}
</Box>
</s> add <Box
justifyContent="center"
alignItems="center"
{...resolvedProps}
ref={ref}
/> </s> remove return (
<Modal.Content {...newProps} ref={ref}>
{children}
</Modal.Content>
);
</s> add return <Modal.Content {...resolvedProps} ref={ref} />; </s> remove {...remainingProps}
</s> add {...resolvedProps} </s> remove [SPECIFICITY_100]: 0,
[SPECIFICITY_70]: 0,
[SPECIFICITY_60]: 0,
[SPECIFICITY_50]: 0,
[SPECIFICITY_55]: 0,
[SPECIFICITY_40]: 0,
[SPECIFICITY_30]: 0,
[SPECIFICITY_10]: 0,
</s> add ...INITIAL_PROP_SPECIFICITY,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/components/composites/Actionsheet/ActionsheetContent.tsx
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.