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
|
|---|---|---|---|---|
const ActionsheetFooter = (props: IActionsheetFooterProps, ref?: any) => {
const resolvedProps = usePropsResolution('ActionsheetFooter', props);
|
<mask> import type { IActionsheetFooterProps } from './types';
<mask> import { usePropsResolution } from '../../../hooks';
<mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps';
<mask>
<mask> const ActionsheetFooter = (
<mask> { children, ...props }: IActionsheetFooterProps,
<mask> ref?: any
<mask> ) => {
<mask> const newProps = usePropsResolution('ActionsheetFooter', props);
<mask> //TODO: refactor for responsive prop
<mask> if (useHasResponsiveProps(props)) {
<mask> return null;
<mask> }
<mask> return (
</s> fix: padding fixes and alias prop fix </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 import { propsFlattenerTest } from './propsFlattenerTest';
</s> add import { propsFlattener, compareSpecificity } from './propsFlattener'; </s> remove const specificityOrder = [
</s> add const SPREAD_PROP_SPECIFICITY_ORDER = [ </s> remove ...remainingProps
</s> add ...resolvedProps
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/components/composites/Actionsheet/ActionsheetFooter.tsx
|
return <Modal.Content {...resolvedProps} ref={ref} />;
|
<mask> //TODO: refactor for responsive prop
<mask> if (useHasResponsiveProps(props)) {
<mask> return null;
<mask> }
<mask> return (
<mask> <Modal.Content {...newProps} ref={ref}>
<mask> {children}
<mask> </Modal.Content>
<mask> );
<mask> };
<mask>
<mask> export default memo(forwardRef(ActionsheetFooter));
</s> fix: padding fixes and alias prop fix </s> remove return (
<Button
startIcon={startIcon}
endIcon={endIcon}
spinner={spinner}
{...newProps}
ref={ref}
>
{children}
</Button>
);
</s> add return <Button {...resolvedProps} ref={ref} />; </s> remove <Box justifyContent="center" alignItems="center" {...newProps} ref={ref}>
{children}
</Box>
</s> add <Box
justifyContent="center"
alignItems="center"
{...resolvedProps}
ref={ref}
/> </s> remove ...remainingProps
</s> add ...resolvedProps </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);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/components/composites/Actionsheet/ActionsheetFooter.tsx
|
const ActionsheetHeader = (props: IActionsheetHeaderProps, ref?: any) => {
const resolvedProps = usePropsResolution('ActionsheetHeader', props);
|
<mask> import type { IActionsheetHeaderProps } from './types';
<mask> import { usePropsResolution } from '../../../hooks';
<mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps';
<mask>
<mask> const ActionsheetHeader = (
<mask> { children, ...props }: IActionsheetHeaderProps,
<mask> ref?: any
<mask> ) => {
<mask> const newProps = usePropsResolution('ActionsheetHeader', props);
<mask> //TODO: refactor for responsive prop
<mask> if (useHasResponsiveProps(props)) {
<mask> return null;
<mask> }
<mask> return (
</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 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 import { propsFlattenerTest } from './propsFlattenerTest';
</s> add import { propsFlattener, compareSpecificity } from './propsFlattener'; </s> remove const specificityOrder = [
</s> add const SPREAD_PROP_SPECIFICITY_ORDER = [ </s> remove ...remainingProps
</s> add ...resolvedProps
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/components/composites/Actionsheet/ActionsheetHeader.tsx
|
<Box
justifyContent="center"
alignItems="center"
{...resolvedProps}
ref={ref}
/>
|
<mask> if (useHasResponsiveProps(props)) {
<mask> return null;
<mask> }
<mask> return (
<mask> <Box justifyContent="center" alignItems="center" {...newProps} ref={ref}>
<mask> {children}
<mask> </Box>
<mask> );
<mask> };
<mask>
<mask> export default memo(forwardRef(ActionsheetHeader));
</s> fix: padding fixes and alias prop fix </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} />; </s> remove ...remainingProps
</s> add ...resolvedProps </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);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/components/composites/Actionsheet/ActionsheetHeader.tsx
|
const ActionsheetItem = (props: IActionsheetItemProps, ref?: any) => {
const resolvedProps = usePropsResolution('ActionsheetItem', props);
|
<mask> import type { IActionsheetItemProps } from './types';
<mask> import { usePropsResolution } from '../../../hooks';
<mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps';
<mask>
<mask> const ActionsheetItem = (
<mask> { children, startIcon, endIcon, spinner, ...props }: IActionsheetItemProps,
<mask> ref?: any
<mask> ) => {
<mask> const newProps = usePropsResolution('ActionsheetItem', props);
<mask> //TODO: refactor for responsive prop
<mask> if (useHasResponsiveProps(props)) {
<mask> return null;
<mask> }
<mask> return (
</s> fix: padding fixes and alias prop fix </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 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 import { propsFlattenerTest } from './propsFlattenerTest';
</s> add import { propsFlattener, compareSpecificity } from './propsFlattener'; </s> remove const specificityOrder = [
</s> add const SPREAD_PROP_SPECIFICITY_ORDER = [ </s> remove ...remainingProps
</s> add ...resolvedProps
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/components/composites/Actionsheet/ActionsheetItem.tsx
|
return <Button {...resolvedProps} ref={ref} />;
|
<mask> //TODO: refactor for responsive prop
<mask> if (useHasResponsiveProps(props)) {
<mask> return null;
<mask> }
<mask> return (
<mask> <Button
<mask> startIcon={startIcon}
<mask> endIcon={endIcon}
<mask> spinner={spinner}
<mask> {...newProps}
<mask> ref={ref}
<mask> >
<mask> {children}
<mask> </Button>
<mask> );
<mask> };
<mask>
<mask> export default memo(forwardRef(ActionsheetItem));
</s> fix: padding fixes and alias prop fix </s> remove return (
<Modal.Content {...newProps} ref={ref}>
{children}
</Modal.Content>
);
</s> add return <Modal.Content {...resolvedProps} ref={ref} />; </s> remove <Box justifyContent="center" alignItems="center" {...newProps} ref={ref}>
{children}
</Box>
</s> add <Box
justifyContent="center"
alignItems="center"
{...resolvedProps}
ref={ref}
/> </s> remove ...remainingProps
</s> add ...resolvedProps </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);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/components/composites/Actionsheet/ActionsheetItem.tsx
|
{ isDisabled, isHovered, isFocused, isPressed, isLoading },
|
<mask> ...resolvedProps
<mask> } = usePropsResolution(
<mask> 'Button',
<mask> props,
<mask> { isDisabled, isHovered, isFocused, isPressed },
<mask> { ignoreProps: ['_spinner'] }
<mask> );
<mask>
<mask> // const pressableProps = {
<mask> // ...resolvedProps,
</s> fix: padding fixes and alias prop fix </s> remove const { _dragIndicator, ...newProps } = usePropsResolution(
</s> add const { _dragIndicator, ...resolvedProps } = usePropsResolution( </s> remove flattenProps = overrideDefaultProps(flattenProps, defaultStyles);
</s> add for (const prop in defaultStyles) {
delete flattenProps[prop];
}
const defaultSpecificity = merge(
{},
specificityMap,
baseSpecificityMap,
variantSpecificityMap,
sizeSpecificityMap
);
flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
); </s> remove export const propsFlattenerTest = (
</s> add export const propsFlattener = ( </s> remove ...remainingProps
</s> add ...resolvedProps </s> remove flattenProps = propsSpreader(defaultStyles, defaultSpecificity);
</s> add flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/components/primitives/Button/Button.tsx
|
// focusRingProps.onFocus
|
<mask> onHoverOut={composeEventHandlers(onHoverOut, hoverProps.onHoverOut)}
<mask> // @ts-ignore - web only
<mask> onFocus={composeEventHandlers(
<mask> composeEventHandlers(onFocus, focusProps.onFocus)
<mask> // focusRingProps.onFocu
<mask> )}
<mask> // @ts-ignore - web only
<mask> onBlur={composeEventHandlers(
<mask> composeEventHandlers(onBlur, focusProps.onBlur)
<mask> // focusRingProps.onBlur
</s> fix: padding fixes and alias prop fix </s> remove {...remainingProps}
</s> add {...resolvedProps} </s> remove flattenSizeStyle;
</s> add flattenSizeStyle,
sizeSpecificityMap; </s> remove // const windowWidth = useWindowDimensions()?.width;
// const currentBreakpoint = React.useMemo(
// () => getClosestBreakpoint(theme.breakpoints, windowWidth),
// [windowWidth, theme.breakpoints]
// );
</s> add </s> remove flattenProps,
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/components/primitives/Button/Button.tsx
|
const INITIAL_PROP_SPECIFICITY = {
[SPECIFICITY_100]: 0,
[SPECIFICITY_70]: 0,
[SPECIFICITY_60]: 0,
[SPECIFICITY_50]: 0,
[SPECIFICITY_55]: 0,
[SPECIFICITY_40]: 0,
[SPECIFICITY_30]: 0,
[SPECIFICITY_10]: 0,
[SPECIFICITY_1]: 0,
};
|
<mask> SPECIFICITY_10,
<mask> SPECIFICITY_1,
<mask> ];
<mask>
<mask> const pseudoPropsMap: any = {
<mask> _web: { dependentOn: 'platform', priority: SPECIFICITY_10 },
<mask> _ios: { dependentOn: 'platform', priority: SPECIFICITY_10 },
<mask> _android: { dependentOn: 'platform', priority: SPECIFICITY_10 },
</s> fix: padding fixes and alias prop fix </s> remove const compareSpecificity = (
</s> add export const compareSpecificity = ( </s> remove { isDisabled, isHovered, isFocused, isPressed },
</s> add { isDisabled, isHovered, isFocused, isPressed, isLoading }, </s> remove export const propsFlattenerTest = (
</s> add export const propsFlattener = ( </s> remove const marginMap: any = {
</s> add const FINAL_SPREAD_PROPS = [
'paddingTop',
'paddingBottom',
'paddingLeft',
'paddingRight',
'marginTop',
'marginBottom',
'marginLeft',
'marginRight',
];
const MARGIN_MAP: any = { </s> remove flattenProps = propsSpreader(defaultStyles, defaultSpecificity);
</s> add flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
);
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/propsFlattenerTest.tsx
|
export const compareSpecificity = (
|
<mask> priority: SPECIFICITY_100,
<mask> },
<mask> };
<mask>
<mask> const compareSpecificity = (
<mask> exisiting: any,
<mask> upcoming: any,
<mask> ignorebaseTheme?: boolean
<mask> // property?: any
<mask> ) => {
</s> fix: padding fixes and alias prop fix </s> remove export const propsFlattenerTest = (
</s> add export const propsFlattener = ( </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove const specificityMaps: any = {
...paddingMap,
...marginMap,
</s> add const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP, </s> remove { isDisabled, isHovered, isFocused, isPressed },
</s> add { isDisabled, isHovered, isFocused, isPressed, isLoading },
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/propsFlattenerTest.tsx
|
if (!upcoming) return false;
|
<mask> ) => {
<mask> if (!exisiting) return true;
<mask> const condition = ignorebaseTheme
<mask> ? specificityPrecedence.length - 1
<mask> : specificityPrecedence.length;
<mask> for (let index = 0; index < condition; index++) {
</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 {...remainingProps}
</s> add {...resolvedProps} </s> remove const { _dragIndicator, ...newProps } = usePropsResolution(
</s> add const { _dragIndicator, ...resolvedProps } = usePropsResolution(
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/propsFlattenerTest.tsx
|
...INITIAL_PROP_SPECIFICITY,
|
<mask> // NOTE: the order is important here. Keep in mind while specificity breakpoints.
<mask> const propertySpecity = currentSpecificity
<mask> ? { ...currentSpecificity }
<mask> : {
<mask> [SPECIFICITY_100]: 0,
<mask> [SPECIFICITY_70]: 0,
<mask> [SPECIFICITY_60]: 0,
<mask> [SPECIFICITY_50]: 0,
<mask> [SPECIFICITY_55]: 0,
<mask> [SPECIFICITY_40]: 0,
<mask> [SPECIFICITY_30]: 0,
<mask> [SPECIFICITY_10]: 0,
<mask> [SPECIFICITY_1]: priority,
<mask> };
<mask>
<mask> if (
<mask> state[pseudoPropsMap[property]?.respondTo] ||
</s> fix: padding fixes and alias prop fix </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove flattenProps = overrideDefaultProps(flattenProps, defaultStyles);
</s> add for (const prop in defaultStyles) {
delete flattenProps[prop];
}
const defaultSpecificity = merge(
{},
specificityMap,
baseSpecificityMap,
variantSpecificityMap,
sizeSpecificityMap
);
flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
); </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;
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/propsFlattenerTest.tsx
|
export const propsFlattener = (
|
<mask> }
<mask> }
<mask> };
<mask>
<mask> export const propsFlattenerTest = (
<mask> { props, colormode, platform, state, currentSpecificityMap }: any,
<mask> priority: number
<mask> ) => {
<mask> const flattenProps = {};
<mask>
</s> fix: padding fixes and alias prop fix </s> remove const compareSpecificity = (
</s> add export const compareSpecificity = ( </s> remove const { _dragIndicator, ...newProps } = usePropsResolution(
</s> add const { _dragIndicator, ...resolvedProps } = usePropsResolution( </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </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);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/propsFlattenerTest.tsx
|
const val = incomingProps[prop] || flattenedDefaultProps[prop];
if (!FINAL_SPREAD_PROPS.includes(prop)) {
|
<mask> const specificity: any = {};
<mask>
<mask> SPREAD_PROP_SPECIFICITY_ORDER.forEach((prop) => {
<mask> if (prop in flattenedDefaultProps) {
<mask> const val = flattenedDefaultProps[prop];
<mask> if (!FINAL_SPREAD_PROPS.includes(prop))
<mask> delete flattenedDefaultProps[prop];
<mask>
<mask> specificity[prop] = incomingSpecifity[prop];
<mask> SPREAD_PROP_SPECIFICITY_MAP[prop].forEach((newProp: string) => {
<mask> if (compareSpecificity(specificity[newProp], specificity[prop])) {
</s> fix: padding fixes and alias prop fix </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 specificity[prop] = incomingSpecifity[prop];
</s> add </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {};
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
specificity[prop] = incomingSpecifity[prop];
}
|
<mask> if (!FINAL_SPREAD_PROPS.includes(prop)) {
<mask> delete flattenedDefaultProps[prop];
<mask>
<mask> SPREAD_PROP_SPECIFICITY_MAP[prop].forEach((newProp: string) => {
<mask> if (compareSpecificity(specificity[newProp], specificity[prop])) {
<mask> specificity[newProp] = incomingSpecifity[prop];
<mask> flattenedDefaultProps[newProp] = val;
<mask> }
</s> fix: padding fixes and alias prop fix </s> remove specificity[prop] = incomingSpecifity[prop];
</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 const val = flattenedDefaultProps[prop];
if (!FINAL_SPREAD_PROPS.includes(prop))
</s> add const val = incomingProps[prop] || flattenedDefaultProps[prop];
if (!FINAL_SPREAD_PROPS.includes(prop)) { </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {};
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
<mask> const val = flattenedDefaultProps[prop];
<mask> if (!FINAL_SPREAD_PROPS.includes(prop))
<mask> delete flattenedDefaultProps[prop];
<mask>
<mask> specificity[prop] = incomingSpecifity[prop];
<mask> SPREAD_PROP_SPECIFICITY_MAP[prop].forEach((newProp: string) => {
<mask> if (compareSpecificity(specificity[newProp], specificity[prop])) {
<mask> specificity[newProp] = incomingSpecifity[prop];
<mask> flattenedDefaultProps[newProp] = val;
<mask> }
</s> fix: padding fixes and alias prop fix </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 const val = flattenedDefaultProps[prop];
if (!FINAL_SPREAD_PROPS.includes(prop))
</s> add const val = incomingProps[prop] || flattenedDefaultProps[prop];
if (!FINAL_SPREAD_PROPS.includes(prop)) { </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {};
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
|
<mask>
<mask> // // STEP 4: merge
<mask> const defaultStyles = merge(
<mask> {},
<mask> flattenProps,
<mask> flattenBaseStyle,
<mask> flattenVariantStyle,
<mask> flattenSizeStyle
<mask> );
<mask> const defaultSpecificity = merge(
</s> fix: padding fixes and alias prop fix </s> remove flattenProps = overrideDefaultProps(flattenProps, defaultStyles);
</s> add for (const prop in defaultStyles) {
delete flattenProps[prop];
}
const defaultSpecificity = merge(
{},
specificityMap,
baseSpecificityMap,
variantSpecificityMap,
sizeSpecificityMap
);
flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
); </s> remove // const windowWidth = useWindowDimensions()?.width;
// const currentBreakpoint = React.useMemo(
// () => getClosestBreakpoint(theme.breakpoints, windowWidth),
// [windowWidth, theme.breakpoints]
// );
</s> add </s> remove flattenProps = propsSpreader(defaultStyles, defaultSpecificity);
</s> add flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
|
for (const prop in defaultStyles) {
delete flattenProps[prop];
}
|
<mask> flattenSizeStyle
<mask> );
<mask> const defaultSpecificity = merge(
<mask> {},
<mask> specificityMap,
<mask> baseSpecificityMap,
</s> fix: padding fixes and alias prop fix </s> remove flattenProps = overrideDefaultProps(flattenProps, defaultStyles);
</s> add for (const prop in defaultStyles) {
delete flattenProps[prop];
}
const defaultSpecificity = merge(
{},
specificityMap,
baseSpecificityMap,
variantSpecificityMap,
sizeSpecificityMap
);
flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
); </s> remove flattenProps,
</s> add </s> remove // const windowWidth = useWindowDimensions()?.width;
// const currentBreakpoint = React.useMemo(
// () => getClosestBreakpoint(theme.breakpoints, windowWidth),
// [windowWidth, theme.breakpoints]
// );
</s> add </s> remove flattenProps = propsSpreader(defaultStyles, defaultSpecificity);
</s> add flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
);
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
);
|
<mask> variantSpecificityMap,
<mask> sizeSpecificityMap
<mask> );
<mask>
<mask> flattenProps = propsSpreader(defaultStyles, defaultSpecificity);
<mask>
<mask> // // STEP 5: linear Grad and contrastText
<mask> let ignore: any = [];
<mask> if (
<mask> flattenProps.bg?.linearGradient ||
</s> fix: padding fixes and alias prop fix </s> remove flattenProps = overrideDefaultProps(flattenProps, defaultStyles);
</s> add for (const prop in defaultStyles) {
delete flattenProps[prop];
}
const defaultSpecificity = merge(
{},
specificityMap,
baseSpecificityMap,
variantSpecificityMap,
sizeSpecificityMap
);
flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
); </s> remove // const windowWidth = useWindowDimensions()?.width;
// const currentBreakpoint = React.useMemo(
// () => getClosestBreakpoint(theme.breakpoints, windowWidth),
// [windowWidth, theme.breakpoints]
// );
</s> add </s> remove let [flattenProps, specificityMap] = propsFlattenerTest(
</s> add let [flattenProps, specificityMap] = propsFlattener( </s> remove flattenProps,
</s> add </s> remove flattenSizeStyle;
</s> add flattenSizeStyle,
sizeSpecificityMap;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
import { propsFlattener, compareSpecificity } from './propsFlattener';
|
<mask> import { useColorMode } from '../../core/color-mode';
<mask> import { omitUndefined, extractInObject } from '../../theme/tools';
<mask> import { useContrastText } from '../useContrastText';
<mask> import { useBreakpointResolvedProps } from '../useBreakpointResolvedProps';
<mask> import { propsFlattenerTest } from './propsFlattenerTest';
<mask>
<mask> const specificityOrder = [
<mask> 'p',
<mask> 'padding',
<mask> 'px',
</s> fix: padding fixes and alias prop fix </s> remove const specificityOrder = [
</s> add const SPREAD_PROP_SPECIFICITY_ORDER = [ </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 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 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/hooks/useThemeProps/usePropsResolutionTest.tsx
|
const SPREAD_PROP_SPECIFICITY_ORDER = [
|
<mask> import { useContrastText } from '../useContrastText';
<mask> import { useBreakpointResolvedProps } from '../useBreakpointResolvedProps';
<mask> import { propsFlattenerTest } from './propsFlattenerTest';
<mask>
<mask> const specificityOrder = [
<mask> 'p',
<mask> 'padding',
<mask> 'px',
<mask> 'py',
<mask> 'pt',
</s> fix: padding fixes and alias prop fix </s> remove import { propsFlattenerTest } from './propsFlattenerTest';
</s> add import { propsFlattener, compareSpecificity } from './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); </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/hooks/useThemeProps/usePropsResolutionTest.tsx
|
const FINAL_SPREAD_PROPS = [
'paddingTop',
'paddingBottom',
'paddingLeft',
'paddingRight',
'marginTop',
'marginBottom',
'marginLeft',
'marginRight',
];
const MARGIN_MAP: any = {
|
<mask> 'marginLeft',
<mask> 'marginRight',
<mask> ];
<mask>
<mask> const marginMap: any = {
<mask> mx: ['marginRight', 'marginLeft'],
<mask> my: ['marginTop', 'marginBottom'],
<mask> mt: ['marginTop'],
<mask> mb: ['marginBottom'],
<mask> mr: ['marginRight'],
</s> fix: padding fixes and alias prop fix </s> remove marginMap.margin = [...marginMap.mx, ...marginMap.my];
marginMap.m = marginMap.margin;
marginMap.marginTop = marginMap.mt;
marginMap.marginBottom = marginMap.mb;
marginMap.marginLeft = marginMap.ml;
marginMap.marginRight = marginMap.mr;
</s> add MARGIN_MAP.margin = [...MARGIN_MAP.mx, ...MARGIN_MAP.my];
MARGIN_MAP.m = MARGIN_MAP.margin;
MARGIN_MAP.marginTop = MARGIN_MAP.mt;
MARGIN_MAP.marginBottom = MARGIN_MAP.mb;
MARGIN_MAP.marginLeft = MARGIN_MAP.ml;
MARGIN_MAP.marginRight = MARGIN_MAP.mr; </s> remove const specificityMaps: any = {
...paddingMap,
...marginMap,
</s> add const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP, </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove const { _dragIndicator, ...newProps } = usePropsResolution(
</s> add const { _dragIndicator, ...resolvedProps } = usePropsResolution(
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
MARGIN_MAP.margin = [...MARGIN_MAP.mx, ...MARGIN_MAP.my];
MARGIN_MAP.m = MARGIN_MAP.margin;
MARGIN_MAP.marginTop = MARGIN_MAP.mt;
MARGIN_MAP.marginBottom = MARGIN_MAP.mb;
MARGIN_MAP.marginLeft = MARGIN_MAP.ml;
MARGIN_MAP.marginRight = MARGIN_MAP.mr;
|
<mask> mr: ['marginRight'],
<mask> ml: ['marginLeft'],
<mask> };
<mask>
<mask> marginMap.margin = [...marginMap.mx, ...marginMap.my];
<mask> marginMap.m = marginMap.margin;
<mask> marginMap.marginTop = marginMap.mt;
<mask> marginMap.marginBottom = marginMap.mb;
<mask> marginMap.marginLeft = marginMap.ml;
<mask> marginMap.marginRight = marginMap.mr;
<mask>
<mask> const paddingMap: any = {
<mask> px: ['paddingRight', 'paddingLeft'],
<mask> py: ['paddingTop', 'paddingBottom'],
<mask> pt: ['paddingTop'],
</s> fix: padding fixes and alias prop fix </s> remove const paddingMap: any = {
</s> add const PADDING_MAP: any = { </s> remove const marginMap: any = {
</s> add const FINAL_SPREAD_PROPS = [
'paddingTop',
'paddingBottom',
'paddingLeft',
'paddingRight',
'marginTop',
'marginBottom',
'marginLeft',
'marginRight',
];
const MARGIN_MAP: any = { </s> remove const specificityMaps: any = {
...paddingMap,
...marginMap,
</s> add const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP, </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove paddingMap.padding = [...paddingMap.px, ...paddingMap.py];
paddingMap.p = paddingMap.padding;
paddingMap.paddingTop = paddingMap.pt;
paddingMap.paddingBottom = paddingMap.pb;
paddingMap.paddingLeft = paddingMap.pl;
paddingMap.paddingRight = paddingMap.pr;
</s> add PADDING_MAP.padding = [...PADDING_MAP.px, ...PADDING_MAP.py];
PADDING_MAP.p = PADDING_MAP.padding;
PADDING_MAP.paddingTop = PADDING_MAP.pt;
PADDING_MAP.paddingBottom = PADDING_MAP.pb;
PADDING_MAP.paddingLeft = PADDING_MAP.pl;
PADDING_MAP.paddingRight = PADDING_MAP.pr;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
const PADDING_MAP: any = {
|
<mask> marginMap.marginBottom = marginMap.mb;
<mask> marginMap.marginLeft = marginMap.ml;
<mask> marginMap.marginRight = marginMap.mr;
<mask>
<mask> const paddingMap: any = {
<mask> px: ['paddingRight', 'paddingLeft'],
<mask> py: ['paddingTop', 'paddingBottom'],
<mask> pt: ['paddingTop'],
<mask> pb: ['paddingBottom'],
<mask> pr: ['paddingRight'],
</s> fix: padding fixes and alias prop fix </s> remove marginMap.margin = [...marginMap.mx, ...marginMap.my];
marginMap.m = marginMap.margin;
marginMap.marginTop = marginMap.mt;
marginMap.marginBottom = marginMap.mb;
marginMap.marginLeft = marginMap.ml;
marginMap.marginRight = marginMap.mr;
</s> add MARGIN_MAP.margin = [...MARGIN_MAP.mx, ...MARGIN_MAP.my];
MARGIN_MAP.m = MARGIN_MAP.margin;
MARGIN_MAP.marginTop = MARGIN_MAP.mt;
MARGIN_MAP.marginBottom = MARGIN_MAP.mb;
MARGIN_MAP.marginLeft = MARGIN_MAP.ml;
MARGIN_MAP.marginRight = MARGIN_MAP.mr; </s> remove paddingMap.padding = [...paddingMap.px, ...paddingMap.py];
paddingMap.p = paddingMap.padding;
paddingMap.paddingTop = paddingMap.pt;
paddingMap.paddingBottom = paddingMap.pb;
paddingMap.paddingLeft = paddingMap.pl;
paddingMap.paddingRight = paddingMap.pr;
</s> add PADDING_MAP.padding = [...PADDING_MAP.px, ...PADDING_MAP.py];
PADDING_MAP.p = PADDING_MAP.padding;
PADDING_MAP.paddingTop = PADDING_MAP.pt;
PADDING_MAP.paddingBottom = PADDING_MAP.pb;
PADDING_MAP.paddingLeft = PADDING_MAP.pl;
PADDING_MAP.paddingRight = PADDING_MAP.pr; </s> remove const specificityMaps: any = {
...paddingMap,
...marginMap,
</s> add const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP, </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove const { _dragIndicator, ...newProps } = usePropsResolution(
</s> add const { _dragIndicator, ...resolvedProps } = usePropsResolution(
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
PADDING_MAP.padding = [...PADDING_MAP.px, ...PADDING_MAP.py];
PADDING_MAP.p = PADDING_MAP.padding;
PADDING_MAP.paddingTop = PADDING_MAP.pt;
PADDING_MAP.paddingBottom = PADDING_MAP.pb;
PADDING_MAP.paddingLeft = PADDING_MAP.pl;
PADDING_MAP.paddingRight = PADDING_MAP.pr;
|
<mask> pr: ['paddingRight'],
<mask> pl: ['paddingLeft'],
<mask> };
<mask>
<mask> paddingMap.padding = [...paddingMap.px, ...paddingMap.py];
<mask> paddingMap.p = paddingMap.padding;
<mask> paddingMap.paddingTop = paddingMap.pt;
<mask> paddingMap.paddingBottom = paddingMap.pb;
<mask> paddingMap.paddingLeft = paddingMap.pl;
<mask> paddingMap.paddingRight = paddingMap.pr;
<mask>
<mask> const specificityMaps: any = {
<mask> ...paddingMap,
<mask> ...marginMap,
<mask> };
</s> fix: padding fixes and alias prop fix </s> remove const specificityMaps: any = {
...paddingMap,
...marginMap,
</s> add const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP, </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove const paddingMap: any = {
</s> add const PADDING_MAP: any = { </s> remove marginMap.margin = [...marginMap.mx, ...marginMap.my];
marginMap.m = marginMap.margin;
marginMap.marginTop = marginMap.mt;
marginMap.marginBottom = marginMap.mb;
marginMap.marginLeft = marginMap.ml;
marginMap.marginRight = marginMap.mr;
</s> add MARGIN_MAP.margin = [...MARGIN_MAP.mx, ...MARGIN_MAP.my];
MARGIN_MAP.m = MARGIN_MAP.margin;
MARGIN_MAP.marginTop = MARGIN_MAP.mt;
MARGIN_MAP.marginBottom = MARGIN_MAP.mb;
MARGIN_MAP.marginLeft = MARGIN_MAP.ml;
MARGIN_MAP.marginRight = MARGIN_MAP.mr; </s> remove export const propsFlattenerTest = (
</s> add export const propsFlattener = (
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP,
|
<mask> paddingMap.paddingBottom = paddingMap.pb;
<mask> paddingMap.paddingLeft = paddingMap.pl;
<mask> paddingMap.paddingRight = paddingMap.pr;
<mask>
<mask> const specificityMaps: any = {
<mask> ...paddingMap,
<mask> ...marginMap,
<mask> };
<mask>
<mask> function overrideDefaultProps(userProps: any, defaultProps: any) {
<mask> const flattenedUserProps: any = { ...userProps };
<mask> const flattenedDefaultProps: any = { ...defaultProps };
</s> fix: padding fixes and alias prop fix </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove paddingMap.padding = [...paddingMap.px, ...paddingMap.py];
paddingMap.p = paddingMap.padding;
paddingMap.paddingTop = paddingMap.pt;
paddingMap.paddingBottom = paddingMap.pb;
paddingMap.paddingLeft = paddingMap.pl;
paddingMap.paddingRight = paddingMap.pr;
</s> add PADDING_MAP.padding = [...PADDING_MAP.px, ...PADDING_MAP.py];
PADDING_MAP.p = PADDING_MAP.padding;
PADDING_MAP.paddingTop = PADDING_MAP.pt;
PADDING_MAP.paddingBottom = PADDING_MAP.pb;
PADDING_MAP.paddingLeft = PADDING_MAP.pl;
PADDING_MAP.paddingRight = PADDING_MAP.pr; </s> remove const compareSpecificity = (
</s> add export const compareSpecificity = ( </s> remove export const propsFlattenerTest = (
</s> add export const propsFlattener = ( </s> remove const { _dragIndicator, ...newProps } = usePropsResolution(
</s> add const { _dragIndicator, ...resolvedProps } = usePropsResolution(
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {};
|
<mask> ...paddingMap,
<mask> ...marginMap,
<mask> };
<mask>
<mask> function overrideDefaultProps(userProps: any, defaultProps: any) {
<mask> const flattenedUserProps: any = { ...userProps };
<mask> const flattenedDefaultProps: any = { ...defaultProps };
<mask>
<mask> specificityOrder.forEach((prop) => {
<mask> if (prop in flattenedUserProps) {
<mask> const val = flattenedUserProps[prop];
<mask> delete flattenedUserProps[prop];
<mask>
<mask> specificityMaps[prop].forEach((newProp: string) => {
<mask> flattenedUserProps[newProp] = val;
<mask> });
<mask> }
<mask>
<mask> if (prop in flattenedDefaultProps) {
<mask> const val = flattenedDefaultProps[prop];
<mask> delete flattenedDefaultProps[prop];
<mask>
</s> fix: padding fixes and alias prop fix </s> remove const specificityMaps: any = {
...paddingMap,
...marginMap,
</s> add const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP, </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 const val = flattenedDefaultProps[prop];
if (!FINAL_SPREAD_PROPS.includes(prop))
</s> add const val = incomingProps[prop] || flattenedDefaultProps[prop];
if (!FINAL_SPREAD_PROPS.includes(prop)) { </s> remove specificity[prop] = incomingSpecifity[prop];
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
SPREAD_PROP_SPECIFICITY_ORDER.forEach((prop) => {
|
<mask> const specificity: any = {};
<mask>
<mask> if (prop in flattenedDefaultProps) {
<mask> const val = incomingProps[prop] || flattenedDefaultProps[prop];
<mask> if (!FINAL_SPREAD_PROPS.includes(prop)) {
<mask> delete flattenedDefaultProps[prop];
</s> fix: padding fixes and alias prop fix </s> remove const val = flattenedDefaultProps[prop];
if (!FINAL_SPREAD_PROPS.includes(prop))
</s> add const val = incomingProps[prop] || flattenedDefaultProps[prop];
if (!FINAL_SPREAD_PROPS.includes(prop)) { </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 function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove specificity[prop] = incomingSpecifity[prop];
</s> add
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
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;
}
|
<mask> });
<mask> }
<mask>
<mask> if (prop in flattenedDefaultProps) {
<mask> const val = flattenedDefaultProps[prop];
<mask> delete flattenedDefaultProps[prop];
<mask>
<mask> specificityMaps[prop].forEach((newProp: string) => {
<mask> flattenedDefaultProps[newProp] = val;
<mask> });
<mask> }
<mask> });
<mask>
<mask> return merge({}, flattenedUserProps, flattenedDefaultProps);
</s> fix: padding fixes and alias prop fix </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove specificity[prop] = incomingSpecifity[prop];
</s> add </s> remove const val = flattenedDefaultProps[prop];
if (!FINAL_SPREAD_PROPS.includes(prop))
</s> add const val = incomingProps[prop] || flattenedDefaultProps[prop];
if (!FINAL_SPREAD_PROPS.includes(prop)) { </s> remove return merge({}, flattenedUserProps, flattenedDefaultProps);
</s> add return merge({}, flattenedDefaultProps);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
return merge({}, flattenedDefaultProps);
|
<mask> });
<mask> }
<mask> });
<mask>
<mask> return merge({}, flattenedUserProps, flattenedDefaultProps);
<mask> }
<mask>
<mask> /**
<mask> * @summary Combines provided porps with component's theme props and resloves them.
<mask> * @arg {string} component - Name of the component.
</s> fix: padding fixes and alias prop fix </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 flattenSizeStyle;
</s> add flattenSizeStyle,
sizeSpecificityMap; </s> remove [flattenVariantStyle, variantSpecificityMap] = propsFlattenerTest(
</s> add [flattenVariantStyle, variantSpecificityMap] = propsFlattener( </s> remove [flattenBaseStyle, baseSpecificityMap] = propsFlattenerTest(
</s> add [flattenBaseStyle, baseSpecificityMap] = propsFlattener( </s> remove // const windowWidth = useWindowDimensions()?.width;
// const currentBreakpoint = React.useMemo(
// () => getClosestBreakpoint(theme.breakpoints, windowWidth),
// [windowWidth, theme.breakpoints]
// );
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
<mask> const colorModeProps = useColorMode();
<mask>
<mask> const componentTheme = get(theme, `components.${component}`, {});
<mask>
<mask> // const windowWidth = useWindowDimensions()?.width;
<mask> // const currentBreakpoint = React.useMemo(
<mask> // () => getClosestBreakpoint(theme.breakpoints, windowWidth),
<mask> // [windowWidth, theme.breakpoints]
<mask> // );
<mask>
<mask> // STEP 1: combine default props and incoming props
<mask>
<mask> const incomingWithDefaultProps = merge(
<mask> {},
<mask> componentTheme.defaultProps || {},
</s> fix: padding fixes and alias prop fix </s> remove flattenProps,
</s> add </s> remove flattenProps = overrideDefaultProps(flattenProps, defaultStyles);
</s> add for (const prop in defaultStyles) {
delete flattenProps[prop];
}
const defaultSpecificity = merge(
{},
specificityMap,
baseSpecificityMap,
variantSpecificityMap,
sizeSpecificityMap
);
flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
); </s> remove flattenSizeStyle;
</s> add flattenSizeStyle,
sizeSpecificityMap; </s> remove flattenProps = propsSpreader(defaultStyles, defaultSpecificity);
</s> add flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
|
let [flattenProps, specificityMap] = propsFlattener(
|
<mask> cleanIncomingProps
<mask> );
<mask> // STEP 2: flatten them
<mask>
<mask> let [flattenProps, specificityMap] = propsFlattenerTest(
<mask> {
<mask> props: incomingWithDefaultProps,
<mask> platform: Platform.OS,
<mask> colormode: colorModeProps.colorMode,
<mask> state: state || {},
</s> fix: padding fixes and alias prop fix </s> remove [flattenVariantStyle, variantSpecificityMap] = propsFlattenerTest(
</s> add [flattenVariantStyle, variantSpecificityMap] = propsFlattener( </s> remove [flattenBaseStyle, baseSpecificityMap] = propsFlattenerTest(
</s> add [flattenBaseStyle, baseSpecificityMap] = propsFlattener( </s> remove [flattenSizeStyle] = propsFlattenerTest(
</s> add [flattenSizeStyle, sizeSpecificityMap] = propsFlattener( </s> remove flattenProps = propsSpreader(defaultStyles, defaultSpecificity);
</s> add flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
); </s> remove flattenProps = overrideDefaultProps(flattenProps, defaultStyles);
</s> add for (const prop in defaultStyles) {
delete flattenProps[prop];
}
const defaultSpecificity = merge(
{},
specificityMap,
baseSpecificityMap,
variantSpecificityMap,
sizeSpecificityMap
);
flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
[flattenBaseStyle, baseSpecificityMap] = propsFlattener(
|
<mask> ...flattenProps,
<mask> ...colorModeProps,
<mask> });
<mask>
<mask> [flattenBaseStyle, baseSpecificityMap] = propsFlattenerTest(
<mask> {
<mask> props: componentBaseStyle,
<mask> platform: Platform.OS,
<mask> colormode: colorModeProps.colorMode,
<mask> state: state || {},
</s> fix: padding fixes and alias prop fix </s> remove [flattenVariantStyle, variantSpecificityMap] = propsFlattenerTest(
</s> add [flattenVariantStyle, variantSpecificityMap] = propsFlattener( </s> remove [flattenSizeStyle] = propsFlattenerTest(
</s> add [flattenSizeStyle, sizeSpecificityMap] = propsFlattener( </s> remove let [flattenProps, specificityMap] = propsFlattenerTest(
</s> add let [flattenProps, specificityMap] = propsFlattener( </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 function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {};
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
[flattenVariantStyle, variantSpecificityMap] = propsFlattener(
|
<mask> ...flattenProps,
<mask> ...colorModeProps,
<mask> });
<mask>
<mask> [flattenVariantStyle, variantSpecificityMap] = propsFlattenerTest(
<mask> {
<mask> props: componentVariantProps,
<mask> platform: Platform.OS,
<mask> colormode: colorModeProps.colorMode,
<mask> state: state || {},
</s> fix: padding fixes and alias prop fix </s> remove [flattenBaseStyle, baseSpecificityMap] = propsFlattenerTest(
</s> add [flattenBaseStyle, baseSpecificityMap] = propsFlattener( </s> remove [flattenSizeStyle] = propsFlattenerTest(
</s> add [flattenSizeStyle, sizeSpecificityMap] = propsFlattener( </s> remove let [flattenProps, specificityMap] = propsFlattenerTest(
</s> add let [flattenProps, specificityMap] = propsFlattener( </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 function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {};
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
flattenSizeStyle,
sizeSpecificityMap;
|
<mask>
<mask> const size = flattenProps.size;
<mask>
<mask> let componentSizeProps = {},
<mask> flattenSizeStyle;
<mask> // Extracting props from size
<mask> if (size && componentTheme.sizes && componentTheme.sizes[size]) {
<mask> // Type - sizes: {lg: 1}. Refer icon theme
<mask> if (
<mask> typeof componentTheme.sizes[size] === 'string' ||
</s> fix: padding fixes and alias prop fix </s> remove // const windowWidth = useWindowDimensions()?.width;
// const currentBreakpoint = React.useMemo(
// () => getClosestBreakpoint(theme.breakpoints, windowWidth),
// [windowWidth, theme.breakpoints]
// );
</s> add </s> remove flattenProps = overrideDefaultProps(flattenProps, defaultStyles);
</s> add for (const prop in defaultStyles) {
delete flattenProps[prop];
}
const defaultSpecificity = merge(
{},
specificityMap,
baseSpecificityMap,
variantSpecificityMap,
sizeSpecificityMap
);
flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
); </s> remove flattenProps = propsSpreader(defaultStyles, defaultSpecificity);
</s> add flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
); </s> remove let [flattenProps, specificityMap] = propsFlattenerTest(
</s> add let [flattenProps, specificityMap] = propsFlattener( </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);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
[flattenSizeStyle, sizeSpecificityMap] = propsFlattener(
|
<mask> flattenProps.size = undefined;
<mask> componentSizeProps = componentTheme.sizes[size];
<mask> }
<mask>
<mask> [flattenSizeStyle] = propsFlattenerTest(
<mask> {
<mask> props: componentSizeProps,
<mask> platform: Platform.OS,
<mask> colormode: colorModeProps.colorMode,
<mask> state: state || {},
</s> fix: padding fixes and alias prop fix </s> remove [flattenVariantStyle, variantSpecificityMap] = propsFlattenerTest(
</s> add [flattenVariantStyle, variantSpecificityMap] = propsFlattener( </s> remove [flattenBaseStyle, baseSpecificityMap] = propsFlattenerTest(
</s> add [flattenBaseStyle, baseSpecificityMap] = propsFlattener( </s> remove let [flattenProps, specificityMap] = propsFlattenerTest(
</s> add let [flattenProps, specificityMap] = propsFlattener( </s> remove flattenSizeStyle;
</s> add flattenSizeStyle,
sizeSpecificityMap; </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;
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
{},
|
<mask>
<mask> // // STEP 4: merge
<mask> const defaultStyles = merge(
<mask> flattenBaseStyle,
<mask> flattenVariantStyle,
<mask> flattenSizeStyle
<mask> );
<mask>
<mask> for (const prop in defaultStyles) {
</s> fix: padding fixes and alias prop fix </s> remove flattenProps,
</s> add </s> remove flattenProps = overrideDefaultProps(flattenProps, defaultStyles);
</s> add for (const prop in defaultStyles) {
delete flattenProps[prop];
}
const defaultSpecificity = merge(
{},
specificityMap,
baseSpecificityMap,
variantSpecificityMap,
sizeSpecificityMap
);
flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
); </s> remove // const windowWidth = useWindowDimensions()?.width;
// const currentBreakpoint = React.useMemo(
// () => getClosestBreakpoint(theme.breakpoints, windowWidth),
// [windowWidth, theme.breakpoints]
// );
</s> add </s> remove flattenProps = propsSpreader(defaultStyles, defaultSpecificity);
</s> add flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
);
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
for (const prop in defaultStyles) {
delete flattenProps[prop];
}
const defaultSpecificity = merge(
{},
specificityMap,
baseSpecificityMap,
variantSpecificityMap,
sizeSpecificityMap
);
flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
);
|
<mask> flattenVariantStyle,
<mask> flattenSizeStyle
<mask> );
<mask>
<mask> flattenProps = overrideDefaultProps(flattenProps, defaultStyles);
<mask>
<mask> // // STEP 5: linear Grad and contrastText
<mask> let ignore: any = [];
<mask> if (
<mask> flattenProps.bg?.linearGradient ||
</s> fix: padding fixes and alias prop fix </s> remove flattenProps = propsSpreader(defaultStyles, defaultSpecificity);
</s> add flattenProps = propsSpreader(
{ ...defaultStyles, ...flattenProps },
defaultSpecificity
); </s> remove flattenProps,
</s> add </s> remove // const windowWidth = useWindowDimensions()?.width;
// const currentBreakpoint = React.useMemo(
// () => getClosestBreakpoint(theme.breakpoints, windowWidth),
// [windowWidth, theme.breakpoints]
// );
</s> add </s> remove let [flattenProps, specificityMap] = propsFlattenerTest(
</s> add let [flattenProps, specificityMap] = propsFlattener(
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6fe387ece700d58535bbd7b012443facf48dfddb
|
src/hooks/useThemeProps/usePropsResolutionTest.tsx
|
_backdrop,
|
<mask> initialFocusRef,
<mask> finalFocusRef,
<mask> useRNModal,
<mask> trapFocus = true,
<mask> ...props
<mask> }: IPopoverProps,
<mask> ref: any
<mask> ) => {
<mask> const triggerRef = React.useRef(null);
<mask> const mergedRef = mergeRefs([triggerRef]);
</s> feat: add backdrop pseudo prop </s> remove <Backdrop onPress={handleClose} bg="transparent" />
</s> add <Backdrop onPress={handleClose} bg="transparent" {..._backdrop} />
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/706ef1b102b2c22d7968e579d197d5159329ddcc
|
src/components/composites/Popover/Popover.tsx
|
<Backdrop onPress={handleClose} bg="transparent" {..._backdrop} />
|
<mask> visible={isOpen}
<mask> style={StyleSheet.absoluteFill}
<mask> >
<mask> <Popper onClose={handleClose} triggerRef={triggerRef} {...props}>
<mask> <Backdrop onPress={handleClose} bg="transparent" />
<mask> <PopoverContext.Provider
<mask> value={{
<mask> onClose: handleClose,
<mask> initialFocusRef,
<mask> finalFocusRef,
</s> feat: add backdrop pseudo prop
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/706ef1b102b2c22d7968e579d197d5159329ddcc
|
src/components/composites/Popover/Popover.tsx
|
/**
* Props applied on Overlay.
*/
_backdrop?: any;
|
<mask> */
<mask> useRNModal?: boolean;
<mask> }
<mask>
<mask> export type IPopoverContentImpl = {
<mask> arrowHeight: number;
<mask> arrowWidth: number;
</s> feat: add backdrop pseudo prop </s> remove <Backdrop onPress={handleClose} bg="transparent" />
</s> add <Backdrop onPress={handleClose} bg="transparent" {..._backdrop} />
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/706ef1b102b2c22d7968e579d197d5159329ddcc
|
src/components/composites/Popover/types.ts
|
import { NativeBaseProvider, Box, Text } from 'native-base';
|
<mask> import React from 'react';
<mask> import { NativeBaseProvider, View, Text } from 'native-base';
<mask> function MyComponent() {
<mask> return (
<mask> // This would look same on all devices
<mask> <View bg="teal.400" height={200} width={200} safeAreaTop={8}>
<mask> <Text>NativeBase</Text>
</s> fix: removed view from list of components and added safeAreaView to box </s> remove <View bg="teal.400" height={200} width={200} safeAreaTop={8}>
</s> add <Box bg="teal.400" height={200} width={200} safeAreaTop={8}> </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Text, Box } from 'native-base'; </s> remove <View bg="teal.400" height={200} width={200} safeArea>
</s> add <Box bg="teal.400" height={200} width={200} safeAreaTop> </s> remove </View>
</s> add </Box> </s> remove </View>
</s> add </Box>
|
[
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72449e044d77026a32baa9c8f2ecf3f44917eb58
|
example/storybook/stories/hooks/useSafeArea/Fixed.tsx
|
<Box bg="teal.400" height={200} width={200} safeAreaTop={8}>
|
<mask> import { NativeBaseProvider, View, Text } from 'native-base';
<mask> function MyComponent() {
<mask> return (
<mask> // This would look same on all devices
<mask> <View bg="teal.400" height={200} width={200} safeAreaTop={8}>
<mask> <Text>NativeBase</Text>
<mask> </View>
<mask> );
<mask> }
<mask>
</s> fix: removed view from list of components and added safeAreaView to box </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Box, Text } from 'native-base'; </s> remove </View>
</s> add </Box> </s> remove <View bg="teal.400" height={200} width={200} safeArea>
</s> add <Box bg="teal.400" height={200} width={200} safeAreaTop> </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Text, Box } from 'native-base'; </s> remove </View>
</s> add </Box>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72449e044d77026a32baa9c8f2ecf3f44917eb58
|
example/storybook/stories/hooks/useSafeArea/Fixed.tsx
|
</Box>
|
<mask> return (
<mask> // This would look same on all devices
<mask> <View bg="teal.400" height={200} width={200} safeAreaTop={8}>
<mask> <Text>NativeBase</Text>
<mask> </View>
<mask> );
<mask> }
<mask>
<mask> export default function () {
<mask> return (
</s> fix: removed view from list of components and added safeAreaView to box </s> remove </View>
</s> add </Box> </s> remove <View bg="teal.400" height={200} width={200} safeAreaTop={8}>
</s> add <Box bg="teal.400" height={200} width={200} safeAreaTop={8}> </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Box, Text } from 'native-base'; </s> remove <View bg="teal.400" height={200} width={200} safeArea>
</s> add <Box bg="teal.400" height={200} width={200} safeAreaTop> </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Text, Box } from 'native-base';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72449e044d77026a32baa9c8f2ecf3f44917eb58
|
example/storybook/stories/hooks/useSafeArea/Fixed.tsx
|
import { NativeBaseProvider, Text, Box } from 'native-base';
|
<mask> import React from 'react';
<mask> import { NativeBaseProvider, View, Text } from 'native-base';
<mask> function MyComponent() {
<mask> return (
<mask> // This would look different on devices with different insets
<mask> <View bg="teal.400" height={200} width={200} safeArea>
<mask> <Text>NativeBase</Text>
</s> fix: removed view from list of components and added safeAreaView to box </s> remove <View bg="teal.400" height={200} width={200} safeArea>
</s> add <Box bg="teal.400" height={200} width={200} safeAreaTop> </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Box, Text } from 'native-base'; </s> remove </View>
</s> add </Box> </s> remove <View bg="teal.400" height={200} width={200} safeAreaTop={8}>
</s> add <Box bg="teal.400" height={200} width={200} safeAreaTop={8}> </s> remove </View>
</s> add </Box>
|
[
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72449e044d77026a32baa9c8f2ecf3f44917eb58
|
example/storybook/stories/hooks/useSafeArea/Flexible.tsx
|
<Box bg="teal.400" height={200} width={200} safeAreaTop>
|
<mask> import { NativeBaseProvider, View, Text } from 'native-base';
<mask> function MyComponent() {
<mask> return (
<mask> // This would look different on devices with different insets
<mask> <View bg="teal.400" height={200} width={200} safeArea>
<mask> <Text>NativeBase</Text>
<mask> </View>
<mask> );
<mask> }
<mask>
</s> fix: removed view from list of components and added safeAreaView to box </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Text, Box } from 'native-base'; </s> remove </View>
</s> add </Box> </s> remove <View bg="teal.400" height={200} width={200} safeAreaTop={8}>
</s> add <Box bg="teal.400" height={200} width={200} safeAreaTop={8}> </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Box, Text } from 'native-base'; </s> remove </View>
</s> add </Box>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72449e044d77026a32baa9c8f2ecf3f44917eb58
|
example/storybook/stories/hooks/useSafeArea/Flexible.tsx
|
</Box>
|
<mask> return (
<mask> // This would look different on devices with different insets
<mask> <View bg="teal.400" height={200} width={200} safeArea>
<mask> <Text>NativeBase</Text>
<mask> </View>
<mask> );
<mask> }
<mask>
<mask> export default function () {
<mask> return (
</s> fix: removed view from list of components and added safeAreaView to box </s> remove <View bg="teal.400" height={200} width={200} safeArea>
</s> add <Box bg="teal.400" height={200} width={200} safeAreaTop> </s> remove </View>
</s> add </Box> </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Text, Box } from 'native-base'; </s> remove <View bg="teal.400" height={200} width={200} safeAreaTop={8}>
</s> add <Box bg="teal.400" height={200} width={200} safeAreaTop={8}> </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Box, Text } from 'native-base';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72449e044d77026a32baa9c8f2ecf3f44917eb58
|
example/storybook/stories/hooks/useSafeArea/Flexible.tsx
|
// export * from './components/primitives/View';
|
<mask> export * from './components/composites/Toast';
<mask> export * from './components/composites/Transitions';
<mask> export * from './components/composites/Typeahead';
<mask>
<mask> export * from './components/primitives/View';
<mask> export * from './components/primitives/VStack';
<mask> export * from './components/composites/Wrap';
<mask> export * from './components/primitives/ZStack';
<mask>
<mask> // Hooks
</s> fix: removed view from list of components and added safeAreaView to box </s> remove </View>
</s> add </Box> </s> remove </View>
</s> add </Box> </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Box, Text } from 'native-base';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72449e044d77026a32baa9c8f2ecf3f44917eb58
|
example/storybook/stories/index.ts
|
import { useSafeArea } from '../../../hooks/useSafeArea';
|
<mask> } from '../../../utils/customProps';
<mask> import type { IBoxProps } from './types';
<mask>
<mask> const StyledBox = styled(View)<IBoxProps>(
<mask> color,
<mask> space,
</s> fix: removed view from list of components and added safeAreaView to box </s> remove <StyledBox ref={ref} {...boxProps}>
</s> add <StyledBox ref={ref} {...safeAreaProps}> </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Box, Text } from 'native-base'; </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Text, Box } from 'native-base';
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72449e044d77026a32baa9c8f2ecf3f44917eb58
|
src/components/primitives/Box/index.tsx
|
const safeAreaProps = useSafeArea(boxProps);
|
<mask>
<mask> const Box = ({ children, _text, ...props }: IBoxProps, ref: any) => {
<mask> const boxProps = useThemeProps('Box', props);
<mask> return (
<mask> <StyledBox ref={ref} {...safeAreaProps}>
<mask> {React.Children.map(children, (child) =>
<mask> typeof child === 'string' ? <Text {..._text}>{child}</Text> : child
<mask> )}
<mask> </StyledBox>
</s> fix: removed view from list of components and added safeAreaView to box </s> remove <StyledBox ref={ref} {...boxProps}>
</s> add <StyledBox ref={ref} {...safeAreaProps}> </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Text, Box } from 'native-base'; </s> remove </View>
</s> add </Box>
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72449e044d77026a32baa9c8f2ecf3f44917eb58
|
src/components/primitives/Box/index.tsx
|
<StyledBox ref={ref} {...safeAreaProps}>
|
<mask>
<mask> const Box = ({ children, _text, ...props }: IBoxProps, ref: any) => {
<mask> const boxProps = useThemeProps('Box', props);
<mask> return (
<mask> <StyledBox ref={ref} {...boxProps}>
<mask> {React.Children.map(children, (child) =>
<mask> typeof child === 'string' ? <Text {..._text}>{child}</Text> : child
<mask> )}
<mask> </StyledBox>
<mask> );
</s> fix: removed view from list of components and added safeAreaView to box </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Text, Box } from 'native-base'; </s> remove </View>
</s> add </Box>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72449e044d77026a32baa9c8f2ecf3f44917eb58
|
src/components/primitives/Box/index.tsx
|
SafeAreaProps,
|
<mask> customPositionProps,
<mask> customShadowProps,
<mask> customTransformProps,
<mask> customTypographyProps,
<mask> } from '../../../utils/customProps';
<mask> import type { ITextProps } from './../Text/types';
<mask>
<mask> export type IBoxProps = ViewProps &
</s> fix: removed view from list of components and added safeAreaView to box </s> remove export * from './components/primitives/View';
</s> add // export * from './components/primitives/View'; </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Box, Text } from 'native-base'; </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Text, Box } from 'native-base';
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72449e044d77026a32baa9c8f2ecf3f44917eb58
|
src/components/primitives/Box/types.ts
|
SafeAreaProps &
|
<mask> FlexboxProps &
<mask> TypographyProps &
<mask> PositionProps &
<mask> BorderProps &
<mask> customBorderProps &
<mask> customPositionProps &
<mask> customExtraProps &
<mask> customOutlineProps &
<mask> customShadowProps &
<mask> customLayoutProps &
</s> fix: removed view from list of components and added safeAreaView to box </s> remove View,
</s> add // View, </s> remove View,
</s> add // View, </s> remove <StyledBox ref={ref} {...boxProps}>
</s> add <StyledBox ref={ref} {...safeAreaProps}>
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72449e044d77026a32baa9c8f2ecf3f44917eb58
|
src/components/primitives/Box/types.ts
|
// View,
|
<mask> useTypeahead,
<mask> } from './components/composites';
<mask>
<mask> import {
<mask> View,
<mask> Text,
<mask> ITextProps,
<mask> Checkbox,
<mask> ICheckboxProps,
<mask> ICheckboxGroupProps,
</s> fix: removed view from list of components and added safeAreaView to box </s> remove View,
</s> add // View, </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Text, Box } from 'native-base'; </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Box, Text } from 'native-base';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72449e044d77026a32baa9c8f2ecf3f44917eb58
|
src/index.tsx
|
// View,
|
<mask> Button,
<mask> ButtonGroup,
<mask> IconButton,
<mask> Heading,
<mask> View,
<mask> Text,
<mask> Code,
<mask> Checkbox,
<mask> Radio,
<mask> Column,
</s> fix: removed view from list of components and added safeAreaView to box </s> remove View,
</s> add // View, </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Text, Box } from 'native-base'; </s> remove <View bg="teal.400" height={200} width={200} safeAreaTop={8}>
</s> add <Box bg="teal.400" height={200} width={200} safeAreaTop={8}> </s> remove <View bg="teal.400" height={200} width={200} safeArea>
</s> add <Box bg="teal.400" height={200} width={200} safeAreaTop> </s> remove import { NativeBaseProvider, View, Text } from 'native-base';
</s> add import { NativeBaseProvider, Box, Text } from 'native-base';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72449e044d77026a32baa9c8f2ecf3f44917eb58
|
src/index.tsx
|
<mask> import React, { Component } from "react";
<mask> import PropTypes from "prop-types";
<mask> import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
<mask> import { connectStyle } from "native-base-shoutem-theme";
<mask> import mapPropsToStyleNames from "../utils/mapPropsToStyleNames";
<mask> import variable from "../theme/variables/platform";
<mask>
<mask> class Content extends Component {
<mask> render() {
<mask> const variables = this.context.theme
</s> Changed file Content.js based on branch feat/SafeArea </s> remove render() {
const variables = this.context.theme
? this.context.theme["@@shoutem.theme/themeStyle"].variables
: variable;
return (
<KeyboardAwareScrollView
automaticallyAdjustContentInsets={false}
resetScrollToCoords={this.props.disableKBDismissScroll ? null : { x: 0, y: 0 }}
keyboardShouldPersistTaps={this.props.keyboardShouldPersistTaps ? this.props.keyboardShouldPersistTaps : 'handled'}
ref={c => {
this._scrollview = c;
this._root = c;
}}
{...this.props}
contentContainerStyle={[{ padding: this.props.padder ? variables.contentPadding : undefined }, this.props.contentContainerStyle]}
>
{this.props.children}
</KeyboardAwareScrollView>
);
}
</s> add static contextTypes = {
theme: PropTypes.object
};
constructor(props) {
super(props);
this.state = {
orientation: "portrait"
};
}
layoutChange(val) {
let maxComp = Math.max(variable.deviceWidth, variable.deviceHeight);
if (val.width >= maxComp) this.setState({ orientation: "landscape" });
else {
this.setState({ orientation: "portrait" });
}
}
calculateLeft(mode, inSet) {
let inset = null;
if (inSet !== undefined) {
inset = inSet;
} else {
inset = variable.Inset;
}
const InsetValues = mode === "portrait" ? inset.portrait : inset.landscape;
let leftPadder = null;
if (this.props.style[1] !== undefined) {
if (
this.props.style[1].padding !== undefined ||
this.props.style[1].paddingLeft !== undefined
) {
leftPadder =
(this.props.style[1].paddingLeft
? this.props.style[1].paddingLeft
: this.props.style[1].padding) + InsetValues.leftInset;
}
} else if (
this.props.style.padding !== undefined ||
this.props.style.paddingLeft !== undefined
) {
leftPadder =
(this.props.style.paddingLeft
? this.props.style.paddingLeft
: this.props.style.padding) + InsetValues.leftInset;
} else {
leftPadder = InsetValues.leftInset;
}
return leftPadder;
}
calculateRight(mode, inSet) {
let inset = null;
if (inSet !== undefined) {
inset = inSet;
} else {
inset = variable.Inset;
}
const InsetValues = mode === "portrait" ? inset.portrait : inset.landscape;
let rightPadder = null;
if (this.props.style[1] !== undefined) {
if (
this.props.style[1].padding !== undefined ||
this.props.style[1].paddingRight !== undefined
) {
rightPadder =
(this.props.style[1].paddingRight
? this.props.style[1].paddingRight
: this.props.style[1].padding) + InsetValues.rightInset;
}
} else if (
this.props.style.padding !== undefined ||
this.props.style.paddingRight !== undefined
) {
rightPadder =
(this.props.style.paddingRight
? this.props.style.paddingRight
: this.props.style.padding) + InsetValues.rightInset;
} else {
rightPadder = InsetValues.rightInset;
}
return rightPadder;
}
render() {
const variables = this.context.theme
? this.context.theme["@@shoutem.theme/themeStyle"].variables
: variable;
return variable.isIphoneX ? (
<KeyboardAwareScrollView
automaticallyAdjustContentInsets={false}
resetScrollToCoords={
this.props.disableKBDismissScroll ? null : { x: 0, y: 0 }
}
keyboardShouldPersistTaps={
this.props.keyboardShouldPersistTaps
? this.props.keyboardShouldPersistTaps
: "handled"
}
ref={c => {
this._scrollview = c;
this._root = c;
}}
{...this.props}
onLayout={e => this.layoutChange(e.nativeEvent.layout)}
style={[
this.props.style,
{
paddingLeft: this.calculateLeft(
this.state.orientation,
variables.Inset
)
}
]}
contentContainerStyle={[{ padding: this.props.padder ? variables.contentPadding : undefined }, this.props.contentContainerStyle]}
>
{this.props.children}
</KeyboardAwareScrollView>
) : (
<KeyboardAwareScrollView
automaticallyAdjustContentInsets={false}
resetScrollToCoords={
this.props.disableKBDismissScroll ? null : { x: 0, y: 0 }
}
keyboardShouldPersistTaps={
this.props.keyboardShouldPersistTaps
? this.props.keyboardShouldPersistTaps
: "handled"
}
ref={c => {
this._scrollview = c;
this._root = c;
}}
{...this.props}
contentContainerStyle={[{ padding: this.props.padder ? variables.contentPadding : undefined }, this.props.contentContainerStyle]}
>
{this.props.children}
</KeyboardAwareScrollView>
);
} </s> remove style: PropTypes.oneOfType([PropTypes.object, PropTypes.number, PropTypes.array]),
padder: PropTypes.bool,
disableKBDismissScroll: PropTypes.bool,
enableResetScrollToCoords: PropTypes.bool,
keyboardShouldPersistTaps: PropTypes.string
</s> add style: PropTypes.oneOfType([
PropTypes.object,
PropTypes.number,
PropTypes.array
]),
padder: PropTypes.bool,
disableKBDismissScroll: PropTypes.bool,
enableResetScrollToCoords: PropTypes.bool,
keyboardShouldPersistTaps: PropTypes.string </s> remove const StyledContent = connectStyle("NativeBase.Content", {}, mapPropsToStyleNames)(Content);
</s> add const StyledContent = connectStyle(
"NativeBase.Content",
{},
mapPropsToStyleNames
)(Content);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/729f04f45d3b15c600acefbf560d80005c8bcb37
|
src/basic/Content.js
|
|
import mapPropsToStyleNames from "../utils/mapPropsToStyleNames";
|
<mask> import PropTypes from "prop-types";
<mask> import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
<mask> import { connectStyle } from "native-base-shoutem-theme";
<mask> import variable from "../theme/variables/platform";
<mask>
<mask> class Content extends Component {
<mask> static contextTypes = {
<mask> theme: PropTypes.object
<mask> };
</s> Changed file Content.js based on branch feat/SafeArea </s> remove import mapPropsToStyleNames from "../utils/mapPropsToStyleNames";
</s> add </s> remove render() {
const variables = this.context.theme
? this.context.theme["@@shoutem.theme/themeStyle"].variables
: variable;
return (
<KeyboardAwareScrollView
automaticallyAdjustContentInsets={false}
resetScrollToCoords={this.props.disableKBDismissScroll ? null : { x: 0, y: 0 }}
keyboardShouldPersistTaps={this.props.keyboardShouldPersistTaps ? this.props.keyboardShouldPersistTaps : 'handled'}
ref={c => {
this._scrollview = c;
this._root = c;
}}
{...this.props}
contentContainerStyle={[{ padding: this.props.padder ? variables.contentPadding : undefined }, this.props.contentContainerStyle]}
>
{this.props.children}
</KeyboardAwareScrollView>
);
}
</s> add static contextTypes = {
theme: PropTypes.object
};
constructor(props) {
super(props);
this.state = {
orientation: "portrait"
};
}
layoutChange(val) {
let maxComp = Math.max(variable.deviceWidth, variable.deviceHeight);
if (val.width >= maxComp) this.setState({ orientation: "landscape" });
else {
this.setState({ orientation: "portrait" });
}
}
calculateLeft(mode, inSet) {
let inset = null;
if (inSet !== undefined) {
inset = inSet;
} else {
inset = variable.Inset;
}
const InsetValues = mode === "portrait" ? inset.portrait : inset.landscape;
let leftPadder = null;
if (this.props.style[1] !== undefined) {
if (
this.props.style[1].padding !== undefined ||
this.props.style[1].paddingLeft !== undefined
) {
leftPadder =
(this.props.style[1].paddingLeft
? this.props.style[1].paddingLeft
: this.props.style[1].padding) + InsetValues.leftInset;
}
} else if (
this.props.style.padding !== undefined ||
this.props.style.paddingLeft !== undefined
) {
leftPadder =
(this.props.style.paddingLeft
? this.props.style.paddingLeft
: this.props.style.padding) + InsetValues.leftInset;
} else {
leftPadder = InsetValues.leftInset;
}
return leftPadder;
}
calculateRight(mode, inSet) {
let inset = null;
if (inSet !== undefined) {
inset = inSet;
} else {
inset = variable.Inset;
}
const InsetValues = mode === "portrait" ? inset.portrait : inset.landscape;
let rightPadder = null;
if (this.props.style[1] !== undefined) {
if (
this.props.style[1].padding !== undefined ||
this.props.style[1].paddingRight !== undefined
) {
rightPadder =
(this.props.style[1].paddingRight
? this.props.style[1].paddingRight
: this.props.style[1].padding) + InsetValues.rightInset;
}
} else if (
this.props.style.padding !== undefined ||
this.props.style.paddingRight !== undefined
) {
rightPadder =
(this.props.style.paddingRight
? this.props.style.paddingRight
: this.props.style.padding) + InsetValues.rightInset;
} else {
rightPadder = InsetValues.rightInset;
}
return rightPadder;
}
render() {
const variables = this.context.theme
? this.context.theme["@@shoutem.theme/themeStyle"].variables
: variable;
return variable.isIphoneX ? (
<KeyboardAwareScrollView
automaticallyAdjustContentInsets={false}
resetScrollToCoords={
this.props.disableKBDismissScroll ? null : { x: 0, y: 0 }
}
keyboardShouldPersistTaps={
this.props.keyboardShouldPersistTaps
? this.props.keyboardShouldPersistTaps
: "handled"
}
ref={c => {
this._scrollview = c;
this._root = c;
}}
{...this.props}
onLayout={e => this.layoutChange(e.nativeEvent.layout)}
style={[
this.props.style,
{
paddingLeft: this.calculateLeft(
this.state.orientation,
variables.Inset
)
}
]}
contentContainerStyle={[{ padding: this.props.padder ? variables.contentPadding : undefined }, this.props.contentContainerStyle]}
>
{this.props.children}
</KeyboardAwareScrollView>
) : (
<KeyboardAwareScrollView
automaticallyAdjustContentInsets={false}
resetScrollToCoords={
this.props.disableKBDismissScroll ? null : { x: 0, y: 0 }
}
keyboardShouldPersistTaps={
this.props.keyboardShouldPersistTaps
? this.props.keyboardShouldPersistTaps
: "handled"
}
ref={c => {
this._scrollview = c;
this._root = c;
}}
{...this.props}
contentContainerStyle={[{ padding: this.props.padder ? variables.contentPadding : undefined }, this.props.contentContainerStyle]}
>
{this.props.children}
</KeyboardAwareScrollView>
);
} </s> remove style: PropTypes.oneOfType([PropTypes.object, PropTypes.number, PropTypes.array]),
padder: PropTypes.bool,
disableKBDismissScroll: PropTypes.bool,
enableResetScrollToCoords: PropTypes.bool,
keyboardShouldPersistTaps: PropTypes.string
</s> add style: PropTypes.oneOfType([
PropTypes.object,
PropTypes.number,
PropTypes.array
]),
padder: PropTypes.bool,
disableKBDismissScroll: PropTypes.bool,
enableResetScrollToCoords: PropTypes.bool,
keyboardShouldPersistTaps: PropTypes.string </s> remove const StyledContent = connectStyle("NativeBase.Content", {}, mapPropsToStyleNames)(Content);
</s> add const StyledContent = connectStyle(
"NativeBase.Content",
{},
mapPropsToStyleNames
)(Content);
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/729f04f45d3b15c600acefbf560d80005c8bcb37
|
src/basic/Content.js
|
static contextTypes = {
theme: PropTypes.object
};
constructor(props) {
super(props);
this.state = {
orientation: "portrait"
};
}
layoutChange(val) {
let maxComp = Math.max(variable.deviceWidth, variable.deviceHeight);
if (val.width >= maxComp) this.setState({ orientation: "landscape" });
else {
this.setState({ orientation: "portrait" });
}
}
calculateLeft(mode, inSet) {
let inset = null;
if (inSet !== undefined) {
inset = inSet;
} else {
inset = variable.Inset;
}
const InsetValues = mode === "portrait" ? inset.portrait : inset.landscape;
let leftPadder = null;
if (this.props.style[1] !== undefined) {
if (
this.props.style[1].padding !== undefined ||
this.props.style[1].paddingLeft !== undefined
) {
leftPadder =
(this.props.style[1].paddingLeft
? this.props.style[1].paddingLeft
: this.props.style[1].padding) + InsetValues.leftInset;
}
} else if (
this.props.style.padding !== undefined ||
this.props.style.paddingLeft !== undefined
) {
leftPadder =
(this.props.style.paddingLeft
? this.props.style.paddingLeft
: this.props.style.padding) + InsetValues.leftInset;
} else {
leftPadder = InsetValues.leftInset;
}
return leftPadder;
}
calculateRight(mode, inSet) {
let inset = null;
if (inSet !== undefined) {
inset = inSet;
} else {
inset = variable.Inset;
}
const InsetValues = mode === "portrait" ? inset.portrait : inset.landscape;
let rightPadder = null;
if (this.props.style[1] !== undefined) {
if (
this.props.style[1].padding !== undefined ||
this.props.style[1].paddingRight !== undefined
) {
rightPadder =
(this.props.style[1].paddingRight
? this.props.style[1].paddingRight
: this.props.style[1].padding) + InsetValues.rightInset;
}
} else if (
this.props.style.padding !== undefined ||
this.props.style.paddingRight !== undefined
) {
rightPadder =
(this.props.style.paddingRight
? this.props.style.paddingRight
: this.props.style.padding) + InsetValues.rightInset;
} else {
rightPadder = InsetValues.rightInset;
}
return rightPadder;
}
render() {
const variables = this.context.theme
? this.context.theme["@@shoutem.theme/themeStyle"].variables
: variable;
return variable.isIphoneX ? (
<KeyboardAwareScrollView
automaticallyAdjustContentInsets={false}
resetScrollToCoords={
this.props.disableKBDismissScroll ? null : { x: 0, y: 0 }
}
keyboardShouldPersistTaps={
this.props.keyboardShouldPersistTaps
? this.props.keyboardShouldPersistTaps
: "handled"
}
ref={c => {
this._scrollview = c;
this._root = c;
}}
{...this.props}
onLayout={e => this.layoutChange(e.nativeEvent.layout)}
style={[
this.props.style,
{
paddingLeft: this.calculateLeft(
this.state.orientation,
variables.Inset
)
}
]}
contentContainerStyle={[{ padding: this.props.padder ? variables.contentPadding : undefined }, this.props.contentContainerStyle]}
>
{this.props.children}
</KeyboardAwareScrollView>
) : (
<KeyboardAwareScrollView
automaticallyAdjustContentInsets={false}
resetScrollToCoords={
this.props.disableKBDismissScroll ? null : { x: 0, y: 0 }
}
keyboardShouldPersistTaps={
this.props.keyboardShouldPersistTaps
? this.props.keyboardShouldPersistTaps
: "handled"
}
ref={c => {
this._scrollview = c;
this._root = c;
}}
{...this.props}
contentContainerStyle={[{ padding: this.props.padder ? variables.contentPadding : undefined }, this.props.contentContainerStyle]}
>
{this.props.children}
</KeyboardAwareScrollView>
);
}
|
<mask> import mapPropsToStyleNames from "../utils/mapPropsToStyleNames";
<mask> import variable from "../theme/variables/platform";
<mask>
<mask> class Content extends Component {
<mask> render() {
<mask> const variables = this.context.theme
<mask> ? this.context.theme["@@shoutem.theme/themeStyle"].variables
<mask> : variable;
<mask> return (
<mask> <KeyboardAwareScrollView
<mask> automaticallyAdjustContentInsets={false}
<mask> resetScrollToCoords={this.props.disableKBDismissScroll ? null : { x: 0, y: 0 }}
<mask> keyboardShouldPersistTaps={this.props.keyboardShouldPersistTaps ? this.props.keyboardShouldPersistTaps : 'handled'}
<mask> ref={c => {
<mask> this._scrollview = c;
<mask> this._root = c;
<mask> }}
<mask> {...this.props}
<mask> contentContainerStyle={[{ padding: this.props.padder ? variables.contentPadding : undefined }, this.props.contentContainerStyle]}
<mask> >
<mask> {this.props.children}
<mask> </KeyboardAwareScrollView>
<mask> );
<mask> }
<mask> }
<mask>
<mask> Content.propTypes = {
<mask> style: PropTypes.oneOfType([PropTypes.object, PropTypes.number, PropTypes.array]),
<mask> padder: PropTypes.bool,
</s> Changed file Content.js based on branch feat/SafeArea </s> remove import mapPropsToStyleNames from "../utils/mapPropsToStyleNames";
</s> add </s> remove style: PropTypes.oneOfType([PropTypes.object, PropTypes.number, PropTypes.array]),
padder: PropTypes.bool,
disableKBDismissScroll: PropTypes.bool,
enableResetScrollToCoords: PropTypes.bool,
keyboardShouldPersistTaps: PropTypes.string
</s> add style: PropTypes.oneOfType([
PropTypes.object,
PropTypes.number,
PropTypes.array
]),
padder: PropTypes.bool,
disableKBDismissScroll: PropTypes.bool,
enableResetScrollToCoords: PropTypes.bool,
keyboardShouldPersistTaps: PropTypes.string </s> remove const StyledContent = connectStyle("NativeBase.Content", {}, mapPropsToStyleNames)(Content);
</s> add const StyledContent = connectStyle(
"NativeBase.Content",
{},
mapPropsToStyleNames
)(Content);
|
[
"keep",
"keep",
"keep",
"keep",
"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/729f04f45d3b15c600acefbf560d80005c8bcb37
|
src/basic/Content.js
|
style: PropTypes.oneOfType([
PropTypes.object,
PropTypes.number,
PropTypes.array
]),
padder: PropTypes.bool,
disableKBDismissScroll: PropTypes.bool,
enableResetScrollToCoords: PropTypes.bool,
keyboardShouldPersistTaps: PropTypes.string
|
<mask> }
<mask> }
<mask>
<mask> Content.propTypes = {
<mask> style: PropTypes.oneOfType([PropTypes.object, PropTypes.number, PropTypes.array]),
<mask> padder: PropTypes.bool,
<mask> disableKBDismissScroll: PropTypes.bool,
<mask> enableResetScrollToCoords: PropTypes.bool,
<mask> keyboardShouldPersistTaps: PropTypes.string
<mask> };
<mask>
<mask> const StyledContent = connectStyle("NativeBase.Content", {}, mapPropsToStyleNames)(Content);
<mask>
<mask> export { StyledContent as Content };
</s> Changed file Content.js based on branch feat/SafeArea </s> remove const StyledContent = connectStyle("NativeBase.Content", {}, mapPropsToStyleNames)(Content);
</s> add const StyledContent = connectStyle(
"NativeBase.Content",
{},
mapPropsToStyleNames
)(Content); </s> remove render() {
const variables = this.context.theme
? this.context.theme["@@shoutem.theme/themeStyle"].variables
: variable;
return (
<KeyboardAwareScrollView
automaticallyAdjustContentInsets={false}
resetScrollToCoords={this.props.disableKBDismissScroll ? null : { x: 0, y: 0 }}
keyboardShouldPersistTaps={this.props.keyboardShouldPersistTaps ? this.props.keyboardShouldPersistTaps : 'handled'}
ref={c => {
this._scrollview = c;
this._root = c;
}}
{...this.props}
contentContainerStyle={[{ padding: this.props.padder ? variables.contentPadding : undefined }, this.props.contentContainerStyle]}
>
{this.props.children}
</KeyboardAwareScrollView>
);
}
</s> add static contextTypes = {
theme: PropTypes.object
};
constructor(props) {
super(props);
this.state = {
orientation: "portrait"
};
}
layoutChange(val) {
let maxComp = Math.max(variable.deviceWidth, variable.deviceHeight);
if (val.width >= maxComp) this.setState({ orientation: "landscape" });
else {
this.setState({ orientation: "portrait" });
}
}
calculateLeft(mode, inSet) {
let inset = null;
if (inSet !== undefined) {
inset = inSet;
} else {
inset = variable.Inset;
}
const InsetValues = mode === "portrait" ? inset.portrait : inset.landscape;
let leftPadder = null;
if (this.props.style[1] !== undefined) {
if (
this.props.style[1].padding !== undefined ||
this.props.style[1].paddingLeft !== undefined
) {
leftPadder =
(this.props.style[1].paddingLeft
? this.props.style[1].paddingLeft
: this.props.style[1].padding) + InsetValues.leftInset;
}
} else if (
this.props.style.padding !== undefined ||
this.props.style.paddingLeft !== undefined
) {
leftPadder =
(this.props.style.paddingLeft
? this.props.style.paddingLeft
: this.props.style.padding) + InsetValues.leftInset;
} else {
leftPadder = InsetValues.leftInset;
}
return leftPadder;
}
calculateRight(mode, inSet) {
let inset = null;
if (inSet !== undefined) {
inset = inSet;
} else {
inset = variable.Inset;
}
const InsetValues = mode === "portrait" ? inset.portrait : inset.landscape;
let rightPadder = null;
if (this.props.style[1] !== undefined) {
if (
this.props.style[1].padding !== undefined ||
this.props.style[1].paddingRight !== undefined
) {
rightPadder =
(this.props.style[1].paddingRight
? this.props.style[1].paddingRight
: this.props.style[1].padding) + InsetValues.rightInset;
}
} else if (
this.props.style.padding !== undefined ||
this.props.style.paddingRight !== undefined
) {
rightPadder =
(this.props.style.paddingRight
? this.props.style.paddingRight
: this.props.style.padding) + InsetValues.rightInset;
} else {
rightPadder = InsetValues.rightInset;
}
return rightPadder;
}
render() {
const variables = this.context.theme
? this.context.theme["@@shoutem.theme/themeStyle"].variables
: variable;
return variable.isIphoneX ? (
<KeyboardAwareScrollView
automaticallyAdjustContentInsets={false}
resetScrollToCoords={
this.props.disableKBDismissScroll ? null : { x: 0, y: 0 }
}
keyboardShouldPersistTaps={
this.props.keyboardShouldPersistTaps
? this.props.keyboardShouldPersistTaps
: "handled"
}
ref={c => {
this._scrollview = c;
this._root = c;
}}
{...this.props}
onLayout={e => this.layoutChange(e.nativeEvent.layout)}
style={[
this.props.style,
{
paddingLeft: this.calculateLeft(
this.state.orientation,
variables.Inset
)
}
]}
contentContainerStyle={[{ padding: this.props.padder ? variables.contentPadding : undefined }, this.props.contentContainerStyle]}
>
{this.props.children}
</KeyboardAwareScrollView>
) : (
<KeyboardAwareScrollView
automaticallyAdjustContentInsets={false}
resetScrollToCoords={
this.props.disableKBDismissScroll ? null : { x: 0, y: 0 }
}
keyboardShouldPersistTaps={
this.props.keyboardShouldPersistTaps
? this.props.keyboardShouldPersistTaps
: "handled"
}
ref={c => {
this._scrollview = c;
this._root = c;
}}
{...this.props}
contentContainerStyle={[{ padding: this.props.padder ? variables.contentPadding : undefined }, this.props.contentContainerStyle]}
>
{this.props.children}
</KeyboardAwareScrollView>
);
} </s> remove import mapPropsToStyleNames from "../utils/mapPropsToStyleNames";
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/729f04f45d3b15c600acefbf560d80005c8bcb37
|
src/basic/Content.js
|
const StyledContent = connectStyle(
"NativeBase.Content",
{},
mapPropsToStyleNames
)(Content);
|
<mask> enableResetScrollToCoords: PropTypes.bool,
<mask> keyboardShouldPersistTaps: PropTypes.string
<mask> };
<mask>
<mask> const StyledContent = connectStyle("NativeBase.Content", {}, mapPropsToStyleNames)(Content);
<mask>
<mask> export { StyledContent as Content };
</s> Changed file Content.js based on branch feat/SafeArea </s> remove style: PropTypes.oneOfType([PropTypes.object, PropTypes.number, PropTypes.array]),
padder: PropTypes.bool,
disableKBDismissScroll: PropTypes.bool,
enableResetScrollToCoords: PropTypes.bool,
keyboardShouldPersistTaps: PropTypes.string
</s> add style: PropTypes.oneOfType([
PropTypes.object,
PropTypes.number,
PropTypes.array
]),
padder: PropTypes.bool,
disableKBDismissScroll: PropTypes.bool,
enableResetScrollToCoords: PropTypes.bool,
keyboardShouldPersistTaps: PropTypes.string </s> remove render() {
const variables = this.context.theme
? this.context.theme["@@shoutem.theme/themeStyle"].variables
: variable;
return (
<KeyboardAwareScrollView
automaticallyAdjustContentInsets={false}
resetScrollToCoords={this.props.disableKBDismissScroll ? null : { x: 0, y: 0 }}
keyboardShouldPersistTaps={this.props.keyboardShouldPersistTaps ? this.props.keyboardShouldPersistTaps : 'handled'}
ref={c => {
this._scrollview = c;
this._root = c;
}}
{...this.props}
contentContainerStyle={[{ padding: this.props.padder ? variables.contentPadding : undefined }, this.props.contentContainerStyle]}
>
{this.props.children}
</KeyboardAwareScrollView>
);
}
</s> add static contextTypes = {
theme: PropTypes.object
};
constructor(props) {
super(props);
this.state = {
orientation: "portrait"
};
}
layoutChange(val) {
let maxComp = Math.max(variable.deviceWidth, variable.deviceHeight);
if (val.width >= maxComp) this.setState({ orientation: "landscape" });
else {
this.setState({ orientation: "portrait" });
}
}
calculateLeft(mode, inSet) {
let inset = null;
if (inSet !== undefined) {
inset = inSet;
} else {
inset = variable.Inset;
}
const InsetValues = mode === "portrait" ? inset.portrait : inset.landscape;
let leftPadder = null;
if (this.props.style[1] !== undefined) {
if (
this.props.style[1].padding !== undefined ||
this.props.style[1].paddingLeft !== undefined
) {
leftPadder =
(this.props.style[1].paddingLeft
? this.props.style[1].paddingLeft
: this.props.style[1].padding) + InsetValues.leftInset;
}
} else if (
this.props.style.padding !== undefined ||
this.props.style.paddingLeft !== undefined
) {
leftPadder =
(this.props.style.paddingLeft
? this.props.style.paddingLeft
: this.props.style.padding) + InsetValues.leftInset;
} else {
leftPadder = InsetValues.leftInset;
}
return leftPadder;
}
calculateRight(mode, inSet) {
let inset = null;
if (inSet !== undefined) {
inset = inSet;
} else {
inset = variable.Inset;
}
const InsetValues = mode === "portrait" ? inset.portrait : inset.landscape;
let rightPadder = null;
if (this.props.style[1] !== undefined) {
if (
this.props.style[1].padding !== undefined ||
this.props.style[1].paddingRight !== undefined
) {
rightPadder =
(this.props.style[1].paddingRight
? this.props.style[1].paddingRight
: this.props.style[1].padding) + InsetValues.rightInset;
}
} else if (
this.props.style.padding !== undefined ||
this.props.style.paddingRight !== undefined
) {
rightPadder =
(this.props.style.paddingRight
? this.props.style.paddingRight
: this.props.style.padding) + InsetValues.rightInset;
} else {
rightPadder = InsetValues.rightInset;
}
return rightPadder;
}
render() {
const variables = this.context.theme
? this.context.theme["@@shoutem.theme/themeStyle"].variables
: variable;
return variable.isIphoneX ? (
<KeyboardAwareScrollView
automaticallyAdjustContentInsets={false}
resetScrollToCoords={
this.props.disableKBDismissScroll ? null : { x: 0, y: 0 }
}
keyboardShouldPersistTaps={
this.props.keyboardShouldPersistTaps
? this.props.keyboardShouldPersistTaps
: "handled"
}
ref={c => {
this._scrollview = c;
this._root = c;
}}
{...this.props}
onLayout={e => this.layoutChange(e.nativeEvent.layout)}
style={[
this.props.style,
{
paddingLeft: this.calculateLeft(
this.state.orientation,
variables.Inset
)
}
]}
contentContainerStyle={[{ padding: this.props.padder ? variables.contentPadding : undefined }, this.props.contentContainerStyle]}
>
{this.props.children}
</KeyboardAwareScrollView>
) : (
<KeyboardAwareScrollView
automaticallyAdjustContentInsets={false}
resetScrollToCoords={
this.props.disableKBDismissScroll ? null : { x: 0, y: 0 }
}
keyboardShouldPersistTaps={
this.props.keyboardShouldPersistTaps
? this.props.keyboardShouldPersistTaps
: "handled"
}
ref={c => {
this._scrollview = c;
this._root = c;
}}
{...this.props}
contentContainerStyle={[{ padding: this.props.padder ? variables.contentPadding : undefined }, this.props.contentContainerStyle]}
>
{this.props.children}
</KeyboardAwareScrollView>
);
} </s> remove import mapPropsToStyleNames from "../utils/mapPropsToStyleNames";
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/729f04f45d3b15c600acefbf560d80005c8bcb37
|
src/basic/Content.js
|
const remainingChildren: JSX.Element[] = [];
|
<mask> size,
<mask> });
<mask>
<mask> let Badge = <></>;
<mask> let remainingChildren: JSX.Element[] = [];
<mask> // Pop Badge from children
<mask> React.Children.map(children, (child, key) => {
<mask> if (
<mask> typeof child?.type === 'object' &&
<mask> child?.type.displayName === 'AvatarBadge'
</s> fix: fixed avatar api for no children </s> remove remainingChildren
</s> add remainingChildren.length !== 0 && remainingChildren </s> remove ) : remainingChildren.length === 0 ? (
<Text {..._text}>--</Text> // default alternate
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72f06bce524626b909e2ae9dbe540990a42face4
|
src/components/composites/Avatar/Avatar.tsx
|
<mask> setError(true);
<mask> }}
<mask> ref={ref}
<mask> />
<mask> ) : remainingChildren.length === 0 ? (
<mask> <Text {..._text}>--</Text> // default alternate
<mask> ) : (
<mask> remainingChildren
<mask> )}
<mask> {Badge}
<mask> </Box>
</s> fix: fixed avatar api for no children </s> remove remainingChildren
</s> add remainingChildren.length !== 0 && remainingChildren </s> remove let remainingChildren: JSX.Element[] = [];
</s> add const remainingChildren: JSX.Element[] = [];
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72f06bce524626b909e2ae9dbe540990a42face4
|
src/components/composites/Avatar/Avatar.tsx
|
|
remainingChildren.length !== 0 && remainingChildren
|
<mask> />
<mask> ) : remainingChildren.length === 0 ? (
<mask> <Text {..._text}>--</Text> // default alternate
<mask> ) : (
<mask> remainingChildren
<mask> )}
<mask> {Badge}
<mask> </Box>
<mask> );
<mask> };
</s> fix: fixed avatar api for no children </s> remove ) : remainingChildren.length === 0 ? (
<Text {..._text}>--</Text> // default alternate
</s> add </s> remove let remainingChildren: JSX.Element[] = [];
</s> add const remainingChildren: JSX.Element[] = [];
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/72f06bce524626b909e2ae9dbe540990a42face4
|
src/components/composites/Avatar/Avatar.tsx
|
storiesOf('usePopover', module)
|
<mask> import { withKnobs } from '@storybook/addon-knobs';
<mask> import Wrapper from './../../components/Wrapper';
<mask> import Usage from './Usage';
<mask>
<mask> storiesOf('useClipboard', module)
<mask> .addDecorator(withKnobs)
<mask> .addDecorator((getStory: any) => <Wrapper>{getStory()}</Wrapper>)
<mask> .add('Usage', () => <Usage />);
</s> Fixes for SafeAreaView and minor improvements </s> remove
const ColoredBackground = ({ children, ...props }: any) => (
<View {...props} bg={useColorModeValue(`gray.50`, `gray.800`)} flex={1}>
<OverlayProvider>
<PopoverProvider>{children}</PopoverProvider>
</OverlayProvider>
</View>
);
</s> add import SafeAreaView from '../components/primitives/SafeAreaView'; </s> remove import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig';
</s> add import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig/usePropsWithComponentTheme'; </s> remove import { usePropsConfig } from '../../../hooks';
</s> add import { usePropsConfig } from '../../../hooks/usePropsConfig'; </s> remove import { SafeAreaView, StyleSheet } from 'react-native';
</s> add </s> remove import { canUseDom } from '../../../utils';
</s> add import { canUseDom } from '../../../utils/canUseDom';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7342fb0da44b7b1aeab3f07b27907dcf15503f6a
|
example/storybook/stories/hooks/usePopover/index.tsx
|
"babel-plugin-transform-remove-console": "^6.9.4",
|
<mask> "@types/react-native-vector-icons": "^6.4.6",
<mask> "@types/styled-components-react-native": "^5.1.0",
<mask> "@types/styled-system": "^5.1.9",
<mask> "@types/tinycolor2": "^1.4.2",
<mask> "commitlint": "^8.3.5",
<mask> "eslint": "^7.10.0",
<mask> "eslint-config-prettier": "^6.11.0",
<mask> "eslint-plugin-prettier": "^3.1.3",
<mask> "husky": "^4.2.5",
<mask> "jest": "^26.0.1",
</s> Fixes for SafeAreaView and minor improvements </s> remove import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig';
</s> add import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig/usePropsWithComponentTheme'; </s> remove {disableSafeArea ? (
<ColoredBackground {...rest} />
) : (
<SafeAreaView style={styles.container}>
<ColoredBackground {...rest} />
</SafeAreaView>
)}
</s> add <Wrapper bg={useColorModeValue(`gray.50`, `gray.800`)} flex={1}>
<OverlayProvider>
<PopoverProvider>{children}</PopoverProvider>
</OverlayProvider>
</Wrapper> </s> remove const styles = StyleSheet.create({
container: {
flex: 1,
},
});
</s> add const Wrapper = disableSafeArea ? View : SafeAreaView; </s> remove ...rest
</s> add children, </s> remove
const ColoredBackground = ({ children, ...props }: any) => (
<View {...props} bg={useColorModeValue(`gray.50`, `gray.800`)} flex={1}>
<OverlayProvider>
<PopoverProvider>{children}</PopoverProvider>
</OverlayProvider>
</View>
);
</s> add import SafeAreaView from '../components/primitives/SafeAreaView';
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7342fb0da44b7b1aeab3f07b27907dcf15503f6a
|
package.json
|
class Tooltip extends React.PureComponent<Props, State> {
|
<mask> borderColor?: string;
<mask> borderWidth?: number;
<mask> };
<mask>
<mask> class Tooltip extends React.Component<Props, State> {
<mask> state = {
<mask> isVisible: false,
<mask> yOffset: 0,
<mask> xOffset: 0,
<mask> elementWidth: 0,
</s> Fixes for SafeAreaView and minor improvements </s> remove class NBSlider extends React.Component<
</s> add class NBSlider extends React.PureComponent< </s> remove import { canUseDom } from '../../../utils';
</s> add import { canUseDom } from '../../../utils/canUseDom'; </s> remove { fontSize: newProps.size },
</s> add { fontSize: parseInt(newProps.size, 10) }, </s> remove ...rest
</s> add children, </s> remove import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig';
</s> add import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig/usePropsWithComponentTheme';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7342fb0da44b7b1aeab3f07b27907dcf15503f6a
|
src/components/composites/Popover/Tooltip.tsx
|
import { canUseDom } from '../../../utils/canUseDom';
|
<mask> import React from 'react';
<mask> import { Animated, Platform } from 'react-native';
<mask> import { canUseDom } from '../../../utils';
<mask>
<mask> export const useFadeTransition = (
<mask> duration = 500,
<mask> initValue = 0,
<mask> finalValue = 1
</s> Fixes for SafeAreaView and minor improvements </s> remove import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig';
</s> add import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig/usePropsWithComponentTheme'; </s> remove import { SafeAreaView, StyleSheet } from 'react-native';
</s> add </s> remove
const ColoredBackground = ({ children, ...props }: any) => (
<View {...props} bg={useColorModeValue(`gray.50`, `gray.800`)} flex={1}>
<OverlayProvider>
<PopoverProvider>{children}</PopoverProvider>
</OverlayProvider>
</View>
);
</s> add import SafeAreaView from '../components/primitives/SafeAreaView'; </s> remove import { usePropsConfig } from '../../../hooks';
</s> add import { usePropsConfig } from '../../../hooks/usePropsConfig'; </s> remove class Tooltip extends React.Component<Props, State> {
</s> add class Tooltip extends React.PureComponent<Props, State> {
|
[
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7342fb0da44b7b1aeab3f07b27907dcf15503f6a
|
src/components/composites/Transitions/useFadeTransition.tsx
|
{ fontSize: parseInt(newProps.size, 10) },
|
<mask> if (!name) {
<mask> return <SVGIcon {...iconProps} />;
<mask> }
<mask> const flattenedIconStyle: TextStyle = StyleSheet.flatten([
<mask> { fontSize: newProps.size },
<mask> ]);
<mask> switch (type) {
<mask> case 'AntDesign':
<mask> return (
<mask> <AntDesign
</s> Fixes for SafeAreaView and minor improvements </s> remove const styles = StyleSheet.create({
container: {
flex: 1,
},
});
</s> add const Wrapper = disableSafeArea ? View : SafeAreaView; </s> remove import { canUseDom } from '../../../utils';
</s> add import { canUseDom } from '../../../utils/canUseDom'; </s> remove ...rest
</s> add children, </s> remove import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig';
</s> add import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig/usePropsWithComponentTheme'; </s> remove import { usePropsConfig } from '../../../hooks';
</s> add import { usePropsConfig } from '../../../hooks/usePropsConfig';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7342fb0da44b7b1aeab3f07b27907dcf15503f6a
|
src/components/primitives/Icon/index.tsx
|
class NBSlider extends React.PureComponent<
|
<mask> deltaValue: number;
<mask> value: number;
<mask> };
<mask>
<mask> class NBSlider extends React.Component<
<mask> ISliderProps & {
<mask> thumbSize?: number;
<mask> sliderSize?: number;
<mask> activeColor?: string;
<mask> },
</s> Fixes for SafeAreaView and minor improvements </s> remove class Tooltip extends React.Component<Props, State> {
</s> add class Tooltip extends React.PureComponent<Props, State> { </s> remove { fontSize: newProps.size },
</s> add { fontSize: parseInt(newProps.size, 10) }, </s> remove const styles = StyleSheet.create({
container: {
flex: 1,
},
});
</s> add const Wrapper = disableSafeArea ? View : SafeAreaView; </s> remove {disableSafeArea ? (
<ColoredBackground {...rest} />
) : (
<SafeAreaView style={styles.container}>
<ColoredBackground {...rest} />
</SafeAreaView>
)}
</s> add <Wrapper bg={useColorModeValue(`gray.50`, `gray.800`)} flex={1}>
<OverlayProvider>
<PopoverProvider>{children}</PopoverProvider>
</OverlayProvider>
</Wrapper> </s> remove import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig';
</s> add import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig/usePropsWithComponentTheme';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7342fb0da44b7b1aeab3f07b27907dcf15503f6a
|
src/components/primitives/Slider/Slider.tsx
|
import { usePropsConfig } from '../../../hooks/usePropsConfig';
|
<mask> layout,
<mask> flexbox,
<mask> border,
<mask> } from 'styled-system';
<mask> import { usePropsConfig } from '../../../hooks';
<mask> import {
<mask> customBorder,
<mask> customBackground,
<mask> customOutline,
<mask> customLayout,
</s> Fixes for SafeAreaView and minor improvements </s> remove import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig';
</s> add import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig/usePropsWithComponentTheme'; </s> remove import { SafeAreaView, StyleSheet } from 'react-native';
</s> add </s> remove import { canUseDom } from '../../../utils';
</s> add import { canUseDom } from '../../../utils/canUseDom'; </s> remove storiesOf('useClipboard', module)
</s> add storiesOf('usePopover', module) </s> remove { fontSize: newProps.size },
</s> add { fontSize: parseInt(newProps.size, 10) },
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7342fb0da44b7b1aeab3f07b27907dcf15503f6a
|
src/components/primitives/Text/index.tsx
|
<mask> ThemeConsumer,
<mask> ThemeContext,
<mask> ThemeProvider,
<mask> } from 'styled-components/native';
<mask> import { SafeAreaView, StyleSheet } from 'react-native';
<mask> import { theme as defaultTheme, ITheme } from './../theme';
<mask> import {
<mask> IColorModeProviderProps,
<mask> ColorModeProvider,
<mask> useColorModeValue,
</s> Fixes for SafeAreaView and minor improvements </s> remove import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig';
</s> add import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig/usePropsWithComponentTheme'; </s> remove ...rest
</s> add children, </s> remove import { canUseDom } from '../../../utils';
</s> add import { canUseDom } from '../../../utils/canUseDom'; </s> remove import { usePropsConfig } from '../../../hooks';
</s> add import { usePropsConfig } from '../../../hooks/usePropsConfig'; </s> remove storiesOf('useClipboard', module)
</s> add storiesOf('usePopover', module)
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7342fb0da44b7b1aeab3f07b27907dcf15503f6a
|
src/core/NativeBaseProvider.tsx
|
|
import SafeAreaView from '../components/primitives/SafeAreaView';
|
<mask> } from './../color-mode';
<mask> import OverlayProvider from './Overlay/OverlayProvider';
<mask> import PopoverProvider from './Popover/PopoverProvider';
<mask> import View from '../components/primitives/View';
<mask>
<mask> const ColoredBackground = ({ children, ...props }: any) => (
<mask> <View {...props} bg={useColorModeValue(`gray.50`, `gray.800`)} flex={1}>
<mask> <OverlayProvider>
<mask> <PopoverProvider>{children}</PopoverProvider>
<mask> </OverlayProvider>
<mask> </View>
<mask> );
<mask>
<mask> export interface NativeBaseProviderProps {
<mask> theme?: ITheme;
<mask> colorModeManager?: IColorModeProviderProps['colorModeManager'];
<mask> children?: React.ReactNode;
</s> Fixes for SafeAreaView and minor improvements </s> remove {disableSafeArea ? (
<ColoredBackground {...rest} />
) : (
<SafeAreaView style={styles.container}>
<ColoredBackground {...rest} />
</SafeAreaView>
)}
</s> add <Wrapper bg={useColorModeValue(`gray.50`, `gray.800`)} flex={1}>
<OverlayProvider>
<PopoverProvider>{children}</PopoverProvider>
</OverlayProvider>
</Wrapper> </s> remove storiesOf('useClipboard', module)
</s> add storiesOf('usePopover', module) </s> remove import { canUseDom } from '../../../utils';
</s> add import { canUseDom } from '../../../utils/canUseDom'; </s> remove ...rest
</s> add children, </s> remove const styles = StyleSheet.create({
container: {
flex: 1,
},
});
</s> add const Wrapper = disableSafeArea ? View : SafeAreaView;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7342fb0da44b7b1aeab3f07b27907dcf15503f6a
|
src/core/NativeBaseProvider.tsx
|
children,
|
<mask> const {
<mask> colorModeManager,
<mask> theme = defaultTheme,
<mask> disableSafeArea,
<mask> ...rest
<mask> } = props;
<mask>
<mask> const styles = StyleSheet.create({
<mask> container: {
<mask> flex: 1,
</s> Fixes for SafeAreaView and minor improvements </s> remove const styles = StyleSheet.create({
container: {
flex: 1,
},
});
</s> add const Wrapper = disableSafeArea ? View : SafeAreaView; </s> remove import { SafeAreaView, StyleSheet } from 'react-native';
</s> add </s> remove import { canUseDom } from '../../../utils';
</s> add import { canUseDom } from '../../../utils/canUseDom'; </s> remove { fontSize: newProps.size },
</s> add { fontSize: parseInt(newProps.size, 10) }, </s> remove import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig';
</s> add import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig/usePropsWithComponentTheme';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7342fb0da44b7b1aeab3f07b27907dcf15503f6a
|
src/core/NativeBaseProvider.tsx
|
const Wrapper = disableSafeArea ? View : SafeAreaView;
|
<mask> disableSafeArea,
<mask> ...rest
<mask> } = props;
<mask>
<mask> const styles = StyleSheet.create({
<mask> container: {
<mask> flex: 1,
<mask> },
<mask> });
<mask>
<mask> return (
<mask> <ThemeProvider theme={theme}>
<mask> <ColorModeProvider
<mask> colorModeManager={colorModeManager}
<mask> options={theme.config}
</s> Fixes for SafeAreaView and minor improvements </s> remove ...rest
</s> add children, </s> remove { fontSize: newProps.size },
</s> add { fontSize: parseInt(newProps.size, 10) }, </s> remove {disableSafeArea ? (
<ColoredBackground {...rest} />
) : (
<SafeAreaView style={styles.container}>
<ColoredBackground {...rest} />
</SafeAreaView>
)}
</s> add <Wrapper bg={useColorModeValue(`gray.50`, `gray.800`)} flex={1}>
<OverlayProvider>
<PopoverProvider>{children}</PopoverProvider>
</OverlayProvider>
</Wrapper> </s> remove import { canUseDom } from '../../../utils';
</s> add import { canUseDom } from '../../../utils/canUseDom'; </s> remove class NBSlider extends React.Component<
</s> add class NBSlider extends React.PureComponent<
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7342fb0da44b7b1aeab3f07b27907dcf15503f6a
|
src/core/NativeBaseProvider.tsx
|
<Wrapper bg={useColorModeValue(`gray.50`, `gray.800`)} flex={1}>
<OverlayProvider>
<PopoverProvider>{children}</PopoverProvider>
</OverlayProvider>
</Wrapper>
|
<mask> <ColorModeProvider
<mask> colorModeManager={colorModeManager}
<mask> options={theme.config}
<mask> >
<mask> {disableSafeArea ? (
<mask> <ColoredBackground {...rest} />
<mask> ) : (
<mask> <SafeAreaView style={styles.container}>
<mask> <ColoredBackground {...rest} />
<mask> </SafeAreaView>
<mask> )}
<mask> </ColorModeProvider>
<mask> </ThemeProvider>
<mask> );
<mask> };
<mask>
</s> Fixes for SafeAreaView and minor improvements </s> remove const styles = StyleSheet.create({
container: {
flex: 1,
},
});
</s> add const Wrapper = disableSafeArea ? View : SafeAreaView; </s> remove
const ColoredBackground = ({ children, ...props }: any) => (
<View {...props} bg={useColorModeValue(`gray.50`, `gray.800`)} flex={1}>
<OverlayProvider>
<PopoverProvider>{children}</PopoverProvider>
</OverlayProvider>
</View>
);
</s> add import SafeAreaView from '../components/primitives/SafeAreaView'; </s> remove class NBSlider extends React.Component<
</s> add class NBSlider extends React.PureComponent< </s> remove class Tooltip extends React.Component<Props, State> {
</s> add class Tooltip extends React.PureComponent<Props, State> { </s> remove { fontSize: newProps.size },
</s> add { fontSize: parseInt(newProps.size, 10) },
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7342fb0da44b7b1aeab3f07b27907dcf15503f6a
|
src/core/NativeBaseProvider.tsx
|
import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig/usePropsWithComponentTheme';
|
<mask> import React from 'react';
<mask> import type { AnyStyledComponent } from 'styled-components';
<mask> import styled from 'styled-components/native';
<mask> import { usePropsWithComponentTheme } from './../../hooks/usePropsConfig';
<mask> import type { ComponentTheme } from './../../theme';
<mask> import {
<mask> background,
<mask> border,
<mask> color,
</s> Fixes for SafeAreaView and minor improvements </s> remove import { canUseDom } from '../../../utils';
</s> add import { canUseDom } from '../../../utils/canUseDom'; </s> remove import { usePropsConfig } from '../../../hooks';
</s> add import { usePropsConfig } from '../../../hooks/usePropsConfig'; </s> remove import { SafeAreaView, StyleSheet } from 'react-native';
</s> add </s> remove storiesOf('useClipboard', module)
</s> add storiesOf('usePopover', module) </s> remove
const ColoredBackground = ({ children, ...props }: any) => (
<View {...props} bg={useColorModeValue(`gray.50`, `gray.800`)} flex={1}>
<OverlayProvider>
<PopoverProvider>{children}</PopoverProvider>
</OverlayProvider>
</View>
);
</s> add import SafeAreaView from '../components/primitives/SafeAreaView';
|
[
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7342fb0da44b7b1aeab3f07b27907dcf15503f6a
|
src/core/factory/index.tsx
|
<DefaultHeader
title={this.props.item.title}
expanded={this.props.expanded}
headerStyle={this.props.headerStyle}
icon={this.props.icon}
iconStyle={this.props.iconStyle}
expandedIcon={this.props.expandedIcon}
expandedIconStyle={this.props.expandedIconStyle}
/>
)}
|
<mask> <View>
<mask> {this.props.renderHeader ? (
<mask> this.props.renderHeader(this.props.item.title)
<mask> ) : (
<mask> <DefaultHeader
<mask> title={this.props.item.title}
<mask> expanded={this.props.expanded}
<mask> headerStyle={this.props.headerStyle}
<mask> icon={this.props.icon}
<mask> iconStyle={this.props.iconStyle}
<mask> expandedIcon={this.props.expandedIcon}
<mask> expandedIconStyle={this.props.expandedIconStyle}
<mask> />
<mask> )}
<mask> </View>
<mask> </TouchableWithoutFeedback>
<mask> {this.props.expanded ? (
<mask> <AccordionSubItem>
<mask> {this.props.renderContent ? (
</s> Added expanded props to accordion. </s> remove <DefaultContent
content={this.props.item.content}
contentStyle={this.props.contentStyle}
/>
)}
</s> add <DefaultContent
content={this.props.item.content}
contentStyle={this.props.contentStyle}
/>
)}
|
[
"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/735a298050ee58d0696316cb21b11fcf0b8bf9d2
|
src/basic/Accordion.js
|
<DefaultContent
content={this.props.item.content}
contentStyle={this.props.contentStyle}
/>
)}
|
<mask> <AccordionSubItem>
<mask> {this.props.renderContent ? (
<mask> this.props.renderContent(this.props.item.content)
<mask> ) : (
<mask> <DefaultContent
<mask> content={this.props.item.content}
<mask> contentStyle={this.props.contentStyle}
<mask> />
<mask> )}
<mask> </AccordionSubItem>
<mask> ) : null}
<mask> </View>
<mask> );
<mask> }
</s> Added expanded props to accordion. </s> remove <DefaultHeader
title={this.props.item.title}
expanded={this.props.expanded}
headerStyle={this.props.headerStyle}
icon={this.props.icon}
iconStyle={this.props.iconStyle}
expandedIcon={this.props.expandedIcon}
expandedIconStyle={this.props.expandedIconStyle}
/>
)}
</s> add <DefaultHeader
title={this.props.item.title}
expanded={this.props.expanded}
headerStyle={this.props.headerStyle}
icon={this.props.icon}
iconStyle={this.props.iconStyle}
expandedIcon={this.props.expandedIcon}
expandedIconStyle={this.props.expandedIconStyle}
/>
)}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/735a298050ee58d0696316cb21b11fcf0b8bf9d2
|
src/basic/Accordion.js
|
componentDidMount() {
this.setState({ selected: this.props.expanded });
}
|
<mask> }
<mask> }
<mask> render() {
<mask> const variables = this.context.theme
<mask> ? this.context.theme["@@shoutem.theme/themeStyle"].variables
<mask> : variable;
</s> Added expanded props to accordion. </s> remove <DefaultContent
content={this.props.item.content}
contentStyle={this.props.contentStyle}
/>
)}
</s> add <DefaultContent
content={this.props.item.content}
contentStyle={this.props.contentStyle}
/>
)} </s> remove <DefaultHeader
title={this.props.item.title}
expanded={this.props.expanded}
headerStyle={this.props.headerStyle}
icon={this.props.icon}
iconStyle={this.props.iconStyle}
expandedIcon={this.props.expandedIcon}
expandedIconStyle={this.props.expandedIconStyle}
/>
)}
</s> add <DefaultHeader
title={this.props.item.title}
expanded={this.props.expanded}
headerStyle={this.props.headerStyle}
icon={this.props.icon}
iconStyle={this.props.iconStyle}
expandedIcon={this.props.expandedIcon}
expandedIconStyle={this.props.expandedIconStyle}
/>
)}
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/735a298050ee58d0696316cb21b11fcf0b8bf9d2
|
src/basic/Accordion.js
|
// import React from 'react';
// import { calculateProps } from './../../hooks/usePropsConfig/utils';
// import { NativeBaseProvider, theme } from 'native-base';
// import { renderHook } from '@testing-library/react-hooks';
|
<mask> import React from 'react';
<mask> import { useCalculateProps } from './../../hooks/usePropsConfig';
<mask> import { NativeBaseProvider, theme } from 'native-base';
<mask> import { renderHook } from '@testing-library/react-hooks';
<mask>
<mask> describe('useCalculateProps', () => {
<mask> const colorModeProps = {
<mask> colorMode: 'light',
<mask> toggleColorMode: () => {},
</s> Commented test cases, need to change them </s> remove const colorModeProps = {
colorMode: 'light',
toggleColorMode: () => {},
setColorMode: () => {},
};
const wrapper = ({ children }: any) => (
<NativeBaseProvider>{children}</NativeBaseProvider>
);
</s> add // const colorModeProps = {
// colorMode: 'light',
// toggleColorMode: () => {},
// setColorMode: () => {},
// };
// const wrapper = ({ children }: any) => (
// <NativeBaseProvider>{children}</NativeBaseProvider>
// );
test; </s> remove const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, {}, {}),
{ wrapper }
);
expect(result.current).toEqual({ style: {} });
</s> add expect(1).toBe(1);
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, {}, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({ style: {} }); </s> remove test('Only component theme(Badge) + no props', () => {
const componentTheme = (theme as any).components.Badge;
const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, componentTheme, {}),
{ wrapper }
);
expect(result.current).toEqual({
px: 1,
py: 1,
textTransform: 'uppercase',
fontSize: 'xs',
borderRadius: 'sm',
fontWeight: 'bold',
bg: 'gray.100',
color: 'gray.700',
borderWidth: 1,
borderColor: 'transparent',
style: {},
});
});
</s> add // test('Only component theme(Badge) + no props', () => {
// const componentTheme = (theme as any).components.Badge;
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, componentTheme, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({
// px: 1,
// py: 1,
// textTransform: 'uppercase',
// fontSize: 'xs',
// borderRadius: 'sm',
// fontWeight: 'bold',
// bg: 'gray.100',
// color: 'gray.700',
// borderWidth: 1,
// borderColor: 'transparent',
// style: {},
// });
// }); </s> remove test('Component theme(Badge) + some props', () => {
const componentTheme = (theme as any).components.Badge;
const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, componentTheme, { py: 3 }),
{ wrapper }
);
expect(result.current).toEqual({
px: 1,
py: 3,
textTransform: 'uppercase',
fontSize: 'xs',
borderRadius: 'sm',
fontWeight: 'bold',
bg: 'gray.100',
color: 'gray.700',
borderWidth: 1,
borderColor: 'transparent',
style: {},
});
});
</s> add // test('Component theme(Badge) + some props', () => {
// const componentTheme = (theme as any).components.Badge;
// const { result } = renderHook(
// () =>
// calculateProps(theme, colorModeProps, componentTheme, { py: 3 }, 750),
// { wrapper }
// );
// expect(result.current).toEqual({
// px: 1,
// py: 3,
// textTransform: 'uppercase',
// fontSize: 'xs',
// borderRadius: 'sm',
// fontWeight: 'bold',
// bg: 'gray.100',
// color: 'gray.700',
// borderWidth: 1,
// borderColor: 'transparent',
// style: {},
// });
// }); </s> remove disableSafeArea,
</s> add // disableSafeArea,
|
[
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/74bd0d65cd1984b7bcc76dffaa553f5807815fbf
|
src/__tests__/hooks/useCalculateProps.test.tsx
|
// const colorModeProps = {
// colorMode: 'light',
// toggleColorMode: () => {},
// setColorMode: () => {},
// };
// const wrapper = ({ children }: any) => (
// <NativeBaseProvider>{children}</NativeBaseProvider>
// );
test;
|
<mask> import { NativeBaseProvider, theme } from 'native-base';
<mask> import { renderHook } from '@testing-library/react-hooks';
<mask>
<mask> describe('useCalculateProps', () => {
<mask> const colorModeProps = {
<mask> colorMode: 'light',
<mask> toggleColorMode: () => {},
<mask> setColorMode: () => {},
<mask> };
<mask> const wrapper = ({ children }: any) => (
<mask> <NativeBaseProvider>{children}</NativeBaseProvider>
<mask> );
<mask>
<mask> test('No component theme + no props', () => {
<mask> const { result } = renderHook(
<mask> () => useCalculateProps(theme, colorModeProps, {}, {}),
<mask> { wrapper }
<mask> );
</s> Commented test cases, need to change them </s> remove import React from 'react';
import { useCalculateProps } from './../../hooks/usePropsConfig';
import { NativeBaseProvider, theme } from 'native-base';
import { renderHook } from '@testing-library/react-hooks';
</s> add // import React from 'react';
// import { calculateProps } from './../../hooks/usePropsConfig/utils';
// import { NativeBaseProvider, theme } from 'native-base';
// import { renderHook } from '@testing-library/react-hooks'; </s> remove const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, {}, {}),
{ wrapper }
);
expect(result.current).toEqual({ style: {} });
</s> add expect(1).toBe(1);
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, {}, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({ style: {} }); </s> remove test('Only component theme(Badge) + no props', () => {
const componentTheme = (theme as any).components.Badge;
const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, componentTheme, {}),
{ wrapper }
);
expect(result.current).toEqual({
px: 1,
py: 1,
textTransform: 'uppercase',
fontSize: 'xs',
borderRadius: 'sm',
fontWeight: 'bold',
bg: 'gray.100',
color: 'gray.700',
borderWidth: 1,
borderColor: 'transparent',
style: {},
});
});
</s> add // test('Only component theme(Badge) + no props', () => {
// const componentTheme = (theme as any).components.Badge;
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, componentTheme, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({
// px: 1,
// py: 1,
// textTransform: 'uppercase',
// fontSize: 'xs',
// borderRadius: 'sm',
// fontWeight: 'bold',
// bg: 'gray.100',
// color: 'gray.700',
// borderWidth: 1,
// borderColor: 'transparent',
// style: {},
// });
// }); </s> remove test('Component theme(Badge) + some props', () => {
const componentTheme = (theme as any).components.Badge;
const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, componentTheme, { py: 3 }),
{ wrapper }
);
expect(result.current).toEqual({
px: 1,
py: 3,
textTransform: 'uppercase',
fontSize: 'xs',
borderRadius: 'sm',
fontWeight: 'bold',
bg: 'gray.100',
color: 'gray.700',
borderWidth: 1,
borderColor: 'transparent',
style: {},
});
});
</s> add // test('Component theme(Badge) + some props', () => {
// const componentTheme = (theme as any).components.Badge;
// const { result } = renderHook(
// () =>
// calculateProps(theme, colorModeProps, componentTheme, { py: 3 }, 750),
// { wrapper }
// );
// expect(result.current).toEqual({
// px: 1,
// py: 3,
// textTransform: 'uppercase',
// fontSize: 'xs',
// borderRadius: 'sm',
// fontWeight: 'bold',
// bg: 'gray.100',
// color: 'gray.700',
// borderWidth: 1,
// borderColor: 'transparent',
// style: {},
// });
// }); </s> remove disableSafeArea,
</s> add // disableSafeArea,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/74bd0d65cd1984b7bcc76dffaa553f5807815fbf
|
src/__tests__/hooks/useCalculateProps.test.tsx
|
expect(1).toBe(1);
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, {}, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({ style: {} });
|
<mask> <NativeBaseProvider>{children}</NativeBaseProvider>
<mask> );
<mask>
<mask> test('No component theme + no props', () => {
<mask> const { result } = renderHook(
<mask> () => useCalculateProps(theme, colorModeProps, {}, {}),
<mask> { wrapper }
<mask> );
<mask> expect(result.current).toEqual({ style: {} });
<mask> });
<mask>
<mask> test('Only component theme(Badge) + no props', () => {
<mask> const componentTheme = (theme as any).components.Badge;
<mask> const { result } = renderHook(
</s> Commented test cases, need to change them </s> remove test('Only component theme(Badge) + no props', () => {
const componentTheme = (theme as any).components.Badge;
const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, componentTheme, {}),
{ wrapper }
);
expect(result.current).toEqual({
px: 1,
py: 1,
textTransform: 'uppercase',
fontSize: 'xs',
borderRadius: 'sm',
fontWeight: 'bold',
bg: 'gray.100',
color: 'gray.700',
borderWidth: 1,
borderColor: 'transparent',
style: {},
});
});
</s> add // test('Only component theme(Badge) + no props', () => {
// const componentTheme = (theme as any).components.Badge;
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, componentTheme, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({
// px: 1,
// py: 1,
// textTransform: 'uppercase',
// fontSize: 'xs',
// borderRadius: 'sm',
// fontWeight: 'bold',
// bg: 'gray.100',
// color: 'gray.700',
// borderWidth: 1,
// borderColor: 'transparent',
// style: {},
// });
// }); </s> remove const colorModeProps = {
colorMode: 'light',
toggleColorMode: () => {},
setColorMode: () => {},
};
const wrapper = ({ children }: any) => (
<NativeBaseProvider>{children}</NativeBaseProvider>
);
</s> add // const colorModeProps = {
// colorMode: 'light',
// toggleColorMode: () => {},
// setColorMode: () => {},
// };
// const wrapper = ({ children }: any) => (
// <NativeBaseProvider>{children}</NativeBaseProvider>
// );
test; </s> remove test('Component theme(Badge) + some props', () => {
const componentTheme = (theme as any).components.Badge;
const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, componentTheme, { py: 3 }),
{ wrapper }
);
expect(result.current).toEqual({
px: 1,
py: 3,
textTransform: 'uppercase',
fontSize: 'xs',
borderRadius: 'sm',
fontWeight: 'bold',
bg: 'gray.100',
color: 'gray.700',
borderWidth: 1,
borderColor: 'transparent',
style: {},
});
});
</s> add // test('Component theme(Badge) + some props', () => {
// const componentTheme = (theme as any).components.Badge;
// const { result } = renderHook(
// () =>
// calculateProps(theme, colorModeProps, componentTheme, { py: 3 }, 750),
// { wrapper }
// );
// expect(result.current).toEqual({
// px: 1,
// py: 3,
// textTransform: 'uppercase',
// fontSize: 'xs',
// borderRadius: 'sm',
// fontWeight: 'bold',
// bg: 'gray.100',
// color: 'gray.700',
// borderWidth: 1,
// borderColor: 'transparent',
// style: {},
// });
// }); </s> remove import React from 'react';
import { useCalculateProps } from './../../hooks/usePropsConfig';
import { NativeBaseProvider, theme } from 'native-base';
import { renderHook } from '@testing-library/react-hooks';
</s> add // import React from 'react';
// import { calculateProps } from './../../hooks/usePropsConfig/utils';
// import { NativeBaseProvider, theme } from 'native-base';
// import { renderHook } from '@testing-library/react-hooks'; </s> remove disableSafeArea,
</s> add // disableSafeArea,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/74bd0d65cd1984b7bcc76dffaa553f5807815fbf
|
src/__tests__/hooks/useCalculateProps.test.tsx
|
// test('Only component theme(Badge) + no props', () => {
// const componentTheme = (theme as any).components.Badge;
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, componentTheme, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({
// px: 1,
// py: 1,
// textTransform: 'uppercase',
// fontSize: 'xs',
// borderRadius: 'sm',
// fontWeight: 'bold',
// bg: 'gray.100',
// color: 'gray.700',
// borderWidth: 1,
// borderColor: 'transparent',
// style: {},
// });
// });
|
<mask> );
<mask> expect(result.current).toEqual({ style: {} });
<mask> });
<mask>
<mask> test('Only component theme(Badge) + no props', () => {
<mask> const componentTheme = (theme as any).components.Badge;
<mask> const { result } = renderHook(
<mask> () => useCalculateProps(theme, colorModeProps, componentTheme, {}),
<mask> { wrapper }
<mask> );
<mask> expect(result.current).toEqual({
<mask> px: 1,
<mask> py: 1,
<mask> textTransform: 'uppercase',
<mask> fontSize: 'xs',
<mask> borderRadius: 'sm',
<mask> fontWeight: 'bold',
<mask> bg: 'gray.100',
<mask> color: 'gray.700',
<mask> borderWidth: 1,
<mask> borderColor: 'transparent',
<mask> style: {},
<mask> });
<mask> });
<mask>
<mask> test('Component theme(Badge) + some props', () => {
<mask> const componentTheme = (theme as any).components.Badge;
<mask> const { result } = renderHook(
<mask> () => useCalculateProps(theme, colorModeProps, componentTheme, { py: 3 }),
</s> Commented test cases, need to change them </s> remove test('Component theme(Badge) + some props', () => {
const componentTheme = (theme as any).components.Badge;
const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, componentTheme, { py: 3 }),
{ wrapper }
);
expect(result.current).toEqual({
px: 1,
py: 3,
textTransform: 'uppercase',
fontSize: 'xs',
borderRadius: 'sm',
fontWeight: 'bold',
bg: 'gray.100',
color: 'gray.700',
borderWidth: 1,
borderColor: 'transparent',
style: {},
});
});
</s> add // test('Component theme(Badge) + some props', () => {
// const componentTheme = (theme as any).components.Badge;
// const { result } = renderHook(
// () =>
// calculateProps(theme, colorModeProps, componentTheme, { py: 3 }, 750),
// { wrapper }
// );
// expect(result.current).toEqual({
// px: 1,
// py: 3,
// textTransform: 'uppercase',
// fontSize: 'xs',
// borderRadius: 'sm',
// fontWeight: 'bold',
// bg: 'gray.100',
// color: 'gray.700',
// borderWidth: 1,
// borderColor: 'transparent',
// style: {},
// });
// }); </s> remove const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, {}, {}),
{ wrapper }
);
expect(result.current).toEqual({ style: {} });
</s> add expect(1).toBe(1);
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, {}, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({ style: {} }); </s> remove const colorModeProps = {
colorMode: 'light',
toggleColorMode: () => {},
setColorMode: () => {},
};
const wrapper = ({ children }: any) => (
<NativeBaseProvider>{children}</NativeBaseProvider>
);
</s> add // const colorModeProps = {
// colorMode: 'light',
// toggleColorMode: () => {},
// setColorMode: () => {},
// };
// const wrapper = ({ children }: any) => (
// <NativeBaseProvider>{children}</NativeBaseProvider>
// );
test; </s> remove import React from 'react';
import { useCalculateProps } from './../../hooks/usePropsConfig';
import { NativeBaseProvider, theme } from 'native-base';
import { renderHook } from '@testing-library/react-hooks';
</s> add // import React from 'react';
// import { calculateProps } from './../../hooks/usePropsConfig/utils';
// import { NativeBaseProvider, theme } from 'native-base';
// import { renderHook } from '@testing-library/react-hooks'; </s> remove disableSafeArea,
</s> add // disableSafeArea,
|
[
"keep",
"keep",
"keep",
"keep",
"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/74bd0d65cd1984b7bcc76dffaa553f5807815fbf
|
src/__tests__/hooks/useCalculateProps.test.tsx
|
// test('Component theme(Badge) + some props', () => {
// const componentTheme = (theme as any).components.Badge;
// const { result } = renderHook(
// () =>
// calculateProps(theme, colorModeProps, componentTheme, { py: 3 }, 750),
// { wrapper }
// );
// expect(result.current).toEqual({
// px: 1,
// py: 3,
// textTransform: 'uppercase',
// fontSize: 'xs',
// borderRadius: 'sm',
// fontWeight: 'bold',
// bg: 'gray.100',
// color: 'gray.700',
// borderWidth: 1,
// borderColor: 'transparent',
// style: {},
// });
// });
|
<mask> style: {},
<mask> });
<mask> });
<mask>
<mask> test('Component theme(Badge) + some props', () => {
<mask> const componentTheme = (theme as any).components.Badge;
<mask> const { result } = renderHook(
<mask> () => useCalculateProps(theme, colorModeProps, componentTheme, { py: 3 }),
<mask> { wrapper }
<mask> );
<mask> expect(result.current).toEqual({
<mask> px: 1,
<mask> py: 3,
<mask> textTransform: 'uppercase',
<mask> fontSize: 'xs',
<mask> borderRadius: 'sm',
<mask> fontWeight: 'bold',
<mask> bg: 'gray.100',
<mask> color: 'gray.700',
<mask> borderWidth: 1,
<mask> borderColor: 'transparent',
<mask> style: {},
<mask> });
<mask> });
<mask> });
</s> Commented test cases, need to change them </s> remove test('Only component theme(Badge) + no props', () => {
const componentTheme = (theme as any).components.Badge;
const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, componentTheme, {}),
{ wrapper }
);
expect(result.current).toEqual({
px: 1,
py: 1,
textTransform: 'uppercase',
fontSize: 'xs',
borderRadius: 'sm',
fontWeight: 'bold',
bg: 'gray.100',
color: 'gray.700',
borderWidth: 1,
borderColor: 'transparent',
style: {},
});
});
</s> add // test('Only component theme(Badge) + no props', () => {
// const componentTheme = (theme as any).components.Badge;
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, componentTheme, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({
// px: 1,
// py: 1,
// textTransform: 'uppercase',
// fontSize: 'xs',
// borderRadius: 'sm',
// fontWeight: 'bold',
// bg: 'gray.100',
// color: 'gray.700',
// borderWidth: 1,
// borderColor: 'transparent',
// style: {},
// });
// }); </s> remove const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, {}, {}),
{ wrapper }
);
expect(result.current).toEqual({ style: {} });
</s> add expect(1).toBe(1);
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, {}, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({ style: {} }); </s> remove const colorModeProps = {
colorMode: 'light',
toggleColorMode: () => {},
setColorMode: () => {},
};
const wrapper = ({ children }: any) => (
<NativeBaseProvider>{children}</NativeBaseProvider>
);
</s> add // const colorModeProps = {
// colorMode: 'light',
// toggleColorMode: () => {},
// setColorMode: () => {},
// };
// const wrapper = ({ children }: any) => (
// <NativeBaseProvider>{children}</NativeBaseProvider>
// );
test; </s> remove import React from 'react';
import { useCalculateProps } from './../../hooks/usePropsConfig';
import { NativeBaseProvider, theme } from 'native-base';
import { renderHook } from '@testing-library/react-hooks';
</s> add // import React from 'react';
// import { calculateProps } from './../../hooks/usePropsConfig/utils';
// import { NativeBaseProvider, theme } from 'native-base';
// import { renderHook } from '@testing-library/react-hooks'; </s> remove disableSafeArea,
</s> add // disableSafeArea,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/74bd0d65cd1984b7bcc76dffaa553f5807815fbf
|
src/__tests__/hooks/useCalculateProps.test.tsx
|
export type { IHybridContextProps } from './props';
|
<mask> export { HybridContext } from './Context';
<mask> export { default as HybridProvider } from './HybridProvider';
<mask> export { useHybridOverlay } from './useHybridOverlay';
<mask> export type { IHybridProps, IHybridContextProps } from './props';
</s> Commented test cases, need to change them </s> remove export { Overlay, useOverlay } from './Overlay';
</s> add export { useOverlay } from './Overlay'; </s> remove import React from 'react';
import { useCalculateProps } from './../../hooks/usePropsConfig';
import { NativeBaseProvider, theme } from 'native-base';
import { renderHook } from '@testing-library/react-hooks';
</s> add // import React from 'react';
// import { calculateProps } from './../../hooks/usePropsConfig/utils';
// import { NativeBaseProvider, theme } from 'native-base';
// import { renderHook } from '@testing-library/react-hooks'; </s> remove const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, {}, {}),
{ wrapper }
);
expect(result.current).toEqual({ style: {} });
</s> add expect(1).toBe(1);
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, {}, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({ style: {} }); </s> remove const colorModeProps = {
colorMode: 'light',
toggleColorMode: () => {},
setColorMode: () => {},
};
const wrapper = ({ children }: any) => (
<NativeBaseProvider>{children}</NativeBaseProvider>
);
</s> add // const colorModeProps = {
// colorMode: 'light',
// toggleColorMode: () => {},
// setColorMode: () => {},
// };
// const wrapper = ({ children }: any) => (
// <NativeBaseProvider>{children}</NativeBaseProvider>
// );
test; </s> remove test('Only component theme(Badge) + no props', () => {
const componentTheme = (theme as any).components.Badge;
const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, componentTheme, {}),
{ wrapper }
);
expect(result.current).toEqual({
px: 1,
py: 1,
textTransform: 'uppercase',
fontSize: 'xs',
borderRadius: 'sm',
fontWeight: 'bold',
bg: 'gray.100',
color: 'gray.700',
borderWidth: 1,
borderColor: 'transparent',
style: {},
});
});
</s> add // test('Only component theme(Badge) + no props', () => {
// const componentTheme = (theme as any).components.Badge;
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, componentTheme, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({
// px: 1,
// py: 1,
// textTransform: 'uppercase',
// fontSize: 'xs',
// borderRadius: 'sm',
// fontWeight: 'bold',
// bg: 'gray.100',
// color: 'gray.700',
// borderWidth: 1,
// borderColor: 'transparent',
// style: {},
// });
// });
|
[
"keep",
"keep",
"replace",
"replace"
] |
https://github.com/GeekyAnts/NativeBase/commit/74bd0d65cd1984b7bcc76dffaa553f5807815fbf
|
src/core/HybridOverlay/index.ts
|
// disableSafeArea,
|
<mask> const NativeBaseProvider = (props: NativeBaseProviderProps) => {
<mask> const {
<mask> colorModeManager,
<mask> theme = defaultTheme,
<mask> disableSafeArea,
<mask> children,
<mask> } = props;
<mask> // const Wrapper = disableSafeArea ? View : SafeAreaView;
<mask> return (
<mask> <ThemeProvider theme={theme}>
</s> Commented test cases, need to change them </s> remove const colorModeProps = {
colorMode: 'light',
toggleColorMode: () => {},
setColorMode: () => {},
};
const wrapper = ({ children }: any) => (
<NativeBaseProvider>{children}</NativeBaseProvider>
);
</s> add // const colorModeProps = {
// colorMode: 'light',
// toggleColorMode: () => {},
// setColorMode: () => {},
// };
// const wrapper = ({ children }: any) => (
// <NativeBaseProvider>{children}</NativeBaseProvider>
// );
test; </s> remove const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, {}, {}),
{ wrapper }
);
expect(result.current).toEqual({ style: {} });
</s> add expect(1).toBe(1);
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, {}, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({ style: {} }); </s> remove test('Only component theme(Badge) + no props', () => {
const componentTheme = (theme as any).components.Badge;
const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, componentTheme, {}),
{ wrapper }
);
expect(result.current).toEqual({
px: 1,
py: 1,
textTransform: 'uppercase',
fontSize: 'xs',
borderRadius: 'sm',
fontWeight: 'bold',
bg: 'gray.100',
color: 'gray.700',
borderWidth: 1,
borderColor: 'transparent',
style: {},
});
});
</s> add // test('Only component theme(Badge) + no props', () => {
// const componentTheme = (theme as any).components.Badge;
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, componentTheme, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({
// px: 1,
// py: 1,
// textTransform: 'uppercase',
// fontSize: 'xs',
// borderRadius: 'sm',
// fontWeight: 'bold',
// bg: 'gray.100',
// color: 'gray.700',
// borderWidth: 1,
// borderColor: 'transparent',
// style: {},
// });
// }); </s> remove test('Component theme(Badge) + some props', () => {
const componentTheme = (theme as any).components.Badge;
const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, componentTheme, { py: 3 }),
{ wrapper }
);
expect(result.current).toEqual({
px: 1,
py: 3,
textTransform: 'uppercase',
fontSize: 'xs',
borderRadius: 'sm',
fontWeight: 'bold',
bg: 'gray.100',
color: 'gray.700',
borderWidth: 1,
borderColor: 'transparent',
style: {},
});
});
</s> add // test('Component theme(Badge) + some props', () => {
// const componentTheme = (theme as any).components.Badge;
// const { result } = renderHook(
// () =>
// calculateProps(theme, colorModeProps, componentTheme, { py: 3 }, 750),
// { wrapper }
// );
// expect(result.current).toEqual({
// px: 1,
// py: 3,
// textTransform: 'uppercase',
// fontSize: 'xs',
// borderRadius: 'sm',
// fontWeight: 'bold',
// bg: 'gray.100',
// color: 'gray.700',
// borderWidth: 1,
// borderColor: 'transparent',
// style: {},
// });
// }); </s> remove import React from 'react';
import { useCalculateProps } from './../../hooks/usePropsConfig';
import { NativeBaseProvider, theme } from 'native-base';
import { renderHook } from '@testing-library/react-hooks';
</s> add // import React from 'react';
// import { calculateProps } from './../../hooks/usePropsConfig/utils';
// import { NativeBaseProvider, theme } from 'native-base';
// import { renderHook } from '@testing-library/react-hooks';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/74bd0d65cd1984b7bcc76dffaa553f5807815fbf
|
src/core/NativeBaseProvider.tsx
|
export { useOverlay } from './Overlay';
|
<mask> export * from './NativeBaseProvider';
<mask> export * from './extendTheme';
<mask>
<mask> export { Overlay, useOverlay } from './Overlay';
<mask> export type {
<mask> IOverlayProps,
<mask> IOverlayContextProps,
<mask> IuseOverlayProps,
<mask> } from './Overlay';
</s> Commented test cases, need to change them </s> remove export { useHybridOverlay } from './useHybridOverlay';
export type { IHybridProps, IHybridContextProps } from './props';
</s> add export type { IHybridContextProps } from './props'; </s> remove import React from 'react';
import { useCalculateProps } from './../../hooks/usePropsConfig';
import { NativeBaseProvider, theme } from 'native-base';
import { renderHook } from '@testing-library/react-hooks';
</s> add // import React from 'react';
// import { calculateProps } from './../../hooks/usePropsConfig/utils';
// import { NativeBaseProvider, theme } from 'native-base';
// import { renderHook } from '@testing-library/react-hooks'; </s> remove const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, {}, {}),
{ wrapper }
);
expect(result.current).toEqual({ style: {} });
</s> add expect(1).toBe(1);
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, {}, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({ style: {} }); </s> remove const colorModeProps = {
colorMode: 'light',
toggleColorMode: () => {},
setColorMode: () => {},
};
const wrapper = ({ children }: any) => (
<NativeBaseProvider>{children}</NativeBaseProvider>
);
</s> add // const colorModeProps = {
// colorMode: 'light',
// toggleColorMode: () => {},
// setColorMode: () => {},
// };
// const wrapper = ({ children }: any) => (
// <NativeBaseProvider>{children}</NativeBaseProvider>
// );
test; </s> remove test('Only component theme(Badge) + no props', () => {
const componentTheme = (theme as any).components.Badge;
const { result } = renderHook(
() => useCalculateProps(theme, colorModeProps, componentTheme, {}),
{ wrapper }
);
expect(result.current).toEqual({
px: 1,
py: 1,
textTransform: 'uppercase',
fontSize: 'xs',
borderRadius: 'sm',
fontWeight: 'bold',
bg: 'gray.100',
color: 'gray.700',
borderWidth: 1,
borderColor: 'transparent',
style: {},
});
});
</s> add // test('Only component theme(Badge) + no props', () => {
// const componentTheme = (theme as any).components.Badge;
// const { result } = renderHook(
// () => calculateProps(theme, colorModeProps, componentTheme, {}, 750),
// { wrapper }
// );
// expect(result.current).toEqual({
// px: 1,
// py: 1,
// textTransform: 'uppercase',
// fontSize: 'xs',
// borderRadius: 'sm',
// fontWeight: 'bold',
// bg: 'gray.100',
// color: 'gray.700',
// borderWidth: 1,
// borderColor: 'transparent',
// style: {},
// });
// });
|
[
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/74bd0d65cd1984b7bcc76dffaa553f5807815fbf
|
src/core/index.ts
|
import { Button, Modal } from 'native-base';
|
<mask> import React from 'react';
<mask> import { Button, Modal, ScrollView, Text } from 'native-base';
<mask> import { useState } from 'react';
<mask>
<mask> export const Example = () => {
<mask> const [showModal, setShowModal] = useState(false);
<mask>
</s> feat: pseudo selector prop for scrollview in modal body </s> remove import { ScrollView } from 'react-native';
</s> add </s> remove const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => {
</s> add const ModalBody = (
{
children,
_scrollview,
...props
}: IBoxProps & { _scrollview?: IScrollViewProps },
ref?: any
) => { </s> remove props: IBoxProps<IModalProps> & { ref?: MutableRefObject<any> }
</s> add props: IBoxProps<IModalProps> & { _scrollview?: IScrollViewProps } & {
ref?: MutableRefObject<any>;
}
|
[
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7510782de9301721f5409cd18cb023da8d41ead9
|
example/storybook/stories/components/composites/Modal/CustomBackdrop.tsx
|
<mask> import React, { memo, forwardRef } from 'react';
<mask> import Box, { IBoxProps } from '../../primitives/Box';
<mask> import { usePropsResolution } from '../../../hooks';
<mask> import { ScrollView } from 'react-native';
<mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps';
<mask>
<mask> const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => {
<mask> const resolvedProps = usePropsResolution('ModalBody', props);
<mask> //TODO: refactor for responsive prop
</s> feat: pseudo selector prop for scrollview in modal body </s> remove const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => {
</s> add const ModalBody = (
{
children,
_scrollview,
...props
}: IBoxProps & { _scrollview?: IScrollViewProps },
ref?: any
) => { </s> remove import { Button, Modal, ScrollView, Text } from 'native-base';
</s> add import { Button, Modal } from 'native-base'; </s> remove props: IBoxProps<IModalProps> & { ref?: MutableRefObject<any> }
</s> add props: IBoxProps<IModalProps> & { _scrollview?: IScrollViewProps } & {
ref?: MutableRefObject<any>;
}
|
[
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7510782de9301721f5409cd18cb023da8d41ead9
|
src/components/composites/Modal/ModalBody.tsx
|
|
import { ScrollView, IScrollViewProps } from '../../basic/ScrollView';
|
<mask> import { usePropsResolution } from '../../../hooks';
<mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps';
<mask>
<mask> const ModalBody = (
<mask> {
<mask> children,
</s> feat: pseudo selector prop for scrollview in modal body </s> remove import { ScrollView } from 'react-native';
</s> add </s> remove const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => {
</s> add const ModalBody = (
{
children,
_scrollview,
...props
}: IBoxProps & { _scrollview?: IScrollViewProps },
ref?: any
) => { </s> remove import { Button, Modal, ScrollView, Text } from 'native-base';
</s> add import { Button, Modal } from 'native-base'; </s> remove props: IBoxProps<IModalProps> & { ref?: MutableRefObject<any> }
</s> add props: IBoxProps<IModalProps> & { _scrollview?: IScrollViewProps } & {
ref?: MutableRefObject<any>;
}
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7510782de9301721f5409cd18cb023da8d41ead9
|
src/components/composites/Modal/ModalBody.tsx
|
const ModalBody = (
{
children,
_scrollview,
...props
}: IBoxProps & { _scrollview?: IScrollViewProps },
ref?: any
) => {
|
<mask> import { usePropsResolution } from '../../../hooks';
<mask> import { ScrollView } from 'react-native';
<mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps';
<mask>
<mask> const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => {
<mask> const resolvedProps = usePropsResolution('ModalBody', props);
<mask> //TODO: refactor for responsive prop
<mask> if (useHasResponsiveProps(props)) {
<mask> return null;
<mask> }
</s> feat: pseudo selector prop for scrollview in modal body </s> remove import { ScrollView } from 'react-native';
</s> add </s> remove import { Button, Modal, ScrollView, Text } from 'native-base';
</s> add import { Button, Modal } from 'native-base'; </s> remove <ScrollView>
</s> add <ScrollView {..._scrollview}>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7510782de9301721f5409cd18cb023da8d41ead9
|
src/components/composites/Modal/ModalBody.tsx
|
<ScrollView {..._scrollview}>
|
<mask> if (useHasResponsiveProps(props)) {
<mask> return null;
<mask> }
<mask> return (
<mask> <ScrollView>
<mask> <Box {...resolvedProps} ref={ref}>
<mask> {children}
<mask> </Box>
<mask> </ScrollView>
<mask> );
</s> feat: pseudo selector prop for scrollview in modal body </s> remove const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => {
</s> add const ModalBody = (
{
children,
_scrollview,
...props
}: IBoxProps & { _scrollview?: IScrollViewProps },
ref?: any
) => { </s> remove props: IBoxProps<IModalProps> & { ref?: MutableRefObject<any> }
</s> add props: IBoxProps<IModalProps> & { _scrollview?: IScrollViewProps } & {
ref?: MutableRefObject<any>;
} </s> remove import { ScrollView } from 'react-native';
</s> add </s> remove import { Button, Modal, ScrollView, Text } from 'native-base';
</s> add import { Button, Modal } from 'native-base';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7510782de9301721f5409cd18cb023da8d41ead9
|
src/components/composites/Modal/ModalBody.tsx
|
import type { IScrollViewProps } from '../../basic/ScrollView';
|
<mask> import type { ResponsiveValue } from '../../../components/types';
<mask> import type { ISizes } from '../../../theme/base/sizes';
<mask>
<mask> export interface IModalProps extends IBoxProps<IModalProps> {
<mask> /**
<mask> * If true, the modal will open. Useful for controllable state behaviour
<mask> */
</s> feat: pseudo selector prop for scrollview in modal body </s> remove import { Button, Modal, ScrollView, Text } from 'native-base';
</s> add import { Button, Modal } from 'native-base'; </s> remove import { ScrollView } from 'react-native';
</s> add </s> remove props: IBoxProps<IModalProps> & { ref?: MutableRefObject<any> }
</s> add props: IBoxProps<IModalProps> & { _scrollview?: IScrollViewProps } & {
ref?: MutableRefObject<any>;
} </s> remove const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => {
</s> add const ModalBody = (
{
children,
_scrollview,
...props
}: IBoxProps & { _scrollview?: IScrollViewProps },
ref?: any
) => {
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7510782de9301721f5409cd18cb023da8d41ead9
|
src/components/composites/Modal/types.ts
|
props: IBoxProps<IModalProps> & { _scrollview?: IScrollViewProps } & {
ref?: MutableRefObject<any>;
}
|
<mask> props: IModalProps & { ref?: MutableRefObject<any> }
<mask> ) => JSX.Element) & {
<mask> Body: React.MemoExoticComponent<
<mask> (
<mask> props: IBoxProps<IModalProps> & { ref?: MutableRefObject<any> }
<mask> ) => JSX.Element
<mask> >;
<mask> CloseButton: React.MemoExoticComponent<
<mask> (props: IIconButtonProps & { ref?: MutableRefObject<any> }) => JSX.Element
<mask> >;
</s> feat: pseudo selector prop for scrollview in modal body </s> remove const ModalBody = ({ children, ...props }: IBoxProps, ref?: any) => {
</s> add const ModalBody = (
{
children,
_scrollview,
...props
}: IBoxProps & { _scrollview?: IScrollViewProps },
ref?: any
) => { </s> remove import { ScrollView } from 'react-native';
</s> add </s> remove import { Button, Modal, ScrollView, Text } from 'native-base';
</s> add import { Button, Modal } from 'native-base';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/7510782de9301721f5409cd18cb023da8d41ead9
|
src/components/composites/Modal/types.ts
|
disabledTextColor: PropTypes.string,
|
<mask> tabs: PropTypes.array,
<mask> backgroundColor: PropTypes.string,
<mask> activeTextColor: PropTypes.string,
<mask> inactiveTextColor: PropTypes.string,
<mask> tabStyle: ViewPropTypes.style,
<mask> renderTab: PropTypes.func,
<mask> underlineStyle: ViewPropTypes.style,
<mask> tabContainerStyle: ViewPropTypes.style
<mask> },
<mask> contextTypes: {
</s> Adding TabBar disabled feature (#2760) </s> remove return `${child.props.heading }_${ idx}`;
</s> add return `${child.props.heading}_${idx}`; </s> remove isTabActive ? activeTextStyle : textStyle
</s> add isTabActive ? activeTextStyle : textStyle,
{ color: textColor } </s> remove variables.tabFontSize
</s> add variables.tabFontSize,
this.props.disabled[page],
this.props.disabledTextColor </s> remove !_.isEqual(this.props.tabs, nextProps.tabs) &&
</s> add !isEqual(this.props.tabs, nextProps.tabs) &&
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/basic/Tabs/DefaultTabBar.js
|
disabledTextColor: variable.tabBarDisabledTextColor,
|
<mask> activeTextColor: variable.topTabBarActiveTextColor,
<mask> inactiveTextColor: variable.topTabBarTextColor,
<mask> backgroundColor: null,
<mask> tabFontSize: variable.tabFontSize
<mask> };
<mask> },
<mask>
<mask> renderTabOption(name, page) {},
</s> Adding TabBar disabled feature (#2760) </s> remove return `${child.props.heading }_${ idx}`;
</s> add return `${child.props.heading}_${idx}`; </s> remove variables.tabFontSize
</s> add variables.tabFontSize,
this.props.disabled[page],
this.props.disabledTextColor </s> remove isTabActive ? activeTextStyle : textStyle
</s> add isTabActive ? activeTextStyle : textStyle,
{ color: textColor }
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/basic/Tabs/DefaultTabBar.js
|
tabFontSize,
disabled,
disabledTextColor
|
<mask> activeTabStyle,
<mask> textStyle,
<mask> activeTextStyle,
<mask> tabHeaderStyle,
<mask> tabFontSize
<mask> ) {
<mask> const headerContent =
<mask> typeof name !== 'string' ? name.props.children : undefined;
<mask> const { activeTextColor, inactiveTextColor } = this.props;
<mask> const textColor = isTabActive ? activeTextColor : inactiveTextColor;
</s> Adding TabBar disabled feature (#2760) </s> remove const textColor = isTabActive ? activeTextColor : inactiveTextColor;
</s> add const textColor = disabled
? disabledTextColor
: isTabActive
? activeTextColor
: inactiveTextColor; </s> remove // const fontSize = tabFontSize;
</s> add </s> remove // const fontSize = tabFontSize;
</s> add const isDisabled = disabled == undefined ? false : true;
</s> remove isTabActive ? activeTextStyle : textStyle
</s> add isTabActive ? activeTextStyle : textStyle,
{ color: textColor } </s> remove return `${child.props.heading }_${ idx}`;
</s> add return `${child.props.heading}_${idx}`;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/basic/Tabs/DefaultTabBar.js
|
const textColor = disabled
? disabledTextColor
: isTabActive
? activeTextColor
: inactiveTextColor;
|
<mask> ) {
<mask> const headerContent =
<mask> typeof name !== 'string' ? name.props.children : undefined;
<mask> const { activeTextColor, inactiveTextColor } = this.props;
<mask> const textColor = isTabActive ? activeTextColor : inactiveTextColor;
<mask> const fontWeight = isTabActive ? 'bold' : 'normal';
<mask> // const fontSize = tabFontSize;
<mask> if (typeof name === 'string') {
<mask> return (
<mask> <Button
</s> Adding TabBar disabled feature (#2760) </s> remove // const fontSize = tabFontSize;
</s> add </s> remove // const fontSize = tabFontSize;
</s> add const isDisabled = disabled == undefined ? false : true;
</s> remove tabFontSize
</s> add tabFontSize,
disabled,
disabledTextColor </s> remove return `${child.props.heading }_${ idx}`;
</s> add return `${child.props.heading}_${idx}`; </s> remove isTabActive ? activeTextStyle : textStyle
</s> add isTabActive ? activeTextStyle : textStyle,
{ color: textColor }
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/basic/Tabs/DefaultTabBar.js
|
const isDisabled = disabled == undefined ? false : true;
|
<mask> typeof name !== 'string' ? name.props.children : undefined;
<mask> const { activeTextColor, inactiveTextColor } = this.props;
<mask> const textColor = isTabActive ? activeTextColor : inactiveTextColor;
<mask> const fontWeight = isTabActive ? 'bold' : 'normal';
<mask> // const fontSize = tabFontSize;
<mask> if (typeof name === 'string') {
<mask> return (
<mask> <Button
<mask> style={{ flex: 1 }}
<mask> key={name}
</s> Adding TabBar disabled feature (#2760) </s> remove // const fontSize = tabFontSize;
</s> add </s> remove const textColor = isTabActive ? activeTextColor : inactiveTextColor;
</s> add const textColor = disabled
? disabledTextColor
: isTabActive
? activeTextColor
: inactiveTextColor; </s> remove tabFontSize
</s> add tabFontSize,
disabled,
disabledTextColor </s> remove return `${child.props.heading }_${ idx}`;
</s> add return `${child.props.heading}_${idx}`;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/basic/Tabs/DefaultTabBar.js
|
disabled={isDisabled}
|
<mask> <Button
<mask> style={{ flex: 1 }}
<mask> key={name}
<mask> onPress={() => onPressHandler(page)}
<mask> >
<mask> <TabHeading
<mask> style={isTabActive ? activeTabStyle : tabStyle}
<mask> active={isTabActive}
</s> Adding TabBar disabled feature (#2760) </s> remove key={_.random(1.2, 5.2)}
</s> add key={`${name}_${page}`} </s> remove // const fontSize = tabFontSize;
</s> add const isDisabled = disabled == undefined ? false : true;
</s> remove isTabActive ? activeTextStyle : textStyle
</s> add isTabActive ? activeTextStyle : textStyle,
{ color: textColor } </s> remove const textColor = isTabActive ? activeTextColor : inactiveTextColor;
</s> add const textColor = disabled
? disabledTextColor
: isTabActive
? activeTextColor
: inactiveTextColor;
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/basic/Tabs/DefaultTabBar.js
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.