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
|
|---|---|---|---|---|
return (
<Comp {...restProps} style={style} ref={ref}>
{props.children}
</Comp>
);
});
|
<mask> {children}
<mask> </Comp>
<mask> );
<mask> }
<mask> );
<mask> } else {
<mask> //@ts-ignore
<mask> return styled(Comp)(...resolversForBox);
<mask> }
<mask> };
</s> Styled system removal bug fixes (#3878)
* feat: alpha opacity in colors and remove styled system
* spinner size fixes
* fix: spinner size and scrollview error
* fix: conflicts </s> remove return React.forwardRef(
({ style: propStyle, children, debug, ...props }: any, ref: any) => {
const theme = useTheme();
const currentBreakpoint = useNativeBaseConfig('makeStyledComponent')
.currentBreakpoint;
const { style, restProps } = React.useMemo(() => {
const { styleSheet, restProps } = getStyleAndFilteredProps({
...props,
theme,
debug,
currentBreakpoint,
});
if (propStyle) {
return { style: [styleSheet.box, propStyle], restProps };
} else {
return { style: styleSheet.box, restProps };
}
}, [props, theme, propStyle, currentBreakpoint, debug]);
return (
<Comp {...restProps} style={style} ref={ref}>
{children}
</Comp>
);
</s> add return React.forwardRef(({ debug, ...props }: any, ref: any) => {
const [style, restProps] = useStyledSystemPropsResolver(props);
if (debug) {
console.log('style:: => ', style, ' restProps:: => ', restProps); </s> remove for (const property in styleObject) {
if (
typeof styleObject[property] === 'string' &&
styleObject[property].includes('px')
) {
styleObject[property] = parseInt(styleObject[property]);
</s> add const { style, restProps } = React.useMemo(() => {
const { styleSheet, restProps } = getStyleAndFilteredProps({
...props,
theme,
debug,
currentBreakpoint,
});
if (propStyle) {
return { style: [styleSheet.box, propStyle], restProps };
} else {
return { style: styleSheet.box, restProps }; </s> remove sizeResolved = true;
</s> add // Type - sizes: { size: 4 }. Refer Images
if (!componentSizeProps.size) {
sizeResolved = true;
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/67ac3166a353d1610697be4ac5502969ce183b74
|
src/utils/styled.tsx
|
import { Stat, Heading, Box } from 'native-base';
|
<mask> import React from 'react';
<mask> import {
<mask> Stat,
<mask> StatLabel,
<mask> StatNumber,
<mask> StatHelpText,
<mask> Heading,
<mask> Box,
<mask> } from 'native-base';
<mask>
<mask> export default function () {
<mask> return (
<mask> <Box>
<mask> <Heading>Basic Stat Usage</Heading>
</s> fix: updated api for Stat </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
StatArrow,
StatGroup,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base'; </s> remove export {
default as Stat,
StatHelpText,
StatLabel,
StatNumber,
StatArrow,
StatGroup,
} from './Stat';
</s> add export { default as Stat } from './Stat'; </s> remove <StatGroup mt={6}>
</s> add <Stat.Group mt={6}>
|
[
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
example/storybook/stories/components/composites/Stat/Example.tsx
|
import { Stat, Heading, Box } from 'native-base';
|
<mask> import React from 'react';
<mask> import {
<mask> Stat,
<mask> StatLabel,
<mask> StatNumber,
<mask> StatHelpText,
<mask> StatArrow,
<mask> StatGroup,
<mask> Heading,
<mask> Box,
<mask> } from 'native-base';
<mask>
<mask> export default function () {
<mask> return (
<mask> <Box>
<mask> <Heading>Stat with Indicator</Heading>
</s> fix: updated api for Stat </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base'; </s> remove <StatGroup mt={6}>
</s> add <Stat.Group mt={6}> </s> remove export {
default as Stat,
StatHelpText,
StatLabel,
StatNumber,
StatArrow,
StatGroup,
} from './Stat';
</s> add export { default as Stat } from './Stat'; </s> remove StatHelpText,
StatLabel,
StatNumber,
StatArrow,
StatGroup,
</s> add
|
[
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
example/storybook/stories/components/composites/Stat/Indicator.tsx
|
<Stat.Group mt={6}>
|
<mask> export default function () {
<mask> return (
<mask> <Box>
<mask> <Heading>Stat with Indicator</Heading>
<mask> <StatGroup mt={6}>
<mask> <Stat>
<mask> <StatLabel>Sent</StatLabel>
<mask> <StatNumber>$3600</StatNumber>
<mask> <StatHelpText>
<mask> <StatArrow type="increase" />
</s> fix: updated api for Stat </s> remove <StatLabel>Sent</StatLabel>
<StatNumber>$3600</StatNumber>
<StatHelpText>
<StatArrow type="increase" />
</s> add <Stat.Label>Sent</Stat.Label>
<Stat.Number>$3600</Stat.Number>
<Stat.HelpText>
<Stat.Arrow type="increase" /> </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
StatArrow,
StatGroup,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base'; </s> remove </StatHelpText>
</s> add </Stat.HelpText> </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base'; </s> remove <StatLabel>Received</StatLabel>
<StatNumber>$454</StatNumber>
<StatHelpText>
<StatArrow type="decrease" />
</s> add <Stat.Label>Received</Stat.Label>
<Stat.Number>$454</Stat.Number>
<Stat.HelpText>
<Stat.Arrow type="decrease" />
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
example/storybook/stories/components/composites/Stat/Indicator.tsx
|
<Stat.Label>Sent</Stat.Label>
<Stat.Number>$3600</Stat.Number>
<Stat.HelpText>
<Stat.Arrow type="increase" />
|
<mask> <Box>
<mask> <Heading>Stat with Indicator</Heading>
<mask> <StatGroup mt={6}>
<mask> <Stat>
<mask> <StatLabel>Sent</StatLabel>
<mask> <StatNumber>$3600</StatNumber>
<mask> <StatHelpText>
<mask> <StatArrow type="increase" />
<mask> 56.67%
<mask> </StatHelpText>
<mask> </Stat>
<mask> <Stat>
<mask> <StatLabel>Received</StatLabel>
</s> fix: updated api for Stat </s> remove <StatGroup mt={6}>
</s> add <Stat.Group mt={6}> </s> remove </StatHelpText>
</s> add </Stat.HelpText> </s> remove <StatLabel>Received</StatLabel>
<StatNumber>$454</StatNumber>
<StatHelpText>
<StatArrow type="decrease" />
</s> add <Stat.Label>Received</Stat.Label>
<Stat.Number>$454</Stat.Number>
<Stat.HelpText>
<Stat.Arrow type="decrease" /> </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
StatArrow,
StatGroup,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base'; </s> remove </StatHelpText>
</s> add </Stat.HelpText>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
example/storybook/stories/components/composites/Stat/Indicator.tsx
|
</Stat.HelpText>
|
<mask> <StatNumber>$3600</StatNumber>
<mask> <StatHelpText>
<mask> <StatArrow type="increase" />
<mask> 56.67%
<mask> </StatHelpText>
<mask> </Stat>
<mask> <Stat>
<mask> <StatLabel>Received</StatLabel>
<mask> <StatNumber>$454</StatNumber>
<mask> <StatHelpText>
</s> fix: updated api for Stat </s> remove <StatLabel>Sent</StatLabel>
<StatNumber>$3600</StatNumber>
<StatHelpText>
<StatArrow type="increase" />
</s> add <Stat.Label>Sent</Stat.Label>
<Stat.Number>$3600</Stat.Number>
<Stat.HelpText>
<Stat.Arrow type="increase" /> </s> remove <StatLabel>Received</StatLabel>
<StatNumber>$454</StatNumber>
<StatHelpText>
<StatArrow type="decrease" />
</s> add <Stat.Label>Received</Stat.Label>
<Stat.Number>$454</Stat.Number>
<Stat.HelpText>
<Stat.Arrow type="decrease" /> </s> remove </StatHelpText>
</s> add </Stat.HelpText> </s> remove <StatGroup mt={6}>
</s> add <Stat.Group mt={6}> </s> remove </StatGroup>
</s> add </Stat.Group>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
example/storybook/stories/components/composites/Stat/Indicator.tsx
|
<Stat.Label>Received</Stat.Label>
<Stat.Number>$454</Stat.Number>
<Stat.HelpText>
<Stat.Arrow type="decrease" />
|
<mask> 56.67%
<mask> </StatHelpText>
<mask> </Stat>
<mask> <Stat>
<mask> <StatLabel>Received</StatLabel>
<mask> <StatNumber>$454</StatNumber>
<mask> <StatHelpText>
<mask> <StatArrow type="decrease" />
<mask> 99.56%
<mask> </StatHelpText>
<mask> </Stat>
<mask> </StatGroup>
<mask> </Box>
</s> fix: updated api for Stat </s> remove </StatHelpText>
</s> add </Stat.HelpText> </s> remove </StatHelpText>
</s> add </Stat.HelpText> </s> remove </StatGroup>
</s> add </Stat.Group> </s> remove <StatLabel>Sent</StatLabel>
<StatNumber>$3600</StatNumber>
<StatHelpText>
<StatArrow type="increase" />
</s> add <Stat.Label>Sent</Stat.Label>
<Stat.Number>$3600</Stat.Number>
<Stat.HelpText>
<Stat.Arrow type="increase" /> </s> remove <StatGroup mt={6}>
</s> add <Stat.Group mt={6}>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
example/storybook/stories/components/composites/Stat/Indicator.tsx
|
</Stat.HelpText>
|
<mask> <StatNumber>$454</StatNumber>
<mask> <StatHelpText>
<mask> <StatArrow type="decrease" />
<mask> 99.56%
<mask> </StatHelpText>
<mask> </Stat>
<mask> </StatGroup>
<mask> </Box>
<mask> );
<mask> }
</s> fix: updated api for Stat </s> remove <StatLabel>Received</StatLabel>
<StatNumber>$454</StatNumber>
<StatHelpText>
<StatArrow type="decrease" />
</s> add <Stat.Label>Received</Stat.Label>
<Stat.Number>$454</Stat.Number>
<Stat.HelpText>
<Stat.Arrow type="decrease" /> </s> remove </StatGroup>
</s> add </Stat.Group> </s> remove </StatHelpText>
</s> add </Stat.HelpText> </s> remove <StatLabel>Sent</StatLabel>
<StatNumber>$3600</StatNumber>
<StatHelpText>
<StatArrow type="increase" />
</s> add <Stat.Label>Sent</Stat.Label>
<Stat.Number>$3600</Stat.Number>
<Stat.HelpText>
<Stat.Arrow type="increase" /> </s> remove export const StatArrow = React.memo(
({ type, ...props }: { type?: 'increase' | 'decrease' }) => {
return (
<Icon
ml={-1}
type="Entypo"
name={type === 'increase' ? 'triangle-up' : 'triangle-down'}
{...props}
color={type === 'increase' ? 'green.500' : 'red.500'}
size={8}
/>
);
}
);
</s> add type IStatArrowProps = IIconProps | { type?: 'increase' | 'decrease' };
export const StatArrow = React.memo(({ type, ...props }: IStatArrowProps) => {
return (
<Icon
ml={-1}
type="Entypo"
name={type === 'increase' ? 'triangle-up' : 'triangle-down'}
color={type === 'increase' ? 'green.500' : 'red.500'}
size={8}
{...props}
/>
);
});
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
example/storybook/stories/components/composites/Stat/Indicator.tsx
|
</Stat.Group>
|
<mask> <StatArrow type="decrease" />
<mask> 99.56%
<mask> </StatHelpText>
<mask> </Stat>
<mask> </StatGroup>
<mask> </Box>
<mask> );
<mask> }
</s> fix: updated api for Stat </s> remove </StatHelpText>
</s> add </Stat.HelpText> </s> remove <StatLabel>Received</StatLabel>
<StatNumber>$454</StatNumber>
<StatHelpText>
<StatArrow type="decrease" />
</s> add <Stat.Label>Received</Stat.Label>
<Stat.Number>$454</Stat.Number>
<Stat.HelpText>
<Stat.Arrow type="decrease" /> </s> remove </StatHelpText>
</s> add </Stat.HelpText> </s> remove <StatLabel>Sent</StatLabel>
<StatNumber>$3600</StatNumber>
<StatHelpText>
<StatArrow type="increase" />
</s> add <Stat.Label>Sent</Stat.Label>
<Stat.Number>$3600</Stat.Number>
<Stat.HelpText>
<Stat.Arrow type="increase" /> </s> remove export const StatArrow = React.memo(
({ type, ...props }: { type?: 'increase' | 'decrease' }) => {
return (
<Icon
ml={-1}
type="Entypo"
name={type === 'increase' ? 'triangle-up' : 'triangle-down'}
{...props}
color={type === 'increase' ? 'green.500' : 'red.500'}
size={8}
/>
);
}
);
</s> add type IStatArrowProps = IIconProps | { type?: 'increase' | 'decrease' };
export const StatArrow = React.memo(({ type, ...props }: IStatArrowProps) => {
return (
<Icon
ml={-1}
type="Entypo"
name={type === 'increase' ? 'triangle-up' : 'triangle-down'}
color={type === 'increase' ? 'green.500' : 'red.500'}
size={8}
{...props}
/>
);
});
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
example/storybook/stories/components/composites/Stat/Indicator.tsx
|
IIconProps,
|
<mask> IBoxProps,
<mask> Text,
<mask> ITextProps,
<mask> Icon,
<mask> HStack,
<mask> IStackProps,
<mask> } from '../../primitives';
<mask> import { useThemeProps } from '../../../hooks';
<mask>
<mask> export const StatLabel = React.memo(({ style, ...props }: ITextProps) => {
</s> fix: updated api for Stat </s> remove const Stat = ({ style, ...props }: IBoxProps) => {
</s> add const StatMain = ({ style, ...props }: IBoxProps) => { </s> remove export default React.memo(Stat);
</s> add type IStatComponentType = ((props: IBoxProps) => JSX.Element) & {
Label: React.MemoExoticComponent<(props: ITextProps) => JSX.Element>;
Number: React.MemoExoticComponent<(props: ITextProps) => JSX.Element>;
HelpText: React.MemoExoticComponent<(props: IBoxProps) => JSX.Element>;
Arrow: React.MemoExoticComponent<(props: IStatArrowProps) => JSX.Element>;
Group: React.MemoExoticComponent<(props: IStackProps) => JSX.Element>;
};
const StatTemp: any = StatMain;
StatTemp.Label = StatLabel;
StatTemp.Number = StatNumber;
StatTemp.HelpText = StatHelpText;
StatTemp.Arrow = StatArrow;
StatTemp.Group = StatGroup;
const Stat = StatTemp as IStatComponentType;
export default Stat; </s> remove export const StatArrow = React.memo(
({ type, ...props }: { type?: 'increase' | 'decrease' }) => {
return (
<Icon
ml={-1}
type="Entypo"
name={type === 'increase' ? 'triangle-up' : 'triangle-down'}
{...props}
color={type === 'increase' ? 'green.500' : 'red.500'}
size={8}
/>
);
}
);
</s> add type IStatArrowProps = IIconProps | { type?: 'increase' | 'decrease' };
export const StatArrow = React.memo(({ type, ...props }: IStatArrowProps) => {
return (
<Icon
ml={-1}
type="Entypo"
name={type === 'increase' ? 'triangle-up' : 'triangle-down'}
color={type === 'increase' ? 'green.500' : 'red.500'}
size={8}
{...props}
/>
);
}); </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base';
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
src/components/composites/Stat/index.tsx
|
IStackProps,
|
<mask> ITextProps,
<mask> Icon,
<mask> IIconProps,
<mask> HStack,
<mask> } from '../../primitives';
<mask> import { useThemeProps } from '../../../hooks';
<mask>
<mask> export const StatLabel = React.memo(({ style, ...props }: ITextProps) => {
<mask> let newProps = useThemeProps('Stat', props);
<mask> return (
</s> fix: updated api for Stat </s> remove const Stat = ({ style, ...props }: IBoxProps) => {
</s> add const StatMain = ({ style, ...props }: IBoxProps) => { </s> remove export const StatArrow = React.memo(
({ type, ...props }: { type?: 'increase' | 'decrease' }) => {
return (
<Icon
ml={-1}
type="Entypo"
name={type === 'increase' ? 'triangle-up' : 'triangle-down'}
{...props}
color={type === 'increase' ? 'green.500' : 'red.500'}
size={8}
/>
);
}
);
</s> add type IStatArrowProps = IIconProps | { type?: 'increase' | 'decrease' };
export const StatArrow = React.memo(({ type, ...props }: IStatArrowProps) => {
return (
<Icon
ml={-1}
type="Entypo"
name={type === 'increase' ? 'triangle-up' : 'triangle-down'}
color={type === 'increase' ? 'green.500' : 'red.500'}
size={8}
{...props}
/>
);
}); </s> remove export default React.memo(Stat);
</s> add type IStatComponentType = ((props: IBoxProps) => JSX.Element) & {
Label: React.MemoExoticComponent<(props: ITextProps) => JSX.Element>;
Number: React.MemoExoticComponent<(props: ITextProps) => JSX.Element>;
HelpText: React.MemoExoticComponent<(props: IBoxProps) => JSX.Element>;
Arrow: React.MemoExoticComponent<(props: IStatArrowProps) => JSX.Element>;
Group: React.MemoExoticComponent<(props: IStackProps) => JSX.Element>;
};
const StatTemp: any = StatMain;
StatTemp.Label = StatLabel;
StatTemp.Number = StatNumber;
StatTemp.HelpText = StatHelpText;
StatTemp.Arrow = StatArrow;
StatTemp.Group = StatGroup;
const Stat = StatTemp as IStatComponentType;
export default Stat; </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base';
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
src/components/composites/Stat/index.tsx
|
type IStatArrowProps = IIconProps | { type?: 'increase' | 'decrease' };
export const StatArrow = React.memo(({ type, ...props }: IStatArrowProps) => {
return (
<Icon
ml={-1}
type="Entypo"
name={type === 'increase' ? 'triangle-up' : 'triangle-down'}
color={type === 'increase' ? 'green.500' : 'red.500'}
size={8}
{...props}
/>
);
});
|
<mask> </Box>
<mask> );
<mask> });
<mask>
<mask> export const StatArrow = React.memo(
<mask> ({ type, ...props }: { type?: 'increase' | 'decrease' }) => {
<mask> return (
<mask> <Icon
<mask> ml={-1}
<mask> type="Entypo"
<mask> name={type === 'increase' ? 'triangle-up' : 'triangle-down'}
<mask> {...props}
<mask> color={type === 'increase' ? 'green.500' : 'red.500'}
<mask> size={8}
<mask> />
<mask> );
<mask> }
<mask> );
<mask>
<mask> export const StatGroup = React.memo(({ style, ...props }: IBoxProps) => {
<mask> let newProps = useThemeProps('Stat', props);
<mask> return <HStack {...newProps._statGroup} {...newProps} style={style} />;
<mask> });
</s> fix: updated api for Stat </s> remove const Stat = ({ style, ...props }: IBoxProps) => {
</s> add const StatMain = ({ style, ...props }: IBoxProps) => { </s> remove export default React.memo(Stat);
</s> add type IStatComponentType = ((props: IBoxProps) => JSX.Element) & {
Label: React.MemoExoticComponent<(props: ITextProps) => JSX.Element>;
Number: React.MemoExoticComponent<(props: ITextProps) => JSX.Element>;
HelpText: React.MemoExoticComponent<(props: IBoxProps) => JSX.Element>;
Arrow: React.MemoExoticComponent<(props: IStatArrowProps) => JSX.Element>;
Group: React.MemoExoticComponent<(props: IStackProps) => JSX.Element>;
};
const StatTemp: any = StatMain;
StatTemp.Label = StatLabel;
StatTemp.Number = StatNumber;
StatTemp.HelpText = StatHelpText;
StatTemp.Arrow = StatArrow;
StatTemp.Group = StatGroup;
const Stat = StatTemp as IStatComponentType;
export default Stat; </s> remove </StatGroup>
</s> add </Stat.Group>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
src/components/composites/Stat/index.tsx
|
const StatMain = ({ style, ...props }: IBoxProps) => {
|
<mask> let newProps = useThemeProps('Stat', props);
<mask> return <HStack {...newProps._statGroup} {...newProps} style={style} />;
<mask> });
<mask>
<mask> const Stat = ({ style, ...props }: IBoxProps) => {
<mask> return <Box {...props} style={style} />;
<mask> };
<mask> export default React.memo(Stat);
</s> fix: updated api for Stat </s> remove export const StatArrow = React.memo(
({ type, ...props }: { type?: 'increase' | 'decrease' }) => {
return (
<Icon
ml={-1}
type="Entypo"
name={type === 'increase' ? 'triangle-up' : 'triangle-down'}
{...props}
color={type === 'increase' ? 'green.500' : 'red.500'}
size={8}
/>
);
}
);
</s> add type IStatArrowProps = IIconProps | { type?: 'increase' | 'decrease' };
export const StatArrow = React.memo(({ type, ...props }: IStatArrowProps) => {
return (
<Icon
ml={-1}
type="Entypo"
name={type === 'increase' ? 'triangle-up' : 'triangle-down'}
color={type === 'increase' ? 'green.500' : 'red.500'}
size={8}
{...props}
/>
);
}); </s> remove export default React.memo(Stat);
</s> add type IStatComponentType = ((props: IBoxProps) => JSX.Element) & {
Label: React.MemoExoticComponent<(props: ITextProps) => JSX.Element>;
Number: React.MemoExoticComponent<(props: ITextProps) => JSX.Element>;
HelpText: React.MemoExoticComponent<(props: IBoxProps) => JSX.Element>;
Arrow: React.MemoExoticComponent<(props: IStatArrowProps) => JSX.Element>;
Group: React.MemoExoticComponent<(props: IStackProps) => JSX.Element>;
};
const StatTemp: any = StatMain;
StatTemp.Label = StatLabel;
StatTemp.Number = StatNumber;
StatTemp.HelpText = StatHelpText;
StatTemp.Arrow = StatArrow;
StatTemp.Group = StatGroup;
const Stat = StatTemp as IStatComponentType;
export default Stat; </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
src/components/composites/Stat/index.tsx
|
type IStatComponentType = ((props: IBoxProps) => JSX.Element) & {
Label: React.MemoExoticComponent<(props: ITextProps) => JSX.Element>;
Number: React.MemoExoticComponent<(props: ITextProps) => JSX.Element>;
HelpText: React.MemoExoticComponent<(props: IBoxProps) => JSX.Element>;
Arrow: React.MemoExoticComponent<(props: IStatArrowProps) => JSX.Element>;
Group: React.MemoExoticComponent<(props: IStackProps) => JSX.Element>;
};
const StatTemp: any = StatMain;
StatTemp.Label = StatLabel;
StatTemp.Number = StatNumber;
StatTemp.HelpText = StatHelpText;
StatTemp.Arrow = StatArrow;
StatTemp.Group = StatGroup;
const Stat = StatTemp as IStatComponentType;
export default Stat;
|
<mask>
<mask> const Stat = ({ style, ...props }: IBoxProps) => {
<mask> return <Box {...props} style={style} />;
<mask> };
<mask> export default React.memo(Stat);
</s> fix: updated api for Stat </s> remove const Stat = ({ style, ...props }: IBoxProps) => {
</s> add const StatMain = ({ style, ...props }: IBoxProps) => { </s> remove export const StatArrow = React.memo(
({ type, ...props }: { type?: 'increase' | 'decrease' }) => {
return (
<Icon
ml={-1}
type="Entypo"
name={type === 'increase' ? 'triangle-up' : 'triangle-down'}
{...props}
color={type === 'increase' ? 'green.500' : 'red.500'}
size={8}
/>
);
}
);
</s> add type IStatArrowProps = IIconProps | { type?: 'increase' | 'decrease' };
export const StatArrow = React.memo(({ type, ...props }: IStatArrowProps) => {
return (
<Icon
ml={-1}
type="Entypo"
name={type === 'increase' ? 'triangle-up' : 'triangle-down'}
color={type === 'increase' ? 'green.500' : 'red.500'}
size={8}
{...props}
/>
);
}); </s> remove export {
default as Stat,
StatHelpText,
StatLabel,
StatNumber,
StatArrow,
StatGroup,
} from './Stat';
</s> add export { default as Stat } from './Stat';
|
[
"keep",
"keep",
"keep",
"keep",
"replace"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
src/components/composites/Stat/index.tsx
|
export { default as Stat } from './Stat';
|
<mask> export type { IDividerProps } from './Divider';
<mask>
<mask> export { default as Progress } from './Progress';
<mask>
<mask> export {
<mask> default as Stat,
<mask> StatHelpText,
<mask> StatLabel,
<mask> StatNumber,
<mask> StatArrow,
<mask> StatGroup,
<mask> } from './Stat';
<mask>
<mask> export { Skeleton } from './Skeleton';
<mask> export type { ISkeletonProps } from './Skeleton';
<mask>
<mask> export { Accordion } from './Accordion';
</s> fix: updated api for Stat </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
StatArrow,
StatGroup,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base'; </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base'; </s> remove export default React.memo(Stat);
</s> add type IStatComponentType = ((props: IBoxProps) => JSX.Element) & {
Label: React.MemoExoticComponent<(props: ITextProps) => JSX.Element>;
Number: React.MemoExoticComponent<(props: ITextProps) => JSX.Element>;
HelpText: React.MemoExoticComponent<(props: IBoxProps) => JSX.Element>;
Arrow: React.MemoExoticComponent<(props: IStatArrowProps) => JSX.Element>;
Group: React.MemoExoticComponent<(props: IStackProps) => JSX.Element>;
};
const StatTemp: any = StatMain;
StatTemp.Label = StatLabel;
StatTemp.Number = StatNumber;
StatTemp.HelpText = StatHelpText;
StatTemp.Arrow = StatArrow;
StatTemp.Group = StatGroup;
const Stat = StatTemp as IStatComponentType;
export default Stat;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
src/components/composites/index.ts
|
<mask> IFormControlLabelProps,
<mask> IFormControlErrorMessageProps,
<mask> IFormControlHelperTextProps,
<mask> Stat,
<mask> StatHelpText,
<mask> StatLabel,
<mask> StatNumber,
<mask> StatArrow,
<mask> StatGroup,
<mask> Tag,
<mask> Code,
<mask> Center,
<mask> Square,
<mask> Circle,
</s> fix: updated api for Stat </s> remove StatHelpText,
StatLabel,
StatNumber,
StatArrow,
StatGroup,
</s> add </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
StatArrow,
StatGroup,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base'; </s> remove export {
default as Stat,
StatHelpText,
StatLabel,
StatNumber,
StatArrow,
StatGroup,
} from './Stat';
</s> add export { default as Stat } from './Stat'; </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base'; </s> remove </StatHelpText>
</s> add </Stat.HelpText>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
src/index.tsx
|
|
<mask> Accordion,
<mask> Skeleton,
<mask> FormControl,
<mask> Stat,
<mask> StatHelpText,
<mask> StatLabel,
<mask> StatNumber,
<mask> StatArrow,
<mask> StatGroup,
<mask> Tag,
<mask> TextArea,
<mask> Wrap,
<mask> PinInput,
<mask> Fade,
</s> fix: updated api for Stat </s> remove StatHelpText,
StatLabel,
StatNumber,
StatArrow,
StatGroup,
</s> add </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
StatArrow,
StatGroup,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base'; </s> remove export {
default as Stat,
StatHelpText,
StatLabel,
StatNumber,
StatArrow,
StatGroup,
} from './Stat';
</s> add export { default as Stat } from './Stat'; </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base'; </s> remove </StatHelpText>
</s> add </Stat.HelpText>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
src/index.tsx
|
|
_text: {
color: 'gray.500',
fontSize: 'xl',
},
|
<mask> fontWeight: 'bold',
<mask> my: 2,
<mask> },
<mask> _statHelpText: {
<mask> color: 'gray.500',
<mask> fontSize: 'xl',
<mask> flexDirection: 'row',
<mask> alignItems: 'center',
<mask> },
<mask> _statGroup: {
<mask> flexWrap: 'wrap',
</s> fix: updated api for Stat </s> remove export {
default as Stat,
StatHelpText,
StatLabel,
StatNumber,
StatArrow,
StatGroup,
} from './Stat';
</s> add export { default as Stat } from './Stat'; </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base'; </s> remove import {
Stat,
StatLabel,
StatNumber,
StatHelpText,
StatArrow,
StatGroup,
Heading,
Box,
} from 'native-base';
</s> add import { Stat, Heading, Box } from 'native-base';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6822182ae65eb04f861e7cbe976eda1c9b6689ef
|
src/theme/components/stat.ts
|
}else{
this.setState({isFocused:false});
|
<mask> if(this.props.floatingLabel){
<mask> if(this.inputProps&&this.inputProps.value){
<mask> this.setState({isFocused:true});
<mask> this.floatUp(-16);
<mask> }
<mask> if(this.inputProps&&this.inputProps.getRef)
<mask> this.inputProps.getRef(this._inputRef);
<mask> }
</s> explicitly set isFocused to false in componentDidMount and componentWillReceiveProps </s> remove },__source:{fileName:_jsxFileName,lineNumber:157}})));
</s> add },__source:{fileName:_jsxFileName,lineNumber:161}}))); </s> remove newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:139}})));
</s> add newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:143}})));
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/690533267df34561a44b61a3fe45e39887e841fc
|
dist/src/basic/Item.js
|
}else{
this.setState({isFocused:false});
|
<mask> if(this.props.floatingLabel){
<mask> if(this.inputProps&&this.inputProps.value){
<mask> this.setState({isFocused:true});
<mask> this.floatUp(-16);
<mask> }
<mask> if(this.inputProps&&this.inputProps.getRef)
<mask> this.inputProps.getRef(this._inputRef);
<mask> }
<mask> }},{key:"floatBack",value:function floatBack()
</s> explicitly set isFocused to false in componentDidMount and componentWillReceiveProps </s> remove },__source:{fileName:_jsxFileName,lineNumber:157}})));
</s> add },__source:{fileName:_jsxFileName,lineNumber:161}}))); </s> remove newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:139}})));
</s> add newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:143}})));
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/690533267df34561a44b61a3fe45e39887e841fc
|
dist/src/basic/Item.js
|
newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:143}})));
|
<mask> return item;
<mask> }
<mask> });
<mask> if(this.props.floatingLabel&&icon.length){
<mask> newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:139}})));
<mask> newChildren.push(
<mask> _react2.default.createElement(_reactNative.Animated.View,{
<mask> key:"float",
<mask> style:{
<mask> position:"absolute",
</s> explicitly set isFocused to false in componentDidMount and componentWillReceiveProps </s> remove },__source:{fileName:_jsxFileName,lineNumber:157}})));
</s> add },__source:{fileName:_jsxFileName,lineNumber:161}}))); </s> remove width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:221}},
</s> add width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:225}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/690533267df34561a44b61a3fe45e39887e841fc
|
dist/src/basic/Item.js
|
paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:145}},
|
<mask> right:0,
<mask> top:this.state.topAnim,
<mask> opacity:this.state.opacAnim,
<mask> paddingTop:_reactNative.Platform.OS==="ios"?undefined:undefined,
<mask> paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:141}},
<mask>
<mask>
<mask> _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:153}}),this.renderLabel(label,labelProps))));
<mask>
<mask>
</s> explicitly set isFocused to false in componentDidMount and componentWillReceiveProps </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:180}},
</s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:184}}, </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:153}}),this.renderLabel(label,labelProps))));
</s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:157}}),this.renderLabel(label,labelProps)))); </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:192}}),this.renderLabel(label,labelProps))));
</s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:196}}),this.renderLabel(label,labelProps))));
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/690533267df34561a44b61a3fe45e39887e841fc
|
dist/src/basic/Item.js
|
_react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:157}}),this.renderLabel(label,labelProps))));
|
<mask> paddingTop:_reactNative.Platform.OS==="ios"?undefined:undefined,
<mask> paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:141}},
<mask>
<mask>
<mask> _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:153}}),this.renderLabel(label,labelProps))));
<mask>
<mask>
<mask> newChildren.push(
<mask> _react2.default.createElement(_Input.Input,_extends({
<mask> key:"l2"},
</s> explicitly set isFocused to false in componentDidMount and componentWillReceiveProps </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:141}},
</s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:145}}, </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:192}}),this.renderLabel(label,labelProps))));
</s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:196}}),this.renderLabel(label,labelProps)))); </s> remove style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:232}})))));
</s> add style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:236}}))))); </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:180}},
</s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:184}}, </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:229}})),
_react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:230}},
_react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:231}})),
</s> add _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:233}})),
_react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:234}},
_react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:235}})),
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/690533267df34561a44b61a3fe45e39887e841fc
|
dist/src/basic/Item.js
|
},__source:{fileName:_jsxFileName,lineNumber:161}})));
|
<mask> },
<mask> onChangeText:function onChangeText(text){
<mask> _this3.setState({text:text});
<mask> inputProps.onChangeText&&inputProps.onChangeText(text);
<mask> },__source:{fileName:_jsxFileName,lineNumber:157}})));
<mask>
<mask>
<mask> }else if(this.props.floatingLabel){
<mask> newChildren.push(
<mask> _react2.default.createElement(_reactNative.Animated.View,{
</s> explicitly set isFocused to false in componentDidMount and componentWillReceiveProps </s> remove },__source:{fileName:_jsxFileName,lineNumber:196}})));
</s> add },__source:{fileName:_jsxFileName,lineNumber:200}}))); </s> remove newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:139}})));
</s> add newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:143}}))); </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:153}}),this.renderLabel(label,labelProps))));
</s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:157}}),this.renderLabel(label,labelProps))));
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/690533267df34561a44b61a3fe45e39887e841fc
|
dist/src/basic/Item.js
|
paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:184}},
|
<mask> right:0,
<mask> top:this.state.topAnim,
<mask> opacity:this.state.opacAnim,
<mask> paddingTop:_reactNative.Platform.OS==="ios"?undefined:undefined,
<mask> paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:180}},
<mask>
<mask>
<mask> _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:192}}),this.renderLabel(label,labelProps))));
<mask>
<mask>
</s> explicitly set isFocused to false in componentDidMount and componentWillReceiveProps </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:141}},
</s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:145}}, </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:192}}),this.renderLabel(label,labelProps))));
</s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:196}}),this.renderLabel(label,labelProps)))); </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:153}}),this.renderLabel(label,labelProps))));
</s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:157}}),this.renderLabel(label,labelProps))));
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/690533267df34561a44b61a3fe45e39887e841fc
|
dist/src/basic/Item.js
|
_react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:196}}),this.renderLabel(label,labelProps))));
|
<mask> paddingTop:_reactNative.Platform.OS==="ios"?undefined:undefined,
<mask> paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:180}},
<mask>
<mask>
<mask> _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:192}}),this.renderLabel(label,labelProps))));
<mask>
<mask>
<mask> newChildren.push(
<mask> _react2.default.createElement(_Input.Input,_extends({
<mask> ref:function ref(c){return _this3._inputRef=c;},
</s> explicitly set isFocused to false in componentDidMount and componentWillReceiveProps </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:180}},
</s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:184}}, </s> remove activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:265}}),
</s> add activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:269}}), </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:153}}),this.renderLabel(label,labelProps))));
</s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:157}}),this.renderLabel(label,labelProps)))); </s> remove style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:232}})))));
</s> add style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:236}}))))); </s> remove paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:141}},
</s> add paddingBottom:_reactNative.Platform.OS==="ios"?undefined:12},__source:{fileName:_jsxFileName,lineNumber:145}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/690533267df34561a44b61a3fe45e39887e841fc
|
dist/src/basic/Item.js
|
},__source:{fileName:_jsxFileName,lineNumber:200}})));
|
<mask> },
<mask> onChangeText:function onChangeText(text){
<mask> _this3.setState({text:text});
<mask> inputProps.onChangeText&&inputProps.onChangeText(text);
<mask> },__source:{fileName:_jsxFileName,lineNumber:196}})));
<mask>
<mask>
<mask> }else if(this.props.stackedLabel&&icon.length){
<mask> newChildren.push(
<mask> _react2.default.createElement(_reactNative.View,{
</s> explicitly set isFocused to false in componentDidMount and componentWillReceiveProps </s> remove },__source:{fileName:_jsxFileName,lineNumber:157}})));
</s> add },__source:{fileName:_jsxFileName,lineNumber:161}}))); </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:153}}),this.renderLabel(label,labelProps))));
</s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:157}}),this.renderLabel(label,labelProps)))); </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:192}}),this.renderLabel(label,labelProps))));
</s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:196}}),this.renderLabel(label,labelProps)))); </s> remove newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:139}})));
</s> add newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:143}})));
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/690533267df34561a44b61a3fe45e39887e841fc
|
dist/src/basic/Item.js
|
width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:225}},
|
<mask> key:"s",
<mask> style:{
<mask> flexDirection:"row",
<mask> flex:1,
<mask> width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:221}},
<mask>
<mask>
<mask> _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:229}})),
<mask> _react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:230}},
<mask> _react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:231}})),
</s> explicitly set isFocused to false in componentDidMount and componentWillReceiveProps </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:229}})),
_react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:230}},
_react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:231}})),
</s> add _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:233}})),
_react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:234}},
_react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:235}})), </s> remove newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:139}})));
</s> add newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:143}}))); </s> remove style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:232}})))));
</s> add style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:236}})))));
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/690533267df34561a44b61a3fe45e39887e841fc
|
dist/src/basic/Item.js
|
_react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:233}})),
_react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:234}},
_react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:235}})),
|
<mask> flex:1,
<mask> width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:221}},
<mask>
<mask>
<mask> _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:229}})),
<mask> _react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:230}},
<mask> _react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:231}})),
<mask> _react2.default.createElement(_Input.Input,_extends({
<mask> key:"s3"},
<mask> inputProps,{
<mask> style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:232}})))));
<mask>
</s> explicitly set isFocused to false in componentDidMount and componentWillReceiveProps </s> remove width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:221}},
</s> add width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:225}}, </s> remove style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:232}})))));
</s> add style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:236}}))))); </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:153}}),this.renderLabel(label,labelProps))));
</s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:157}}),this.renderLabel(label,labelProps)))); </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:192}}),this.renderLabel(label,labelProps))));
</s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:196}}),this.renderLabel(label,labelProps))));
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/690533267df34561a44b61a3fe45e39887e841fc
|
dist/src/basic/Item.js
|
style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:236}})))));
|
<mask> _react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:231}})),
<mask> _react2.default.createElement(_Input.Input,_extends({
<mask> key:"s3"},
<mask> inputProps,{
<mask> style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:232}})))));
<mask>
<mask>
<mask>
<mask>
<mask> }else{
</s> explicitly set isFocused to false in componentDidMount and componentWillReceiveProps </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:229}})),
_react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:230}},
_react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:231}})),
</s> add _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:233}})),
_react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:234}},
_react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:235}})), </s> remove width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:221}},
</s> add width:_platform2.default.deviceWidth-15},__source:{fileName:_jsxFileName,lineNumber:225}}, </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:153}}),this.renderLabel(label,labelProps))));
</s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:157}}),this.renderLabel(label,labelProps))));
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/690533267df34561a44b61a3fe45e39887e841fc
|
dist/src/basic/Item.js
|
activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:269}}),
|
<mask> return(
<mask> _react2.default.createElement(_reactNative.TouchableOpacity,_extends({
<mask> ref:function ref(c){return _this4._root=c;}},
<mask> this.prepareRootProps(),{
<mask> activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:265}}),
<mask>
<mask> this.renderChildren()));
<mask>
<mask>
<mask> }}]);return Item;}(_react.Component);
</s> explicitly set isFocused to false in componentDidMount and componentWillReceiveProps </s> remove _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:192}}),this.renderLabel(label,labelProps))));
</s> add _react2.default.createElement(_Label.Label,_extends({},labelProps,{__source:{fileName:_jsxFileName,lineNumber:196}}),this.renderLabel(label,labelProps)))); </s> remove style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:232}})))));
</s> add style:{width:_platform2.default.deviceWidth-40},__source:{fileName:_jsxFileName,lineNumber:236}}))))); </s> remove _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:229}})),
_react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:230}},
_react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:231}})),
</s> add _react2.default.createElement(_Icon.Icon,_extends({key:"s1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:233}})),
_react2.default.createElement(_reactNative.View,{style:{flexDirection:"column"},__source:{fileName:_jsxFileName,lineNumber:234}},
_react2.default.createElement(_Label.Label,_extends({key:"s2"},labelProps,{__source:{fileName:_jsxFileName,lineNumber:235}})),
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/690533267df34561a44b61a3fe45e39887e841fc
|
dist/src/basic/Item.js
|
} else {
this.setState({ isFocused: false });
|
<mask> if (this.props.floatingLabel) {
<mask> if (this.inputProps && this.inputProps.value) {
<mask> this.setState({ isFocused: true });
<mask> this.floatUp(-16);
<mask> }
<mask> if (this.inputProps && this.inputProps.getRef)
<mask> this.inputProps.getRef(this._inputRef);
<mask> }
<mask> }
<mask> componentWillReceiveProps(nextProps) {
</s> explicitly set isFocused to false in componentDidMount and componentWillReceiveProps </s> remove newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:139}})));
</s> add newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:143}}))); </s> remove activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:265}}),
</s> add activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:269}}),
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/690533267df34561a44b61a3fe45e39887e841fc
|
src/basic/Item.js
|
} else {
this.setState({ isFocused: false });
|
<mask> if (this.inputProps && this.inputProps.value) {
<mask> this.setState({ isFocused: true });
<mask> this.floatUp(-16);
<mask> }
<mask> if (this.inputProps && this.inputProps.getRef)
<mask> this.inputProps.getRef(this._inputRef);
<mask> }
</s> explicitly set isFocused to false in componentDidMount and componentWillReceiveProps </s> remove newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:139}})));
</s> add newChildren.push(_react2.default.createElement(_Icon.Icon,_extends({key:"i1"},iconProps,{__source:{fileName:_jsxFileName,lineNumber:143}}))); </s> remove activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:265}}),
</s> add activeOpacity:1,__source:{fileName:_jsxFileName,lineNumber:269}}),
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/690533267df34561a44b61a3fe45e39887e841fc
|
src/basic/Item.js
|
const { hoverProps, isHovered } = useHover();
const { pressableProps, isPressed } = useIsPressed();
const { focusProps, isFocused } = useFocus();
const { isFocusVisible, focusProps: focusRingProps }: any = useFocusRing();
const {
_icon,
onPressIn,
onPressOut,
onHoverIn,
onHoverOut,
onFocus,
onBlur,
...rest
} = usePropsResolution('AlertDialogCloseButton', props, {
isHovered,
isPressed,
isFocused,
isFocusVisible,
});
|
<mask> import type { IButtonProps } from '../../primitives/Button';
<mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps';
<mask>
<mask> const AlertDialogCloseButton = (props: IButtonProps, ref?: any) => {
<mask> const { _icon, ...rest } = usePropsResolution(
<mask> 'AlertDialogCloseButton',
<mask> props
<mask> );
<mask> const { handleClose } = React.useContext(AlertDialogContext);
<mask> //TODO: refactor for responsive prop
<mask> if (useHasResponsiveProps(props)) {
<mask> return null;
<mask> }
</s> fix: hover and press issue </s> remove <Button
variant="ghost"
{...rest}
onPress={handleClose}
accessibilityLabel="Close dialog"
</s> add <Pressable
accessibilityRole="button" </s> remove </Button>
</s> add </Pressable>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6a24ed1182a8aca87c6071c43c0c0b12da4fbc1e
|
src/components/composites/AlertDialog/AlertDialogCloseButton.tsx
|
<Pressable
accessibilityRole="button"
|
<mask> if (useHasResponsiveProps(props)) {
<mask> return null;
<mask> }
<mask> return (
<mask> <Button
<mask> variant="ghost"
<mask> {...rest}
<mask> onPress={handleClose}
<mask> accessibilityLabel="Close dialog"
<mask> ref={ref}
<mask> >
<mask> <CloseIcon {..._icon} />
<mask> </Button>
<mask> );
</s> fix: hover and press issue </s> remove </Button>
</s> add </Pressable> </s> remove const { _icon, ...rest } = usePropsResolution(
'AlertDialogCloseButton',
props
);
</s> add const { hoverProps, isHovered } = useHover();
const { pressableProps, isPressed } = useIsPressed();
const { focusProps, isFocused } = useFocus();
const { isFocusVisible, focusProps: focusRingProps }: any = useFocusRing();
const {
_icon,
onPressIn,
onPressOut,
onHoverIn,
onHoverOut,
onFocus,
onBlur,
...rest
} = usePropsResolution('AlertDialogCloseButton', props, {
isHovered,
isPressed,
isFocused,
isFocusVisible,
});
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6a24ed1182a8aca87c6071c43c0c0b12da4fbc1e
|
src/components/composites/AlertDialog/AlertDialogCloseButton.tsx
|
</Pressable>
|
<mask> accessibilityLabel="Close dialog"
<mask> ref={ref}
<mask> >
<mask> <CloseIcon {..._icon} />
<mask> </Button>
<mask> );
<mask> };
<mask>
<mask> export default memo(forwardRef(AlertDialogCloseButton));
</s> fix: hover and press issue </s> remove <Button
variant="ghost"
{...rest}
onPress={handleClose}
accessibilityLabel="Close dialog"
</s> add <Pressable
accessibilityRole="button" </s> remove const { _icon, ...rest } = usePropsResolution(
'AlertDialogCloseButton',
props
);
</s> add const { hoverProps, isHovered } = useHover();
const { pressableProps, isPressed } = useIsPressed();
const { focusProps, isFocused } = useFocus();
const { isFocusVisible, focusProps: focusRingProps }: any = useFocusRing();
const {
_icon,
onPressIn,
onPressOut,
onHoverIn,
onHoverOut,
onFocus,
onBlur,
...rest
} = usePropsResolution('AlertDialogCloseButton', props, {
isHovered,
isPressed,
isFocused,
isFocusVisible,
});
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6a24ed1182a8aca87c6071c43c0c0b12da4fbc1e
|
src/components/composites/AlertDialog/AlertDialogCloseButton.tsx
|
<Icon name="menu" />
|
<mask>
<mask> export default function () {
<mask> return (
<mask> <>
<mask> <Icon name="menu" type="MaterialIcons" />
<mask> <Icon type="Ionicons" name="md-checkmark-circle" />
<mask> <Icon name="stepforward" type="AntDesign" />
<mask> </>
<mask> );
<mask> }
</s> Fixes for Icon padding and margin </s> remove export default styled(React.memo(React.forwardRef(Icon)))<IIconProps>(
color,
space,
layout,
flexbox,
border,
typography,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
customTypography
);
</s> add </s> remove const flattenedIconStyle = StyleSheet.flatten([
{
fontSize: parseInt(newProps.size, 10),
marginRight: marginRight ? parseInt(marginRight, 10) : undefined,
},
]);
const Component = type ? componentMap[type] : MaterialIcons;
return (
<Component
name={name}
{...props}
style={flattenedIconStyle}
color={rawColor}
ref={ref}
/>
);
</s> add const Component = getStyleIconComponent(type ?? 'MaterialIcons');
return <Component name={name} {...newProps} ref={ref} />; </s> remove const Icon = (iconProps: IIconProps, ref: any) => {
const { name, type, size, color: colorProp, ...props } = iconProps;
const newProps = useThemeProps('Icon', { size, color: colorProp, ...props });
const rawColor = useToken('colors', newProps.color);
// FIXME: temporary code, remove and replace with something generic
const marginRight = useToken('space', newProps.marginRight || newProps.mr);
</s> add function getStyleIconComponent(type: IconType) {
return styled(componentMap[type])<IIconProps>(
color,
space,
layout,
flexbox,
border,
typography,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
customTypography
);
}
const Icon = ({ type, name, ...props }: IIconProps, ref?: any) => {
const newProps = useThemeProps('Icon', props); </s> remove import { useThemeProps, useToken } from '../../../hooks';
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6a3e2d095fd0b5faba57a71846964415da2a70a7
|
example/storybook/stories/components/primitives/Icon/Basic.tsx
|
<mask> import React from 'react';
<mask> import { StyleSheet } from 'react-native';
<mask> import {
<mask> border,
<mask> color,
<mask> flexbox,
<mask> layout,
</s> Fixes for Icon padding and margin </s> remove import { useThemeProps, useToken } from '../../../hooks';
</s> add </s> remove export default styled(React.memo(React.forwardRef(Icon)))<IIconProps>(
color,
space,
layout,
flexbox,
border,
typography,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
customTypography
);
</s> add </s> remove const Icon = (iconProps: IIconProps, ref: any) => {
const { name, type, size, color: colorProp, ...props } = iconProps;
const newProps = useThemeProps('Icon', { size, color: colorProp, ...props });
const rawColor = useToken('colors', newProps.color);
// FIXME: temporary code, remove and replace with something generic
const marginRight = useToken('space', newProps.marginRight || newProps.mr);
</s> add function getStyleIconComponent(type: IconType) {
return styled(componentMap[type])<IIconProps>(
color,
space,
layout,
flexbox,
border,
typography,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
customTypography
);
}
const Icon = ({ type, name, ...props }: IIconProps, ref?: any) => {
const newProps = useThemeProps('Icon', props); </s> remove return <SVGIcon {...iconProps} />;
</s> add return <SVGIcon {...props} />;
|
[
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6a3e2d095fd0b5faba57a71846964415da2a70a7
|
src/components/primitives/Icon/index.tsx
|
|
<mask> customShadow,
<mask> customTypography,
<mask> customPosition,
<mask> } from '../../../utils/customProps';
<mask> import { useThemeProps, useToken } from '../../../hooks';
<mask>
<mask> import styled from 'styled-components/native';
<mask> import {
<mask> AntDesign,
<mask> Entypo,
<mask> EvilIcons,
</s> Fixes for Icon padding and margin </s> remove import { StyleSheet } from 'react-native';
</s> add </s> remove export default styled(React.memo(React.forwardRef(Icon)))<IIconProps>(
color,
space,
layout,
flexbox,
border,
typography,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
customTypography
);
</s> add </s> remove const Icon = (iconProps: IIconProps, ref: any) => {
const { name, type, size, color: colorProp, ...props } = iconProps;
const newProps = useThemeProps('Icon', { size, color: colorProp, ...props });
const rawColor = useToken('colors', newProps.color);
// FIXME: temporary code, remove and replace with something generic
const marginRight = useToken('space', newProps.marginRight || newProps.mr);
</s> add function getStyleIconComponent(type: IconType) {
return styled(componentMap[type])<IIconProps>(
color,
space,
layout,
flexbox,
border,
typography,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
customTypography
);
}
const Icon = ({ type, name, ...props }: IIconProps, ref?: any) => {
const newProps = useThemeProps('Icon', props); </s> remove <Icon name="menu" type="MaterialIcons" />
</s> add <Icon name="menu" />
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6a3e2d095fd0b5faba57a71846964415da2a70a7
|
src/components/primitives/Icon/index.tsx
|
|
import { useThemeProps } from '../../../hooks';
|
<mask> customTypography,
<mask> customPosition,
<mask> } from '../../../utils/customProps';
<mask> import styled from 'styled-components/native';
<mask> import {
<mask> AntDesign,
<mask> Entypo,
<mask> EvilIcons,
</s> Fixes for Icon padding and margin </s> remove import { useThemeProps, useToken } from '../../../hooks';
</s> add </s> remove import { StyleSheet } from 'react-native';
</s> add </s> remove const Icon = (iconProps: IIconProps, ref: any) => {
const { name, type, size, color: colorProp, ...props } = iconProps;
const newProps = useThemeProps('Icon', { size, color: colorProp, ...props });
const rawColor = useToken('colors', newProps.color);
// FIXME: temporary code, remove and replace with something generic
const marginRight = useToken('space', newProps.marginRight || newProps.mr);
</s> add function getStyleIconComponent(type: IconType) {
return styled(componentMap[type])<IIconProps>(
color,
space,
layout,
flexbox,
border,
typography,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
customTypography
);
}
const Icon = ({ type, name, ...props }: IIconProps, ref?: any) => {
const newProps = useThemeProps('Icon', props); </s> remove export default styled(React.memo(React.forwardRef(Icon)))<IIconProps>(
color,
space,
layout,
flexbox,
border,
typography,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
customTypography
);
</s> add </s> remove <Icon name="menu" type="MaterialIcons" />
</s> add <Icon name="menu" />
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6a3e2d095fd0b5faba57a71846964415da2a70a7
|
src/components/primitives/Icon/index.tsx
|
function getStyleIconComponent(type: IconType) {
return styled(componentMap[type])<IIconProps>(
color,
space,
layout,
flexbox,
border,
typography,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
customTypography
);
}
const Icon = ({ type, name, ...props }: IIconProps, ref?: any) => {
const newProps = useThemeProps('Icon', props);
|
<mask> SimpleLineIcons,
<mask> Zocial,
<mask> };
<mask>
<mask> const Icon = (iconProps: IIconProps, ref: any) => {
<mask> const { name, type, size, color: colorProp, ...props } = iconProps;
<mask> const newProps = useThemeProps('Icon', { size, color: colorProp, ...props });
<mask> const rawColor = useToken('colors', newProps.color);
<mask> // FIXME: temporary code, remove and replace with something generic
<mask> const marginRight = useToken('space', newProps.marginRight || newProps.mr);
<mask> if (!name) {
<mask> return <SVGIcon {...iconProps} />;
<mask> }
<mask> const flattenedIconStyle = StyleSheet.flatten([
<mask> {
</s> Fixes for Icon padding and margin </s> remove return <SVGIcon {...iconProps} />;
</s> add return <SVGIcon {...props} />; </s> remove const flattenedIconStyle = StyleSheet.flatten([
{
fontSize: parseInt(newProps.size, 10),
marginRight: marginRight ? parseInt(marginRight, 10) : undefined,
},
]);
const Component = type ? componentMap[type] : MaterialIcons;
return (
<Component
name={name}
{...props}
style={flattenedIconStyle}
color={rawColor}
ref={ref}
/>
);
</s> add const Component = getStyleIconComponent(type ?? 'MaterialIcons');
return <Component name={name} {...newProps} ref={ref} />; </s> remove export default styled(React.memo(React.forwardRef(Icon)))<IIconProps>(
color,
space,
layout,
flexbox,
border,
typography,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
customTypography
);
</s> add </s> remove import { useThemeProps, useToken } from '../../../hooks';
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6a3e2d095fd0b5faba57a71846964415da2a70a7
|
src/components/primitives/Icon/index.tsx
|
return <SVGIcon {...props} />;
|
<mask> const rawColor = useToken('colors', newProps.color);
<mask> // FIXME: temporary code, remove and replace with something generic
<mask> const marginRight = useToken('space', newProps.marginRight || newProps.mr);
<mask> if (!name) {
<mask> return <SVGIcon {...iconProps} />;
<mask> }
<mask> const flattenedIconStyle = StyleSheet.flatten([
<mask> {
<mask> fontSize: parseInt(newProps.size, 10),
<mask> marginRight: marginRight ? parseInt(marginRight, 10) : undefined,
</s> Fixes for Icon padding and margin </s> remove const flattenedIconStyle = StyleSheet.flatten([
{
fontSize: parseInt(newProps.size, 10),
marginRight: marginRight ? parseInt(marginRight, 10) : undefined,
},
]);
const Component = type ? componentMap[type] : MaterialIcons;
return (
<Component
name={name}
{...props}
style={flattenedIconStyle}
color={rawColor}
ref={ref}
/>
);
</s> add const Component = getStyleIconComponent(type ?? 'MaterialIcons');
return <Component name={name} {...newProps} ref={ref} />; </s> remove const Icon = (iconProps: IIconProps, ref: any) => {
const { name, type, size, color: colorProp, ...props } = iconProps;
const newProps = useThemeProps('Icon', { size, color: colorProp, ...props });
const rawColor = useToken('colors', newProps.color);
// FIXME: temporary code, remove and replace with something generic
const marginRight = useToken('space', newProps.marginRight || newProps.mr);
</s> add function getStyleIconComponent(type: IconType) {
return styled(componentMap[type])<IIconProps>(
color,
space,
layout,
flexbox,
border,
typography,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
customTypography
);
}
const Icon = ({ type, name, ...props }: IIconProps, ref?: any) => {
const newProps = useThemeProps('Icon', props); </s> remove import { useThemeProps, useToken } from '../../../hooks';
</s> add </s> remove import { StyleSheet } from 'react-native';
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6a3e2d095fd0b5faba57a71846964415da2a70a7
|
src/components/primitives/Icon/index.tsx
|
const Component = getStyleIconComponent(type ?? 'MaterialIcons');
return <Component name={name} {...newProps} ref={ref} />;
|
<mask> const marginRight = useToken('space', newProps.marginRight || newProps.mr);
<mask> if (!name) {
<mask> return <SVGIcon {...iconProps} />;
<mask> }
<mask> const flattenedIconStyle = StyleSheet.flatten([
<mask> {
<mask> fontSize: parseInt(newProps.size, 10),
<mask> marginRight: marginRight ? parseInt(marginRight, 10) : undefined,
<mask> },
<mask> ]);
<mask>
<mask> const Component = type ? componentMap[type] : MaterialIcons;
<mask> return (
<mask> <Component
<mask> name={name}
<mask> {...props}
<mask> style={flattenedIconStyle}
<mask> color={rawColor}
<mask> ref={ref}
<mask> />
<mask> );
<mask> };
<mask>
<mask> export default styled(React.memo(React.forwardRef(Icon)))<IIconProps>(
<mask> color,
<mask> space,
</s> Fixes for Icon padding and margin </s> remove return <SVGIcon {...iconProps} />;
</s> add return <SVGIcon {...props} />; </s> remove const Icon = (iconProps: IIconProps, ref: any) => {
const { name, type, size, color: colorProp, ...props } = iconProps;
const newProps = useThemeProps('Icon', { size, color: colorProp, ...props });
const rawColor = useToken('colors', newProps.color);
// FIXME: temporary code, remove and replace with something generic
const marginRight = useToken('space', newProps.marginRight || newProps.mr);
</s> add function getStyleIconComponent(type: IconType) {
return styled(componentMap[type])<IIconProps>(
color,
space,
layout,
flexbox,
border,
typography,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
customTypography
);
}
const Icon = ({ type, name, ...props }: IIconProps, ref?: any) => {
const newProps = useThemeProps('Icon', props); </s> remove export default styled(React.memo(React.forwardRef(Icon)))<IIconProps>(
color,
space,
layout,
flexbox,
border,
typography,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
customTypography
);
</s> add </s> remove <Icon name="menu" type="MaterialIcons" />
</s> add <Icon name="menu" />
|
[
"keep",
"keep",
"keep",
"keep",
"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/6a3e2d095fd0b5faba57a71846964415da2a70a7
|
src/components/primitives/Icon/index.tsx
|
<mask> />
<mask> );
<mask> };
<mask>
<mask> export default styled(React.memo(React.forwardRef(Icon)))<IIconProps>(
<mask> color,
<mask> space,
<mask> layout,
<mask> flexbox,
<mask> border,
<mask> typography,
<mask> position,
<mask> customPosition,
<mask> customBorder,
<mask> customBackground,
<mask> customOutline,
<mask> customShadow,
<mask> customExtra,
<mask> customLayout,
<mask> customTypography
<mask> );
<mask> export type { IIconProps, IconType, IconNameType };
<mask> export { createIcon } from './createIcon';
</s> Fixes for Icon padding and margin </s> remove const Icon = (iconProps: IIconProps, ref: any) => {
const { name, type, size, color: colorProp, ...props } = iconProps;
const newProps = useThemeProps('Icon', { size, color: colorProp, ...props });
const rawColor = useToken('colors', newProps.color);
// FIXME: temporary code, remove and replace with something generic
const marginRight = useToken('space', newProps.marginRight || newProps.mr);
</s> add function getStyleIconComponent(type: IconType) {
return styled(componentMap[type])<IIconProps>(
color,
space,
layout,
flexbox,
border,
typography,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
customTypography
);
}
const Icon = ({ type, name, ...props }: IIconProps, ref?: any) => {
const newProps = useThemeProps('Icon', props); </s> remove const flattenedIconStyle = StyleSheet.flatten([
{
fontSize: parseInt(newProps.size, 10),
marginRight: marginRight ? parseInt(marginRight, 10) : undefined,
},
]);
const Component = type ? componentMap[type] : MaterialIcons;
return (
<Component
name={name}
{...props}
style={flattenedIconStyle}
color={rawColor}
ref={ref}
/>
);
</s> add const Component = getStyleIconComponent(type ?? 'MaterialIcons');
return <Component name={name} {...newProps} ref={ref} />; </s> remove <Icon name="menu" type="MaterialIcons" />
</s> add <Icon name="menu" /> </s> remove import { StyleSheet } from 'react-native';
</s> add </s> remove import { useThemeProps, useToken } from '../../../hooks';
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6a3e2d095fd0b5faba57a71846964415da2a70a7
|
src/components/primitives/Icon/index.tsx
|
|
import { Box, Text, Image, Heading, Stack } from 'native-base';
export default () => {
|
<mask> import React from 'react';
<mask> import {
<mask> Box,
<mask> Stack,
<mask> Image,
<mask> Heading,
<mask> Icon,
<mask> Text,
<mask> Flex,
<mask> IconButton,
<mask> } from 'native-base';
<mask> export const CompositionShoesCard = () => {
<mask> return (
<mask> <Flex
<mask> w={64}
<mask> rounded={12}
<mask> shadow={4}
</s> Fixes for box composition example </s> remove import { Box, Heading, Icon, AspectRatio, Image, Text } from 'native-base';
</s> add import {
Box,
Heading,
Icon,
AspectRatio,
Image,
Text,
Center,
HStack,
Stack,
} from 'native-base'; </s> remove <Flex
w={64}
rounded={12}
</s> add <Box
flexDirection={{ base: 'column', md: 'row' }} </s> remove <Box width={72} bg="gray.50" p={2}>
<Box bg="white" shadow={1}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',
}}
alt="image"
/>
</AspectRatio>
<Box
bg="red.500"
_text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }}
position="absolute"
bottom={0}
px={2}
py={1}
>
PHOTOS
</Box>
<Box
p={2}
rounded="full"
justifyContent="center"
alignItems="center"
bg="red.500"
boxSize={10}
position="absolute"
right={0}
m={2}
_text={{
color: 'white',
textAlign: 'center',
fontWeight: '700',
fontSize: '8',
</s> add <Box width={72} bg="gray.50" shadow={4}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg', </s> remove borderColor="blueGray.400"
</s> add rounded="xl" </s> remove <Box w="100%" h={40} overflow="hidden">
</s> add <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}>
|
[
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ad875286b8b5cb9604d48fd9740d2a653c9a04f
|
example/storybook/stories/components/primitives/Box/composition-shoes-card.tsx
|
<Box
flexDirection={{ base: 'column', md: 'row' }}
|
<mask> IconButton,
<mask> } from 'native-base';
<mask> export const CompositionShoesCard = () => {
<mask> return (
<mask> <Flex
<mask> w={64}
<mask> rounded={12}
<mask> shadow={4}
<mask> borderColor="blueGray.400"
<mask> overflow="hidden"
<mask> >
<mask> <Box w="100%" h={40} overflow="hidden">
</s> Fixes for box composition example </s> remove import {
Box,
Stack,
Image,
Heading,
Icon,
Text,
Flex,
IconButton,
} from 'native-base';
export const CompositionShoesCard = () => {
</s> add import { Box, Text, Image, Heading, Stack } from 'native-base';
export default () => { </s> remove borderColor="blueGray.400"
</s> add rounded="xl" </s> remove import { Box, Heading, Icon, AspectRatio, Image, Text } from 'native-base';
</s> add import {
Box,
Heading,
Icon,
AspectRatio,
Image,
Text,
Center,
HStack,
Stack,
} from 'native-base'; </s> remove <Box w="100%" h={40} overflow="hidden">
</s> add <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}> </s> remove <Box width={72} bg="gray.50" p={2}>
<Box bg="white" shadow={1}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',
}}
alt="image"
/>
</AspectRatio>
<Box
bg="red.500"
_text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }}
position="absolute"
bottom={0}
px={2}
py={1}
>
PHOTOS
</Box>
<Box
p={2}
rounded="full"
justifyContent="center"
alignItems="center"
bg="red.500"
boxSize={10}
position="absolute"
right={0}
m={2}
_text={{
color: 'white',
textAlign: 'center',
fontWeight: '700',
fontSize: '8',
</s> add <Box width={72} bg="gray.50" shadow={4}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ad875286b8b5cb9604d48fd9740d2a653c9a04f
|
example/storybook/stories/components/primitives/Box/composition-shoes-card.tsx
|
rounded="xl"
|
<mask> <Flex
<mask> w={64}
<mask> rounded={12}
<mask> shadow={4}
<mask> borderColor="blueGray.400"
<mask> overflow="hidden"
<mask> >
<mask> <Box w="100%" h={40} overflow="hidden">
<mask> <Image
<mask> alt="shoes"
</s> Fixes for box composition example </s> remove <Flex
w={64}
rounded={12}
</s> add <Box
flexDirection={{ base: 'column', md: 'row' }} </s> remove <Box w="100%" h={40} overflow="hidden">
</s> add <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}> </s> remove alt="shoes"
</s> add </s> remove import {
Box,
Stack,
Image,
Heading,
Icon,
Text,
Flex,
IconButton,
} from 'native-base';
export const CompositionShoesCard = () => {
</s> add import { Box, Text, Image, Heading, Stack } from 'native-base';
export default () => { </s> remove <Box width={72} bg="gray.50" p={2}>
<Box bg="white" shadow={1}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',
}}
alt="image"
/>
</AspectRatio>
<Box
bg="red.500"
_text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }}
position="absolute"
bottom={0}
px={2}
py={1}
>
PHOTOS
</Box>
<Box
p={2}
rounded="full"
justifyContent="center"
alignItems="center"
bg="red.500"
boxSize={10}
position="absolute"
right={0}
m={2}
_text={{
color: 'white',
textAlign: 'center',
fontWeight: '700',
fontSize: '8',
</s> add <Box width={72} bg="gray.50" shadow={4}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ad875286b8b5cb9604d48fd9740d2a653c9a04f
|
example/storybook/stories/components/primitives/Box/composition-shoes-card.tsx
|
<Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}>
|
<mask> shadow={4}
<mask> borderColor="blueGray.400"
<mask> overflow="hidden"
<mask> >
<mask> <Box w="100%" h={40} overflow="hidden">
<mask> <Image
<mask> alt="shoes"
<mask> source={{
<mask> uri:
<mask> 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg',
</s> Fixes for box composition example </s> remove alt="shoes"
</s> add </s> remove borderColor="blueGray.400"
</s> add rounded="xl" </s> remove <Flex
w={64}
rounded={12}
</s> add <Box
flexDirection={{ base: 'column', md: 'row' }} </s> remove <Box width={72} bg="gray.50" p={2}>
<Box bg="white" shadow={1}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',
}}
alt="image"
/>
</AspectRatio>
<Box
bg="red.500"
_text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }}
position="absolute"
bottom={0}
px={2}
py={1}
>
PHOTOS
</Box>
<Box
p={2}
rounded="full"
justifyContent="center"
alignItems="center"
bg="red.500"
boxSize={10}
position="absolute"
right={0}
m={2}
_text={{
color: 'white',
textAlign: 'center',
fontWeight: '700',
fontSize: '8',
</s> add <Box width={72} bg="gray.50" shadow={4}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ad875286b8b5cb9604d48fd9740d2a653c9a04f
|
example/storybook/stories/components/primitives/Box/composition-shoes-card.tsx
|
<mask> overflow="hidden"
<mask> >
<mask> <Box w="100%" h={40} overflow="hidden">
<mask> <Image
<mask> alt="shoes"
<mask> source={{
<mask> uri:
<mask> 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg',
<mask> }}
<mask> />
</s> Fixes for box composition example </s> remove <Box w="100%" h={40} overflow="hidden">
</s> add <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}> </s> remove borderColor="blueGray.400"
</s> add rounded="xl" </s> remove <Flex
w={64}
rounded={12}
</s> add <Box
flexDirection={{ base: 'column', md: 'row' }} </s> remove <Box width={72} bg="gray.50" p={2}>
<Box bg="white" shadow={1}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',
}}
alt="image"
/>
</AspectRatio>
<Box
bg="red.500"
_text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }}
position="absolute"
bottom={0}
px={2}
py={1}
>
PHOTOS
</Box>
<Box
p={2}
rounded="full"
justifyContent="center"
alignItems="center"
bg="red.500"
boxSize={10}
position="absolute"
right={0}
m={2}
_text={{
color: 'white',
textAlign: 'center',
fontWeight: '700',
fontSize: '8',
</s> add <Box width={72} bg="gray.50" shadow={4}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ad875286b8b5cb9604d48fd9740d2a653c9a04f
|
example/storybook/stories/components/primitives/Box/composition-shoes-card.tsx
|
|
alt="Shoes"
|
<mask> uri:
<mask> 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg',
<mask> }}
<mask> />
<mask> </Box>
<mask> <Stack p={3} space={2} minW={32}>
<mask> <Text fontSize="xs" color="red.400" fontWeight="semibold">
<mask> Just In
<mask> </Text>
</s> Fixes for box composition example </s> remove <Stack h={32} p={5} space={2} justifyContent="space-between">
<Text fontSize="lg" color="blueGray.400">
Sneakers
</s> add <Stack p={3} space={2} minW={32}>
<Text fontSize="xs" color="red.400" fontWeight="semibold">
Just In </s> remove alt="shoes"
</s> add </s> remove <Heading size="lg">Jordan MA2</Heading>
<Text fontSize="xl" fontWeight="medium" color="blueGray.600">
$ 150
</s> add <Heading size="sm">Jordan MA2</Heading>
<Text fontWeight="medium" color="blueGray.600">
Older Kids' Shoe
</Text>
<Text fontWeight="medium" color="blueGray.600">
2 colors </s> remove <Box w="100%" h={40} overflow="hidden">
</s> add <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}>
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ad875286b8b5cb9604d48fd9740d2a653c9a04f
|
example/storybook/stories/components/primitives/Box/composition-shoes-card.tsx
|
<Stack p={3} space={2} minW={32}>
<Text fontSize="xs" color="red.400" fontWeight="semibold">
Just In
|
<mask> 'https://static.nike.com/a/images/f_auto/dpr_2.0/w_1328,c_limit/b56d1e9b-3861-4c89-995d-b8fb6240a762/nike-just-do-it.jpg',
<mask> }}
<mask> />
<mask> </Box>
<mask> <Stack h={32} p={5} space={2} justifyContent="space-between">
<mask> <Text fontSize="lg" color="blueGray.400">
<mask> Sneakers
<mask> </Text>
<mask> <Stack space={1}>
<mask> <Heading size="lg">Jordan MA2</Heading>
<mask> <Text fontSize="xl" fontWeight="medium" color="blueGray.600">
<mask> $ 150
</s> Fixes for box composition example </s> remove <Heading size="lg">Jordan MA2</Heading>
<Text fontSize="xl" fontWeight="medium" color="blueGray.600">
$ 150
</s> add <Heading size="sm">Jordan MA2</Heading>
<Text fontWeight="medium" color="blueGray.600">
Older Kids' Shoe
</Text>
<Text fontWeight="medium" color="blueGray.600">
2 colors </s> remove >
27 MAR
</Box>
</Box>
<Box p={4}>
</s> add alt="image"
/>
</AspectRatio>
<Center
bg="red.500"
_text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }}
position="absolute"
bottom={0}
px={2}
py={1}
>
PHOTOS
</Center>
<Center
p={1}
rounded="full"
bg="red.500"
boxSize={10}
position="absolute"
right={0}
m={2}
_text={{
color: 'white',
textAlign: 'center',
fontWeight: '700',
fontSize: 'xs',
}}
>
27 MAR
</Center>
</Box>
<Stack p={4} space={3}>
<Stack space={2}> </s> remove <IconButton
position="absolute"
mt={32}
right={4}
w={16}
h={16}
rounded="full"
bg="orange.500"
icon={<Icon size={6} color="white" name="heart-o" type="FontAwesome" />}
/>
<Icon
position="absolute"
mt={4}
right={4}
name="more-horiz"
color="white"
/>
</Flex>
</s> add </Box>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ad875286b8b5cb9604d48fd9740d2a653c9a04f
|
example/storybook/stories/components/primitives/Box/composition-shoes-card.tsx
|
<Heading size="sm">Jordan MA2</Heading>
<Text fontWeight="medium" color="blueGray.600">
Older Kids' Shoe
</Text>
<Text fontWeight="medium" color="blueGray.600">
2 colors
|
<mask> <Text fontSize="lg" color="blueGray.400">
<mask> Sneakers
<mask> </Text>
<mask> <Stack space={1}>
<mask> <Heading size="lg">Jordan MA2</Heading>
<mask> <Text fontSize="xl" fontWeight="medium" color="blueGray.600">
<mask> $ 150
<mask> </Text>
<mask> </Stack>
<mask> </Stack>
<mask> <IconButton
<mask> position="absolute"
</s> Fixes for box composition example </s> remove <Stack h={32} p={5} space={2} justifyContent="space-between">
<Text fontSize="lg" color="blueGray.400">
Sneakers
</s> add <Stack p={3} space={2} minW={32}>
<Text fontSize="xs" color="red.400" fontWeight="semibold">
Just In </s> remove <IconButton
position="absolute"
mt={32}
right={4}
w={16}
h={16}
rounded="full"
bg="orange.500"
icon={<Icon size={6} color="white" name="heart-o" type="FontAwesome" />}
/>
<Icon
position="absolute"
mt={4}
right={4}
name="more-horiz"
color="white"
/>
</Flex>
</s> add </Box> </s> remove >
27 MAR
</Box>
</Box>
<Box p={4}>
</s> add alt="image"
/>
</AspectRatio>
<Center
bg="red.500"
_text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }}
position="absolute"
bottom={0}
px={2}
py={1}
>
PHOTOS
</Center>
<Center
p={1}
rounded="full"
bg="red.500"
boxSize={10}
position="absolute"
right={0}
m={2}
_text={{
color: 'white',
textAlign: 'center',
fontWeight: '700',
fontSize: 'xs',
}}
>
27 MAR
</Center>
</Box>
<Stack p={4} space={3}>
<Stack space={2}>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ad875286b8b5cb9604d48fd9740d2a653c9a04f
|
example/storybook/stories/components/primitives/Box/composition-shoes-card.tsx
|
<Text fontSize="md" fontWeight="semibold" color="blueGray.600">
$ 150
</Text>
|
<mask> 2 colors
<mask> </Text>
<mask> </Stack>
<mask> </Stack>
<mask> </Box>
<mask> );
<mask> };
</s> Fixes for box composition example </s> remove <IconButton
position="absolute"
mt={32}
right={4}
w={16}
h={16}
rounded="full"
bg="orange.500"
icon={<Icon size={6} color="white" name="heart-o" type="FontAwesome" />}
/>
<Icon
position="absolute"
mt={4}
right={4}
name="more-horiz"
color="white"
/>
</Flex>
</s> add </Box> </s> remove <Heading size="lg">Jordan MA2</Heading>
<Text fontSize="xl" fontWeight="medium" color="blueGray.600">
$ 150
</s> add <Heading size="sm">Jordan MA2</Heading>
<Text fontWeight="medium" color="blueGray.600">
Older Kids' Shoe
</Text>
<Text fontWeight="medium" color="blueGray.600">
2 colors </s> remove <Stack h={32} p={5} space={2} justifyContent="space-between">
<Text fontSize="lg" color="blueGray.400">
Sneakers
</s> add <Stack p={3} space={2} minW={32}>
<Text fontSize="xs" color="red.400" fontWeight="semibold">
Just In </s> remove <Heading size="sm" mt={2} color="red.500" fontWeight="500">
</s> add <Heading size="sm" color="red.500" fontWeight="500">
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ad875286b8b5cb9604d48fd9740d2a653c9a04f
|
example/storybook/stories/components/primitives/Box/composition-shoes-card.tsx
|
</Box>
|
<mask> $ 150
<mask> </Text>
<mask> </Stack>
<mask> </Stack>
<mask> <IconButton
<mask> position="absolute"
<mask> mt={32}
<mask> right={4}
<mask> w={16}
<mask> h={16}
<mask> rounded="full"
<mask> bg="orange.500"
<mask> icon={<Icon size={6} color="white" name="heart-o" type="FontAwesome" />}
<mask> />
<mask> <Icon
<mask> position="absolute"
<mask> mt={4}
<mask> right={4}
<mask> name="more-horiz"
<mask> color="white"
<mask> />
<mask> </Flex>
<mask> );
<mask> };
</s> Fixes for box composition example </s> remove <Heading size="lg">Jordan MA2</Heading>
<Text fontSize="xl" fontWeight="medium" color="blueGray.600">
$ 150
</s> add <Heading size="sm">Jordan MA2</Heading>
<Text fontWeight="medium" color="blueGray.600">
Older Kids' Shoe
</Text>
<Text fontWeight="medium" color="blueGray.600">
2 colors </s> remove >
27 MAR
</Box>
</Box>
<Box p={4}>
</s> add alt="image"
/>
</AspectRatio>
<Center
bg="red.500"
_text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }}
position="absolute"
bottom={0}
px={2}
py={1}
>
PHOTOS
</Center>
<Center
p={1}
rounded="full"
bg="red.500"
boxSize={10}
position="absolute"
right={0}
m={2}
_text={{
color: 'white',
textAlign: 'center',
fontWeight: '700',
fontSize: 'xs',
}}
>
27 MAR
</Center>
</Box>
<Stack p={4} space={3}>
<Stack space={2}> </s> remove <Stack h={32} p={5} space={2} justifyContent="space-between">
<Text fontSize="lg" color="blueGray.400">
Sneakers
</s> add <Stack p={3} space={2} minW={32}>
<Text fontSize="xs" color="red.400" fontWeight="semibold">
Just In </s> remove <Box width={72} bg="gray.50" p={2}>
<Box bg="white" shadow={1}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',
}}
alt="image"
/>
</AspectRatio>
<Box
bg="red.500"
_text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }}
position="absolute"
bottom={0}
px={2}
py={1}
>
PHOTOS
</Box>
<Box
p={2}
rounded="full"
justifyContent="center"
alignItems="center"
bg="red.500"
boxSize={10}
position="absolute"
right={0}
m={2}
_text={{
color: 'white',
textAlign: 'center',
fontWeight: '700',
fontSize: '8',
</s> add <Box width={72} bg="gray.50" shadow={4}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ad875286b8b5cb9604d48fd9740d2a653c9a04f
|
example/storybook/stories/components/primitives/Box/composition-shoes-card.tsx
|
import {
Box,
Heading,
Icon,
AspectRatio,
Image,
Text,
Center,
HStack,
Stack,
} from 'native-base';
|
<mask> import React from 'react';
<mask> import { Box, Heading, Icon, AspectRatio, Image, Text } from 'native-base';
<mask> export const Composition = () => {
<mask> return (
<mask> <Box width={72} bg="gray.50" p={2}>
<mask> <Box bg="white" shadow={1}>
<mask> <Box>
</s> Fixes for box composition example </s> remove import {
Box,
Stack,
Image,
Heading,
Icon,
Text,
Flex,
IconButton,
} from 'native-base';
export const CompositionShoesCard = () => {
</s> add import { Box, Text, Image, Heading, Stack } from 'native-base';
export default () => { </s> remove <Box width={72} bg="gray.50" p={2}>
<Box bg="white" shadow={1}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',
}}
alt="image"
/>
</AspectRatio>
<Box
bg="red.500"
_text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }}
position="absolute"
bottom={0}
px={2}
py={1}
>
PHOTOS
</Box>
<Box
p={2}
rounded="full"
justifyContent="center"
alignItems="center"
bg="red.500"
boxSize={10}
position="absolute"
right={0}
m={2}
_text={{
color: 'white',
textAlign: 'center',
fontWeight: '700',
fontSize: '8',
</s> add <Box width={72} bg="gray.50" shadow={4}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg', </s> remove <Flex
w={64}
rounded={12}
</s> add <Box
flexDirection={{ base: 'column', md: 'row' }} </s> remove <Box w="100%" h={40} overflow="hidden">
</s> add <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}> </s> remove alt="shoes"
</s> add
|
[
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ad875286b8b5cb9604d48fd9740d2a653c9a04f
|
example/storybook/stories/components/primitives/Box/composition.tsx
|
<Box width={72} bg="gray.50" shadow={4}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',
|
<mask> import React from 'react';
<mask> import { Box, Heading, Icon, AspectRatio, Image, Text } from 'native-base';
<mask> export const Composition = () => {
<mask> return (
<mask> <Box width={72} bg="gray.50" p={2}>
<mask> <Box bg="white" shadow={1}>
<mask> <Box>
<mask> <AspectRatio ratio={16 / 9}>
<mask> <Image
<mask> source={{
<mask> uri:
<mask> 'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',
<mask> }}
<mask> alt="image"
<mask> />
<mask> </AspectRatio>
<mask> <Box
<mask> bg="red.500"
<mask> _text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }}
<mask> position="absolute"
<mask> bottom={0}
<mask> px={2}
<mask> py={1}
<mask> >
<mask> PHOTOS
<mask> </Box>
<mask> <Box
<mask> p={2}
<mask> rounded="full"
<mask> justifyContent="center"
<mask> alignItems="center"
<mask> bg="red.500"
<mask> boxSize={10}
<mask> position="absolute"
<mask> right={0}
<mask> m={2}
<mask> _text={{
<mask> color: 'white',
<mask> textAlign: 'center',
<mask> fontWeight: '700',
<mask> fontSize: '8',
<mask> }}
<mask> >
<mask> 27 MAR
<mask> </Box>
<mask> </Box>
</s> Fixes for box composition example </s> remove >
27 MAR
</Box>
</Box>
<Box p={4}>
</s> add alt="image"
/>
</AspectRatio>
<Center
bg="red.500"
_text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }}
position="absolute"
bottom={0}
px={2}
py={1}
>
PHOTOS
</Center>
<Center
p={1}
rounded="full"
bg="red.500"
boxSize={10}
position="absolute"
right={0}
m={2}
_text={{
color: 'white',
textAlign: 'center',
fontWeight: '700',
fontSize: 'xs',
}}
>
27 MAR
</Center>
</Box>
<Stack p={4} space={3}>
<Stack space={2}> </s> remove import { Box, Heading, Icon, AspectRatio, Image, Text } from 'native-base';
</s> add import {
Box,
Heading,
Icon,
AspectRatio,
Image,
Text,
Center,
HStack,
Stack,
} from 'native-base'; </s> remove import {
Box,
Stack,
Image,
Heading,
Icon,
Text,
Flex,
IconButton,
} from 'native-base';
export const CompositionShoesCard = () => {
</s> add import { Box, Text, Image, Heading, Stack } from 'native-base';
export default () => { </s> remove <Flex
w={64}
rounded={12}
</s> add <Box
flexDirection={{ base: 'column', md: 'row' }} </s> remove alt="shoes"
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ad875286b8b5cb9604d48fd9740d2a653c9a04f
|
example/storybook/stories/components/primitives/Box/composition.tsx
|
alt="image"
/>
</AspectRatio>
<Center
bg="red.500"
_text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }}
position="absolute"
bottom={0}
px={2}
py={1}
>
PHOTOS
</Center>
<Center
p={1}
rounded="full"
bg="red.500"
boxSize={10}
position="absolute"
right={0}
m={2}
_text={{
color: 'white',
textAlign: 'center',
fontWeight: '700',
fontSize: 'xs',
}}
>
27 MAR
</Center>
</Box>
<Stack p={4} space={3}>
<Stack space={2}>
|
<mask> textAlign: 'center',
<mask> fontWeight: '700',
<mask> fontSize: '8',
<mask> }}
<mask> >
<mask> 27 MAR
<mask> </Box>
<mask> </Box>
<mask> <Box p={4}>
<mask> <Heading size="md">Life in the Garden City</Heading>
<mask> <Heading size="sm" mt={2} color="red.500" fontWeight="500">
<mask> The Silicon Valley of India.
<mask> </Heading>
<mask> <Text mt={4} lineHeight={6} fontWeight={400}>
</s> Fixes for box composition example </s> remove <Heading size="sm" mt={2} color="red.500" fontWeight="500">
</s> add <Heading size="sm" color="red.500" fontWeight="500"> </s> remove <Box width={72} bg="gray.50" p={2}>
<Box bg="white" shadow={1}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg',
}}
alt="image"
/>
</AspectRatio>
<Box
bg="red.500"
_text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }}
position="absolute"
bottom={0}
px={2}
py={1}
>
PHOTOS
</Box>
<Box
p={2}
rounded="full"
justifyContent="center"
alignItems="center"
bg="red.500"
boxSize={10}
position="absolute"
right={0}
m={2}
_text={{
color: 'white',
textAlign: 'center',
fontWeight: '700',
fontSize: '8',
</s> add <Box width={72} bg="gray.50" shadow={4}>
<Box>
<AspectRatio ratio={16 / 9}>
<Image
source={{
uri:
'https://www.holidify.com/images/cmsuploads/compressed/Bangalore_citycover_20190613234056.jpg', </s> remove <Heading size="lg">Jordan MA2</Heading>
<Text fontSize="xl" fontWeight="medium" color="blueGray.600">
$ 150
</s> add <Heading size="sm">Jordan MA2</Heading>
<Text fontWeight="medium" color="blueGray.600">
Older Kids' Shoe
</Text>
<Text fontWeight="medium" color="blueGray.600">
2 colors </s> remove <Stack h={32} p={5} space={2} justifyContent="space-between">
<Text fontSize="lg" color="blueGray.400">
Sneakers
</s> add <Stack p={3} space={2} minW={32}>
<Text fontSize="xs" color="red.400" fontWeight="semibold">
Just In </s> remove <IconButton
position="absolute"
mt={32}
right={4}
w={16}
h={16}
rounded="full"
bg="orange.500"
icon={<Icon size={6} color="white" name="heart-o" type="FontAwesome" />}
/>
<Icon
position="absolute"
mt={4}
right={4}
name="more-horiz"
color="white"
/>
</Flex>
</s> add </Box>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ad875286b8b5cb9604d48fd9740d2a653c9a04f
|
example/storybook/stories/components/primitives/Box/composition.tsx
|
<Heading size="sm" color="red.500" fontWeight="500">
|
<mask> </Box>
<mask> </Box>
<mask> <Box p={4}>
<mask> <Heading size="md">Life in the Garden City</Heading>
<mask> <Heading size="sm" mt={2} color="red.500" fontWeight="500">
<mask> The Silicon Valley of India.
<mask> </Heading>
<mask> <Text mt={4} lineHeight={6} fontWeight={400}>
<mask> Bengaluru (also called Bangalore) is the center of India's high-tech
<mask> industry. The city is also known for its parks and nightlife.
</s> Fixes for box composition example </s> remove >
27 MAR
</Box>
</Box>
<Box p={4}>
</s> add alt="image"
/>
</AspectRatio>
<Center
bg="red.500"
_text={{ color: 'white', fontWeight: '700', fontSize: 'xs' }}
position="absolute"
bottom={0}
px={2}
py={1}
>
PHOTOS
</Center>
<Center
p={1}
rounded="full"
bg="red.500"
boxSize={10}
position="absolute"
right={0}
m={2}
_text={{
color: 'white',
textAlign: 'center',
fontWeight: '700',
fontSize: 'xs',
}}
>
27 MAR
</Center>
</Box>
<Stack p={4} space={3}>
<Stack space={2}> </s> remove <Heading size="lg">Jordan MA2</Heading>
<Text fontSize="xl" fontWeight="medium" color="blueGray.600">
$ 150
</s> add <Heading size="sm">Jordan MA2</Heading>
<Text fontWeight="medium" color="blueGray.600">
Older Kids' Shoe
</Text>
<Text fontWeight="medium" color="blueGray.600">
2 colors </s> remove <Stack h={32} p={5} space={2} justifyContent="space-between">
<Text fontSize="lg" color="blueGray.400">
Sneakers
</s> add <Stack p={3} space={2} minW={32}>
<Text fontSize="xs" color="red.400" fontWeight="semibold">
Just In </s> remove <IconButton
position="absolute"
mt={32}
right={4}
w={16}
h={16}
rounded="full"
bg="orange.500"
icon={<Icon size={6} color="white" name="heart-o" type="FontAwesome" />}
/>
<Icon
position="absolute"
mt={4}
right={4}
name="more-horiz"
color="white"
/>
</Flex>
</s> add </Box> </s> remove <Box w="100%" h={40} overflow="hidden">
</s> add <Box width={{ md: 24 }} height={{ base: 32, md: '100%' }}>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6ad875286b8b5cb9604d48fd9740d2a653c9a04f
|
example/storybook/stories/components/primitives/Box/composition.tsx
|
<mask>
<mask> return computeProps(this.props, defaultProps);
<mask> }
<mask>
<mask> isIconLeft() {
<mask> var iconLeft = false;
<mask> if (this.props['icon-left']) {
<mask> iconLeft = true;
<mask> }
<mask> return iconLeft;
<mask> }
<mask>
<mask> isIconRight() {
<mask> var iconRight = false;
<mask> if (this.props['icon-right']) {
<mask> iconRight = true;
<mask> }
<mask> return iconRight;
<mask> }
<mask>
<mask> getTextStyle() {
<mask> var mergedStyle = {};
<mask>
<mask> var btnType = {
<mask> paddingLeft: 3,
</s> change hyphen case to camel case </s> remove if (this.isIconLeft() && !this.isIconRight()) {
</s> add if (this.props.iconLeft && !this.props.iconRight) { </s> remove else if (this.isIconRight() && !this.isIconLeft()) {
</s> add else if (this.props.iconRight && !this.props.iconLeft) { </s> remove else if (this.isIconRight() && this.isIconLeft()) {
</s> add else if (this.props.iconRight && this.props.iconLeft) { </s> remove if(this.isIconRight()) {
</s> add if(this.props.iconRight) { </s> remove else if(this.isIconLeft() || iconElement) {
</s> add else if(this.props.iconLeft || iconElement) {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4327230ed40c716d81875c2115e0d18432dae1
|
Components/Widgets/Button.js
|
|
if(this.props.iconRight) {
|
<mask> if(item.type == Icon) {
<mask> return true;
<mask> }
<mask> });
<mask> if(this.isIconRight()) {
<mask> newChildren.push(<Text style={this.getTextStyle()}>{childrenArray[0]}</Text>);
<mask> newChildren.push(<Text>{React.cloneElement(iconElement[0], this.getIconProps(iconElement[0]))}</Text>);
<mask> }
<mask>
<mask> else if(this.isIconLeft() || iconElement) {
</s> change hyphen case to camel case </s> remove else if(this.isIconLeft() || iconElement) {
</s> add else if(this.props.iconLeft || iconElement) { </s> remove else if (this.isIconRight() && !this.isIconLeft()) {
</s> add else if (this.props.iconRight && !this.props.iconLeft) { </s> remove else if (this.isIconRight() && this.isIconLeft()) {
</s> add else if (this.props.iconRight && this.props.iconLeft) { </s> remove if (this.isIconLeft() && !this.isIconRight()) {
</s> add if (this.props.iconLeft && !this.props.iconRight) { </s> remove isIconLeft() {
var iconLeft = false;
if (this.props['icon-left']) {
iconLeft = true;
}
return iconLeft;
}
isIconRight() {
var iconRight = false;
if (this.props['icon-right']) {
iconRight = true;
}
return iconRight;
}
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4327230ed40c716d81875c2115e0d18432dae1
|
Components/Widgets/Button.js
|
else if(this.props.iconLeft || iconElement) {
|
<mask> newChildren.push(<Text style={this.getTextStyle()}>{childrenArray[0]}</Text>);
<mask> newChildren.push(<Text>{React.cloneElement(iconElement[0], this.getIconProps(iconElement[0]))}</Text>);
<mask> }
<mask>
<mask> else if(this.isIconLeft() || iconElement) {
<mask> newChildren.push(<Text>{React.cloneElement(iconElement[0], this.getIconProps(iconElement[0]))}</Text>);
<mask> newChildren.push(<Text style={this.getTextStyle()}>{childrenArray[0]}</Text>);
<mask> }
<mask>
<mask> return newChildren;
</s> change hyphen case to camel case </s> remove if(this.isIconRight()) {
</s> add if(this.props.iconRight) { </s> remove else if (this.isIconRight() && !this.isIconLeft()) {
</s> add else if (this.props.iconRight && !this.props.iconLeft) { </s> remove else if (this.isIconRight() && this.isIconLeft()) {
</s> add else if (this.props.iconRight && this.props.iconLeft) { </s> remove isIconLeft() {
var iconLeft = false;
if (this.props['icon-left']) {
iconLeft = true;
}
return iconLeft;
}
isIconRight() {
var iconRight = false;
if (this.props['icon-right']) {
iconRight = true;
}
return iconRight;
}
</s> add </s> remove if (this.isIconLeft() && !this.isIconRight()) {
</s> add if (this.props.iconLeft && !this.props.iconRight) {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4327230ed40c716d81875c2115e0d18432dae1
|
Components/Widgets/Button.js
|
paddingLeft: (this.props.borderType === 'rounded' && !this.props.children.type == Icon) ? 15 :
|
<mask>
<mask> prepareRootProps() {
<mask>
<mask> var type = {
<mask> paddingLeft: (this.props['border-type'] === 'rounded' && !this.props.children.type == Icon) ? 15 :
<mask> (this.props.children.type == Icon ) ? this.getTheme().inputPaddingLeftIcon : 10
<mask> }
<mask>
<mask> var defaultStyle = (this.props['border-type'] === 'regular') ? this.getInitialStyle().bordered : (this.props['border-type'] === 'rounded') ? this.getInitialStyle().rounded : this.getInitialStyle().underline;
<mask>
</s> change hyphen case to camel case </s> remove var defaultStyle = (this.props['border-type'] === 'regular') ? this.getInitialStyle().bordered : (this.props['border-type'] === 'rounded') ? this.getInitialStyle().rounded : this.getInitialStyle().underline;
</s> add var defaultStyle = (this.props.borderType === 'regular') ? this.getInitialStyle().bordered : (this.props.borderType === 'rounded') ? this.getInitialStyle().rounded : this.getInitialStyle().underline; </s> remove if (this.isIconLeft() && !this.isIconRight()) {
</s> add if (this.props.iconLeft && !this.props.iconRight) { </s> remove else if (this.isIconRight() && this.isIconLeft()) {
</s> add else if (this.props.iconRight && this.props.iconLeft) { </s> remove else if (this.isIconRight() && !this.isIconLeft()) {
</s> add else if (this.props.iconRight && !this.props.iconLeft) { </s> remove isIconLeft() {
var iconLeft = false;
if (this.props['icon-left']) {
iconLeft = true;
}
return iconLeft;
}
isIconRight() {
var iconRight = false;
if (this.props['icon-right']) {
iconRight = true;
}
return iconRight;
}
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4327230ed40c716d81875c2115e0d18432dae1
|
Components/Widgets/InputGroup.js
|
var defaultStyle = (this.props.borderType === 'regular') ? this.getInitialStyle().bordered : (this.props.borderType === 'rounded') ? this.getInitialStyle().rounded : this.getInitialStyle().underline;
|
<mask> paddingLeft: (this.props['border-type'] === 'rounded' && !this.props.children.type == Icon) ? 15 :
<mask> (this.props.children.type == Icon ) ? this.getTheme().inputPaddingLeftIcon : 10
<mask> }
<mask>
<mask> var defaultStyle = (this.props['border-type'] === 'regular') ? this.getInitialStyle().bordered : (this.props['border-type'] === 'rounded') ? this.getInitialStyle().rounded : this.getInitialStyle().underline;
<mask>
<mask> type = _.merge(type, defaultStyle);
<mask>
<mask> var addedProps = _.merge(this.getInitialStyle().textInput, type);
<mask>
</s> change hyphen case to camel case </s> remove paddingLeft: (this.props['border-type'] === 'rounded' && !this.props.children.type == Icon) ? 15 :
</s> add paddingLeft: (this.props.borderType === 'rounded' && !this.props.children.type == Icon) ? 15 : </s> remove if (this.isIconLeft() && !this.isIconRight()) {
</s> add if (this.props.iconLeft && !this.props.iconRight) { </s> remove else if (this.isIconRight() && this.isIconLeft()) {
</s> add else if (this.props.iconRight && this.props.iconLeft) { </s> remove else if (this.isIconRight() && !this.isIconLeft()) {
</s> add else if (this.props.iconRight && !this.props.iconLeft) { </s> remove isIconLeft() {
var iconLeft = false;
if (this.props['icon-left']) {
iconLeft = true;
}
return iconLeft;
}
isIconRight() {
var iconRight = false;
if (this.props['icon-right']) {
iconRight = true;
}
return iconRight;
}
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4327230ed40c716d81875c2115e0d18432dae1
|
Components/Widgets/InputGroup.js
|
if (this.props.iconLeft && !this.props.iconRight) {
|
<mask> else {
<mask> var childrenArray = React.Children.toArray(this.props.children);
<mask> var iconElement = [];
<mask>
<mask> if (this.isIconLeft() && !this.isIconRight()) {
<mask>
<mask> iconElement = _.remove(childrenArray, function(item) {
<mask> if(item.type == Icon) {
<mask> return true;
<mask> }
</s> change hyphen case to camel case </s> remove else if (this.isIconRight() && !this.isIconLeft()) {
</s> add else if (this.props.iconRight && !this.props.iconLeft) { </s> remove else if (this.isIconRight() && this.isIconLeft()) {
</s> add else if (this.props.iconRight && this.props.iconLeft) { </s> remove isIconLeft() {
var iconLeft = false;
if (this.props['icon-left']) {
iconLeft = true;
}
return iconLeft;
}
isIconRight() {
var iconRight = false;
if (this.props['icon-right']) {
iconRight = true;
}
return iconRight;
}
</s> add </s> remove if(this.isIconRight()) {
</s> add if(this.props.iconRight) { </s> remove paddingLeft: (this.props['border-type'] === 'rounded' && !this.props.children.type == Icon) ? 15 :
</s> add paddingLeft: (this.props.borderType === 'rounded' && !this.props.children.type == Icon) ? 15 :
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4327230ed40c716d81875c2115e0d18432dae1
|
Components/Widgets/ListItem.js
|
else if (this.props.iconRight && !this.props.iconLeft) {
|
<mask> return React.cloneElement(child, this.getChildProps(child));
<mask> })}
<mask> </View>);
<mask> }
<mask> else if (this.isIconRight() && !this.isIconLeft()) {
<mask>
<mask> iconElement = _.remove(childrenArray, function(item) {
<mask> if(item.type == Icon) {
<mask> return true;
<mask> }
</s> change hyphen case to camel case </s> remove else if (this.isIconRight() && this.isIconLeft()) {
</s> add else if (this.props.iconRight && this.props.iconLeft) { </s> remove if (this.isIconLeft() && !this.isIconRight()) {
</s> add if (this.props.iconLeft && !this.props.iconRight) { </s> remove if(this.isIconRight()) {
</s> add if(this.props.iconRight) { </s> remove isIconLeft() {
var iconLeft = false;
if (this.props['icon-left']) {
iconLeft = true;
}
return iconLeft;
}
isIconRight() {
var iconRight = false;
if (this.props['icon-right']) {
iconRight = true;
}
return iconRight;
}
</s> add </s> remove else if(this.isIconLeft() || iconElement) {
</s> add else if(this.props.iconLeft || iconElement) {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4327230ed40c716d81875c2115e0d18432dae1
|
Components/Widgets/ListItem.js
|
else if (this.props.iconRight && this.props.iconLeft) {
|
<mask> })}
<mask> </View>);
<mask> newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
<mask> }
<mask> else if (this.isIconRight() && this.isIconLeft()) {
<mask>
<mask> iconElement = _.filter(childrenArray, function(item) {
<mask> if(item.type == Icon) {
<mask> return true;
<mask> }
</s> change hyphen case to camel case </s> remove else if (this.isIconRight() && !this.isIconLeft()) {
</s> add else if (this.props.iconRight && !this.props.iconLeft) { </s> remove if (this.isIconLeft() && !this.isIconRight()) {
</s> add if (this.props.iconLeft && !this.props.iconRight) { </s> remove if(this.isIconRight()) {
</s> add if(this.props.iconRight) { </s> remove isIconLeft() {
var iconLeft = false;
if (this.props['icon-left']) {
iconLeft = true;
}
return iconLeft;
}
isIconRight() {
var iconRight = false;
if (this.props['icon-right']) {
iconRight = true;
}
return iconRight;
}
</s> add </s> remove else if(this.isIconLeft() || iconElement) {
</s> add else if(this.props.iconLeft || iconElement) {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4327230ed40c716d81875c2115e0d18432dae1
|
Components/Widgets/ListItem.js
|
<mask> <Center>
<mask> <Heading>Input Variants</Heading>
<mask> </Center>
<mask> <Input variant="outline" placeholder="Outline" />
<mask> <Input
<mask> variant="outline"
<mask> placeholder="Outline with label"
<mask> label="Outline"
<mask> />
<mask> <Input variant="filled" placeholder="Filled" />
<mask> <Input variant="underlined" placeholder="Underlined" />
<mask> <Input variant="unstyled" placeholder="Unstyled" />
<mask> <Input variant="rounded" placeholder="round" />
<mask> </Stack>
</s> fix: removed floating label and fixes for theme and style </s> remove const slideAnim = React.useRef(new Animated.Value(0)).current;
const slideIn = () => {
Animated.timing(slideAnim, {
toValue: 0,
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // NOTE: Logic related with label
// const slideAnim = React.useRef(new Animated.Value(0)).current;
// const slideIn = () => {
// Animated.timing(slideAnim, {
// toValue: 0,
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// }; </s> remove placeholder={isFocused && label ? '' : placeholder}
</s> add // placeholder={isFocused && label ? '' : placeholder}
placeholder={placeholder} </s> remove import { TextInput, Animated, Platform } from 'react-native';
</s> add import { TextInput, Platform } from 'react-native'; </s> remove const slideOut = () => {
Animated.timing(slideAnim, {
// NOTE: Below 3 value are (padding + half of font + buffer)
toValue: -(12 + Math.floor(fontSize / 2) + 2),
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // const slideOut = () => {
// Animated.timing(slideAnim, {
// // NOTE: Below 3 value are (padding + half of font + buffer)
// toValue: -(12 + Math.floor(fontSize / 2) + 2),
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// }; </s> remove const focusStyle = {
shadow: 3,
shadowColor: '#2563EB',
};
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
example/storybook/stories/components/primitives/Input/example.tsx
|
|
import { TextInput, Platform } from 'react-native';
|
<mask> import React from 'react';
<mask> import { TextInput, Animated, Platform } from 'react-native';
<mask> import styled from 'styled-components/native';
<mask> import {
<mask> border,
<mask> flex,
<mask> space,
</s> fix: removed floating label and fixes for theme and style </s> remove import type { ITextProps } from '../Text';
</s> add </s> remove function defaultStyle() {
</s> add function outlineStyle() {
|
[
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/components/primitives/Input/index.tsx
|
// NOTE: Logic related with label
// const slideAnim = React.useRef(new Animated.Value(0)).current;
// const slideIn = () => {
// Animated.timing(slideAnim, {
// toValue: 0,
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// };
|
<mask> 'pl',
<mask> 'pr',
<mask> ]);
<mask>
<mask> const slideAnim = React.useRef(new Animated.Value(0)).current;
<mask> const slideIn = () => {
<mask> Animated.timing(slideAnim, {
<mask> toValue: 0,
<mask> duration: 200,
<mask> useNativeDriver: Platform.OS !== 'web',
<mask> }).start();
<mask> };
<mask>
<mask> const slideOut = () => {
<mask> Animated.timing(slideAnim, {
<mask> // NOTE: Below 3 value are (padding + half of font + buffer)
<mask> toValue: -(12 + Math.floor(fontSize / 2) + 2),
</s> fix: removed floating label and fixes for theme and style </s> remove const slideOut = () => {
Animated.timing(slideAnim, {
// NOTE: Below 3 value are (padding + half of font + buffer)
toValue: -(12 + Math.floor(fontSize / 2) + 2),
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // const slideOut = () => {
// Animated.timing(slideAnim, {
// // NOTE: Below 3 value are (padding + half of font + buffer)
// toValue: -(12 + Math.floor(fontSize / 2) + 2),
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// }; </s> remove slideOut();
</s> add // slideOut(); </s> remove e.nativeEvent.text && slideIn();
</s> add // e.nativeEvent.text && slideIn(); </s> remove variant: 'default',
</s> add variant: 'underlined', </s> remove default: defaultStyle,
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/components/primitives/Input/index.tsx
|
// const slideOut = () => {
// Animated.timing(slideAnim, {
// // NOTE: Below 3 value are (padding + half of font + buffer)
// toValue: -(12 + Math.floor(fontSize / 2) + 2),
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// };
|
<mask> useNativeDriver: Platform.OS !== 'web',
<mask> }).start();
<mask> };
<mask>
<mask> const slideOut = () => {
<mask> Animated.timing(slideAnim, {
<mask> // NOTE: Below 3 value are (padding + half of font + buffer)
<mask> toValue: -(12 + Math.floor(fontSize / 2) + 2),
<mask> duration: 200,
<mask> useNativeDriver: Platform.OS !== 'web',
<mask> }).start();
<mask> };
<mask>
<mask> const _ref = React.useRef(null);
<mask> const { isHovered } = useHover({}, _ref);
<mask>
<mask> let updatedBorderColor = borderColorFromProps;
</s> fix: removed floating label and fixes for theme and style </s> remove const slideAnim = React.useRef(new Animated.Value(0)).current;
const slideIn = () => {
Animated.timing(slideAnim, {
toValue: 0,
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // NOTE: Logic related with label
// const slideAnim = React.useRef(new Animated.Value(0)).current;
// const slideIn = () => {
// Animated.timing(slideAnim, {
// toValue: 0,
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// }; </s> remove const focusStyle = {
shadow: 3,
shadowColor: '#2563EB',
};
</s> add </s> remove variant: 'default',
</s> add variant: 'underlined', </s> remove default: defaultStyle,
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/components/primitives/Input/index.tsx
|
<mask> let updatedBorderColor = borderColorFromProps;
<mask> if (isHovered) updatedBorderColor = hoverBorderColor;
<mask> else if (isFocused) updatedBorderColor = focusBorderColor;
<mask> else if (isInvalid) updatedBorderColor = errorBorderColor;
<mask> const focusStyle = {
<mask> shadow: 3,
<mask> shadowColor: '#2563EB',
<mask> };
<mask>
<mask> return (
<mask> <Box w={isFullWidth ? '100%' : 'auto'} {...layoutProps}>
<mask> <Box
<mask> ref={_ref}
</s> fix: removed floating label and fixes for theme and style </s> remove const slideOut = () => {
Animated.timing(slideAnim, {
// NOTE: Below 3 value are (padding + half of font + buffer)
toValue: -(12 + Math.floor(fontSize / 2) + 2),
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // const slideOut = () => {
// Animated.timing(slideAnim, {
// // NOTE: Below 3 value are (padding + half of font + buffer)
// toValue: -(12 + Math.floor(fontSize / 2) + 2),
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// }; </s> remove const slideAnim = React.useRef(new Animated.Value(0)).current;
const slideIn = () => {
Animated.timing(slideAnim, {
toValue: 0,
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // NOTE: Logic related with label
// const slideAnim = React.useRef(new Animated.Value(0)).current;
// const slideIn = () => {
// Animated.timing(slideAnim, {
// toValue: 0,
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// };
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/components/primitives/Input/index.tsx
|
|
{...(isFocused && Platform.OS === 'web' && _focusStyle)}
|
<mask> borderBottomWidth={borderBottomWidth}
<mask> {...rem}
<mask> {...(isDisabled && newProps._isDisabledProps)}
<mask> {...computedProps}
<mask> {...(isFocused && Platform.OS === 'web' && focusStyle)}
<mask> style={style}
<mask> >
<mask> {InputLeftElement ? (
<mask> <Flex justify="center" align="center" left={0}>
<mask> {InputLeftElement}
</s> fix: removed floating label and fixes for theme and style </s> remove {isFocused && label && (
</s> add {/* NOTE: Currently removing label as it's not stable. */}
{/* {isFocused && label && ( </s> remove placeholder={isFocused && label ? '' : placeholder}
</s> add // placeholder={isFocused && label ? '' : placeholder}
placeholder={placeholder} </s> remove e.nativeEvent.text && slideIn();
</s> add // e.nativeEvent.text && slideIn(); </s> remove slideOut();
</s> add // slideOut(); </s> remove const focusStyle = {
shadow: 3,
shadowColor: '#2563EB',
};
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/components/primitives/Input/index.tsx
|
{/* NOTE: Currently removing label as it's not stable. */}
{/* {isFocused && label && (
|
<mask> <Flex justify="center" align="center" left={0}>
<mask> {InputLeftElement}
<mask> </Flex>
<mask> ) : null}
<mask> {isFocused && label && (
<mask> <Flex position="absolute">
<mask> <Animated.View
<mask> style={{
<mask> transform: [{ translateY: slideAnim, translateX: 4 }],
<mask> }}
</s> fix: removed floating label and fixes for theme and style </s> remove {...(isFocused && Platform.OS === 'web' && focusStyle)}
</s> add {...(isFocused && Platform.OS === 'web' && _focusStyle)} </s> remove e.nativeEvent.text && slideIn();
</s> add // e.nativeEvent.text && slideIn(); </s> remove placeholder={isFocused && label ? '' : placeholder}
</s> add // placeholder={isFocused && label ? '' : placeholder}
placeholder={placeholder} </s> remove slideOut();
</s> add // slideOut(); </s> remove )}
</s> add )} */}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/components/primitives/Input/index.tsx
|
)} */}
|
<mask> </Box>
<mask> </Flex>
<mask> </Animated.View>
<mask> </Flex>
<mask> )}
<mask> <StyledInput
<mask> {...newProps}
<mask> fontSize={fontSize}
<mask> backgroundColor="transparent"
<mask> flex={1}
</s> fix: removed floating label and fixes for theme and style </s> remove {isFocused && label && (
</s> add {/* NOTE: Currently removing label as it's not stable. */}
{/* {isFocused && label && ( </s> remove variant: 'default',
</s> add variant: 'underlined', </s> remove placeholder={isFocused && label ? '' : placeholder}
</s> add // placeholder={isFocused && label ? '' : placeholder}
placeholder={placeholder} </s> remove import { TextInput, Animated, Platform } from 'react-native';
</s> add import { TextInput, Platform } from 'react-native'; </s> remove const slideAnim = React.useRef(new Animated.Value(0)).current;
const slideIn = () => {
Animated.timing(slideAnim, {
toValue: 0,
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // NOTE: Logic related with label
// const slideAnim = React.useRef(new Animated.Value(0)).current;
// const slideIn = () => {
// Animated.timing(slideAnim, {
// toValue: 0,
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// };
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/components/primitives/Input/index.tsx
|
// slideOut();
|
<mask> e.persist();
<mask> props.onKeyPress && props.onKeyPress(e);
<mask> }}
<mask> onFocus={(e) => {
<mask> slideOut();
<mask> handleFocus(true, onFocus ? () => onFocus(e) : () => {});
<mask> }}
<mask> onBlur={(e) => {
<mask> // TODO: animation not happening because of component rerender
<mask> e.nativeEvent.text && slideIn();
</s> fix: removed floating label and fixes for theme and style </s> remove e.nativeEvent.text && slideIn();
</s> add // e.nativeEvent.text && slideIn(); </s> remove placeholder={isFocused && label ? '' : placeholder}
</s> add // placeholder={isFocused && label ? '' : placeholder}
placeholder={placeholder} </s> remove const slideAnim = React.useRef(new Animated.Value(0)).current;
const slideIn = () => {
Animated.timing(slideAnim, {
toValue: 0,
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // NOTE: Logic related with label
// const slideAnim = React.useRef(new Animated.Value(0)).current;
// const slideIn = () => {
// Animated.timing(slideAnim, {
// toValue: 0,
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// }; </s> remove const slideOut = () => {
Animated.timing(slideAnim, {
// NOTE: Below 3 value are (padding + half of font + buffer)
toValue: -(12 + Math.floor(fontSize / 2) + 2),
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // const slideOut = () => {
// Animated.timing(slideAnim, {
// // NOTE: Below 3 value are (padding + half of font + buffer)
// toValue: -(12 + Math.floor(fontSize / 2) + 2),
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// }; </s> remove {isFocused && label && (
</s> add {/* NOTE: Currently removing label as it's not stable. */}
{/* {isFocused && label && (
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/components/primitives/Input/index.tsx
|
// e.nativeEvent.text && slideIn();
|
<mask> handleFocus(true, onFocus ? () => onFocus(e) : () => {});
<mask> }}
<mask> onBlur={(e) => {
<mask> // TODO: animation not happening because of component rerender
<mask> e.nativeEvent.text && slideIn();
<mask> handleFocus(false, onBlur ? () => onBlur(e) : () => {});
<mask> }}
<mask> placeholder={isFocused && label ? '' : placeholder}
<mask> placeholderTextColor={placeholderColor}
<mask> editable={isDisabled || isReadOnly ? false : true}
</s> fix: removed floating label and fixes for theme and style </s> remove placeholder={isFocused && label ? '' : placeholder}
</s> add // placeholder={isFocused && label ? '' : placeholder}
placeholder={placeholder} </s> remove slideOut();
</s> add // slideOut(); </s> remove const slideAnim = React.useRef(new Animated.Value(0)).current;
const slideIn = () => {
Animated.timing(slideAnim, {
toValue: 0,
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // NOTE: Logic related with label
// const slideAnim = React.useRef(new Animated.Value(0)).current;
// const slideIn = () => {
// Animated.timing(slideAnim, {
// toValue: 0,
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// }; </s> remove {isFocused && label && (
</s> add {/* NOTE: Currently removing label as it's not stable. */}
{/* {isFocused && label && ( </s> remove const slideOut = () => {
Animated.timing(slideAnim, {
// NOTE: Below 3 value are (padding + half of font + buffer)
toValue: -(12 + Math.floor(fontSize / 2) + 2),
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // const slideOut = () => {
// Animated.timing(slideAnim, {
// // NOTE: Below 3 value are (padding + half of font + buffer)
// toValue: -(12 + Math.floor(fontSize / 2) + 2),
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// };
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/components/primitives/Input/index.tsx
|
// placeholder={isFocused && label ? '' : placeholder}
placeholder={placeholder}
|
<mask> // TODO: animation not happening because of component rerender
<mask> e.nativeEvent.text && slideIn();
<mask> handleFocus(false, onBlur ? () => onBlur(e) : () => {});
<mask> }}
<mask> placeholder={isFocused && label ? '' : placeholder}
<mask> placeholderTextColor={placeholderColor}
<mask> editable={isDisabled || isReadOnly ? false : true}
<mask> // borderRadius={50} //Remove variant props from StyledInput
<mask> borderWidth={undefined}
<mask> {...(Platform.OS === 'web'
</s> fix: removed floating label and fixes for theme and style </s> remove e.nativeEvent.text && slideIn();
</s> add // e.nativeEvent.text && slideIn(); </s> remove slideOut();
</s> add // slideOut(); </s> remove {...(isFocused && Platform.OS === 'web' && focusStyle)}
</s> add {...(isFocused && Platform.OS === 'web' && _focusStyle)} </s> remove {isFocused && label && (
</s> add {/* NOTE: Currently removing label as it's not stable. */}
{/* {isFocused && label && ( </s> remove const slideAnim = React.useRef(new Animated.Value(0)).current;
const slideIn = () => {
Animated.timing(slideAnim, {
toValue: 0,
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // NOTE: Logic related with label
// const slideAnim = React.useRef(new Animated.Value(0)).current;
// const slideIn = () => {
// Animated.timing(slideAnim, {
// toValue: 0,
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// };
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/components/primitives/Input/index.tsx
|
<mask> customLayoutProps,
<mask> customBackgroundProps,
<mask> customTypographyProps,
<mask> } from '../../../utils/customProps';
<mask> import type { ITextProps } from '../Text';
<mask>
<mask> export type IInputProps = ColorProps &
<mask> TextInputProps &
<mask> SpaceProps &
<mask> LayoutProps &
</s> fix: removed floating label and fixes for theme and style </s> remove import { TextInput, Animated, Platform } from 'react-native';
</s> add import { TextInput, Platform } from 'react-native'; </s> remove variant: 'default',
</s> add variant: 'underlined',
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/components/primitives/Input/types.ts
|
|
// label?: string;
// _label?: ITextProps;
|
<mask> ariaLabel?: string;
<mask> InputLeftElement?: JSX.Element | JSX.Element[];
<mask> InputRightElement?: JSX.Element | JSX.Element[];
<mask> type?: 'text' | 'password' | string;
<mask> label?: string;
<mask> _label?: ITextProps;
<mask> };
</s> fix: removed floating label and fixes for theme and style </s> remove variant: 'default',
</s> add variant: 'underlined', </s> remove function defaultStyle() {
</s> add function outlineStyle() { </s> remove errorBorderColor: mode('danger.600', 'danger.200')(props),
</s> add errorBorderColor: mode('error.600', 'error.200')(props), </s> remove outline: defaultStyle,
</s> add outline: outlineStyle, </s> remove default: defaultStyle,
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/components/primitives/Input/types.ts
|
? mode('error.600', 'error.200')(props)
|
<mask> opacity: 0.8,
<mask> bg: mode('gray.100', 'gray.700')(props),
<mask> },
<mask> borderColor: isInvalid
<mask> ? mode('danger.600', 'danger.200')(props)
<mask> : mode('gray.300', 'gray.600')(props),
<mask> hoverBorderColor: 'primary.500',
<mask> focusBorderColor: mode('primary.600', 'primary.400')(props),
<mask> errorBorderColor: mode('danger.600', 'danger.200')(props),
<mask> };
</s> fix: removed floating label and fixes for theme and style </s> remove errorBorderColor: mode('danger.600', 'danger.200')(props),
</s> add errorBorderColor: mode('error.600', 'error.200')(props), </s> remove ? mode('danger.600', 'danger.200')(props)
</s> add ? mode('error.600', 'error.200')(props) </s> remove default: defaultStyle,
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/theme/components/input.ts
|
errorBorderColor: mode('error.600', 'error.200')(props),
|
<mask> ? mode('danger.600', 'danger.200')(props)
<mask> : mode('gray.300', 'gray.600')(props),
<mask> hoverBorderColor: 'primary.500',
<mask> focusBorderColor: mode('primary.600', 'primary.400')(props),
<mask> errorBorderColor: mode('danger.600', 'danger.200')(props),
<mask> };
<mask> };
<mask>
<mask> function roundedStyle() {
<mask> return {
</s> fix: removed floating label and fixes for theme and style </s> remove ? mode('danger.600', 'danger.200')(props)
</s> add ? mode('error.600', 'error.200')(props) </s> remove ? mode('danger.600', 'danger.200')(props)
</s> add ? mode('error.600', 'error.200')(props) </s> remove function defaultStyle() {
</s> add function outlineStyle() {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/theme/components/input.ts
|
// HACK: focusStyle is temp. fix.
_focusStyle: {
shadow: 3,
//TODO: use color from theme instead
shadowColor: '#2563EB',
},
|
<mask> function roundedStyle() {
<mask> return {
<mask> borderRadius: '50',
<mask> borderWidth: 1,
<mask> };
<mask> }
<mask> function outlineStyle() {
</s> fix: removed floating label and fixes for theme and style </s> remove function defaultStyle() {
</s> add function outlineStyle() { </s> remove ? mode('danger.600', 'danger.200')(props)
</s> add ? mode('error.600', 'error.200')(props) </s> remove errorBorderColor: mode('danger.600', 'danger.200')(props),
</s> add errorBorderColor: mode('error.600', 'error.200')(props),
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/theme/components/input.ts
|
function outlineStyle() {
|
<mask> borderRadius: '50',
<mask> borderWidth: 1,
<mask> };
<mask> }
<mask> function defaultStyle() {
<mask> return {
<mask> borderWidth: 1,
<mask> };
<mask> }
<mask> function filledStyle(props: Record<string, any>) {
</s> fix: removed floating label and fixes for theme and style </s> remove ? mode('danger.600', 'danger.200')(props)
</s> add ? mode('error.600', 'error.200')(props) </s> remove errorBorderColor: mode('danger.600', 'danger.200')(props),
</s> add errorBorderColor: mode('error.600', 'error.200')(props),
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/theme/components/input.ts
|
// HACK: focusStyle is temp. fix.
_focusStyle: {
shadow: 3,
//TODO: use color from theme instead
shadowColor: '#2563EB',
},
|
<mask> }
<mask> function outlineStyle() {
<mask> return {
<mask> borderWidth: 1,
<mask> };
<mask> }
<mask> function filledStyle(props: Record<string, any>) {
<mask> const { isInvalid } = props;
<mask> return {
</s> fix: removed floating label and fixes for theme and style </s> remove function defaultStyle() {
</s> add function outlineStyle() { </s> remove ? mode('danger.600', 'danger.200')(props)
</s> add ? mode('error.600', 'error.200')(props) </s> remove errorBorderColor: mode('danger.600', 'danger.200')(props),
</s> add errorBorderColor: mode('error.600', 'error.200')(props),
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/theme/components/input.ts
|
// HACK: focusStyle is temp. fix.
_focusStyle: {
shadow: 3,
//TODO: use color from theme instead
shadowColor: '#2563EB',
},
|
<mask> function filledStyle(props: Record<string, any>) {
<mask> const { isInvalid } = props;
<mask> return {
<mask> bg: props.bg || mode('gray.200', 'gray.600')(props),
<mask> borderWidth: 1,
<mask> borderColor: isInvalid
<mask> ? mode('error.600', 'error.200')(props)
</s> fix: removed floating label and fixes for theme and style </s> remove ? mode('danger.600', 'danger.200')(props)
</s> add ? mode('error.600', 'error.200')(props) </s> remove function defaultStyle() {
</s> add function outlineStyle() { </s> remove ? mode('danger.600', 'danger.200')(props)
</s> add ? mode('error.600', 'error.200')(props) </s> remove errorBorderColor: mode('danger.600', 'danger.200')(props),
</s> add errorBorderColor: mode('error.600', 'error.200')(props),
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/theme/components/input.ts
|
? mode('error.600', 'error.200')(props)
|
<mask> return {
<mask> bg: props.bg || mode('gray.200', 'gray.600')(props),
<mask> borderWidth: 1,
<mask> borderColor: isInvalid
<mask> ? mode('danger.600', 'danger.200')(props)
<mask> : 'transparent',
<mask> };
<mask> }
<mask> function unstyledStyle() {
<mask> return {
</s> fix: removed floating label and fixes for theme and style </s> remove errorBorderColor: mode('danger.600', 'danger.200')(props),
</s> add errorBorderColor: mode('error.600', 'error.200')(props), </s> remove ? mode('danger.600', 'danger.200')(props)
</s> add ? mode('error.600', 'error.200')(props) </s> remove function defaultStyle() {
</s> add function outlineStyle() {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/theme/components/input.ts
|
outline: outlineStyle,
|
<mask> };
<mask> }
<mask>
<mask> const variants = {
<mask> outline: defaultStyle,
<mask> underlined: underlinedStyle,
<mask> rounded: roundedStyle,
<mask> filled: filledStyle,
<mask> unstyled: unstyledStyle,
<mask> default: defaultStyle,
</s> fix: removed floating label and fixes for theme and style </s> remove default: defaultStyle,
</s> add </s> remove variant: 'default',
</s> add variant: 'underlined', </s> remove const slideOut = () => {
Animated.timing(slideAnim, {
// NOTE: Below 3 value are (padding + half of font + buffer)
toValue: -(12 + Math.floor(fontSize / 2) + 2),
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // const slideOut = () => {
// Animated.timing(slideAnim, {
// // NOTE: Below 3 value are (padding + half of font + buffer)
// toValue: -(12 + Math.floor(fontSize / 2) + 2),
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// }; </s> remove const slideAnim = React.useRef(new Animated.Value(0)).current;
const slideIn = () => {
Animated.timing(slideAnim, {
toValue: 0,
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // NOTE: Logic related with label
// const slideAnim = React.useRef(new Animated.Value(0)).current;
// const slideIn = () => {
// Animated.timing(slideAnim, {
// toValue: 0,
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// };
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/theme/components/input.ts
|
<mask> underlined: underlinedStyle,
<mask> rounded: roundedStyle,
<mask> filled: filledStyle,
<mask> unstyled: unstyledStyle,
<mask> default: defaultStyle,
<mask> };
<mask>
<mask> const sizes = {
<mask> '2xl': { fontSize: '2xl' },
<mask> 'xl': { fontSize: 'xl' },
</s> fix: removed floating label and fixes for theme and style </s> remove outline: defaultStyle,
</s> add outline: outlineStyle, </s> remove variant: 'default',
</s> add variant: 'underlined',
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/theme/components/input.ts
|
|
variant: 'underlined',
|
<mask> };
<mask>
<mask> const defaultProps = {
<mask> size: 'md',
<mask> variant: 'default',
<mask> borderRadius: 'md',
<mask> };
<mask>
<mask> export default {
<mask> baseStyle,
</s> fix: removed floating label and fixes for theme and style </s> remove function defaultStyle() {
</s> add function outlineStyle() { </s> remove default: defaultStyle,
</s> add </s> remove const slideAnim = React.useRef(new Animated.Value(0)).current;
const slideIn = () => {
Animated.timing(slideAnim, {
toValue: 0,
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // NOTE: Logic related with label
// const slideAnim = React.useRef(new Animated.Value(0)).current;
// const slideIn = () => {
// Animated.timing(slideAnim, {
// toValue: 0,
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// }; </s> remove const slideOut = () => {
Animated.timing(slideAnim, {
// NOTE: Below 3 value are (padding + half of font + buffer)
toValue: -(12 + Math.floor(fontSize / 2) + 2),
duration: 200,
useNativeDriver: Platform.OS !== 'web',
}).start();
};
</s> add // const slideOut = () => {
// Animated.timing(slideAnim, {
// // NOTE: Below 3 value are (padding + half of font + buffer)
// toValue: -(12 + Math.floor(fontSize / 2) + 2),
// duration: 200,
// useNativeDriver: Platform.OS !== 'web',
// }).start();
// };
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6b4d7c567bec6b12b6d186acb1a58af7212c0b0c
|
src/theme/components/input.ts
|
/* If true, renders react-native native modal
* @default false
*/
useRNModal?: boolean;
|
<mask> /**
<mask> * Props applied on Overlay.
<mask> */
<mask> _backdrop?: any;
<mask> }
<mask>
<mask> export interface IActionsheetContentProps
<mask> extends InterfaceBoxProps<IActionsheetContentProps> {
<mask> /**
<mask> * Props applied on area above actionsheet content
</s> feat: adding new prop usernmodal for overlay </s> remove import { Modal } from 'react-native';
</s> add import { Modal, Platform } from 'react-native'; </s> remove import type { IActionsheetContentProps } from '../../composites/Actionsheet/types';
</s> add import type {
IActionsheetContentProps,
IActionsheetProps,
} from '../../composites/Actionsheet/types';
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6bf7a866bbbd2f3160ba4dde16c6db231649c5e2
|
src/components/composites/Actionsheet/types.tsx
|
useRNModalOnAndroid
|
<mask> <Overlay
<mask> isOpen={visible}
<mask> onRequestClose={handleClose}
<mask> isKeyboardDismissable={isKeyboardDismissable}
<mask> useRNModal={useRNModal}
<mask> unmountOnExit
<mask> >
<mask> <AlertDialogContext.Provider
<mask> value={{
</s> feat: adding new prop usernmodal for overlay </s> remove if (useRNModal) {
</s> add if (useRNModal || (useRNModalOnAndroid && Platform.OS === 'android')) { </s> remove <Actionsheet isOpen={isOpen} onClose={handleClose}>
</s> add <Actionsheet isOpen={isOpen} onClose={handleClose} {..._actionSheet}> </s> remove import type { IActionsheetContentProps } from '../../composites/Actionsheet/types';
</s> add import type {
IActionsheetContentProps,
IActionsheetProps,
} from '../../composites/Actionsheet/types';
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6bf7a866bbbd2f3160ba4dde16c6db231649c5e2
|
src/components/composites/AlertDialog/AlertDialog.tsx
|
/* If true, renders react-native native modal
* @default false
*/
useRNModal?: boolean;
|
<mask> */
<mask> animationPreset?: 'slide' | 'fade';
<mask> }
<mask>
<mask> export type IAlertDialogComponentType = ((
<mask> props: IAlertDialogProps & { ref?: MutableRefObject<any> }
<mask> ) => JSX.Element) & {
<mask> Body: React.MemoExoticComponent<
</s> feat: adding new prop usernmodal for overlay </s> remove import { Modal } from 'react-native';
</s> add import { Modal, Platform } from 'react-native'; </s> remove import type { IActionsheetContentProps } from '../../composites/Actionsheet/types';
</s> add import type {
IActionsheetContentProps,
IActionsheetProps,
} from '../../composites/Actionsheet/types';
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6bf7a866bbbd2f3160ba4dde16c6db231649c5e2
|
src/components/composites/AlertDialog/types.ts
|
useRNModalOnAndroid
|
<mask> {updatedTrigger()}
<mask> <Overlay
<mask> isOpen={isOpen}
<mask> onRequestClose={handleClose}
<mask> useRNModal={useRNModal}
<mask> {..._overlay}
<mask> unmountOnExit
<mask> >
<mask> <PresenceTransition visible={isOpen} {..._presenceTransition}>
</s> feat: adding new prop usernmodal for overlay </s> remove <Actionsheet isOpen={isOpen} onClose={handleClose}>
</s> add <Actionsheet isOpen={isOpen} onClose={handleClose} {..._actionSheet}> </s> remove if (useRNModal) {
</s> add if (useRNModal || (useRNModalOnAndroid && Platform.OS === 'android')) { </s> remove import type { IActionsheetContentProps } from '../../composites/Actionsheet/types';
</s> add import type {
IActionsheetContentProps,
IActionsheetProps,
} from '../../composites/Actionsheet/types';
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6bf7a866bbbd2f3160ba4dde16c6db231649c5e2
|
src/components/composites/Menu/Menu.tsx
|
import { Modal, Platform } from 'react-native';
|
<mask> /* eslint-disable @typescript-eslint/no-unused-vars */
<mask> import { OverlayContainer } from '@react-native-aria/overlays';
<mask> import React from 'react';
<mask> import type { ViewStyle } from 'react-native';
<mask> import { Modal } from 'react-native';
<mask> import { useKeyboardDismissable } from '../../../hooks';
<mask> import { ExitAnimationContext } from './ExitAnimationContext';
<mask>
<mask> export interface IOverlayProps {
<mask> isOpen?: boolean;
</s> feat: adding new prop usernmodal for overlay </s> remove import type { IActionsheetContentProps } from '../../composites/Actionsheet/types';
</s> add import type {
IActionsheetContentProps,
IActionsheetProps,
} from '../../composites/Actionsheet/types'; </s> remove if (useRNModal) {
</s> add if (useRNModal || (useRNModalOnAndroid && Platform.OS === 'android')) {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6bf7a866bbbd2f3160ba4dde16c6db231649c5e2
|
src/components/primitives/Overlay/Overlay.tsx
|
useRNModalOnAndroid?: boolean;
|
<mask> isOpen?: boolean;
<mask> children?: any;
<mask> // We use RN modal on android if needed as it supports shifting accessiblity focus to the opened view. IOS automatically shifts focus if an absolutely placed view appears in front.
<mask> useRNModal?: boolean;
<mask> onRequestClose?: any;
<mask> isKeyboardDismissable?: boolean;
<mask> animationPreset?: 'fade' | 'slide' | 'none';
</s> feat: adding new prop usernmodal for overlay </s> remove if (useRNModal) {
</s> add if (useRNModal || (useRNModalOnAndroid && Platform.OS === 'android')) { </s> remove import { Modal } from 'react-native';
</s> add import { Modal, Platform } from 'react-native';
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6bf7a866bbbd2f3160ba4dde16c6db231649c5e2
|
src/components/primitives/Overlay/Overlay.tsx
|
useRNModalOnAndroid = false,
|
<mask> children,
<mask> isOpen,
<mask> useRNModal = false,
<mask> isKeyboardDismissable = true,
<mask> //@ts-ignore
<mask> animationPreset = 'fade',
<mask> onRequestClose,
<mask> style,
</s> feat: adding new prop usernmodal for overlay </s> remove import type { IActionsheetContentProps } from '../../composites/Actionsheet/types';
</s> add import type {
IActionsheetContentProps,
IActionsheetProps,
} from '../../composites/Actionsheet/types';
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6bf7a866bbbd2f3160ba4dde16c6db231649c5e2
|
src/components/primitives/Overlay/Overlay.tsx
|
if (useRNModal || (useRNModalOnAndroid && Platform.OS === 'android')) {
|
<mask> if (unmountOnExit && !isOpen && exited) {
<mask> return null;
<mask> }
<mask>
<mask> if (useRNModal) {
<mask> return (
<mask> <ExitAnimationContext.Provider value={{ exited, setExited }}>
<mask> <Modal
<mask> transparent
<mask> visible={isOpen}
</s> feat: adding new prop usernmodal for overlay </s> remove <Actionsheet isOpen={isOpen} onClose={handleClose}>
</s> add <Actionsheet isOpen={isOpen} onClose={handleClose} {..._actionSheet}> </s> remove import type { IActionsheetContentProps } from '../../composites/Actionsheet/types';
</s> add import type {
IActionsheetContentProps,
IActionsheetProps,
} from '../../composites/Actionsheet/types';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6bf7a866bbbd2f3160ba4dde16c6db231649c5e2
|
src/components/primitives/Overlay/Overlay.tsx
|
_actionSheet,
|
<mask> optimized,
<mask> customDropdownIconProps,
<mask> _actionSheetContent,
<mask> _actionSheetBody,
<mask> _webSelect,
<mask> ...resolvedProps
<mask> } = usePropsResolution(
</s> feat: adding new prop usernmodal for overlay </s> remove import type { IActionsheetContentProps } from '../../composites/Actionsheet/types';
</s> add import type {
IActionsheetContentProps,
IActionsheetProps,
} from '../../composites/Actionsheet/types'; </s> remove <Actionsheet isOpen={isOpen} onClose={handleClose}>
</s> add <Actionsheet isOpen={isOpen} onClose={handleClose} {..._actionSheet}>
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6bf7a866bbbd2f3160ba4dde16c6db231649c5e2
|
src/components/primitives/Select/Select.tsx
|
<Actionsheet isOpen={isOpen} onClose={handleClose} {..._actionSheet}>
|
<mask> {...layoutProps}
<mask> >
<mask> {commonInput}
<mask> </Pressable>
<mask> <Actionsheet isOpen={isOpen} onClose={handleClose}>
<mask> <Actionsheet.Content {..._actionSheetContent}>
<mask> {/* TODO: Replace ScrollVeiw with FlatList */}
<mask> {optimized ? (
<mask> <FlatList
<mask> {..._actionSheetBody}
</s> feat: adding new prop usernmodal for overlay </s> remove if (useRNModal) {
</s> add if (useRNModal || (useRNModalOnAndroid && Platform.OS === 'android')) { </s> remove import type { IActionsheetContentProps } from '../../composites/Actionsheet/types';
</s> add import type {
IActionsheetContentProps,
IActionsheetProps,
} from '../../composites/Actionsheet/types';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6bf7a866bbbd2f3160ba4dde16c6db231649c5e2
|
src/components/primitives/Select/Select.tsx
|
import type {
IActionsheetContentProps,
IActionsheetProps,
} from '../../composites/Actionsheet/types';
|
<mask> import type { InterfaceBoxProps } from '../Box';
<mask> import type { IButtonProps } from '../Button';
<mask> import type { IActionsheetContentProps } from '../../composites/Actionsheet/types';
<mask> import type { MutableRefObject } from 'react';
<mask> import type { CustomProps, ResponsiveValue } from '../../../components/types';
<mask> import type { IColors } from '../../../theme/base/colors';
<mask> import type { IFlatListProps } from '../../../components/basic/FlatList';
<mask> import type { InterfaceButtonProps } from '../Button/types';
</s> feat: adding new prop usernmodal for overlay </s> remove import { Modal } from 'react-native';
</s> add import { Modal, Platform } from 'react-native'; </s> remove if (useRNModal) {
</s> add if (useRNModal || (useRNModalOnAndroid && Platform.OS === 'android')) {
|
[
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/6bf7a866bbbd2f3160ba4dde16c6db231649c5e2
|
src/components/primitives/Select/types.ts
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.