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 |
|---|---|---|---|---|
borderLeftWidth: '0', | <mask> // roundedRight: '4',
<mask> p: '2',
<mask> borderWidth: '1',
<mask> _text: {
<mask> fontWeight: 400,
<mask> },
<mask> alignItems: 'center',
</s> fix: input right addon design fix </s> remove color: mode('muted.400', 'muted.500')(props),
fontWeight: 600,
</s> add fontWeight: 400, </s> remove borderLeftWidth: '0',
roundedRight: '4',
bg: mode('gray.50', 'gray.700')(props),
</s> add // roundedRight: '4', </s> remove borderColor: mode('gray.300', 'gray.600')(props),
</s> add </s> remove import { mode } from './../tools';
const baseStyle = (props: Record<string, any>) => {
</s> add const baseStyle = () => { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/41bedda0f9453741f745c8cb160f8801475b2986 | src/theme/components/inputrightaddon.ts |
fontWeight: 400, | <mask> p: '2',
<mask> borderColor: mode('gray.300', 'gray.600')(props),
<mask> borderWidth: '1',
<mask> _text: {
<mask> color: mode('muted.400', 'muted.500')(props),
<mask> fontWeight: 600,
<mask> },
<mask> alignItems: 'center',
<mask> justifyContent: 'center',
<mask> };
<mask> };
</s> fix: input right addon design fix </s> remove borderColor: mode('gray.300', 'gray.600')(props),
</s> add </s> remove borderLeftWidth: '0',
roundedRight: '4',
bg: mode('gray.50', 'gray.700')(props),
</s> add // roundedRight: '4', </s> remove import { mode } from './../tools';
const baseStyle = (props: Record<string, any>) => {
</s> add const baseStyle = () => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/41bedda0f9453741f745c8cb160f8801475b2986 | src/theme/components/inputrightaddon.ts |
_light: {
bg: 'muted.50',
borderColor: 'muted.300',
_text: {
color: 'text.900',
},
},
_dark: {
bg: 'muted.800',
borderColor: 'muted.700',
_text: {
color: 'text.50',
},
}, | <mask> alignItems: 'center',
<mask> justifyContent: 'center',
<mask> };
<mask> };
<mask>
<mask> export default { baseStyle };
</s> fix: input right addon design fix </s> remove color: mode('muted.400', 'muted.500')(props),
fontWeight: 600,
</s> add fontWeight: 400, </s> remove import { mode } from './../tools';
const baseStyle = (props: Record<string, any>) => {
</s> add const baseStyle = () => { </s> remove borderLeftWidth: '0',
roundedRight: '4',
bg: mode('gray.50', 'gray.700')(props),
</s> add // roundedRight: '4', </s> remove borderColor: mode('gray.300', 'gray.600')(props),
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/41bedda0f9453741f745c8cb160f8801475b2986 | src/theme/components/inputrightaddon.ts |
accessibilityLiveRegion: 'assertive', | <mask> setSnackbar(template, {
<mask> accessibilityAnnouncement: 'Well done, we are proud of you.',
<mask> autoHideDuration: 1000,
<mask> })
<mask> }
<mask> >
<mask> Get Default Snackbar
<mask> </Button>
<mask> <Button
</s> feat: v3 snackbar and toast accessibility announcement </s> remove <Slide in={isOpen} {...props} ref={ref}>
</s> add <Slide
in={isOpen}
{...props}
accessibilityLiveRegion={accessibilityLiveRegion}
ref={ref}
> </s> remove const ToastItem = ({ title, offset, ...props }: IToastProps) => {
</s> add const ToastItem = ({
title,
accessibilityAnnouncement,
offset,
...props
}: IToastProps) => { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/423f5aafa510d8a600b87ce3fbeb18453fc3670d | example/storybook/stories/components/composites/Snackbar/Hook.tsx |
accessibilityLiveRegion: 'polite', | <mask> onPress={() =>
<mask> setSnackbar(template, {
<mask> placement: 'top',
<mask> accessibilityAnnouncement: 'Well done, we are proud of you.',
<mask> })
<mask> }
<mask> >
<mask> Get Snackbar With Overlay
</s> feat: v3 snackbar and toast accessibility announcement </s> remove const ToastItem = ({ title, offset, ...props }: IToastProps) => {
</s> add const ToastItem = ({
title,
accessibilityAnnouncement,
offset,
...props
}: IToastProps) => { </s> remove setOverlay(<ToastItem title={title} _title={_title} offset={offset} />, {
position,
disableOverlay: true,
});
</s> add setOverlay(
<ToastItem
accessibilityLiveRegion={accessibilityLiveRegion}
accessibilityAnnouncement={accessibilityAnnouncement}
title={title}
_title={_title}
offset={offset}
/>,
{
position,
disableOverlay: true,
}
); </s> remove <Slide in={isOpen} {...props} ref={ref}>
</s> add <Slide
in={isOpen}
{...props}
accessibilityLiveRegion={accessibilityLiveRegion}
ref={ref}
> | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/423f5aafa510d8a600b87ce3fbeb18453fc3670d | example/storybook/stories/components/composites/Snackbar/Hook.tsx |
accessibilityLiveRegion = 'polite', | <mask> children,
<mask> autoHideDuration = 5000,
<mask> accessibilityAnnouncement,
<mask> ...props
<mask> }: ISnackbarProps,
<mask> ref: any
<mask> ) => {
<mask> const [isOpen, setIsOpen] = React.useState(true);
</s> feat: v3 snackbar and toast accessibility announcement </s> remove const ToastItem = ({ title, offset, ...props }: IToastProps) => {
</s> add const ToastItem = ({
title,
accessibilityAnnouncement,
offset,
...props
}: IToastProps) => { </s> remove if (accessibilityAnnouncement && isOpen && Platform.OS !== 'web') {
</s> add if (accessibilityAnnouncement && isOpen && Platform.OS === 'ios') { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/423f5aafa510d8a600b87ce3fbeb18453fc3670d | src/components/composites/Snackbar/Snackbar.tsx |
if (accessibilityAnnouncement && isOpen && Platform.OS === 'ios') { | <mask> }, autoHideDuration);
<mask> }, [isOpen, autoHideDuration]);
<mask>
<mask> React.useEffect(() => {
<mask> if (accessibilityAnnouncement && isOpen && Platform.OS !== 'web') {
<mask> AccessibilityInfo.announceForAccessibility(accessibilityAnnouncement);
<mask> }
<mask> }, [accessibilityAnnouncement, isOpen]);
<mask> return (
<mask> <Slide in={isOpen} {...props} ref={ref}>
</s> feat: v3 snackbar and toast accessibility announcement </s> remove <Slide in={isOpen} {...props} ref={ref}>
</s> add <Slide
in={isOpen}
{...props}
accessibilityLiveRegion={accessibilityLiveRegion}
ref={ref}
> </s> remove const ToastItem = ({ title, offset, ...props }: IToastProps) => {
</s> add const ToastItem = ({
title,
accessibilityAnnouncement,
offset,
...props
}: IToastProps) => { </s> remove setOverlay(<ToastItem title={title} _title={_title} offset={offset} />, {
position,
disableOverlay: true,
});
</s> add setOverlay(
<ToastItem
accessibilityLiveRegion={accessibilityLiveRegion}
accessibilityAnnouncement={accessibilityAnnouncement}
title={title}
_title={_title}
offset={offset}
/>,
{
position,
disableOverlay: true,
}
); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/423f5aafa510d8a600b87ce3fbeb18453fc3670d | src/components/composites/Snackbar/Snackbar.tsx |
<Slide
in={isOpen}
{...props}
accessibilityLiveRegion={accessibilityLiveRegion}
ref={ref}
> | <mask> AccessibilityInfo.announceForAccessibility(accessibilityAnnouncement);
<mask> }
<mask> }, [accessibilityAnnouncement, isOpen]);
<mask> return (
<mask> <Slide in={isOpen} {...props} ref={ref}>
<mask> {children}
<mask> </Slide>
<mask> );
<mask> };
<mask>
</s> feat: v3 snackbar and toast accessibility announcement </s> remove if (accessibilityAnnouncement && isOpen && Platform.OS !== 'web') {
</s> add if (accessibilityAnnouncement && isOpen && Platform.OS === 'ios') { </s> remove setOverlay(<ToastItem title={title} _title={_title} offset={offset} />, {
position,
disableOverlay: true,
});
</s> add setOverlay(
<ToastItem
accessibilityLiveRegion={accessibilityLiveRegion}
accessibilityAnnouncement={accessibilityAnnouncement}
title={title}
_title={_title}
offset={offset}
/>,
{
position,
disableOverlay: true,
}
); </s> remove const ToastItem = ({ title, offset, ...props }: IToastProps) => {
</s> add const ToastItem = ({
title,
accessibilityAnnouncement,
offset,
...props
}: IToastProps) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/423f5aafa510d8a600b87ce3fbeb18453fc3670d | src/components/composites/Snackbar/Snackbar.tsx |
import { AccessibilityInfo, Platform } from 'react-native'; | <mask> import Text from '../../primitives/Text';
<mask> import type { IToastProps } from './types';
<mask> import { useThemeProps } from '../../../hooks';
<mask>
<mask> const ToastItem = ({
<mask> title,
<mask> accessibilityAnnouncement,
</s> feat: v3 snackbar and toast accessibility announcement </s> remove const ToastItem = ({ title, offset, ...props }: IToastProps) => {
</s> add const ToastItem = ({
title,
accessibilityAnnouncement,
offset,
...props
}: IToastProps) => { </s> remove setOverlay(<ToastItem title={title} _title={_title} offset={offset} />, {
position,
disableOverlay: true,
});
</s> add setOverlay(
<ToastItem
accessibilityLiveRegion={accessibilityLiveRegion}
accessibilityAnnouncement={accessibilityAnnouncement}
title={title}
_title={_title}
offset={offset}
/>,
{
position,
disableOverlay: true,
}
); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/423f5aafa510d8a600b87ce3fbeb18453fc3670d | src/components/composites/Toast/ToastItem.tsx |
const ToastItem = ({
title,
accessibilityAnnouncement,
offset,
...props
}: IToastProps) => { | <mask> import Text from '../../primitives/Text';
<mask> import type { IToastProps } from './types';
<mask> import { useThemeProps } from '../../../hooks';
<mask>
<mask> const ToastItem = ({ title, offset, ...props }: IToastProps) => {
<mask> let { _title, ...newProps } = useThemeProps('Toast', props);
<mask> return (
<mask> <Box ml={offset?.x} mt={offset?.y} {...newProps}>
<mask> <Text {..._title}>{title}</Text>
<mask> </Box>
</s> feat: v3 snackbar and toast accessibility announcement </s> remove if (accessibilityAnnouncement && isOpen && Platform.OS !== 'web') {
</s> add if (accessibilityAnnouncement && isOpen && Platform.OS === 'ios') { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/423f5aafa510d8a600b87ce3fbeb18453fc3670d | src/components/composites/Toast/ToastItem.tsx |
React.useEffect(() => {
if (accessibilityAnnouncement && Platform.OS === 'ios') {
AccessibilityInfo.announceForAccessibility(accessibilityAnnouncement);
}
}, [accessibilityAnnouncement]);
| <mask> ...props
<mask> }: IToastProps) => {
<mask> let { _title, ...newProps } = useThemeProps('Toast', props);
<mask> return (
<mask> <Box ml={offset?.x} mt={offset?.y} {...newProps}>
<mask> <Text {..._title}>{title}</Text>
<mask> </Box>
<mask> );
<mask> };
</s> feat: v3 snackbar and toast accessibility announcement </s> remove const ToastItem = ({ title, offset, ...props }: IToastProps) => {
</s> add const ToastItem = ({
title,
accessibilityAnnouncement,
offset,
...props
}: IToastProps) => { </s> remove setOverlay(<ToastItem title={title} _title={_title} offset={offset} />, {
position,
disableOverlay: true,
});
</s> add setOverlay(
<ToastItem
accessibilityLiveRegion={accessibilityLiveRegion}
accessibilityAnnouncement={accessibilityAnnouncement}
title={title}
_title={_title}
offset={offset}
/>,
{
position,
disableOverlay: true,
}
); </s> remove <Slide in={isOpen} {...props} ref={ref}>
</s> add <Slide
in={isOpen}
{...props}
accessibilityLiveRegion={accessibilityLiveRegion}
ref={ref}
> | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/423f5aafa510d8a600b87ce3fbeb18453fc3670d | src/components/composites/Toast/ToastItem.tsx |
accessibilityLiveRegion = 'polite',
accessibilityAnnouncement, | <mask> title,
<mask> duration = 2000,
<mask> position = 'bottom',
<mask> offset,
<mask> _title,
<mask> }: IsetToastProps) => {
<mask> setTimeout(() => {
<mask> closeOverlay();
<mask> }, duration);
</s> feat: v3 snackbar and toast accessibility announcement </s> remove setOverlay(<ToastItem title={title} _title={_title} offset={offset} />, {
position,
disableOverlay: true,
});
</s> add setOverlay(
<ToastItem
accessibilityLiveRegion={accessibilityLiveRegion}
accessibilityAnnouncement={accessibilityAnnouncement}
title={title}
_title={_title}
offset={offset}
/>,
{
position,
disableOverlay: true,
}
); </s> remove const ToastItem = ({ title, offset, ...props }: IToastProps) => {
</s> add const ToastItem = ({
title,
accessibilityAnnouncement,
offset,
...props
}: IToastProps) => { </s> remove if (accessibilityAnnouncement && isOpen && Platform.OS !== 'web') {
</s> add if (accessibilityAnnouncement && isOpen && Platform.OS === 'ios') { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/423f5aafa510d8a600b87ce3fbeb18453fc3670d | src/components/composites/Toast/hooks.tsx |
setOverlay(
<ToastItem
accessibilityLiveRegion={accessibilityLiveRegion}
accessibilityAnnouncement={accessibilityAnnouncement}
title={title}
_title={_title}
offset={offset}
/>,
{
position,
disableOverlay: true,
}
); | <mask> }: IsetToastProps) => {
<mask> setTimeout(() => {
<mask> closeOverlay();
<mask> }, duration);
<mask> setOverlay(<ToastItem title={title} _title={_title} offset={offset} />, {
<mask> position,
<mask> disableOverlay: true,
<mask> });
<mask> };
<mask> return setToast;
<mask> };
</s> feat: v3 snackbar and toast accessibility announcement </s> remove const ToastItem = ({ title, offset, ...props }: IToastProps) => {
</s> add const ToastItem = ({
title,
accessibilityAnnouncement,
offset,
...props
}: IToastProps) => { </s> remove if (accessibilityAnnouncement && isOpen && Platform.OS !== 'web') {
</s> add if (accessibilityAnnouncement && isOpen && Platform.OS === 'ios') { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/423f5aafa510d8a600b87ce3fbeb18453fc3670d | src/components/composites/Toast/hooks.tsx |
const ToastItem = ({ title, offset, ...props }: IToastProps) => {
let { _title, ...newProps } = useThemeProps('Toast', props); | <mask> import Text from '../../primitives/Text';
<mask> import type { IToastProps } from './types';
<mask> import { useThemeProps } from '../../../hooks';
<mask>
<mask> const ToastItem = ({ title, offset, _title, ...props }: IToastProps) => {
<mask> let newProps = useThemeProps('Toast', props);
<mask>
<mask> return (
<mask> <Box ml={offset?.x} mt={offset?.y} {...newProps}>
<mask> <Text {..._title}>{title}</Text>
<mask> </Box>
<mask> );
</s> fix: toast title color in dark mode </s> remove fontSize: 'md',
color: 'black',
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42d8f77c21ff6e07fe8a2edbd449465745cb9d88 | src/components/composites/Toast/ToastItem.tsx |
<mask> const baseStyle = (props: Record<string, any>) => {
<mask> return {
<mask> opacity: 0.9,
<mask> backgroundColor: mode('gray.200', 'white')(props),
<mask> fontSize: 'md',
<mask> color: 'black',
<mask> };
<mask> };
<mask> const defaultProps = {
<mask> p: 3,
<mask> borderRadius: 'full',
</s> fix: toast title color in dark mode </s> remove const ToastItem = ({ title, offset, _title, ...props }: IToastProps) => {
let newProps = useThemeProps('Toast', props);
</s> add const ToastItem = ({ title, offset, ...props }: IToastProps) => {
let { _title, ...newProps } = useThemeProps('Toast', props); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42d8f77c21ff6e07fe8a2edbd449465745cb9d88 | src/theme/components/toast.ts | |
_title: {
fontSize: 'md',
color: 'black',
}, | <mask> p: 3,
<mask> borderRadius: 'full',
<mask> };
<mask>
<mask> export default {
<mask> baseStyle,
<mask> defaultProps,
<mask> };
</s> fix: toast title color in dark mode </s> remove fontSize: 'md',
color: 'black',
</s> add </s> remove const ToastItem = ({ title, offset, _title, ...props }: IToastProps) => {
let newProps = useThemeProps('Toast', props);
</s> add const ToastItem = ({ title, offset, ...props }: IToastProps) => {
let { _title, ...newProps } = useThemeProps('Toast', props); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42d8f77c21ff6e07fe8a2edbd449465745cb9d88 | src/theme/components/toast.ts |
import { ToastContainer as Toast } from './ToastContainer';
import { ActionSheetContainer as ActionSheet } from './Actionsheet';
import { Text } from './Text'; | <mask> import { View, ViewPropTypes } from 'react-native';
<mask>
<mask> import { connectStyle } from 'native-base-shoutem-theme';
<mask> import mapPropsToStyleNames from '../Utils/mapPropsToStyleNames';
<mask> import {ToastContainer as Toast} from './ToastContainer';
<mask> import {ActionSheetContainer as ActionSheet} from './Actionsheet';
<mask> import {Text} from './Text';
<mask>
<mask> class Container extends Component {
<mask> render() {
<mask> return (
<mask> <View ref={c => this._root = c} {...this.props}>
</s> fix for toast and actionsheet #819 and #739 </s> remove <Toast ref={ (c) => {Toast.toastInstance = c;}} />
<ActionSheet ref={ (c) => {ActionSheet.actionsheetInstance = c;}} />
</s> add <Toast ref={(c) => { if (!Toast.toastInstance) Toast.toastInstance = c; }} />
<ActionSheet ref={(c) => { if (!ActionSheet.actionsheetInstance) ActionSheet.actionsheetInstance = c; }} /> </s> remove animationType={(this.state.position=='bottom') ? "slide" : "fade"}
</s> add animationType={(this.state.position == 'bottom') ? "slide" : "fade"} </s> remove if (config.duration>0) {
setTimeout(()=> {
</s> add if (config.duration > 0) {
setTimeout(() => { </s> remove static show({...config}) {
this.toastInstance._root.showToast({config});
</s> add static show({ ...config }) {
this.toastInstance._root.showToast({ config }); </s> remove showToast({config}) {
</s> add showToast({ config }) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42de80ea3fca273d82327a055e37cb8ee0d24197 | src/basic/Container.js |
<Toast ref={(c) => { if (!Toast.toastInstance) Toast.toastInstance = c; }} />
<ActionSheet ref={(c) => { if (!ActionSheet.actionsheetInstance) ActionSheet.actionsheetInstance = c; }} /> | <mask> render() {
<mask> return (
<mask> <View ref={c => this._root = c} {...this.props}>
<mask> {this.props.children}
<mask> <Toast ref={ (c) => {Toast.toastInstance = c;}} />
<mask> <ActionSheet ref={ (c) => {ActionSheet.actionsheetInstance = c;}} />
<mask> </View>
<mask> );
<mask> }
<mask> }
<mask>
</s> fix for toast and actionsheet #819 and #739 </s> remove import {ToastContainer as Toast} from './ToastContainer';
import {ActionSheetContainer as ActionSheet} from './Actionsheet';
import {Text} from './Text';
</s> add import { ToastContainer as Toast } from './ToastContainer';
import { ActionSheetContainer as ActionSheet } from './Actionsheet';
import { Text } from './Text'; </s> remove animationType={(this.state.position=='bottom') ? "slide" : "fade"}
</s> add animationType={(this.state.position == 'bottom') ? "slide" : "fade"} </s> remove if (config.duration>0) {
setTimeout(()=> {
</s> add if (config.duration > 0) {
setTimeout(() => { </s> remove this.setState({
modalVisible: false
});
}}>
</s> add this.setState({
modalVisible: false
});
}}> </s> remove static show({...config}) {
this.toastInstance._root.showToast({config});
</s> add static show({ ...config }) {
this.toastInstance._root.showToast({ config }); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42de80ea3fca273d82327a055e37cb8ee0d24197 | src/basic/Container.js |
static show({ ...config }) {
this.toastInstance._root.showToast({ config }); | <mask> modalVisible: false
<mask> }
<mask> }
<mask> static toastInstance;
<mask> static show({...config}) {
<mask> this.toastInstance._root.showToast({config});
<mask> }
<mask> showToast({config}) {
<mask> this.setState({
<mask> modalVisible: true,
<mask> text: config.text,
</s> fix for toast and actionsheet #819 and #739 </s> remove showToast({config}) {
</s> add showToast({ config }) { </s> remove if (config.duration>0) {
setTimeout(()=> {
</s> add if (config.duration > 0) {
setTimeout(() => { </s> remove import {ToastContainer as Toast} from './ToastContainer';
import {ActionSheetContainer as ActionSheet} from './Actionsheet';
import {Text} from './Text';
</s> add import { ToastContainer as Toast } from './ToastContainer';
import { ActionSheetContainer as ActionSheet } from './Actionsheet';
import { Text } from './Text'; </s> remove this.setState({
modalVisible: false
});
}}>
</s> add this.setState({
modalVisible: false
});
}}> </s> remove animationType={(this.state.position=='bottom') ? "slide" : "fade"}
</s> add animationType={(this.state.position == 'bottom') ? "slide" : "fade"} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42de80ea3fca273d82327a055e37cb8ee0d24197 | src/basic/ToastContainer.js |
showToast({ config }) { | <mask> static toastInstance;
<mask> static show({...config}) {
<mask> this.toastInstance._root.showToast({config});
<mask> }
<mask> showToast({config}) {
<mask> this.setState({
<mask> modalVisible: true,
<mask> text: config.text,
<mask> buttonText: config.buttonText,
<mask> type: config.type,
</s> fix for toast and actionsheet #819 and #739 </s> remove static show({...config}) {
this.toastInstance._root.showToast({config});
</s> add static show({ ...config }) {
this.toastInstance._root.showToast({ config }); </s> remove if (config.duration>0) {
setTimeout(()=> {
</s> add if (config.duration > 0) {
setTimeout(() => { </s> remove animationType={(this.state.position=='bottom') ? "slide" : "fade"}
</s> add animationType={(this.state.position == 'bottom') ? "slide" : "fade"} </s> remove import {ToastContainer as Toast} from './ToastContainer';
import {ActionSheetContainer as ActionSheet} from './Actionsheet';
import {Text} from './Text';
</s> add import { ToastContainer as Toast } from './ToastContainer';
import { ActionSheetContainer as ActionSheet } from './Actionsheet';
import { Text } from './Text'; </s> remove this.setState({
modalVisible: false
});
}}>
</s> add this.setState({
modalVisible: false
});
}}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42de80ea3fca273d82327a055e37cb8ee0d24197 | src/basic/ToastContainer.js |
if (config.duration > 0) {
setTimeout(() => { | <mask> type: config.type,
<mask> position: config.position,
<mask> supportedOrientations: config.supportedOrientations
<mask> });
<mask> if (config.duration>0) {
<mask> setTimeout(()=> {
<mask> this.setState({
<mask> modalVisible: false
<mask> });
<mask> }, config.duration);
<mask> }
</s> fix for toast and actionsheet #819 and #739 </s> remove showToast({config}) {
</s> add showToast({ config }) { </s> remove static show({...config}) {
this.toastInstance._root.showToast({config});
</s> add static show({ ...config }) {
this.toastInstance._root.showToast({ config }); </s> remove this.setState({
modalVisible: false
});
}}>
</s> add this.setState({
modalVisible: false
});
}}> </s> remove <Toast ref={ (c) => {Toast.toastInstance = c;}} />
<ActionSheet ref={ (c) => {ActionSheet.actionsheetInstance = c;}} />
</s> add <Toast ref={(c) => { if (!Toast.toastInstance) Toast.toastInstance = c; }} />
<ActionSheet ref={(c) => { if (!ActionSheet.actionsheetInstance) ActionSheet.actionsheetInstance = c; }} /> </s> remove animationType={(this.state.position=='bottom') ? "slide" : "fade"}
</s> add animationType={(this.state.position == 'bottom') ? "slide" : "fade"} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42de80ea3fca273d82327a055e37cb8ee0d24197 | src/basic/ToastContainer.js |
animationType={(this.state.position == 'bottom') ? "slide" : "fade"} | <mask> render() {
<mask> return (
<mask> <Modal
<mask> supportedOrientations={this.state.supportedOrientations || null}
<mask> animationType={(this.state.position=='bottom') ? "slide" : "fade"}
<mask> transparent={true}
<mask> visible={this.state.modalVisible}
<mask> onRequestClose={() => {
<mask> this.setState({
<mask> modalVisible: false
</s> fix for toast and actionsheet #819 and #739 </s> remove <Toast ref={ (c) => {Toast.toastInstance = c;}} />
<ActionSheet ref={ (c) => {ActionSheet.actionsheetInstance = c;}} />
</s> add <Toast ref={(c) => { if (!Toast.toastInstance) Toast.toastInstance = c; }} />
<ActionSheet ref={(c) => { if (!ActionSheet.actionsheetInstance) ActionSheet.actionsheetInstance = c; }} /> </s> remove this.setState({
modalVisible: false
});
}}>
</s> add this.setState({
modalVisible: false
});
}}> </s> remove import {ToastContainer as Toast} from './ToastContainer';
import {ActionSheetContainer as ActionSheet} from './Actionsheet';
import {Text} from './Text';
</s> add import { ToastContainer as Toast } from './ToastContainer';
import { ActionSheetContainer as ActionSheet } from './Actionsheet';
import { Text } from './Text'; </s> remove if (config.duration>0) {
setTimeout(()=> {
</s> add if (config.duration > 0) {
setTimeout(() => { </s> remove static show({...config}) {
this.toastInstance._root.showToast({config});
</s> add static show({ ...config }) {
this.toastInstance._root.showToast({ config }); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42de80ea3fca273d82327a055e37cb8ee0d24197 | src/basic/ToastContainer.js |
> | <mask> this.setState({
<mask> modalVisible: false
<mask> });
<mask> }}
<mask> >
<mask> <View style={{
<mask> margin: (Platform.OS==='ios') ? 20 : 0,
<mask> flex: 1,
<mask> justifyContent: (this.state.position==='top') ? 'flex-start' : (this.state.position==='bottom') ? 'flex-end' : (this.state.position==='center') ? 'center' : 'flex-start'}}>
<mask> <Toast
</s> fix for toast and actionsheet #819 and #739 </s> remove margin: (Platform.OS==='ios') ? 20 : 0,
flex: 1,
justifyContent: (this.state.position==='top') ? 'flex-start' : (this.state.position==='bottom') ? 'flex-end' : (this.state.position==='center') ? 'center' : 'flex-start'}}>
</s> add margin: (Platform.OS === 'ios') ? 20 : 0,
flex: 1,
justifyContent: (this.state.position === 'top') ? 'flex-start' : (this.state.position === 'bottom') ? 'flex-end' : (this.state.position === 'center') ? 'center' : 'flex-start'
}}> </s> remove this.setState({
modalVisible: false
});
}}>
</s> add this.setState({
modalVisible: false
});
}}> </s> remove animationType={(this.state.position=='bottom') ? "slide" : "fade"}
</s> add animationType={(this.state.position == 'bottom') ? "slide" : "fade"} </s> remove if (config.duration>0) {
setTimeout(()=> {
</s> add if (config.duration > 0) {
setTimeout(() => { </s> remove <Toast ref={ (c) => {Toast.toastInstance = c;}} />
<ActionSheet ref={ (c) => {ActionSheet.actionsheetInstance = c;}} />
</s> add <Toast ref={(c) => { if (!Toast.toastInstance) Toast.toastInstance = c; }} />
<ActionSheet ref={(c) => { if (!ActionSheet.actionsheetInstance) ActionSheet.actionsheetInstance = c; }} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42de80ea3fca273d82327a055e37cb8ee0d24197 | src/basic/ToastContainer.js |
margin: (Platform.OS === 'ios') ? 20 : 0,
flex: 1,
justifyContent: (this.state.position === 'top') ? 'flex-start' : (this.state.position === 'bottom') ? 'flex-end' : (this.state.position === 'center') ? 'center' : 'flex-start'
}}> | <mask> });
<mask> }}
<mask> >
<mask> <View style={{
<mask> margin: (Platform.OS==='ios') ? 20 : 0,
<mask> flex: 1,
<mask> justifyContent: (this.state.position==='top') ? 'flex-start' : (this.state.position==='bottom') ? 'flex-end' : (this.state.position==='center') ? 'center' : 'flex-start'}}>
<mask> <Toast
<mask> danger={(this.state.type == 'danger') ? true : false}
<mask> success={(this.state.type == 'success') ? true : false}
<mask> warning={(this.state.type == 'warning') ? true : false}>
<mask> <Text>{this.state.text}</Text>
</s> fix for toast and actionsheet #819 and #739 </s> remove >
</s> add > </s> remove this.setState({
modalVisible: false
});
}}>
</s> add this.setState({
modalVisible: false
});
}}> </s> remove animationType={(this.state.position=='bottom') ? "slide" : "fade"}
</s> add animationType={(this.state.position == 'bottom') ? "slide" : "fade"} </s> remove <Toast ref={ (c) => {Toast.toastInstance = c;}} />
<ActionSheet ref={ (c) => {ActionSheet.actionsheetInstance = c;}} />
</s> add <Toast ref={(c) => { if (!Toast.toastInstance) Toast.toastInstance = c; }} />
<ActionSheet ref={(c) => { if (!ActionSheet.actionsheetInstance) ActionSheet.actionsheetInstance = c; }} /> </s> remove if (config.duration>0) {
setTimeout(()=> {
</s> add if (config.duration > 0) {
setTimeout(() => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42de80ea3fca273d82327a055e37cb8ee0d24197 | src/basic/ToastContainer.js |
this.setState({
modalVisible: false
});
}}> | <mask> success={(this.state.type == 'success') ? true : false}
<mask> warning={(this.state.type == 'warning') ? true : false}>
<mask> <Text>{this.state.text}</Text>
<mask> {(this.state.buttonText) && <Button onPress={() => {
<mask> this.setState({
<mask> modalVisible: false
<mask> });
<mask> }}>
<mask> <Text>{this.state.buttonText}</Text>
<mask> </Button>}
<mask>
<mask> </Toast>
<mask> </View>
</s> fix for toast and actionsheet #819 and #739 </s> remove margin: (Platform.OS==='ios') ? 20 : 0,
flex: 1,
justifyContent: (this.state.position==='top') ? 'flex-start' : (this.state.position==='bottom') ? 'flex-end' : (this.state.position==='center') ? 'center' : 'flex-start'}}>
</s> add margin: (Platform.OS === 'ios') ? 20 : 0,
flex: 1,
justifyContent: (this.state.position === 'top') ? 'flex-start' : (this.state.position === 'bottom') ? 'flex-end' : (this.state.position === 'center') ? 'center' : 'flex-start'
}}> </s> remove animationType={(this.state.position=='bottom') ? "slide" : "fade"}
</s> add animationType={(this.state.position == 'bottom') ? "slide" : "fade"} </s> remove >
</s> add > </s> remove if (config.duration>0) {
setTimeout(()=> {
</s> add if (config.duration > 0) {
setTimeout(() => { </s> remove static show({...config}) {
this.toastInstance._root.showToast({config});
</s> add static show({ ...config }) {
this.toastInstance._root.showToast({ config }); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42de80ea3fca273d82327a055e37cb8ee0d24197 | src/basic/ToastContainer.js |
"babel-cli": "^6.18.0", | <mask> "react-native-keyboard-aware-scroll-view": "0.2.0",
<mask> "react-native-vector-icons": "~3.0.0"
<mask> },
<mask> "devDependencies": {
<mask> "babel-eslint": "^6.1.2",
<mask> "babel-plugin-transform-class-properties": "^6.19.0",
<mask> "babel-plugin-transform-object-rest-spread": "^6.20.2",
<mask> "babel-preset-react": "^6.16.0",
<mask> "eslint": "^3.5.0",
<mask> "eslint-config-airbnb": "^11.1.0",
</s> add babel deps and build command </s> remove "main": "index.js",
</s> add "main": "dist/index.js", </s> remove "scripts": {}
</s> add "scripts": {
"build": "babel . --out-dir dist --ignore node_modules,dist"
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42ee304731e7cc96652d7e39cb9652b67a285135 | package.json |
"babel-plugin-transform-class-properties": "^6.19.0",
"babel-plugin-transform-object-rest-spread": "^6.20.2",
"babel-preset-react": "^6.16.0", | <mask> "babel-cli": "^6.18.0",
<mask> "babel-eslint": "^6.1.2",
<mask> "eslint": "^3.5.0",
<mask> "eslint-config-airbnb": "^11.1.0",
<mask> "eslint-plugin-import": "^1.14.0",
<mask> "eslint-plugin-jsx-a11y": "^2.2.1",
<mask> "eslint-plugin-react": "^6.2.0",
</s> add babel deps and build command </s> remove "scripts": {}
</s> add "scripts": {
"build": "babel . --out-dir dist --ignore node_modules,dist"
} </s> remove "main": "index.js",
</s> add "main": "dist/index.js", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42ee304731e7cc96652d7e39cb9652b67a285135 | package.json |
"main": "dist/index.js", | <mask> "tarball": "https://registry.npmjs.org/native-base/-/native-base-0.5.19.tgz"
<mask> },
<mask> "gitHead": "a8504267642c8bafe763ce292bcf0e97737fd0e4",
<mask> "homepage": "https://github.com/GeekyAnts/NativeBase#readme",
<mask> "main": "index.js",
<mask> "maintainers": [
<mask> {
<mask> "name": "himanshu-sahusoft",
<mask> "email": "himanshu@sahusoft.com"
<mask> },
</s> add babel deps and build command </s> remove "scripts": {}
</s> add "scripts": {
"build": "babel . --out-dir dist --ignore node_modules,dist"
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42ee304731e7cc96652d7e39cb9652b67a285135 | package.json |
"scripts": {
"build": "babel . --out-dir dist --ignore node_modules,dist"
} | <mask> "assets": [
<mask> "Fonts"
<mask> ]
<mask> },
<mask> "scripts": {}
<mask> }
</s> add babel deps and build command </s> remove "main": "index.js",
</s> add "main": "dist/index.js", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/42ee304731e7cc96652d7e39cb9652b67a285135 | package.json |
fontSize: variables.DefaultFontSize - 3, | <mask> export default (variables = variable) => {
<mask> const platform = variables.platform;
<mask> const transparentBtnCommon = {
<mask> "NativeBase.Text": {
<mask> fontSize: variables.DefaultFontSize - 4,
<mask> color: variables.sTabBarActiveTextColor
<mask> },
<mask> "NativeBase.Icon": {
<mask> fontSize: variables.iconFontSize - 10,
<mask> color: variables.sTabBarActiveTextColor,
</s> Default font size changed to 16 </s> remove fontSize: variables.DefaultFontSize - 1,
</s> add fontSize: variables.DefaultFontSize, </s> remove fontSize: variables.DefaultFontSize - 2,
</s> add fontSize: variables.DefaultFontSize - 1, </s> remove fontSize: variables.DefaultFontSize - 3
</s> add fontSize: variables.DefaultFontSize - 2 </s> remove DefaultFontSize: 17,
</s> add DefaultFontSize: 16, </s> remove DefaultFontSize: 17,
</s> add DefaultFontSize: 16, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/43a580d5e01425b65c2a361ee45f256ba41e014b | src/theme/components/CardItem.js |
fontSize: variables.DefaultFontSize - 2 | <mask>
<mask> ".content": {
<mask> "NativeBase.Text": {
<mask> color: platform === "ios" ? "#555" : "#222",
<mask> fontSize: variables.DefaultFontSize - 3
<mask> }
<mask> },
<mask> ".cardBody": {
<mask> padding: -5,
<mask> "NativeBase.Text": {
</s> Default font size changed to 16 </s> remove fontSize: variables.DefaultFontSize - 4,
</s> add fontSize: variables.DefaultFontSize - 3, </s> remove fontSize: variables.DefaultFontSize - 2,
</s> add fontSize: variables.DefaultFontSize - 1, </s> remove fontSize: variables.DefaultFontSize - 1,
</s> add fontSize: variables.DefaultFontSize, </s> remove DefaultFontSize: 17,
</s> add DefaultFontSize: 16, </s> remove DefaultFontSize: 17,
</s> add DefaultFontSize: 16, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/43a580d5e01425b65c2a361ee45f256ba41e014b | src/theme/components/CardItem.js |
fontSize: variables.DefaultFontSize - 1, | <mask> fontSize: variables.iconFontSize - 8,
<mask> color: variables.cardBorderColor
<mask> },
<mask> "NativeBase.Text": {
<mask> fontSize: variables.DefaultFontSize - 2,
<mask> alignSelf: null
<mask> },
<mask> "NativeBase.Thumbnail": {
<mask> alignSelf: null
<mask> },
</s> Default font size changed to 16 </s> remove fontSize: variables.DefaultFontSize - 4,
</s> add fontSize: variables.DefaultFontSize - 3, </s> remove fontSize: variables.DefaultFontSize - 3
</s> add fontSize: variables.DefaultFontSize - 2 </s> remove fontSize: variables.DefaultFontSize - 1,
</s> add fontSize: variables.DefaultFontSize, </s> remove DefaultFontSize: 17,
</s> add DefaultFontSize: 16, </s> remove DefaultFontSize: 17,
</s> add DefaultFontSize: 16, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/43a580d5e01425b65c2a361ee45f256ba41e014b | src/theme/components/CardItem.js |
fontSize: variables.DefaultFontSize, | <mask> import variable from "./../variables/platform";
<mask>
<mask> export default (variables = variable) => {
<mask> const textTheme = {
<mask> fontSize: variables.DefaultFontSize - 1,
<mask> fontFamily: variables.fontFamily,
<mask> color: variables.textColor,
<mask> ".note": {
<mask> color: "#a7a7a7",
<mask> fontSize: variables.noteFontSize
</s> Default font size changed to 16 </s> remove fontSize: variables.DefaultFontSize - 4,
</s> add fontSize: variables.DefaultFontSize - 3, </s> remove fontSize: variables.DefaultFontSize - 2,
</s> add fontSize: variables.DefaultFontSize - 1, </s> remove fontSize: variables.DefaultFontSize - 3
</s> add fontSize: variables.DefaultFontSize - 2 </s> remove DefaultFontSize: 17,
</s> add DefaultFontSize: 16, </s> remove DefaultFontSize: 17,
</s> add DefaultFontSize: 16, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/43a580d5e01425b65c2a361ee45f256ba41e014b | src/theme/components/Text.js |
DefaultFontSize: 16, | <mask> CheckboxPaddingBottom: platform === "ios" ? 0 : 5,
<mask> CheckboxIconSize: platform === "ios" ? 21 : 16,
<mask> CheckboxIconMarginTop: platform === "ios" ? undefined : 1,
<mask> CheckboxFontSize: platform === "ios" ? 23 / 0.9 : 17,
<mask> DefaultFontSize: 17,
<mask> checkboxBgColor: "#039BE5",
<mask> checkboxSize: 20,
<mask> checkboxTickColor: "#fff",
<mask>
<mask> // Color
</s> Default font size changed to 16 </s> remove DefaultFontSize: 17,
</s> add DefaultFontSize: 16, </s> remove DefaultFontSize: 17,
</s> add DefaultFontSize: 16, </s> remove fontSize: variables.DefaultFontSize - 3
</s> add fontSize: variables.DefaultFontSize - 2 </s> remove fontSize: variables.DefaultFontSize - 4,
</s> add fontSize: variables.DefaultFontSize - 3, </s> remove fontSize: variables.DefaultFontSize - 2,
</s> add fontSize: variables.DefaultFontSize - 1, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/43a580d5e01425b65c2a361ee45f256ba41e014b | src/theme/variables/commonColor.js |
DefaultFontSize: 16, | <mask> CheckboxPaddingBottom: 5,
<mask> CheckboxIconSize: 16,
<mask> CheckboxIconMarginTop: 1,
<mask> CheckboxFontSize: 17,
<mask> DefaultFontSize: 17,
<mask> checkboxBgColor: "#039BE5",
<mask> checkboxSize: 20,
<mask> checkboxTickColor: "#fff",
<mask>
<mask> // Color
</s> Default font size changed to 16 </s> remove DefaultFontSize: 17,
</s> add DefaultFontSize: 16, </s> remove DefaultFontSize: 17,
</s> add DefaultFontSize: 16, </s> remove fontSize: variables.DefaultFontSize - 2,
</s> add fontSize: variables.DefaultFontSize - 1, </s> remove fontSize: variables.DefaultFontSize - 1,
</s> add fontSize: variables.DefaultFontSize, </s> remove fontSize: variables.DefaultFontSize - 3
</s> add fontSize: variables.DefaultFontSize - 2 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/43a580d5e01425b65c2a361ee45f256ba41e014b | src/theme/variables/material.js |
DefaultFontSize: 16, | <mask> CheckboxPaddingBottom: platform === "ios" ? 0 : 5,
<mask> CheckboxIconSize: platform === "ios" ? 21 : 16,
<mask> CheckboxIconMarginTop: platform === "ios" ? undefined : 1,
<mask> CheckboxFontSize: platform === "ios" ? 23 / 0.9 : 17,
<mask> DefaultFontSize: 17,
<mask> checkboxBgColor: "#039BE5",
<mask> checkboxSize: 20,
<mask> checkboxTickColor: "#fff",
<mask>
<mask> // Color
</s> Default font size changed to 16 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/43a580d5e01425b65c2a361ee45f256ba41e014b | src/theme/variables/platform.js |
_checked: 'isChecked', | <mask> _invalid: 'isInvalid',
<mask> _indeterminate: 'isIndeterminate',
<mask> };
<mask>
<mask> /**
<mask> * @summary Check weather provided property should be resolved or not. based on plaform, colormode and state
</s> feat: ireduced base style specificity </s> remove * @arg {string} props - .
* @arg {object} platform - .
* @arg {object} colormode - .
* @arg {object} state - .
* @arg {object} currentDepth - .
</s> add * @arg {object} {props, platform, colorMode, state} - .
* @arg {number} currentDepth - . </s> remove const pseudoPropsResolver = ({
props,
platform,
colormode,
state,
currentDepth = 0,
}: any) => {
</s> add const pseudoPropsResolver = (
{ props, platform, colormode, state }: any,
currentDepth: number
) => { </s> remove const defaultProps = { size: 'md', color: 'primary' };
</s> add const defaultProps = { size: 'md' }; </s> remove pseudoPropsResolver({
props: props[property],
platform,
colormode,
state,
currentDepth: currentDepth++,
});
</s> add pseudoPropsResolver(
{
props: props[property],
platform,
colormode,
state,
},
currentDepth + 1
); </s> remove pseudoPropsResolver({
props: componentSizeProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentSizeProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/442e8156bc1a0fe425be5db4a8935a639f88e215 | src/hooks/useThemeProps/usePropsResolution.tsx |
* @arg {object} {props, platform, colorMode, state} - .
* @arg {number} currentDepth - . | <mask> let propertyDepth: any = {};
<mask>
<mask> /**
<mask> * @summary Resolved pseudo props and returns a flattened object.
<mask> * @arg {string} props - .
<mask> * @arg {object} platform - .
<mask> * @arg {object} colormode - .
<mask> * @arg {object} state - .
<mask> * @arg {object} currentDepth - .
<mask> * @returns {object} Resolved and flattened props.
<mask> */
<mask> const pseudoPropsResolver = ({
<mask> props,
<mask> platform,
</s> feat: ireduced base style specificity </s> remove const pseudoPropsResolver = ({
props,
platform,
colormode,
state,
currentDepth = 0,
}: any) => {
</s> add const pseudoPropsResolver = (
{ props, platform, colormode, state }: any,
currentDepth: number
) => { </s> remove pseudoPropsResolver({
props: incomingWithDefaultProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: incomingWithDefaultProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
// some high value
2
); </s> remove let alphaMatched = rawValue?.match(/:alpha\.\d\d?\d?/);
</s> add let alphaMatched =
typeof rawValue === 'string' ? rawValue?.match(/:alpha\.\d\d?\d?/) : false; </s> remove pseudoPropsResolver({
props: componentVariantProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentVariantProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/442e8156bc1a0fe425be5db4a8935a639f88e215 | src/hooks/useThemeProps/usePropsResolution.tsx |
const pseudoPropsResolver = (
{ props, platform, colormode, state }: any,
currentDepth: number
) => { | <mask> * @arg {object} state - .
<mask> * @arg {object} currentDepth - .
<mask> * @returns {object} Resolved and flattened props.
<mask> */
<mask> const pseudoPropsResolver = ({
<mask> props,
<mask> platform,
<mask> colormode,
<mask> state,
<mask> currentDepth = 0,
<mask> }: any) => {
<mask> for (const property in props) {
<mask> // @ts-ignore
<mask> if (pseudoPropsMap[property]) {
<mask> if (shouldResolve({ property: property, state, platform, colormode })) {
<mask> pseudoPropsResolver({
</s> feat: ireduced base style specificity </s> remove * @arg {string} props - .
* @arg {object} platform - .
* @arg {object} colormode - .
* @arg {object} state - .
* @arg {object} currentDepth - .
</s> add * @arg {object} {props, platform, colorMode, state} - .
* @arg {number} currentDepth - . </s> remove pseudoPropsResolver({
props: props[property],
platform,
colormode,
state,
currentDepth: currentDepth++,
});
</s> add pseudoPropsResolver(
{
props: props[property],
platform,
colormode,
state,
},
currentDepth + 1
); </s> remove let alphaMatched = rawValue?.match(/:alpha\.\d\d?\d?/);
</s> add let alphaMatched =
typeof rawValue === 'string' ? rawValue?.match(/:alpha\.\d\d?\d?/) : false; </s> remove !(propertyDepth[property] && propertyDepth[property] > currentDepth)
</s> add flattenProps[property] === undefined ||
propertyDepth[property] <= currentDepth | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/442e8156bc1a0fe425be5db4a8935a639f88e215 | src/hooks/useThemeProps/usePropsResolution.tsx |
pseudoPropsResolver(
{
props: props[property],
platform,
colormode,
state,
},
currentDepth + 1
); | <mask> for (const property in props) {
<mask> // @ts-ignore
<mask> if (pseudoPropsMap[property]) {
<mask> if (shouldResolve({ property: property, state, platform, colormode })) {
<mask> pseudoPropsResolver({
<mask> props: props[property],
<mask> platform,
<mask> colormode,
<mask> state,
<mask> currentDepth: currentDepth++,
<mask> });
<mask> }
<mask> } else {
<mask> if (
<mask> !(propertyDepth[property] && propertyDepth[property] > currentDepth)
<mask> ) {
</s> feat: ireduced base style specificity </s> remove const pseudoPropsResolver = ({
props,
platform,
colormode,
state,
currentDepth = 0,
}: any) => {
</s> add const pseudoPropsResolver = (
{ props, platform, colormode, state }: any,
currentDepth: number
) => { </s> remove !(propertyDepth[property] && propertyDepth[property] > currentDepth)
</s> add flattenProps[property] === undefined ||
propertyDepth[property] <= currentDepth </s> remove pseudoPropsResolver({
props: componentVariantProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentVariantProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); </s> remove flattenProps._text = contrastTextColor
? {
color: contrastTextColor,
...flattenProps._text,
}
: flattenProps._text;
</s> add flattenProps._text =
contrastTextColor && flattenProps?._text?.color === undefined
? {
color: contrastTextColor,
...flattenProps._text,
}
: flattenProps._text; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/442e8156bc1a0fe425be5db4a8935a639f88e215 | src/hooks/useThemeProps/usePropsResolution.tsx |
flattenProps[property] === undefined ||
propertyDepth[property] <= currentDepth | <mask> });
<mask> }
<mask> } else {
<mask> if (
<mask> !(propertyDepth[property] && propertyDepth[property] > currentDepth)
<mask> ) {
<mask> propertyDepth[property] = currentDepth;
<mask> if (property.startsWith('_')) {
<mask> flattenProps[property] = merge(
<mask> {},
</s> feat: ireduced base style specificity </s> remove pseudoPropsResolver({
props: props[property],
platform,
colormode,
state,
currentDepth: currentDepth++,
});
</s> add pseudoPropsResolver(
{
props: props[property],
platform,
colormode,
state,
},
currentDepth + 1
); </s> remove const pseudoPropsResolver = ({
props,
platform,
colormode,
state,
currentDepth = 0,
}: any) => {
</s> add const pseudoPropsResolver = (
{ props, platform, colormode, state }: any,
currentDepth: number
) => { </s> remove flattenProps._text = contrastTextColor
? {
color: contrastTextColor,
...flattenProps._text,
}
: flattenProps._text;
</s> add flattenProps._text =
contrastTextColor && flattenProps?._text?.color === undefined
? {
color: contrastTextColor,
...flattenProps._text,
}
: flattenProps._text; </s> remove pseudoPropsResolver({
props: componentSizeProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentSizeProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/442e8156bc1a0fe425be5db4a8935a639f88e215 | src/hooks/useThemeProps/usePropsResolution.tsx |
delete flattenProps[property]; | <mask> );
<mask> } else {
<mask> flattenProps[property] = props[property];
<mask> }
<mask> }
<mask> }
</s> feat: ireduced base style specificity </s> remove !(propertyDepth[property] && propertyDepth[property] > currentDepth)
</s> add flattenProps[property] === undefined ||
propertyDepth[property] <= currentDepth </s> remove pseudoPropsResolver({
props: props[property],
platform,
colormode,
state,
currentDepth: currentDepth++,
});
</s> add pseudoPropsResolver(
{
props: props[property],
platform,
colormode,
state,
},
currentDepth + 1
); </s> remove flattenProps._text = contrastTextColor
? {
color: contrastTextColor,
...flattenProps._text,
}
: flattenProps._text;
</s> add flattenProps._text =
contrastTextColor && flattenProps?._text?.color === undefined
? {
color: contrastTextColor,
...flattenProps._text,
}
: flattenProps._text; </s> remove pseudoPropsResolver({
props: componentSizeProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentSizeProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); </s> remove pseudoPropsResolver({
props: componentBaseStyle,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentBaseStyle,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/442e8156bc1a0fe425be5db4a8935a639f88e215 | src/hooks/useThemeProps/usePropsResolution.tsx |
pseudoPropsResolver(
{
props: incomingWithDefaultProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
// some high value
2
); | <mask> componentTheme.defaultProps || {},
<mask> cleanIncomingProps
<mask> );
<mask> // STEP 2: flatten them
<mask> pseudoPropsResolver({
<mask> props: incomingWithDefaultProps,
<mask> platform: Platform.OS,
<mask> colormode: colorModeProps.colorMode,
<mask> state: state || {},
<mask> });
<mask>
<mask> // STEP 2.5: resolving responsive props
<mask> const responsiveProps = {};
<mask> resolveResponsively.map((propsName) => {
<mask> if (flattenProps[propsName]) {
</s> feat: ireduced base style specificity </s> remove pseudoPropsResolver({
props: componentSizeProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentSizeProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); </s> remove pseudoPropsResolver({
props: componentBaseStyle,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentBaseStyle,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); </s> remove pseudoPropsResolver({
props: componentVariantProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentVariantProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); </s> remove const pseudoPropsResolver = ({
props,
platform,
colormode,
state,
currentDepth = 0,
}: any) => {
</s> add const pseudoPropsResolver = (
{ props, platform, colormode, state }: any,
currentDepth: number
) => { </s> remove !(propertyDepth[property] && propertyDepth[property] > currentDepth)
</s> add flattenProps[property] === undefined ||
propertyDepth[property] <= currentDepth | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/442e8156bc1a0fe425be5db4a8935a639f88e215 | src/hooks/useThemeProps/usePropsResolution.tsx |
pseudoPropsResolver(
{
props: componentBaseStyle,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); | <mask> ...flattenProps,
<mask> ...colorModeProps,
<mask> });
<mask>
<mask> pseudoPropsResolver({
<mask> props: componentBaseStyle,
<mask> platform: Platform.OS,
<mask> colormode: colorModeProps.colorMode,
<mask> state: state || {},
<mask> });
<mask> }
<mask>
<mask> // NOTE: Resolving variants
<mask> // const variant = resolveValueWithBreakpoint(
<mask> // flattenProps.variant,
</s> feat: ireduced base style specificity </s> remove pseudoPropsResolver({
props: componentVariantProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentVariantProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); </s> remove pseudoPropsResolver({
props: componentSizeProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentSizeProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); </s> remove pseudoPropsResolver({
props: incomingWithDefaultProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: incomingWithDefaultProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
// some high value
2
); </s> remove flattenProps._text = contrastTextColor
? {
color: contrastTextColor,
...flattenProps._text,
}
: flattenProps._text;
</s> add flattenProps._text =
contrastTextColor && flattenProps?._text?.color === undefined
? {
color: contrastTextColor,
...flattenProps._text,
}
: flattenProps._text; </s> remove !(propertyDepth[property] && propertyDepth[property] > currentDepth)
</s> add flattenProps[property] === undefined ||
propertyDepth[property] <= currentDepth | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/442e8156bc1a0fe425be5db4a8935a639f88e215 | src/hooks/useThemeProps/usePropsResolution.tsx |
pseudoPropsResolver(
{
props: componentVariantProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); | <mask> ...flattenProps,
<mask> ...colorModeProps,
<mask> });
<mask>
<mask> pseudoPropsResolver({
<mask> props: componentVariantProps,
<mask> platform: Platform.OS,
<mask> colormode: colorModeProps.colorMode,
<mask> state: state || {},
<mask> });
<mask>
<mask> // We remove variant from original props if we found it in the componentTheme
<mask> //@ts-ignore
<mask> flattenProps.variant = undefined;
<mask> }
</s> feat: ireduced base style specificity </s> remove pseudoPropsResolver({
props: componentBaseStyle,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentBaseStyle,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); </s> remove pseudoPropsResolver({
props: componentSizeProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentSizeProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); </s> remove pseudoPropsResolver({
props: incomingWithDefaultProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: incomingWithDefaultProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
// some high value
2
); </s> remove !(propertyDepth[property] && propertyDepth[property] > currentDepth)
</s> add flattenProps[property] === undefined ||
propertyDepth[property] <= currentDepth </s> remove pseudoPropsResolver({
props: props[property],
platform,
colormode,
state,
currentDepth: currentDepth++,
});
</s> add pseudoPropsResolver(
{
props: props[property],
platform,
colormode,
state,
},
currentDepth + 1
); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/442e8156bc1a0fe425be5db4a8935a639f88e215 | src/hooks/useThemeProps/usePropsResolution.tsx |
pseudoPropsResolver(
{
props: componentSizeProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); | <mask> flattenProps.size = undefined;
<mask> componentSizeProps = componentTheme.sizes[size];
<mask> }
<mask>
<mask> pseudoPropsResolver({
<mask> props: componentSizeProps,
<mask> platform: Platform.OS,
<mask> colormode: colorModeProps.colorMode,
<mask> state: state || {},
<mask> });
<mask> }
<mask>
<mask> // STEP 4: Merge
<mask>
<mask> // STEP 5: linear Grad and contrastText
</s> feat: ireduced base style specificity </s> remove pseudoPropsResolver({
props: incomingWithDefaultProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: incomingWithDefaultProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
// some high value
2
); </s> remove pseudoPropsResolver({
props: componentVariantProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentVariantProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); </s> remove pseudoPropsResolver({
props: componentBaseStyle,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentBaseStyle,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); </s> remove !(propertyDepth[property] && propertyDepth[property] > currentDepth)
</s> add flattenProps[property] === undefined ||
propertyDepth[property] <= currentDepth | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/442e8156bc1a0fe425be5db4a8935a639f88e215 | src/hooks/useThemeProps/usePropsResolution.tsx |
flattenProps._text =
contrastTextColor && flattenProps?._text?.color === undefined
? {
color: contrastTextColor,
...flattenProps._text,
}
: flattenProps._text; | <mask> bgColor,
<mask> flattenProps?._text?.color
<mask> );
<mask>
<mask> flattenProps._text = contrastTextColor
<mask> ? {
<mask> color: contrastTextColor,
<mask> ...flattenProps._text,
<mask> }
<mask> : flattenProps._text;
<mask>
<mask> const resolvedProps = omitUndefined({
<mask> ...flattenProps,
<mask> ...ignoredProps,
<mask> ...gradientProps,
</s> feat: ireduced base style specificity </s> remove let alphaMatched = rawValue?.match(/:alpha\.\d\d?\d?/);
</s> add let alphaMatched =
typeof rawValue === 'string' ? rawValue?.match(/:alpha\.\d\d?\d?/) : false; </s> remove const defaultProps = { size: 'md', color: 'primary' };
</s> add const defaultProps = { size: 'md' }; </s> remove pseudoPropsResolver({
props: componentBaseStyle,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentBaseStyle,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); </s> remove pseudoPropsResolver({
props: componentVariantProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
});
</s> add pseudoPropsResolver(
{
props: componentVariantProps,
platform: Platform.OS,
colormode: colorModeProps.colorMode,
state: state || {},
},
1
); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/442e8156bc1a0fe425be5db4a8935a639f88e215 | src/hooks/useThemeProps/usePropsResolution.tsx |
const defaultProps = { size: 'md' }; | <mask> '5xl': 32,
<mask> '6xl': 64,
<mask> };
<mask>
<mask> const defaultProps = { size: 'md', color: 'primary' };
<mask> export default { baseStyle, sizes, defaultProps };
</s> feat: ireduced base style specificity </s> remove flattenProps._text = contrastTextColor
? {
color: contrastTextColor,
...flattenProps._text,
}
: flattenProps._text;
</s> add flattenProps._text =
contrastTextColor && flattenProps?._text?.color === undefined
? {
color: contrastTextColor,
...flattenProps._text,
}
: flattenProps._text; </s> remove let alphaMatched = rawValue?.match(/:alpha\.\d\d?\d?/);
</s> add let alphaMatched =
typeof rawValue === 'string' ? rawValue?.match(/:alpha\.\d\d?\d?/) : false; </s> remove const pseudoPropsResolver = ({
props,
platform,
colormode,
state,
currentDepth = 0,
}: any) => {
</s> add const pseudoPropsResolver = (
{ props, platform, colormode, state }: any,
currentDepth: number
) => { </s> remove !(propertyDepth[property] && propertyDepth[property] > currentDepth)
</s> add flattenProps[property] === undefined ||
propertyDepth[property] <= currentDepth | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/442e8156bc1a0fe425be5db4a8935a639f88e215 | src/theme/components/icon.ts |
let alphaMatched =
typeof rawValue === 'string' ? rawValue?.match(/:alpha\.\d\d?\d?/) : false; | <mask>
<mask> const isNumber = (n: any) => typeof n === 'number' && !isNaN(n);
<mask>
<mask> export const getColor = (rawValue: any, scale: any, theme: any) => {
<mask> let alphaMatched = rawValue?.match(/:alpha\.\d\d?\d?/);
<mask>
<mask> if (alphaMatched) {
<mask> let colorMatched = rawValue?.match(/^.*?(?=:alpha)/);
<mask> let color = colorMatched ? colorMatched[0] : colorMatched;
<mask> const alphaValue = alphaMatched[0].split('.')[1];
<mask> const alphaFromToken = get(theme['opacity'], alphaValue, alphaValue);
</s> feat: ireduced base style specificity </s> remove const pseudoPropsResolver = ({
props,
platform,
colormode,
state,
currentDepth = 0,
}: any) => {
</s> add const pseudoPropsResolver = (
{ props, platform, colormode, state }: any,
currentDepth: number
) => { </s> remove flattenProps._text = contrastTextColor
? {
color: contrastTextColor,
...flattenProps._text,
}
: flattenProps._text;
</s> add flattenProps._text =
contrastTextColor && flattenProps?._text?.color === undefined
? {
color: contrastTextColor,
...flattenProps._text,
}
: flattenProps._text; </s> remove const defaultProps = { size: 'md', color: 'primary' };
</s> add const defaultProps = { size: 'md' }; </s> remove !(propertyDepth[property] && propertyDepth[property] > currentDepth)
</s> add flattenProps[property] === undefined ||
propertyDepth[property] <= currentDepth </s> remove * @arg {string} props - .
* @arg {object} platform - .
* @arg {object} colormode - .
* @arg {object} state - .
* @arg {object} currentDepth - .
</s> add * @arg {object} {props, platform, colorMode, state} - .
* @arg {number} currentDepth - . | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/442e8156bc1a0fe425be5db4a8935a639f88e215 | src/theme/styled-system.ts |
underlineStyle: {},
tabFontSize: variable.tabFontSize | <mask> backgroundColor: variable.tabDefaultBg,
<mask> style: {},
<mask> tabStyle: {},
<mask> tabsContainerStyle: {},
<mask> underlineStyle: {}
<mask> };
<mask> },
<mask>
<mask> getInitialState() {
<mask> this._tabsMeasurements = [];
</s> Tab button text font size customizable for scrollbale tabs </s> remove const { activeTextColor, inactiveTextColor } = this.props;
</s> add const { activeTextColor, inactiveTextColor, tabFontSize } = this.props; </s> remove <Text style={isTabActive ? activeTextStyle : textStyle}>
</s> add <Text
style={[
isTabActive ? activeTextStyle : textStyle,
{ fontSize: tabFontSize }
]}
> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/44661a8033bbd667544f81cef80354e3b9c13dda | src/basic/Tabs/ScrollableTabBar.js |
const { activeTextColor, inactiveTextColor, tabFontSize } = this.props; | <mask> tabHeaderStyle
<mask> ) {
<mask> const headerContent =
<mask> typeof name !== "string" ? name.props.children : undefined;
<mask> const { activeTextColor, inactiveTextColor } = this.props;
<mask> const textColor = isTabActive ? activeTextColor : inactiveTextColor;
<mask> const fontWeight = isTabActive ? "bold" : "normal";
<mask>
<mask> if (typeof name === "string") {
<mask> return (
</s> Tab button text font size customizable for scrollbale tabs </s> remove <Text style={isTabActive ? activeTextStyle : textStyle}>
</s> add <Text
style={[
isTabActive ? activeTextStyle : textStyle,
{ fontSize: tabFontSize }
]}
> </s> remove underlineStyle: {}
</s> add underlineStyle: {},
tabFontSize: variable.tabFontSize | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/44661a8033bbd667544f81cef80354e3b9c13dda | src/basic/Tabs/ScrollableTabBar.js |
const fontSize = tabFontSize; | <mask> typeof name !== "string" ? name.props.children : undefined;
<mask> const { activeTextColor, inactiveTextColor, tabFontSize } = this.props;
<mask> const textColor = isTabActive ? activeTextColor : inactiveTextColor;
<mask> const fontWeight = isTabActive ? "bold" : "normal";
<mask>
<mask> if (typeof name === "string") {
<mask> return (
<mask> <Button
</s> Tab button text font size customizable for scrollbale tabs </s> remove const { activeTextColor, inactiveTextColor } = this.props;
</s> add const { activeTextColor, inactiveTextColor, tabFontSize } = this.props; </s> remove <Text style={isTabActive ? activeTextStyle : textStyle}>
</s> add <Text
style={[
isTabActive ? activeTextStyle : textStyle,
{ fontSize: tabFontSize }
]}
> </s> remove underlineStyle: {}
</s> add underlineStyle: {},
tabFontSize: variable.tabFontSize | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/44661a8033bbd667544f81cef80354e3b9c13dda | src/basic/Tabs/ScrollableTabBar.js |
<Text
style={[
isTabActive ? activeTextStyle : textStyle,
{ fontSize: tabFontSize }
]}
> | <mask> scrollable
<mask> style={isTabActive ? activeTabStyle : tabStyle}
<mask> active={isTabActive}
<mask> >
<mask> <Text style={isTabActive ? activeTextStyle : textStyle}>
<mask> {name}
<mask> </Text>
<mask> </TabHeading>
<mask> </Button>
<mask> );
</s> Tab button text font size customizable for scrollbale tabs </s> remove const { activeTextColor, inactiveTextColor } = this.props;
</s> add const { activeTextColor, inactiveTextColor, tabFontSize } = this.props; </s> remove underlineStyle: {}
</s> add underlineStyle: {},
tabFontSize: variable.tabFontSize | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/44661a8033bbd667544f81cef80354e3b9c13dda | src/basic/Tabs/ScrollableTabBar.js |
(this.props.style[1].paddingLeft !== undefined | <mask> this.props.style[1].padding !== undefined ||
<mask> this.props.style[1].paddingLeft !== undefined
<mask> ) {
<mask> leftPadder =
<mask> (this.props.style[1].paddingLeft
<mask> ? this.props.style[1].paddingLeft
<mask> : this.props.style[1].padding) + InsetValues.leftInset;
<mask> }
<mask> } else if (
<mask> this.props.style.padding !== undefined ||
</s> Fix Content calculateLeft & calculateRight </s> remove (this.props.style.paddingRight
</s> add (this.props.style.paddingRight !== undefined </s> remove (this.props.style.paddingLeft
</s> add (this.props.style.paddingLeft !== undefined </s> remove (this.props.style[1].paddingRight
</s> add (this.props.style[1].paddingRight !== undefined | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/453989c90c77d64d514fca43c2cd92695d92d367 | src/basic/Content.js |
(this.props.style.paddingLeft !== undefined | <mask> this.props.style.padding !== undefined ||
<mask> this.props.style.paddingLeft !== undefined
<mask> ) {
<mask> leftPadder =
<mask> (this.props.style.paddingLeft
<mask> ? this.props.style.paddingLeft
<mask> : this.props.style.padding) + InsetValues.leftInset;
<mask> } else {
<mask> leftPadder = InsetValues.leftInset;
<mask> }
</s> Fix Content calculateLeft & calculateRight </s> remove (this.props.style[1].paddingRight
</s> add (this.props.style[1].paddingRight !== undefined </s> remove (this.props.style[1].paddingLeft
</s> add (this.props.style[1].paddingLeft !== undefined </s> remove (this.props.style.paddingRight
</s> add (this.props.style.paddingRight !== undefined | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/453989c90c77d64d514fca43c2cd92695d92d367 | src/basic/Content.js |
(this.props.style[1].paddingRight !== undefined | <mask> this.props.style[1].padding !== undefined ||
<mask> this.props.style[1].paddingRight !== undefined
<mask> ) {
<mask> rightPadder =
<mask> (this.props.style[1].paddingRight
<mask> ? this.props.style[1].paddingRight
<mask> : this.props.style[1].padding) + InsetValues.rightInset;
<mask> }
<mask> } else if (
<mask> this.props.style.padding !== undefined ||
</s> Fix Content calculateLeft & calculateRight </s> remove (this.props.style.paddingRight
</s> add (this.props.style.paddingRight !== undefined </s> remove (this.props.style.paddingLeft
</s> add (this.props.style.paddingLeft !== undefined </s> remove (this.props.style[1].paddingLeft
</s> add (this.props.style[1].paddingLeft !== undefined | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/453989c90c77d64d514fca43c2cd92695d92d367 | src/basic/Content.js |
(this.props.style.paddingRight !== undefined | <mask> this.props.style.padding !== undefined ||
<mask> this.props.style.paddingRight !== undefined
<mask> ) {
<mask> rightPadder =
<mask> (this.props.style.paddingRight
<mask> ? this.props.style.paddingRight
<mask> : this.props.style.padding) + InsetValues.rightInset;
<mask> } else {
<mask> rightPadder = InsetValues.rightInset;
<mask> }
</s> Fix Content calculateLeft & calculateRight </s> remove (this.props.style[1].paddingRight
</s> add (this.props.style[1].paddingRight !== undefined </s> remove (this.props.style[1].paddingLeft
</s> add (this.props.style[1].paddingLeft !== undefined </s> remove (this.props.style.paddingLeft
</s> add (this.props.style.paddingLeft !== undefined | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/453989c90c77d64d514fca43c2cd92695d92d367 | src/basic/Content.js |
const borderWidths = {
0: 0,
1: '1px',
2: '2px',
4: '4px',
8: '8px', | <mask> const borders = {
<mask> 'none': 0,
<mask> '1px': '1px solid',
<mask> '2px': '2px solid',
<mask> '4px': '4px solid',
<mask> };
<mask>
<mask> export default borders;
</s> feat: theme token changes (#3919) </s> remove export default borders;
</s> add export default borderWidths; </s> remove none: 0,
sm: 2,
md: 4,
lg: 6,
xl: 8,
pill: 25,
full: 9999,
</s> add 'none': 0,
'xs': 2,
'sm': 4,
'md': 6,
'lg': 8,
'xl': 12,
'2xl': 16,
'3xl': 24,
'full': 9999, </s> remove base: 0,
sm: 480,
md: 768,
lg: 992,
xl: 1280,
</s> add 'base': 0,
'sm': 480,
'md': 768,
'lg': 992,
'xl': 1280,
'2xl': 1536, </s> remove '0': '0',
'25': '0.25',
'75': '0.75',
'10': '0.1',
'20': '0.2',
'30': '0.3',
'40': '0.4',
'50': '0.5',
'60': '0.6',
'70': '0.7',
'80': '0.8',
'90': '0.9',
'100': '1',
</s> add 0: 0,
5: 0.5,
10: 0.1,
20: 0.2,
25: 0.25,
30: 0.3,
40: 0.4,
50: 0.5,
60: 0.6,
70: 0.7,
75: 0.75,
80: 0.8,
90: 0.9,
95: 0.95,
100: 1, </s> remove borders,
</s> add borderWidths, | [
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/46069bc358b4509b30a0241650beb2653f47be73 | src/theme/base/borders.ts |
export default borderWidths; | <mask> '2px': '2px solid',
<mask> '4px': '4px solid',
<mask> };
<mask>
<mask> export default borders;
</s> feat: theme token changes (#3919) </s> remove const borders = {
'none': 0,
'1px': '1px solid',
'2px': '2px solid',
'4px': '4px solid',
</s> add const borderWidths = {
0: 0,
1: '1px',
2: '2px',
4: '4px',
8: '8px', </s> remove base: 0,
sm: 480,
md: 768,
lg: 992,
xl: 1280,
</s> add 'base': 0,
'sm': 480,
'md': 768,
'lg': 992,
'xl': 1280,
'2xl': 1536, </s> remove none: 0,
sm: 2,
md: 4,
lg: 6,
xl: 8,
pill: 25,
full: 9999,
</s> add 'none': 0,
'xs': 2,
'sm': 4,
'md': 6,
'lg': 8,
'xl': 12,
'2xl': 16,
'3xl': 24,
'full': 9999, </s> remove '0': '0',
'25': '0.25',
'75': '0.75',
'10': '0.1',
'20': '0.2',
'30': '0.3',
'40': '0.4',
'50': '0.5',
'60': '0.6',
'70': '0.7',
'80': '0.8',
'90': '0.9',
'100': '1',
</s> add 0: 0,
5: 0.5,
10: 0.1,
20: 0.2,
25: 0.25,
30: 0.3,
40: 0.4,
50: 0.5,
60: 0.6,
70: 0.7,
75: 0.75,
80: 0.8,
90: 0.9,
95: 0.95,
100: 1, </s> remove borders,
</s> add borderWidths, | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/GeekyAnts/NativeBase/commit/46069bc358b4509b30a0241650beb2653f47be73 | src/theme/base/borders.ts |
'base': 0,
'sm': 480,
'md': 768,
'lg': 992,
'xl': 1280,
'2xl': 1536, | <mask> const breakpoints = {
<mask> base: 0,
<mask> sm: 480,
<mask> md: 768,
<mask> lg: 992,
<mask> xl: 1280,
<mask> };
<mask> export default breakpoints;
</s> feat: theme token changes (#3919) </s> remove none: 0,
sm: 2,
md: 4,
lg: 6,
xl: 8,
pill: 25,
full: 9999,
</s> add 'none': 0,
'xs': 2,
'sm': 4,
'md': 6,
'lg': 8,
'xl': 12,
'2xl': 16,
'3xl': 24,
'full': 9999, </s> remove const borders = {
'none': 0,
'1px': '1px solid',
'2px': '2px solid',
'4px': '4px solid',
</s> add const borderWidths = {
0: 0,
1: '1px',
2: '2px',
4: '4px',
8: '8px', </s> remove '0': '0',
'25': '0.25',
'75': '0.75',
'10': '0.1',
'20': '0.2',
'30': '0.3',
'40': '0.4',
'50': '0.5',
'60': '0.6',
'70': '0.7',
'80': '0.8',
'90': '0.9',
'100': '1',
</s> add 0: 0,
5: 0.5,
10: 0.1,
20: 0.2,
25: 0.25,
30: 0.3,
40: 0.4,
50: 0.5,
60: 0.6,
70: 0.7,
75: 0.75,
80: 0.8,
90: 0.9,
95: 0.95,
100: 1, </s> remove export default borders;
</s> add export default borderWidths; </s> remove borders,
</s> add borderWidths, | [
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/46069bc358b4509b30a0241650beb2653f47be73 | src/theme/base/breakpoints.ts |
import borderWidths from './borders'; | <mask> import borders from './borders';
<mask> import breakpoints from './breakpoints';
<mask> import colors from './colors';
<mask> import radii from './radius';
<mask> import shadows from './shadows';
<mask> import sizes from './sizes';
</s> feat: theme token changes (#3919) </s> remove borders,
</s> add borderWidths, </s> remove base: 0,
sm: 480,
md: 768,
lg: 992,
xl: 1280,
</s> add 'base': 0,
'sm': 480,
'md': 768,
'lg': 992,
'xl': 1280,
'2xl': 1536, </s> remove const borders = {
'none': 0,
'1px': '1px solid',
'2px': '2px solid',
'4px': '4px solid',
</s> add const borderWidths = {
0: 0,
1: '1px',
2: '2px',
4: '4px',
8: '8px', </s> remove none: 0,
sm: 2,
md: 4,
lg: 6,
xl: 8,
pill: 25,
full: 9999,
</s> add 'none': 0,
'xs': 2,
'sm': 4,
'md': 6,
'lg': 8,
'xl': 12,
'2xl': 16,
'3xl': 24,
'full': 9999, </s> remove '0': '0',
'25': '0.25',
'75': '0.75',
'10': '0.1',
'20': '0.2',
'30': '0.3',
'40': '0.4',
'50': '0.5',
'60': '0.6',
'70': '0.7',
'80': '0.8',
'90': '0.9',
'100': '1',
</s> add 0: 0,
5: 0.5,
10: 0.1,
20: 0.2,
25: 0.25,
30: 0.3,
40: 0.4,
50: 0.5,
60: 0.6,
70: 0.7,
75: 0.75,
80: 0.8,
90: 0.9,
95: 0.95,
100: 1, | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/46069bc358b4509b30a0241650beb2653f47be73 | src/theme/base/index.ts |
borderWidths, | <mask> import typography from './typography';
<mask> import opacity from './opacity';
<mask>
<mask> const theme = {
<mask> borders,
<mask> breakpoints,
<mask> colors,
<mask> radii,
<mask> ...typography,
<mask> sizes,
</s> feat: theme token changes (#3919) </s> remove import borders from './borders';
</s> add import borderWidths from './borders'; </s> remove const borders = {
'none': 0,
'1px': '1px solid',
'2px': '2px solid',
'4px': '4px solid',
</s> add const borderWidths = {
0: 0,
1: '1px',
2: '2px',
4: '4px',
8: '8px', </s> remove '0': '0',
'25': '0.25',
'75': '0.75',
'10': '0.1',
'20': '0.2',
'30': '0.3',
'40': '0.4',
'50': '0.5',
'60': '0.6',
'70': '0.7',
'80': '0.8',
'90': '0.9',
'100': '1',
</s> add 0: 0,
5: 0.5,
10: 0.1,
20: 0.2,
25: 0.25,
30: 0.3,
40: 0.4,
50: 0.5,
60: 0.6,
70: 0.7,
75: 0.75,
80: 0.8,
90: 0.9,
95: 0.95,
100: 1, </s> remove base: 0,
sm: 480,
md: 768,
lg: 992,
xl: 1280,
</s> add 'base': 0,
'sm': 480,
'md': 768,
'lg': 992,
'xl': 1280,
'2xl': 1536, </s> remove none: 0,
sm: 2,
md: 4,
lg: 6,
xl: 8,
pill: 25,
full: 9999,
</s> add 'none': 0,
'xs': 2,
'sm': 4,
'md': 6,
'lg': 8,
'xl': 12,
'2xl': 16,
'3xl': 24,
'full': 9999, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/46069bc358b4509b30a0241650beb2653f47be73 | src/theme/base/index.ts |
0: 0,
5: 0.5,
10: 0.1,
20: 0.2,
25: 0.25,
30: 0.3,
40: 0.4,
50: 0.5,
60: 0.6,
70: 0.7,
75: 0.75,
80: 0.8,
90: 0.9,
95: 0.95,
100: 1, | <mask> const opacity = {
<mask> '0': '0',
<mask> '25': '0.25',
<mask> '75': '0.75',
<mask> '10': '0.1',
<mask> '20': '0.2',
<mask> '30': '0.3',
<mask> '40': '0.4',
<mask> '50': '0.5',
<mask> '60': '0.6',
<mask> '70': '0.7',
<mask> '80': '0.8',
<mask> '90': '0.9',
<mask> '100': '1',
<mask> };
<mask> export default opacity;
</s> feat: theme token changes (#3919) </s> remove const borders = {
'none': 0,
'1px': '1px solid',
'2px': '2px solid',
'4px': '4px solid',
</s> add const borderWidths = {
0: 0,
1: '1px',
2: '2px',
4: '4px',
8: '8px', </s> remove borders,
</s> add borderWidths, </s> remove base: 0,
sm: 480,
md: 768,
lg: 992,
xl: 1280,
</s> add 'base': 0,
'sm': 480,
'md': 768,
'lg': 992,
'xl': 1280,
'2xl': 1536, </s> remove none: 0,
sm: 2,
md: 4,
lg: 6,
xl: 8,
pill: 25,
full: 9999,
</s> add 'none': 0,
'xs': 2,
'sm': 4,
'md': 6,
'lg': 8,
'xl': 12,
'2xl': 16,
'3xl': 24,
'full': 9999, </s> remove export default borders;
</s> add export default borderWidths; | [
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/46069bc358b4509b30a0241650beb2653f47be73 | src/theme/base/opacity.ts |
'none': 0,
'xs': 2,
'sm': 4,
'md': 6,
'lg': 8,
'xl': 12,
'2xl': 16,
'3xl': 24,
'full': 9999, | <mask> const radii = {
<mask> none: 0,
<mask> sm: 2,
<mask> md: 4,
<mask> lg: 6,
<mask> xl: 8,
<mask> pill: 25,
<mask> full: 9999,
<mask> };
<mask>
<mask> export type IRadii = typeof radii;
<mask>
<mask> export default radii;
</s> feat: theme token changes (#3919) </s> remove base: 0,
sm: 480,
md: 768,
lg: 992,
xl: 1280,
</s> add 'base': 0,
'sm': 480,
'md': 768,
'lg': 992,
'xl': 1280,
'2xl': 1536, </s> remove const borders = {
'none': 0,
'1px': '1px solid',
'2px': '2px solid',
'4px': '4px solid',
</s> add const borderWidths = {
0: 0,
1: '1px',
2: '2px',
4: '4px',
8: '8px', </s> remove export default borders;
</s> add export default borderWidths; </s> remove '0': '0',
'25': '0.25',
'75': '0.75',
'10': '0.1',
'20': '0.2',
'30': '0.3',
'40': '0.4',
'50': '0.5',
'60': '0.6',
'70': '0.7',
'80': '0.8',
'90': '0.9',
'100': '1',
</s> add 0: 0,
5: 0.5,
10: 0.1,
20: 0.2,
25: 0.25,
30: 0.3,
40: 0.4,
50: 0.5,
60: 0.6,
70: 0.7,
75: 0.75,
80: 0.8,
90: 0.9,
95: 0.95,
100: 1, </s> remove borders,
</s> add borderWidths, | [
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/46069bc358b4509b30a0241650beb2653f47be73 | src/theme/base/radius.ts |
"version": "3.4.13-rc.0", | <mask> "*.{json,md,html}": [
<mask> "prettier --write"
<mask> ]
<mask> },
<mask> "version": "3.4.14-rc.0",
<mask> "license": "MIT",
<mask> "private": false,
<mask> "main": "lib/commonjs/index",
<mask> "module": "lib/module/index",
<mask> "types": "lib/typescript/src/index.d.ts",
</s> Revert "Fix/add theme color palette" </s> remove // Derived colors for theming
colors.backgroundLight = colors.coolGray;
colors.backgroundDark = colors.coolGray;
colors.textLight = colors.coolGray;
colors.textDark = colors.coolGray;
colors.borderLight = colors.coolGray;
colors.borderDark = colors.coolGray;
</s> add </s> remove backgroundLight: {} as IColorHues,
backgroundDark: {} as IColorHues,
textLight: {} as IColorHues,
textDark: {} as IColorHues,
borderLight: {} as IColorHues,
borderDark: {} as IColorHues,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/464c9096123df2b84658bcf80acf2a5785421731 | package.json |
<mask> info: {} as IColorHues,
<mask> secondary: {} as IColorHues,
<mask> light: {} as IColorHues,
<mask> tertiary: {} as IColorHues,
<mask> backgroundLight: {} as IColorHues,
<mask> backgroundDark: {} as IColorHues,
<mask> textLight: {} as IColorHues,
<mask> textDark: {} as IColorHues,
<mask> borderLight: {} as IColorHues,
<mask> borderDark: {} as IColorHues,
<mask> };
<mask>
<mask> colors.danger = colors.rose;
<mask> colors.error = colors.red;
<mask> colors.success = colors.green;
</s> Revert "Fix/add theme color palette" </s> remove // Derived colors for theming
colors.backgroundLight = colors.coolGray;
colors.backgroundDark = colors.coolGray;
colors.textLight = colors.coolGray;
colors.textDark = colors.coolGray;
colors.borderLight = colors.coolGray;
colors.borderDark = colors.coolGray;
</s> add </s> remove "version": "3.4.14-rc.0",
</s> add "version": "3.4.13-rc.0", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/464c9096123df2b84658bcf80acf2a5785421731 | src/theme/base/colors.ts | |
<mask> colors.tertiary = colors.emerald;
<mask> colors.info = colors.lightBlue;
<mask> colors.light = colors.warmGray;
<mask>
<mask> // Derived colors for theming
<mask> colors.backgroundLight = colors.coolGray;
<mask> colors.backgroundDark = colors.coolGray;
<mask> colors.textLight = colors.coolGray;
<mask> colors.textDark = colors.coolGray;
<mask> colors.borderLight = colors.coolGray;
<mask> colors.borderDark = colors.coolGray;
<mask>
<mask> export default colors;
<mask> // export type IColors = Leaves<ITheme['colors']>;
<mask> export type IColors = Leaves<typeof colors>;
</s> Revert "Fix/add theme color palette" </s> remove backgroundLight: {} as IColorHues,
backgroundDark: {} as IColorHues,
textLight: {} as IColorHues,
textDark: {} as IColorHues,
borderLight: {} as IColorHues,
borderDark: {} as IColorHues,
</s> add </s> remove "version": "3.4.14-rc.0",
</s> add "version": "3.4.13-rc.0", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/464c9096123df2b84658bcf80acf2a5785421731 | src/theme/base/colors.ts | |
paddingRight:variables.cardItemPadding+5})}, | <mask>
<mask> "NativeBase.Button":{
<mask> ".transparent":_extends({},
<mask> transparentBtnCommon,{
<mask> paddingRight:variables.listItemPadding+5})},
<mask>
<mask>
<mask> flex:1,
<mask> flexDirection:"row",
<mask> alignItems:"center"},
</s> Replaced listItemPadding for cards with new variable cardItemPadding </s> remove paddingRight:variables.listItemPadding+5,
</s> add paddingRight:variables.cardItemPadding+5, </s> remove padding:variables.listItemPadding+5,
paddingVertical:variables.listItemPadding,
</s> add padding:variables.cardItemPadding+5,
paddingVertical:variables.cardItemPadding, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/470494ca720e553095022b149e49f245cd323654 | dist/src/theme/components/CardItem.js |
paddingRight:variables.cardItemPadding+5, | <mask>
<mask> "NativeBase.Button":{
<mask> ".transparent":_extends({},
<mask> transparentBtnCommon,{
<mask> paddingRight:variables.listItemPadding+5,
<mask> alignSelf:"stretch"})},
<mask>
<mask>
<mask> flex:1,
<mask> alignSelf:"stretch",
</s> Replaced listItemPadding for cards with new variable cardItemPadding </s> remove paddingRight:variables.listItemPadding+5})},
</s> add paddingRight:variables.cardItemPadding+5})}, </s> remove padding: variables.listItemPadding + 5,
paddingVertical: variables.listItemPadding,
</s> add padding: variables.cardItemPadding + 5,
paddingVertical: variables.cardItemPadding, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/470494ca720e553095022b149e49f245cd323654 | dist/src/theme/components/CardItem.js |
paddingVertical:variables.cardItemPadding+5}, | <mask>
<mask> borderBottomWidth:variables.borderWidth},
<mask>
<mask> borderBottomWidth:null,
<mask> paddingVertical:variables.listItemPadding+5},
<mask>
<mask> ".footer":{
<mask> "NativeBase.Text":{
<mask> fontSize:16,
<mask> fontWeight:platform==="ios"?"600":"500"},
</s> Replaced listItemPadding for cards with new variable cardItemPadding </s> remove padding: variables.listItemPadding + 5,
paddingVertical: variables.listItemPadding,
</s> add padding: variables.cardItemPadding + 5,
paddingVertical: variables.cardItemPadding, </s> remove paddingVertical: variables.listItemPadding + 5
</s> add paddingVertical: variables.cardItemPadding + 5 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/470494ca720e553095022b149e49f245cd323654 | dist/src/theme/components/CardItem.js |
padding:variables.cardItemPadding+5,
paddingVertical:variables.cardItemPadding, | <mask>
<mask> flexDirection:"row",
<mask> alignItems:"center",
<mask> borderRadius:2,
<mask> padding:variables.listItemPadding+5,
<mask> paddingVertical:variables.listItemPadding,
<mask> backgroundColor:variables.cardDefaultBg};
<mask>
<mask>
<mask> return cardItemTheme;
<mask> };
</s> Replaced listItemPadding for cards with new variable cardItemPadding </s> remove padding: variables.listItemPadding + 5,
paddingVertical: variables.listItemPadding,
</s> add padding: variables.cardItemPadding + 5,
paddingVertical: variables.cardItemPadding, </s> remove paddingRight:variables.listItemPadding+5})},
</s> add paddingRight:variables.cardItemPadding+5})}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/470494ca720e553095022b149e49f245cd323654 | dist/src/theme/components/CardItem.js |
cardItemPadding:platform==="ios"?10:12, | <mask> cardDefaultBg:"#fff",
<mask> cardBorderColor:"#ccc",
<mask> cardBorderRadius:2,
<mask>
<mask>
<mask> CheckboxRadius:platform==="ios"?13:0,
<mask> CheckboxBorderWidth:platform==="ios"?1:2,
<mask> CheckboxPaddingLeft:platform==="ios"?4:2,
</s> Replaced listItemPadding for cards with new variable cardItemPadding | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/470494ca720e553095022b149e49f245cd323654 | dist/src/theme/variables/commonColor.js |
cardItemPadding:platform==="ios"?10:12, | <mask> cardBorderColor:"#ccc",
<mask> cardBorderRadius:2,
<mask>
<mask>
<mask> CheckboxRadius:0,
<mask> CheckboxBorderWidth:2,
<mask> CheckboxPaddingLeft:2,
<mask> CheckboxPaddingBottom:5,
</s> Replaced listItemPadding for cards with new variable cardItemPadding | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/470494ca720e553095022b149e49f245cd323654 | dist/src/theme/variables/material.js |
cardItemPadding:platform==="ios"?10:12, | <mask> cardDefaultBg:"#fff",
<mask> cardBorderColor:"#ccc",
<mask> cardBorderRadius:2,
<mask>
<mask>
<mask> CheckboxRadius:platform==="ios"?13:0,
<mask> CheckboxBorderWidth:platform==="ios"?1:2,
<mask> CheckboxPaddingLeft:platform==="ios"?4:2,
<mask> CheckboxPaddingBottom:platform==="ios"?0:5,
</s> Replaced listItemPadding for cards with new variable cardItemPadding | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/470494ca720e553095022b149e49f245cd323654 | dist/src/theme/variables/platform.js |
paddingRight: variables.cardItemPadding + 5 | <mask> },
<mask> "NativeBase.Button": {
<mask> ".transparent": {
<mask> ...transparentBtnCommon,
<mask> paddingRight: variables.listItemPadding + 5
<mask> }
<mask> },
<mask> flex: 1,
<mask> flexDirection: "row",
<mask> alignItems: "center"
</s> Replaced listItemPadding for cards with new variable cardItemPadding </s> remove paddingRight: variables.listItemPadding + 5,
</s> add paddingRight: variables.cardItemPadding + 5, </s> remove paddingVertical: variables.listItemPadding + 5
</s> add paddingVertical: variables.cardItemPadding + 5 </s> remove padding: variables.listItemPadding + 5,
paddingVertical: variables.listItemPadding,
</s> add padding: variables.cardItemPadding + 5,
paddingVertical: variables.cardItemPadding, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/470494ca720e553095022b149e49f245cd323654 | src/theme/components/CardItem.js |
paddingRight: variables.cardItemPadding + 5, | <mask> },
<mask> "NativeBase.Button": {
<mask> ".transparent": {
<mask> ...transparentBtnCommon,
<mask> paddingRight: variables.listItemPadding + 5,
<mask> alignSelf: "stretch"
<mask> }
<mask> },
<mask> flex: 1,
<mask> alignSelf: "stretch",
</s> Replaced listItemPadding for cards with new variable cardItemPadding </s> remove paddingRight: variables.listItemPadding + 5
</s> add paddingRight: variables.cardItemPadding + 5 </s> remove paddingVertical: variables.listItemPadding + 5
</s> add paddingVertical: variables.cardItemPadding + 5 </s> remove padding: variables.listItemPadding + 5,
paddingVertical: variables.listItemPadding,
</s> add padding: variables.cardItemPadding + 5,
paddingVertical: variables.cardItemPadding, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/470494ca720e553095022b149e49f245cd323654 | src/theme/components/CardItem.js |
paddingVertical: variables.cardItemPadding + 5 | <mask> },
<mask> borderBottomWidth: variables.borderWidth
<mask> },
<mask> borderBottomWidth: null,
<mask> paddingVertical: variables.listItemPadding + 5
<mask> },
<mask> ".footer": {
<mask> "NativeBase.Text": {
<mask> fontSize: 16,
<mask> fontWeight: platform === "ios" ? "600" : "500"
</s> Replaced listItemPadding for cards with new variable cardItemPadding </s> remove paddingRight: variables.listItemPadding + 5
</s> add paddingRight: variables.cardItemPadding + 5 </s> remove paddingRight: variables.listItemPadding + 5,
</s> add paddingRight: variables.cardItemPadding + 5, </s> remove padding: variables.listItemPadding + 5,
paddingVertical: variables.listItemPadding,
</s> add padding: variables.cardItemPadding + 5,
paddingVertical: variables.cardItemPadding, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/470494ca720e553095022b149e49f245cd323654 | src/theme/components/CardItem.js |
padding: variables.cardItemPadding + 5,
paddingVertical: variables.cardItemPadding, | <mask> },
<mask> flexDirection: "row",
<mask> alignItems: "center",
<mask> borderRadius: 2,
<mask> padding: variables.listItemPadding + 5,
<mask> paddingVertical: variables.listItemPadding,
<mask> backgroundColor: variables.cardDefaultBg
<mask> };
<mask>
<mask> return cardItemTheme;
<mask> };
</s> Replaced listItemPadding for cards with new variable cardItemPadding </s> remove padding:variables.listItemPadding+5,
paddingVertical:variables.listItemPadding,
</s> add padding:variables.cardItemPadding+5,
paddingVertical:variables.cardItemPadding, </s> remove paddingRight: variables.listItemPadding + 5
</s> add paddingRight: variables.cardItemPadding + 5 </s> remove paddingRight: variables.listItemPadding + 5,
</s> add paddingRight: variables.cardItemPadding + 5, </s> remove paddingVertical: variables.listItemPadding + 5
</s> add paddingVertical: variables.cardItemPadding + 5 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/470494ca720e553095022b149e49f245cd323654 | src/theme/components/CardItem.js |
cardItemPadding: platform === "ios" ? 10 : 12, | <mask> cardDefaultBg: "#fff",
<mask> cardBorderColor: "#ccc",
<mask> cardBorderRadius: 2,
<mask>
<mask> // CheckBox
<mask> CheckboxRadius: platform === "ios" ? 13 : 0,
<mask> CheckboxBorderWidth: platform === "ios" ? 1 : 2,
</s> Replaced listItemPadding for cards with new variable cardItemPadding </s> remove paddingVertical: variables.listItemPadding + 5
</s> add paddingVertical: variables.cardItemPadding + 5 </s> remove padding: variables.listItemPadding + 5,
paddingVertical: variables.listItemPadding,
</s> add padding: variables.cardItemPadding + 5,
paddingVertical: variables.cardItemPadding, </s> remove paddingRight: variables.listItemPadding + 5,
</s> add paddingRight: variables.cardItemPadding + 5, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/470494ca720e553095022b149e49f245cd323654 | src/theme/variables/commonColor.js |
cardItemPadding: platform === "ios" ? 10 : 12, | <mask> // Card
<mask> cardDefaultBg: "#fff",
<mask> cardBorderColor: "#ccc",
<mask> cardBorderRadius: 2,
<mask>
<mask> // CheckBox
<mask> CheckboxRadius: 0,
<mask> CheckboxBorderWidth: 2,
<mask> CheckboxPaddingLeft: 2,
</s> Replaced listItemPadding for cards with new variable cardItemPadding </s> remove padding: variables.listItemPadding + 5,
paddingVertical: variables.listItemPadding,
</s> add padding: variables.cardItemPadding + 5,
paddingVertical: variables.cardItemPadding, </s> remove paddingVertical: variables.listItemPadding + 5
</s> add paddingVertical: variables.cardItemPadding + 5 </s> remove paddingRight: variables.listItemPadding + 5,
</s> add paddingRight: variables.cardItemPadding + 5, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/470494ca720e553095022b149e49f245cd323654 | src/theme/variables/material.js |
cardItemPadding: platform === "ios" ? 10 : 12, | <mask> // Card
<mask> cardDefaultBg: "#fff",
<mask> cardBorderColor: "#ccc",
<mask> cardBorderRadius: 2,
<mask>
<mask> // CheckBox
<mask> CheckboxRadius: platform === "ios" ? 13 : 0,
<mask> CheckboxBorderWidth: platform === "ios" ? 1 : 2,
</s> Replaced listItemPadding for cards with new variable cardItemPadding </s> remove paddingVertical: variables.listItemPadding + 5
</s> add paddingVertical: variables.cardItemPadding + 5 </s> remove padding: variables.listItemPadding + 5,
paddingVertical: variables.listItemPadding,
</s> add padding: variables.cardItemPadding + 5,
paddingVertical: variables.cardItemPadding, </s> remove paddingRight: variables.listItemPadding + 5,
</s> add paddingRight: variables.cardItemPadding + 5, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/470494ca720e553095022b149e49f245cd323654 | src/theme/variables/platform.js |
bg="red.200" | <mask> return (
<mask> <Pressable
<mask> onPress={() => Alert.alert('hello')}
<mask> p={2}
<mask> // bg="red.200"
<mask> borderWidth={1}
<mask> // _light={{
<mask> // bg: 'red.500',
<mask> // _pressed: { bg: 'teal.300', _focus: { bg: 'amber.200' } },
<mask> // }}
</s> fix: fixed spread props in prop resolution </s> remove // _light={{
// bg: 'red.500',
// _pressed: { bg: 'teal.300', _focus: { bg: 'amber.200' } },
// }}
</s> add </s> remove // _focus={{ bg: 'white', _pressed: { bg: 'lime.400' } }}
</s> add </s> remove const compareSpecificity = (
</s> add export const compareSpecificity = ( </s> remove delete flattenedDefaultProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedDefaultProps[newProp] = val;
</s> add if (!FINAL_SPREAD_PROPS.includes(prop))
delete flattenedDefaultProps[prop];
specificity[prop] = incomingSpecifity[prop];
SPREAD_PROP_SPECIFICITY_MAP[prop].forEach((newProp: string) => {
if (compareSpecificity(specificity[newProp], specificity[prop])) {
specificity[newProp] = incomingSpecifity[prop];
flattenedDefaultProps[newProp] = val;
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | example/storybook/stories/components/primitives/Pressable/Basic.tsx |
<mask> onPress={() => Alert.alert('hello')}
<mask> p={2}
<mask> // bg="red.200"
<mask> borderWidth={1}
<mask> // _light={{
<mask> // bg: 'red.500',
<mask> // _pressed: { bg: 'teal.300', _focus: { bg: 'amber.200' } },
<mask> // }}
<mask> _pressed={{ bg: 'teal.300', borderColor: 'red.500' }}
<mask> // _focus={{ bg: 'white', _pressed: { bg: 'lime.400' } }}
<mask> >
<mask> <Text>hello world</Text>
<mask> </Pressable>
</s> fix: fixed spread props in prop resolution </s> remove // _focus={{ bg: 'white', _pressed: { bg: 'lime.400' } }}
</s> add </s> remove // bg="red.200"
</s> add bg="red.200" </s> remove const compareSpecificity = (
</s> add export const compareSpecificity = ( </s> remove delete flattenedDefaultProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedDefaultProps[newProp] = val;
</s> add if (!FINAL_SPREAD_PROPS.includes(prop))
delete flattenedDefaultProps[prop];
specificity[prop] = incomingSpecifity[prop];
SPREAD_PROP_SPECIFICITY_MAP[prop].forEach((newProp: string) => {
if (compareSpecificity(specificity[newProp], specificity[prop])) {
specificity[newProp] = incomingSpecifity[prop];
flattenedDefaultProps[newProp] = val;
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | example/storybook/stories/components/primitives/Pressable/Basic.tsx | |
<mask> // bg: 'red.500',
<mask> // _pressed: { bg: 'teal.300', _focus: { bg: 'amber.200' } },
<mask> // }}
<mask> _pressed={{ bg: 'teal.300', borderColor: 'red.500' }}
<mask> // _focus={{ bg: 'white', _pressed: { bg: 'lime.400' } }}
<mask> >
<mask> <Text>hello world</Text>
<mask> </Pressable>
<mask> );
<mask> }
</s> fix: fixed spread props in prop resolution </s> remove // _light={{
// bg: 'red.500',
// _pressed: { bg: 'teal.300', _focus: { bg: 'amber.200' } },
// }}
</s> add </s> remove // bg="red.200"
</s> add bg="red.200" </s> remove import { propsFlattener } from './propsFlattener';
</s> add import { propsFlattener, compareSpecificity } from './propsFlattener'; </s> remove const compareSpecificity = (
</s> add export const compareSpecificity = ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | example/storybook/stories/components/primitives/Pressable/Basic.tsx | |
const INITIAL_PROP_SPECIFICITY = {
[SPECIFICITY_100]: 0,
[SPECIFICITY_70]: 0,
[SPECIFICITY_60]: 0,
[SPECIFICITY_50]: 0,
[SPECIFICITY_55]: 0,
[SPECIFICITY_40]: 0,
[SPECIFICITY_30]: 0,
[SPECIFICITY_10]: 0,
[SPECIFICITY_1]: 0,
}; | <mask> SPECIFICITY_30,
<mask> SPECIFICITY_10,
<mask> SPECIFICITY_1,
<mask> ];
<mask>
<mask> const pseudoPropsMap: any = {
<mask> _web: { dependentOn: 'platform', priority: SPECIFICITY_10 },
<mask> _ios: { dependentOn: 'platform', priority: SPECIFICITY_10 },
<mask> _android: { dependentOn: 'platform', priority: SPECIFICITY_10 },
</s> fix: fixed spread props in prop resolution </s> remove const compareSpecificity = (
</s> add export const compareSpecificity = ( </s> remove const marginMap: any = {
</s> add const FINAL_SPREAD_PROPS = [
'paddingTop',
'paddingBottom',
'paddingLeft',
'paddingRight',
'marginTop',
'marginBottom',
'marginLeft',
'marginRight',
];
const MARGIN_MAP: any = { </s> remove // bg="red.200"
</s> add bg="red.200" </s> remove // _focus={{ bg: 'white', _pressed: { bg: 'lime.400' } }}
</s> add </s> remove // _light={{
// bg: 'red.500',
// _pressed: { bg: 'teal.300', _focus: { bg: 'amber.200' } },
// }}
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/propsFlattener.tsx |
export const compareSpecificity = ( | <mask> priority: SPECIFICITY_100,
<mask> },
<mask> };
<mask>
<mask> const compareSpecificity = (
<mask> exisiting: any,
<mask> upcoming: any,
<mask> ignorebaseTheme?: boolean
<mask> // property?: any
<mask> ) => {
</s> fix: fixed spread props in prop resolution </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove const specificityMaps: any = {
...paddingMap,
...marginMap,
</s> add const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/propsFlattener.tsx |
if (!upcoming) return false; | <mask> ) => {
<mask> if (!exisiting) return true;
<mask> const condition = ignorebaseTheme
<mask> ? specificityPrecedence.length - 1
<mask> : specificityPrecedence.length;
<mask> for (let index = 0; index < condition; index++) {
<mask> if (
</s> fix: fixed spread props in prop resolution </s> remove delete flattenedDefaultProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedDefaultProps[newProp] = val;
</s> add if (!FINAL_SPREAD_PROPS.includes(prop))
delete flattenedDefaultProps[prop];
specificity[prop] = incomingSpecifity[prop];
SPREAD_PROP_SPECIFICITY_MAP[prop].forEach((newProp: string) => {
if (compareSpecificity(specificity[newProp], specificity[prop])) {
specificity[newProp] = incomingSpecifity[prop];
flattenedDefaultProps[newProp] = val;
} </s> remove [SPECIFICITY_100]: 0,
[SPECIFICITY_70]: 0,
[SPECIFICITY_60]: 0,
[SPECIFICITY_50]: 0,
[SPECIFICITY_55]: 0,
[SPECIFICITY_40]: 0,
[SPECIFICITY_30]: 0,
[SPECIFICITY_10]: 0,
</s> add ...INITIAL_PROP_SPECIFICITY, </s> remove const compareSpecificity = (
</s> add export const compareSpecificity = ( </s> remove flattenSizeStyle;
</s> add flattenSizeStyle,
sizeSpecificityMap; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/propsFlattener.tsx |
...INITIAL_PROP_SPECIFICITY, | <mask> // NOTE: the order is important here. Keep in mind while specificity breakpoints.
<mask> const propertySpecity = currentSpecificity
<mask> ? { ...currentSpecificity }
<mask> : {
<mask> [SPECIFICITY_100]: 0,
<mask> [SPECIFICITY_70]: 0,
<mask> [SPECIFICITY_60]: 0,
<mask> [SPECIFICITY_50]: 0,
<mask> [SPECIFICITY_55]: 0,
<mask> [SPECIFICITY_40]: 0,
<mask> [SPECIFICITY_30]: 0,
<mask> [SPECIFICITY_10]: 0,
<mask> [SPECIFICITY_1]: priority,
<mask> };
<mask>
<mask> if (
<mask> state[pseudoPropsMap[property]?.respondTo] ||
</s> fix: fixed spread props in prop resolution </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove delete flattenedDefaultProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedDefaultProps[newProp] = val;
</s> add if (!FINAL_SPREAD_PROPS.includes(prop))
delete flattenedDefaultProps[prop];
specificity[prop] = incomingSpecifity[prop];
SPREAD_PROP_SPECIFICITY_MAP[prop].forEach((newProp: string) => {
if (compareSpecificity(specificity[newProp], specificity[prop])) {
specificity[newProp] = incomingSpecifity[prop];
flattenedDefaultProps[newProp] = val;
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/propsFlattener.tsx |
import { propsFlattener, compareSpecificity } from './propsFlattener'; | <mask> import { useColorMode } from '../../core/color-mode';
<mask> import { omitUndefined, extractInObject } from '../../theme/tools';
<mask> import { useContrastText } from '../useContrastText';
<mask> import { useBreakpointResolvedProps } from '../useBreakpointResolvedProps';
<mask> import { propsFlattener } from './propsFlattener';
<mask>
<mask> const specificityOrder = [
<mask> 'p',
<mask> 'padding',
<mask> 'px',
</s> fix: fixed spread props in prop resolution </s> remove const specificityOrder = [
</s> add const SPREAD_PROP_SPECIFICITY_ORDER = [ </s> remove flattenSizeStyle;
</s> add flattenSizeStyle,
sizeSpecificityMap; </s> remove delete flattenedDefaultProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedDefaultProps[newProp] = val;
</s> add if (!FINAL_SPREAD_PROPS.includes(prop))
delete flattenedDefaultProps[prop];
specificity[prop] = incomingSpecifity[prop];
SPREAD_PROP_SPECIFICITY_MAP[prop].forEach((newProp: string) => {
if (compareSpecificity(specificity[newProp], specificity[prop])) {
specificity[newProp] = incomingSpecifity[prop];
flattenedDefaultProps[newProp] = val;
} </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove // _focus={{ bg: 'white', _pressed: { bg: 'lime.400' } }}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/usePropsResolution.tsx |
const SPREAD_PROP_SPECIFICITY_ORDER = [ | <mask> import { useContrastText } from '../useContrastText';
<mask> import { useBreakpointResolvedProps } from '../useBreakpointResolvedProps';
<mask> import { propsFlattener } from './propsFlattener';
<mask>
<mask> const specificityOrder = [
<mask> 'p',
<mask> 'padding',
<mask> 'px',
<mask> 'py',
<mask> 'pt',
</s> fix: fixed spread props in prop resolution </s> remove import { propsFlattener } from './propsFlattener';
</s> add import { propsFlattener, compareSpecificity } from './propsFlattener'; </s> remove flattenSizeStyle;
</s> add flattenSizeStyle,
sizeSpecificityMap; </s> remove delete flattenedDefaultProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedDefaultProps[newProp] = val;
</s> add if (!FINAL_SPREAD_PROPS.includes(prop))
delete flattenedDefaultProps[prop];
specificity[prop] = incomingSpecifity[prop];
SPREAD_PROP_SPECIFICITY_MAP[prop].forEach((newProp: string) => {
if (compareSpecificity(specificity[newProp], specificity[prop])) {
specificity[newProp] = incomingSpecifity[prop];
flattenedDefaultProps[newProp] = val;
} </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove const marginMap: any = {
</s> add const FINAL_SPREAD_PROPS = [
'paddingTop',
'paddingBottom',
'paddingLeft',
'paddingRight',
'marginTop',
'marginBottom',
'marginLeft',
'marginRight',
];
const MARGIN_MAP: any = { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/usePropsResolution.tsx |
const FINAL_SPREAD_PROPS = [
'paddingTop',
'paddingBottom',
'paddingLeft',
'paddingRight',
'marginTop',
'marginBottom',
'marginLeft',
'marginRight',
];
const MARGIN_MAP: any = { | <mask> 'marginLeft',
<mask> 'marginRight',
<mask> ];
<mask>
<mask> const marginMap: any = {
<mask> mx: ['marginRight', 'marginLeft'],
<mask> my: ['marginTop', 'marginBottom'],
<mask> mt: ['marginTop'],
<mask> mb: ['marginBottom'],
<mask> mr: ['marginRight'],
</s> fix: fixed spread props in prop resolution </s> remove marginMap.margin = [...marginMap.mx, ...marginMap.my];
marginMap.m = marginMap.margin;
marginMap.marginTop = marginMap.mt;
marginMap.marginBottom = marginMap.mb;
marginMap.marginLeft = marginMap.ml;
marginMap.marginRight = marginMap.mr;
</s> add MARGIN_MAP.margin = [...MARGIN_MAP.mx, ...MARGIN_MAP.my];
MARGIN_MAP.m = MARGIN_MAP.margin;
MARGIN_MAP.marginTop = MARGIN_MAP.mt;
MARGIN_MAP.marginBottom = MARGIN_MAP.mb;
MARGIN_MAP.marginLeft = MARGIN_MAP.ml;
MARGIN_MAP.marginRight = MARGIN_MAP.mr; </s> remove const specificityMaps: any = {
...paddingMap,
...marginMap,
</s> add const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP, </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/usePropsResolution.tsx |
MARGIN_MAP.margin = [...MARGIN_MAP.mx, ...MARGIN_MAP.my];
MARGIN_MAP.m = MARGIN_MAP.margin;
MARGIN_MAP.marginTop = MARGIN_MAP.mt;
MARGIN_MAP.marginBottom = MARGIN_MAP.mb;
MARGIN_MAP.marginLeft = MARGIN_MAP.ml;
MARGIN_MAP.marginRight = MARGIN_MAP.mr; | <mask> mr: ['marginRight'],
<mask> ml: ['marginLeft'],
<mask> };
<mask>
<mask> marginMap.margin = [...marginMap.mx, ...marginMap.my];
<mask> marginMap.m = marginMap.margin;
<mask> marginMap.marginTop = marginMap.mt;
<mask> marginMap.marginBottom = marginMap.mb;
<mask> marginMap.marginLeft = marginMap.ml;
<mask> marginMap.marginRight = marginMap.mr;
<mask>
<mask> const paddingMap: any = {
<mask> px: ['paddingRight', 'paddingLeft'],
<mask> py: ['paddingTop', 'paddingBottom'],
<mask> pt: ['paddingTop'],
</s> fix: fixed spread props in prop resolution </s> remove const paddingMap: any = {
</s> add const PADDING_MAP: any = { </s> remove pt: ['paddingTop'],
</s> add pt: [''], </s> remove const marginMap: any = {
</s> add const FINAL_SPREAD_PROPS = [
'paddingTop',
'paddingBottom',
'paddingLeft',
'paddingRight',
'marginTop',
'marginBottom',
'marginLeft',
'marginRight',
];
const MARGIN_MAP: any = { </s> remove const specificityMaps: any = {
...paddingMap,
...marginMap,
</s> add const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP, </s> remove paddingMap.padding = [...paddingMap.px, ...paddingMap.py];
paddingMap.p = paddingMap.padding;
paddingMap.paddingTop = paddingMap.pt;
paddingMap.paddingBottom = paddingMap.pb;
paddingMap.paddingLeft = paddingMap.pl;
paddingMap.paddingRight = paddingMap.pr;
</s> add PADDING_MAP.padding = [...PADDING_MAP.px, ...PADDING_MAP.py];
PADDING_MAP.p = PADDING_MAP.padding;
PADDING_MAP.paddingTop = PADDING_MAP.pt;
PADDING_MAP.paddingBottom = PADDING_MAP.pb;
PADDING_MAP.paddingLeft = PADDING_MAP.pl;
PADDING_MAP.paddingRight = PADDING_MAP.pr; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/usePropsResolution.tsx |
const PADDING_MAP: any = { | <mask> marginMap.marginBottom = marginMap.mb;
<mask> marginMap.marginLeft = marginMap.ml;
<mask> marginMap.marginRight = marginMap.mr;
<mask>
<mask> const paddingMap: any = {
<mask> px: ['paddingRight', 'paddingLeft'],
<mask> py: ['paddingTop', 'paddingBottom'],
<mask> pt: ['paddingTop'],
<mask> pb: ['paddingBottom'],
<mask> pr: ['paddingRight'],
</s> fix: fixed spread props in prop resolution </s> remove pt: ['paddingTop'],
</s> add pt: [''], </s> remove marginMap.margin = [...marginMap.mx, ...marginMap.my];
marginMap.m = marginMap.margin;
marginMap.marginTop = marginMap.mt;
marginMap.marginBottom = marginMap.mb;
marginMap.marginLeft = marginMap.ml;
marginMap.marginRight = marginMap.mr;
</s> add MARGIN_MAP.margin = [...MARGIN_MAP.mx, ...MARGIN_MAP.my];
MARGIN_MAP.m = MARGIN_MAP.margin;
MARGIN_MAP.marginTop = MARGIN_MAP.mt;
MARGIN_MAP.marginBottom = MARGIN_MAP.mb;
MARGIN_MAP.marginLeft = MARGIN_MAP.ml;
MARGIN_MAP.marginRight = MARGIN_MAP.mr; </s> remove paddingMap.padding = [...paddingMap.px, ...paddingMap.py];
paddingMap.p = paddingMap.padding;
paddingMap.paddingTop = paddingMap.pt;
paddingMap.paddingBottom = paddingMap.pb;
paddingMap.paddingLeft = paddingMap.pl;
paddingMap.paddingRight = paddingMap.pr;
</s> add PADDING_MAP.padding = [...PADDING_MAP.px, ...PADDING_MAP.py];
PADDING_MAP.p = PADDING_MAP.padding;
PADDING_MAP.paddingTop = PADDING_MAP.pt;
PADDING_MAP.paddingBottom = PADDING_MAP.pb;
PADDING_MAP.paddingLeft = PADDING_MAP.pl;
PADDING_MAP.paddingRight = PADDING_MAP.pr; </s> remove const specificityMaps: any = {
...paddingMap,
...marginMap,
</s> add const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP, </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/usePropsResolution.tsx |
pt: [''], | <mask>
<mask> const paddingMap: any = {
<mask> px: ['paddingRight', 'paddingLeft'],
<mask> py: ['paddingTop', 'paddingBottom'],
<mask> pt: ['paddingTop'],
<mask> pb: ['paddingBottom'],
<mask> pr: ['paddingRight'],
<mask> pl: ['paddingLeft'],
<mask> };
<mask>
</s> fix: fixed spread props in prop resolution </s> remove const paddingMap: any = {
</s> add const PADDING_MAP: any = { </s> remove marginMap.margin = [...marginMap.mx, ...marginMap.my];
marginMap.m = marginMap.margin;
marginMap.marginTop = marginMap.mt;
marginMap.marginBottom = marginMap.mb;
marginMap.marginLeft = marginMap.ml;
marginMap.marginRight = marginMap.mr;
</s> add MARGIN_MAP.margin = [...MARGIN_MAP.mx, ...MARGIN_MAP.my];
MARGIN_MAP.m = MARGIN_MAP.margin;
MARGIN_MAP.marginTop = MARGIN_MAP.mt;
MARGIN_MAP.marginBottom = MARGIN_MAP.mb;
MARGIN_MAP.marginLeft = MARGIN_MAP.ml;
MARGIN_MAP.marginRight = MARGIN_MAP.mr; </s> remove paddingMap.padding = [...paddingMap.px, ...paddingMap.py];
paddingMap.p = paddingMap.padding;
paddingMap.paddingTop = paddingMap.pt;
paddingMap.paddingBottom = paddingMap.pb;
paddingMap.paddingLeft = paddingMap.pl;
paddingMap.paddingRight = paddingMap.pr;
</s> add PADDING_MAP.padding = [...PADDING_MAP.px, ...PADDING_MAP.py];
PADDING_MAP.p = PADDING_MAP.padding;
PADDING_MAP.paddingTop = PADDING_MAP.pt;
PADDING_MAP.paddingBottom = PADDING_MAP.pb;
PADDING_MAP.paddingLeft = PADDING_MAP.pl;
PADDING_MAP.paddingRight = PADDING_MAP.pr; </s> remove const specificityMaps: any = {
...paddingMap,
...marginMap,
</s> add const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP, </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/usePropsResolution.tsx |
PADDING_MAP.padding = [...PADDING_MAP.px, ...PADDING_MAP.py];
PADDING_MAP.p = PADDING_MAP.padding;
PADDING_MAP.paddingTop = PADDING_MAP.pt;
PADDING_MAP.paddingBottom = PADDING_MAP.pb;
PADDING_MAP.paddingLeft = PADDING_MAP.pl;
PADDING_MAP.paddingRight = PADDING_MAP.pr; | <mask> pr: ['paddingRight'],
<mask> pl: ['paddingLeft'],
<mask> };
<mask>
<mask> paddingMap.padding = [...paddingMap.px, ...paddingMap.py];
<mask> paddingMap.p = paddingMap.padding;
<mask> paddingMap.paddingTop = paddingMap.pt;
<mask> paddingMap.paddingBottom = paddingMap.pb;
<mask> paddingMap.paddingLeft = paddingMap.pl;
<mask> paddingMap.paddingRight = paddingMap.pr;
<mask>
<mask> const specificityMaps: any = {
<mask> ...paddingMap,
<mask> ...marginMap,
<mask> };
</s> fix: fixed spread props in prop resolution </s> remove const specificityMaps: any = {
...paddingMap,
...marginMap,
</s> add const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP, </s> remove pt: ['paddingTop'],
</s> add pt: [''], </s> remove const paddingMap: any = {
</s> add const PADDING_MAP: any = { </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove marginMap.margin = [...marginMap.mx, ...marginMap.my];
marginMap.m = marginMap.margin;
marginMap.marginTop = marginMap.mt;
marginMap.marginBottom = marginMap.mb;
marginMap.marginLeft = marginMap.ml;
marginMap.marginRight = marginMap.mr;
</s> add MARGIN_MAP.margin = [...MARGIN_MAP.mx, ...MARGIN_MAP.my];
MARGIN_MAP.m = MARGIN_MAP.margin;
MARGIN_MAP.marginTop = MARGIN_MAP.mt;
MARGIN_MAP.marginBottom = MARGIN_MAP.mb;
MARGIN_MAP.marginLeft = MARGIN_MAP.ml;
MARGIN_MAP.marginRight = MARGIN_MAP.mr; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/usePropsResolution.tsx |
const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP, | <mask> paddingMap.paddingBottom = paddingMap.pb;
<mask> paddingMap.paddingLeft = paddingMap.pl;
<mask> paddingMap.paddingRight = paddingMap.pr;
<mask>
<mask> const specificityMaps: any = {
<mask> ...paddingMap,
<mask> ...marginMap,
<mask> };
<mask>
<mask> function overrideDefaultProps(userProps: any, defaultProps: any) {
<mask> const flattenedUserProps: any = { ...userProps };
<mask> const flattenedDefaultProps: any = { ...defaultProps };
</s> fix: fixed spread props in prop resolution </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove paddingMap.padding = [...paddingMap.px, ...paddingMap.py];
paddingMap.p = paddingMap.padding;
paddingMap.paddingTop = paddingMap.pt;
paddingMap.paddingBottom = paddingMap.pb;
paddingMap.paddingLeft = paddingMap.pl;
paddingMap.paddingRight = paddingMap.pr;
</s> add PADDING_MAP.padding = [...PADDING_MAP.px, ...PADDING_MAP.py];
PADDING_MAP.p = PADDING_MAP.padding;
PADDING_MAP.paddingTop = PADDING_MAP.pt;
PADDING_MAP.paddingBottom = PADDING_MAP.pb;
PADDING_MAP.paddingLeft = PADDING_MAP.pl;
PADDING_MAP.paddingRight = PADDING_MAP.pr; </s> remove const compareSpecificity = (
</s> add export const compareSpecificity = ( </s> remove const paddingMap: any = {
</s> add const PADDING_MAP: any = { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/usePropsResolution.tsx |
function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; | <mask> ...paddingMap,
<mask> ...marginMap,
<mask> };
<mask>
<mask> function overrideDefaultProps(userProps: any, defaultProps: any) {
<mask> const flattenedUserProps: any = { ...userProps };
<mask> const flattenedDefaultProps: any = { ...defaultProps };
<mask>
<mask> specificityOrder.forEach((prop) => {
<mask> if (prop in flattenedUserProps) {
<mask> const val = flattenedUserProps[prop];
<mask> delete flattenedUserProps[prop];
<mask>
<mask> specificityMaps[prop].forEach((newProp: string) => {
<mask> flattenedUserProps[newProp] = val;
<mask> });
<mask> }
<mask>
<mask> if (prop in flattenedDefaultProps) {
<mask> const val = flattenedDefaultProps[prop];
<mask> delete flattenedDefaultProps[prop];
<mask>
</s> fix: fixed spread props in prop resolution </s> remove delete flattenedDefaultProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedDefaultProps[newProp] = val;
</s> add if (!FINAL_SPREAD_PROPS.includes(prop))
delete flattenedDefaultProps[prop];
specificity[prop] = incomingSpecifity[prop];
SPREAD_PROP_SPECIFICITY_MAP[prop].forEach((newProp: string) => {
if (compareSpecificity(specificity[newProp], specificity[prop])) {
specificity[newProp] = incomingSpecifity[prop];
flattenedDefaultProps[newProp] = val;
} </s> remove const specificityMaps: any = {
...paddingMap,
...marginMap,
</s> add const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP, </s> remove const compareSpecificity = (
</s> add export const compareSpecificity = ( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/usePropsResolution.tsx |
SPREAD_PROP_SPECIFICITY_ORDER.forEach((prop) => { | <mask> function propsSpreader(incomingProps: any, incomingSpecifity: any) {
<mask> const flattenedDefaultProps: any = { ...incomingProps };
<mask> const specificity: any = {};
<mask>
<mask> if (prop in flattenedDefaultProps) {
<mask> const val = flattenedDefaultProps[prop];
<mask> if (!FINAL_SPREAD_PROPS.includes(prop))
<mask> delete flattenedDefaultProps[prop];
<mask>
<mask> specificity[prop] = incomingSpecifity[prop];
</s> fix: fixed spread props in prop resolution </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove delete flattenedDefaultProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedDefaultProps[newProp] = val;
</s> add if (!FINAL_SPREAD_PROPS.includes(prop))
delete flattenedDefaultProps[prop];
specificity[prop] = incomingSpecifity[prop];
SPREAD_PROP_SPECIFICITY_MAP[prop].forEach((newProp: string) => {
if (compareSpecificity(specificity[newProp], specificity[prop])) {
specificity[newProp] = incomingSpecifity[prop];
flattenedDefaultProps[newProp] = val;
} </s> remove const specificityMaps: any = {
...paddingMap,
...marginMap,
</s> add const SPREAD_PROP_SPECIFICITY_MAP: any = {
...PADDING_MAP,
...MARGIN_MAP, </s> remove const compareSpecificity = (
</s> add export const compareSpecificity = ( | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/usePropsResolution.tsx |
if (!FINAL_SPREAD_PROPS.includes(prop))
delete flattenedDefaultProps[prop];
specificity[prop] = incomingSpecifity[prop];
SPREAD_PROP_SPECIFICITY_MAP[prop].forEach((newProp: string) => {
if (compareSpecificity(specificity[newProp], specificity[prop])) {
specificity[newProp] = incomingSpecifity[prop];
flattenedDefaultProps[newProp] = val;
} | <mask> }
<mask>
<mask> if (prop in flattenedDefaultProps) {
<mask> const val = flattenedDefaultProps[prop];
<mask> delete flattenedDefaultProps[prop];
<mask>
<mask> specificityMaps[prop].forEach((newProp: string) => {
<mask> flattenedDefaultProps[newProp] = val;
<mask> });
<mask> }
<mask> });
<mask>
<mask> return merge({}, flattenedUserProps, flattenedDefaultProps);
</s> fix: fixed spread props in prop resolution </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; </s> remove return merge({}, flattenedUserProps, flattenedDefaultProps);
</s> add return merge({}, flattenedDefaultProps); </s> remove const specificityOrder = [
</s> add const SPREAD_PROP_SPECIFICITY_ORDER = [ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/usePropsResolution.tsx |
return merge({}, flattenedDefaultProps); | <mask> });
<mask> }
<mask> });
<mask>
<mask> return merge({}, flattenedUserProps, flattenedDefaultProps);
<mask> }
<mask>
<mask> /**
<mask> * @summary Combines provided porps with component's theme props and resloves them.
<mask> * @arg {string} component - Name of the component.
</s> fix: fixed spread props in prop resolution </s> remove delete flattenedDefaultProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedDefaultProps[newProp] = val;
</s> add if (!FINAL_SPREAD_PROPS.includes(prop))
delete flattenedDefaultProps[prop];
specificity[prop] = incomingSpecifity[prop];
SPREAD_PROP_SPECIFICITY_MAP[prop].forEach((newProp: string) => {
if (compareSpecificity(specificity[newProp], specificity[prop])) {
specificity[newProp] = incomingSpecifity[prop];
flattenedDefaultProps[newProp] = val;
} </s> remove flattenSizeStyle;
</s> add flattenSizeStyle,
sizeSpecificityMap; </s> remove // const windowWidth = useWindowDimensions()?.width;
// const currentBreakpoint = React.useMemo(
// () => getClosestBreakpoint(theme.breakpoints, windowWidth),
// [windowWidth, theme.breakpoints]
// );
</s> add </s> remove function overrideDefaultProps(userProps: any, defaultProps: any) {
const flattenedUserProps: any = { ...userProps };
const flattenedDefaultProps: any = { ...defaultProps };
specificityOrder.forEach((prop) => {
if (prop in flattenedUserProps) {
const val = flattenedUserProps[prop];
delete flattenedUserProps[prop];
specificityMaps[prop].forEach((newProp: string) => {
flattenedUserProps[newProp] = val;
});
}
</s> add function propsSpreader(incomingProps: any, incomingSpecifity: any) {
const flattenedDefaultProps: any = { ...incomingProps };
const specificity: any = {}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/484ce923c0e2b1513f1e9a899ffa735b7a57958c | src/hooks/useThemeProps/usePropsResolution.tsx |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.