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
lineHeight: 13
<mask> }, <mask> btnActiveTextStyle: { <mask> color: this.getTheme().tabBarActiveTextColor, <mask> fontSize: (Platform.OS=='ios') ? 12.5 : 11, <mask> lineHeight: 15 <mask> }, <mask> btnStringTextStyle: { <mask> color: this.getTheme().tabBarTextColor, <mask> fontSize: (Platform.OS=='ios') ? 14 : 11, <mask> lineHeight: 16 </s> git push footerTab iOS fix </s> remove lineHeight: 15 </s> add lineHeight: 13 </s> remove alignSelf: 'stretch', paddingHorizontal: 15 </s> add alignSelf: 'stretch' </s> remove alignSelf: 'center' </s> add alignSelf: 'center', flex: 1, borderRadius: 0, justifyContent: 'center', height: this.getTheme().footerHeight </s> remove style={this.getInitialStyle().btnStyle} </s> add style={[this.getInitialStyle().btnStyle, {backgroundColor: (child.props.active) ? this.getTheme().tabActiveBgColor : undefined}]} </s> remove style: this.getInitialStyle().btnStyle, </s> add style: [this.getInitialStyle().btnStyle, {backgroundColor: (child.props.active) ? this.getTheme().tabActiveBgColor : undefined }],
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/031bde76daaa8424134030ea31ab33497fe494d9
Components/Widgets/FooterTab.js
alignSelf: 'center', flex: 1, borderRadius: 0, justifyContent: 'center', height: this.getTheme().footerHeight
<mask> fontSize: (Platform.OS=='ios') ? 14 : 12, <mask> lineHeight: 16 <mask> }, <mask> btnStyle: { <mask> alignSelf: 'center' <mask> } <mask> } <mask> } <mask> <mask> prepareRootProps() { </s> git push footerTab iOS fix </s> remove lineHeight: 15 </s> add lineHeight: 13 </s> remove alignSelf: 'stretch', paddingHorizontal: 15 </s> add alignSelf: 'stretch' </s> remove lineHeight: 15 </s> add lineHeight: 13 </s> remove style={this.getInitialStyle().btnStyle} </s> add style={[this.getInitialStyle().btnStyle, {backgroundColor: (child.props.active) ? this.getTheme().tabActiveBgColor : undefined}]}
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/031bde76daaa8424134030ea31ab33497fe494d9
Components/Widgets/FooterTab.js
// console.log('this.props.children', this.props.children);
<mask> <mask> } <mask> <mask> renderFooter() { <mask> var childrenArray = React.Children.toArray(this.props.children); <mask> var newChildren = []; <mask> <mask> {childrenArray.map((child, i) => { <mask> if (typeof child.props.children==='string') { <mask> newChildren.push(React.cloneElement(child, { </s> git push footerTab iOS fix </s> remove style: this.getInitialStyle().btnStyle, </s> add style: [this.getInitialStyle().btnStyle, {backgroundColor: (child.props.active) ? this.getTheme().tabActiveBgColor : undefined }], </s> remove alignSelf: 'center' </s> add alignSelf: 'center', flex: 1, borderRadius: 0, justifyContent: 'center', height: this.getTheme().footerHeight </s> remove alignSelf: 'stretch', paddingHorizontal: 15 </s> add alignSelf: 'stretch' </s> remove lineHeight: 15 </s> add lineHeight: 13 </s> remove lineHeight: 15 </s> add lineHeight: 13
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/031bde76daaa8424134030ea31ab33497fe494d9
Components/Widgets/FooterTab.js
style: [this.getInitialStyle().btnStyle, {backgroundColor: (child.props.active) ? this.getTheme().tabActiveBgColor : undefined }],
<mask> <mask> {childrenArray.map((child, i) => { <mask> if (typeof child.props.children==='string') { <mask> newChildren.push(React.cloneElement(child, { <mask> style: this.getInitialStyle().btnStyle, <mask> vertical: true, <mask> capitalize: false, <mask> transparent:true, <mask> textStyle: (child.props.active) ? this.getInitialStyle().btnStringActiveTextStyle : this.getInitialStyle().btnStringTextStyle, <mask> key: i})); </s> git push footerTab iOS fix </s> remove style={this.getInitialStyle().btnStyle} </s> add style={[this.getInitialStyle().btnStyle, {backgroundColor: (child.props.active) ? this.getTheme().tabActiveBgColor : undefined}]} </s> remove style={this.getInitialStyle().btnStyle} </s> add style={[this.getInitialStyle().btnStyle, {backgroundColor: (child.props.active) ? this.getTheme().tabActiveBgColor : undefined}]} </s> remove lineHeight: 15 </s> add lineHeight: 13 </s> remove lineHeight: 15 </s> add lineHeight: 13
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/031bde76daaa8424134030ea31ab33497fe494d9
Components/Widgets/FooterTab.js
style={[this.getInitialStyle().btnStyle, {backgroundColor: (child.props.active) ? this.getTheme().tabActiveBgColor : undefined}]}
<mask> if (iconElement.length>0) { <mask> newChildren.push( <mask> <Button transparent vertical <mask> capitalize={false} <mask> style={this.getInitialStyle().btnStyle} <mask> textStyle={(child.props.active) ? this.getInitialStyle().btnActiveTextStyle : this.getInitialStyle().btnTextStyle} <mask> key={i}> <mask> {child.props.children} <mask> <Icon <mask> style={{color: (child.props.active) ? this.getTheme().tabBarActiveTextColor : this.getTheme().tabBarTextColor}} </s> git push footerTab iOS fix </s> remove style={this.getInitialStyle().btnStyle} </s> add style={[this.getInitialStyle().btnStyle, {backgroundColor: (child.props.active) ? this.getTheme().tabActiveBgColor : undefined}]} </s> remove style: this.getInitialStyle().btnStyle, </s> add style: [this.getInitialStyle().btnStyle, {backgroundColor: (child.props.active) ? this.getTheme().tabActiveBgColor : undefined }], </s> remove lineHeight: 15 </s> add lineHeight: 13 </s> remove lineHeight: 15 </s> add lineHeight: 13 </s> remove alignSelf: 'stretch', paddingHorizontal: 15 </s> add alignSelf: 'stretch'
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/031bde76daaa8424134030ea31ab33497fe494d9
Components/Widgets/FooterTab.js
style={[this.getInitialStyle().btnStyle, {backgroundColor: (child.props.active) ? this.getTheme().tabActiveBgColor : undefined}]}
<mask> else { <mask> newChildren.push( <mask> <Button transparent vertical <mask> capitalize={false} <mask> style={this.getInitialStyle().btnStyle} <mask> key={i}> <mask> <Icon <mask> style={{color: (child.props.active) ? this.getTheme().tabBarActiveTextColor : this.getTheme().tabBarTextColor, <mask> fontSize: 28}} <mask> name={child.props.children.props.name} /> </s> git push footerTab iOS fix </s> remove style={this.getInitialStyle().btnStyle} </s> add style={[this.getInitialStyle().btnStyle, {backgroundColor: (child.props.active) ? this.getTheme().tabActiveBgColor : undefined}]} </s> remove style: this.getInitialStyle().btnStyle, </s> add style: [this.getInitialStyle().btnStyle, {backgroundColor: (child.props.active) ? this.getTheme().tabActiveBgColor : undefined }], </s> remove lineHeight: 15 </s> add lineHeight: 13 </s> remove lineHeight: 15 </s> add lineHeight: 13 </s> remove alignSelf: 'stretch', paddingHorizontal: 15 </s> add alignSelf: 'stretch'
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/031bde76daaa8424134030ea31ab33497fe494d9
Components/Widgets/FooterTab.js
import { Picker, Modal, View, ViewPropTypes, FlatList } from "react-native";
<mask> import React, { Component } from "react"; <mask> import PropTypes from "prop-types"; <mask> import createReactClass from "create-react-class"; <mask> import { Picker, Modal, View, ListView, ViewPropTypes } from "react-native"; <mask> import _ from "lodash"; <mask> import { Text } from "./Text"; <mask> import { List } from "./List"; <mask> import { IconNB as Icon } from "./IconNB"; <mask> import { Radio } from "./Radio"; </s> Possible Fix for issue #1239 Replaced ListView with FlatList in Picker </s> remove <List dataArray={this.state.dataSource} renderRow={child => ( <ListItem selected={child.props.value === this.props.selectedValue} button style={this.props.itemStyle} onPress={() => { this._setModalVisible(false); this.props.onValueChange(child.props.value); this.setState({ current: child.props.label }); }} > <Text style={this.props.itemTextStyle}> {child.props.label} </Text> <Right> {child.props.value === this.props.selectedValue ? ( <Radio selected /> ) : ( <Radio selected={false} /> )} </Right> </ListItem> </s> add <FlatList data={this.state.dataSource} renderItem={({item}) => <ListItem selected={item.props.value === this.props.selectedValue} button style={this.props.itemStyle} onPress={() => { this._setModalVisible(false); this.props.onValueChange(item.props.value); this.setState({ current: item.props.label }); }} > <Text style={this.props.itemTextStyle}> {item.props.label} </Text> <Right> {item.props.value === this.props.selectedValue ? ( <Radio selected /> ) : ( <Radio selected={false} /> </s> remove /> </s> add </Right> </ListItem>} />
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/03502034bcdd3cf86344d876fcc4216ce3c8c9aa
src/basic/Picker.ios.js
<FlatList data={this.state.dataSource} renderItem={({item}) => <ListItem selected={item.props.value === this.props.selectedValue} button style={this.props.itemStyle} onPress={() => { this._setModalVisible(false); this.props.onValueChange(item.props.value); this.setState({ current: item.props.label }); }} > <Text style={this.props.itemTextStyle}> {item.props.label} </Text> <Right> {item.props.value === this.props.selectedValue ? ( <Radio selected /> ) : ( <Radio selected={false} />
<mask> > <mask> <Container> <mask> {this.renderHeader()} <mask> <Content> <mask> <List <mask> dataArray={this.state.dataSource} <mask> renderRow={child => ( <mask> <ListItem <mask> selected={child.props.value === this.props.selectedValue} <mask> button <mask> style={this.props.itemStyle} <mask> onPress={() => { <mask> this._setModalVisible(false); <mask> this.props.onValueChange(child.props.value); <mask> this.setState({ current: child.props.label }); <mask> }} <mask> > <mask> <Text style={this.props.itemTextStyle}> <mask> {child.props.label} <mask> </Text> <mask> <Right> <mask> {child.props.value === this.props.selectedValue ? ( <mask> <Radio selected /> <mask> ) : ( <mask> <Radio selected={false} /> <mask> )} <mask> </Right> <mask> </ListItem> <mask> )} <mask> /> <mask> </Content> <mask> </Container> <mask> </Modal> </s> Possible Fix for issue #1239 Replaced ListView with FlatList in Picker </s> remove /> </s> add </Right> </ListItem>} /> </s> remove import { Picker, Modal, View, ListView, ViewPropTypes } from "react-native"; </s> add import { Picker, Modal, View, ViewPropTypes, FlatList } from "react-native";
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "re...
https://github.com/GeekyAnts/NativeBase/commit/03502034bcdd3cf86344d876fcc4216ce3c8c9aa
src/basic/Picker.ios.js
</Right> </ListItem>} />
<mask> )} <mask> </Right> <mask> </ListItem> <mask> )} <mask> /> <mask> </Content> <mask> </Container> <mask> </Modal> <mask> </View> <mask> ); </s> Possible Fix for issue #1239 Replaced ListView with FlatList in Picker </s> remove <List dataArray={this.state.dataSource} renderRow={child => ( <ListItem selected={child.props.value === this.props.selectedValue} button style={this.props.itemStyle} onPress={() => { this._setModalVisible(false); this.props.onValueChange(child.props.value); this.setState({ current: child.props.label }); }} > <Text style={this.props.itemTextStyle}> {child.props.label} </Text> <Right> {child.props.value === this.props.selectedValue ? ( <Radio selected /> ) : ( <Radio selected={false} /> )} </Right> </ListItem> </s> add <FlatList data={this.state.dataSource} renderItem={({item}) => <ListItem selected={item.props.value === this.props.selectedValue} button style={this.props.itemStyle} onPress={() => { this._setModalVisible(false); this.props.onValueChange(item.props.value); this.setState({ current: item.props.label }); }} > <Text style={this.props.itemTextStyle}> {item.props.label} </Text> <Right> {item.props.value === this.props.selectedValue ? ( <Radio selected /> ) : ( <Radio selected={false} /> </s> remove import { Picker, Modal, View, ListView, ViewPropTypes } from "react-native"; </s> add import { Picker, Modal, View, ViewPropTypes, FlatList } from "react-native";
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/03502034bcdd3cf86344d876fcc4216ce3c8c9aa
src/basic/Picker.ios.js
import { Pressable } from '../../primitives/Pressable';
<mask> import React, { memo, forwardRef } from 'react'; <mask> import { ModalContext } from './Context'; <mask> import { usePropsResolution } from '../../../hooks'; <mask> import Button from '../../primitives/Button/Button'; <mask> import { CloseIcon } from '../../primitives/Icon/Icons'; <mask> import type { IButtonProps } from '../../primitives/Button'; <mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps'; <mask> import { useHover } from '@react-native-aria/interactions'; <mask> import { mergeRefs } from '../../../utils'; </s> fix: hover and press issue in close icon button </s> remove import { useHover } from '@react-native-aria/interactions'; import { mergeRefs } from '../../../utils'; </s> add import { useHover, useFocus, useIsPressed, } from '../../primitives/Pressable/Pressable'; import { composeEventHandlers } from '../../../utils'; import { useFocusRing } from '@react-native-aria/focus'; </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); const { _icon, ...resolvedProps } = usePropsResolution( 'ModalCloseButton', props, { isHovered } ); </s> add const { hoverProps, isHovered } = useHover(); const { pressableProps, isPressed } = useIsPressed(); const { focusProps, isFocused } = useFocus(); const { isFocusVisible, focusProps: focusRingProps }: any = useFocusRing(); const { _icon, onPressIn, onPressOut, onHoverIn, onHoverOut, onFocus, onBlur, ...resolvedProps } = usePropsResolution('ModalCloseButton', props, { isHovered, isPressed, isFocused, isFocusVisible, }); </s> remove <Button variant="ghost" {...resolvedProps} </s> add <Pressable accessibilityRole="button" ref={ref} onPressIn={composeEventHandlers(onPressIn, pressableProps.onPressIn)} onPressOut={composeEventHandlers(onPressOut, pressableProps.onPressOut)} // @ts-ignore - web only onHoverIn={composeEventHandlers(onHoverIn, hoverProps.onHoverIn)} // @ts-ignore - web only onHoverOut={composeEventHandlers(onHoverOut, hoverProps.onHoverOut)} // @ts-ignore - web only onFocus={composeEventHandlers( composeEventHandlers(onFocus, focusProps.onFocus), focusRingProps.onFocus )} // @ts-ignore - web only onBlur={composeEventHandlers( composeEventHandlers(onBlur, focusProps.onBlur), focusRingProps.onBlur )} </s> remove </Button> </s> add </Pressable> </s> remove accessibilityLabel="Close dialog" ref={mergeRefs([ref, _ref])} </s> add {...resolvedProps}
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/03bce4e64b42d9322740b26eca3308bc94e11638
src/components/composites/Modal/ModalCloseButton.tsx
import { useHover, useFocus, useIsPressed, } from '../../primitives/Pressable/Pressable'; import { composeEventHandlers } from '../../../utils'; import { useFocusRing } from '@react-native-aria/focus';
<mask> import Button from '../../primitives/Button/Button'; <mask> import { CloseIcon } from '../../primitives/Icon/Icons'; <mask> import type { IButtonProps } from '../../primitives/Button'; <mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps'; <mask> import { useHover } from '@react-native-aria/interactions'; <mask> import { mergeRefs } from '../../../utils'; <mask> <mask> const ModalCloseButton = (props: IButtonProps, ref?: any) => { <mask> const _ref = React.useRef(null); <mask> const { isHovered } = useHover({}, _ref); <mask> const { _icon, ...resolvedProps } = usePropsResolution( </s> fix: hover and press issue in close icon button </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); const { _icon, ...resolvedProps } = usePropsResolution( 'ModalCloseButton', props, { isHovered } ); </s> add const { hoverProps, isHovered } = useHover(); const { pressableProps, isPressed } = useIsPressed(); const { focusProps, isFocused } = useFocus(); const { isFocusVisible, focusProps: focusRingProps }: any = useFocusRing(); const { _icon, onPressIn, onPressOut, onHoverIn, onHoverOut, onFocus, onBlur, ...resolvedProps } = usePropsResolution('ModalCloseButton', props, { isHovered, isPressed, isFocused, isFocusVisible, }); </s> remove import Button from '../../primitives/Button/Button'; </s> add import { Pressable } from '../../primitives/Pressable'; </s> remove <Button variant="ghost" {...resolvedProps} </s> add <Pressable accessibilityRole="button" ref={ref} onPressIn={composeEventHandlers(onPressIn, pressableProps.onPressIn)} onPressOut={composeEventHandlers(onPressOut, pressableProps.onPressOut)} // @ts-ignore - web only onHoverIn={composeEventHandlers(onHoverIn, hoverProps.onHoverIn)} // @ts-ignore - web only onHoverOut={composeEventHandlers(onHoverOut, hoverProps.onHoverOut)} // @ts-ignore - web only onFocus={composeEventHandlers( composeEventHandlers(onFocus, focusProps.onFocus), focusRingProps.onFocus )} // @ts-ignore - web only onBlur={composeEventHandlers( composeEventHandlers(onBlur, focusProps.onBlur), focusRingProps.onBlur )} </s> remove </Button> </s> add </Pressable> </s> remove accessibilityLabel="Close dialog" ref={mergeRefs([ref, _ref])} </s> add {...resolvedProps}
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/03bce4e64b42d9322740b26eca3308bc94e11638
src/components/composites/Modal/ModalCloseButton.tsx
const { hoverProps, isHovered } = useHover(); const { pressableProps, isPressed } = useIsPressed(); const { focusProps, isFocused } = useFocus(); const { isFocusVisible, focusProps: focusRingProps }: any = useFocusRing(); const { _icon, onPressIn, onPressOut, onHoverIn, onHoverOut, onFocus, onBlur, ...resolvedProps } = usePropsResolution('ModalCloseButton', props, { isHovered, isPressed, isFocused, isFocusVisible, });
<mask> import { useHover } from '@react-native-aria/interactions'; <mask> import { mergeRefs } from '../../../utils'; <mask> <mask> const ModalCloseButton = (props: IButtonProps, ref?: any) => { <mask> const _ref = React.useRef(null); <mask> const { isHovered } = useHover({}, _ref); <mask> const { _icon, ...resolvedProps } = usePropsResolution( <mask> 'ModalCloseButton', <mask> props, <mask> { isHovered } <mask> ); <mask> const { handleClose } = React.useContext(ModalContext); <mask> //TODO: refactor for responsive prop <mask> if (useHasResponsiveProps(props)) { <mask> return null; <mask> } </s> fix: hover and press issue in close icon button </s> remove import { useHover } from '@react-native-aria/interactions'; import { mergeRefs } from '../../../utils'; </s> add import { useHover, useFocus, useIsPressed, } from '../../primitives/Pressable/Pressable'; import { composeEventHandlers } from '../../../utils'; import { useFocusRing } from '@react-native-aria/focus'; </s> remove import Button from '../../primitives/Button/Button'; </s> add import { Pressable } from '../../primitives/Pressable'; </s> remove <Button variant="ghost" {...resolvedProps} </s> add <Pressable accessibilityRole="button" ref={ref} onPressIn={composeEventHandlers(onPressIn, pressableProps.onPressIn)} onPressOut={composeEventHandlers(onPressOut, pressableProps.onPressOut)} // @ts-ignore - web only onHoverIn={composeEventHandlers(onHoverIn, hoverProps.onHoverIn)} // @ts-ignore - web only onHoverOut={composeEventHandlers(onHoverOut, hoverProps.onHoverOut)} // @ts-ignore - web only onFocus={composeEventHandlers( composeEventHandlers(onFocus, focusProps.onFocus), focusRingProps.onFocus )} // @ts-ignore - web only onBlur={composeEventHandlers( composeEventHandlers(onBlur, focusProps.onBlur), focusRingProps.onBlur )} </s> remove </Button> </s> add </Pressable> </s> remove accessibilityLabel="Close dialog" ref={mergeRefs([ref, _ref])} </s> add {...resolvedProps}
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/03bce4e64b42d9322740b26eca3308bc94e11638
src/components/composites/Modal/ModalCloseButton.tsx
<Pressable accessibilityRole="button" ref={ref} onPressIn={composeEventHandlers(onPressIn, pressableProps.onPressIn)} onPressOut={composeEventHandlers(onPressOut, pressableProps.onPressOut)} // @ts-ignore - web only onHoverIn={composeEventHandlers(onHoverIn, hoverProps.onHoverIn)} // @ts-ignore - web only onHoverOut={composeEventHandlers(onHoverOut, hoverProps.onHoverOut)} // @ts-ignore - web only onFocus={composeEventHandlers( composeEventHandlers(onFocus, focusProps.onFocus), focusRingProps.onFocus )} // @ts-ignore - web only onBlur={composeEventHandlers( composeEventHandlers(onBlur, focusProps.onBlur), focusRingProps.onBlur )}
<mask> if (useHasResponsiveProps(props)) { <mask> return null; <mask> } <mask> return ( <mask> <Button <mask> variant="ghost" <mask> {...resolvedProps} <mask> onPress={handleClose} <mask> accessibilityLabel="Close dialog" <mask> ref={mergeRefs([ref, _ref])} <mask> > <mask> <CloseIcon {..._icon} /> </s> fix: hover and press issue in close icon button </s> remove accessibilityLabel="Close dialog" ref={mergeRefs([ref, _ref])} </s> add {...resolvedProps} </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); const { _icon, ...resolvedProps } = usePropsResolution( 'ModalCloseButton', props, { isHovered } ); </s> add const { hoverProps, isHovered } = useHover(); const { pressableProps, isPressed } = useIsPressed(); const { focusProps, isFocused } = useFocus(); const { isFocusVisible, focusProps: focusRingProps }: any = useFocusRing(); const { _icon, onPressIn, onPressOut, onHoverIn, onHoverOut, onFocus, onBlur, ...resolvedProps } = usePropsResolution('ModalCloseButton', props, { isHovered, isPressed, isFocused, isFocusVisible, }); </s> remove import Button from '../../primitives/Button/Button'; </s> add import { Pressable } from '../../primitives/Pressable'; </s> remove import { useHover } from '@react-native-aria/interactions'; import { mergeRefs } from '../../../utils'; </s> add import { useHover, useFocus, useIsPressed, } from '../../primitives/Pressable/Pressable'; import { composeEventHandlers } from '../../../utils'; import { useFocusRing } from '@react-native-aria/focus'; </s> remove </Button> </s> add </Pressable>
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/03bce4e64b42d9322740b26eca3308bc94e11638
src/components/composites/Modal/ModalCloseButton.tsx
{...resolvedProps}
<mask> <Button <mask> variant="ghost" <mask> {...resolvedProps} <mask> onPress={handleClose} <mask> accessibilityLabel="Close dialog" <mask> ref={mergeRefs([ref, _ref])} <mask> > <mask> <CloseIcon {..._icon} /> <mask> </Button> <mask> ); <mask> }; </s> fix: hover and press issue in close icon button </s> remove <Button variant="ghost" {...resolvedProps} </s> add <Pressable accessibilityRole="button" ref={ref} onPressIn={composeEventHandlers(onPressIn, pressableProps.onPressIn)} onPressOut={composeEventHandlers(onPressOut, pressableProps.onPressOut)} // @ts-ignore - web only onHoverIn={composeEventHandlers(onHoverIn, hoverProps.onHoverIn)} // @ts-ignore - web only onHoverOut={composeEventHandlers(onHoverOut, hoverProps.onHoverOut)} // @ts-ignore - web only onFocus={composeEventHandlers( composeEventHandlers(onFocus, focusProps.onFocus), focusRingProps.onFocus )} // @ts-ignore - web only onBlur={composeEventHandlers( composeEventHandlers(onBlur, focusProps.onBlur), focusRingProps.onBlur )} </s> remove </Button> </s> add </Pressable> </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); const { _icon, ...resolvedProps } = usePropsResolution( 'ModalCloseButton', props, { isHovered } ); </s> add const { hoverProps, isHovered } = useHover(); const { pressableProps, isPressed } = useIsPressed(); const { focusProps, isFocused } = useFocus(); const { isFocusVisible, focusProps: focusRingProps }: any = useFocusRing(); const { _icon, onPressIn, onPressOut, onHoverIn, onHoverOut, onFocus, onBlur, ...resolvedProps } = usePropsResolution('ModalCloseButton', props, { isHovered, isPressed, isFocused, isFocusVisible, }); </s> remove import { useHover } from '@react-native-aria/interactions'; import { mergeRefs } from '../../../utils'; </s> add import { useHover, useFocus, useIsPressed, } from '../../primitives/Pressable/Pressable'; import { composeEventHandlers } from '../../../utils'; import { useFocusRing } from '@react-native-aria/focus'; </s> remove import Button from '../../primitives/Button/Button'; </s> add import { Pressable } from '../../primitives/Pressable';
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/03bce4e64b42d9322740b26eca3308bc94e11638
src/components/composites/Modal/ModalCloseButton.tsx
</Pressable>
<mask> accessibilityLabel="Close dialog" <mask> ref={mergeRefs([ref, _ref])} <mask> > <mask> <CloseIcon {..._icon} /> <mask> </Button> <mask> ); <mask> }; <mask> <mask> export default memo(forwardRef(ModalCloseButton)); </s> fix: hover and press issue in close icon button </s> remove accessibilityLabel="Close dialog" ref={mergeRefs([ref, _ref])} </s> add {...resolvedProps} </s> remove <Button variant="ghost" {...resolvedProps} </s> add <Pressable accessibilityRole="button" ref={ref} onPressIn={composeEventHandlers(onPressIn, pressableProps.onPressIn)} onPressOut={composeEventHandlers(onPressOut, pressableProps.onPressOut)} // @ts-ignore - web only onHoverIn={composeEventHandlers(onHoverIn, hoverProps.onHoverIn)} // @ts-ignore - web only onHoverOut={composeEventHandlers(onHoverOut, hoverProps.onHoverOut)} // @ts-ignore - web only onFocus={composeEventHandlers( composeEventHandlers(onFocus, focusProps.onFocus), focusRingProps.onFocus )} // @ts-ignore - web only onBlur={composeEventHandlers( composeEventHandlers(onBlur, focusProps.onBlur), focusRingProps.onBlur )} </s> remove const _ref = React.useRef(null); const { isHovered } = useHover({}, _ref); const { _icon, ...resolvedProps } = usePropsResolution( 'ModalCloseButton', props, { isHovered } ); </s> add const { hoverProps, isHovered } = useHover(); const { pressableProps, isPressed } = useIsPressed(); const { focusProps, isFocused } = useFocus(); const { isFocusVisible, focusProps: focusRingProps }: any = useFocusRing(); const { _icon, onPressIn, onPressOut, onHoverIn, onHoverOut, onFocus, onBlur, ...resolvedProps } = usePropsResolution('ModalCloseButton', props, { isHovered, isPressed, isFocused, isFocusVisible, }); </s> remove import { useHover } from '@react-native-aria/interactions'; import { mergeRefs } from '../../../utils'; </s> add import { useHover, useFocus, useIsPressed, } from '../../primitives/Pressable/Pressable'; import { composeEventHandlers } from '../../../utils'; import { useFocusRing } from '@react-native-aria/focus'; </s> remove import Button from '../../primitives/Button/Button'; </s> add import { Pressable } from '../../primitives/Pressable';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/03bce4e64b42d9322740b26eca3308bc94e11638
src/components/composites/Modal/ModalCloseButton.tsx
"node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/checkbox|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils|@react-native-aria/*))"
<mask> "<rootDir>/example/node_modules", <mask> "<rootDir>/lib/" <mask> ], <mask> "transformIgnorePatterns": [ <mask> "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/checkbox|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils|@react-native-aria/*)" <mask> ], <mask> "setupFiles": [ <mask> "<rootDir>/src/jest/mock.ts" <mask> ] <mask> }, </s> feat: add rem support on web </s> remove <ThemeProvider theme={theme}> </s> add <ThemeProvider theme={newTheme}>
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/03ebe1d9d1c17d5f54a22b4713dd57799d7c4e19
package.json
import { platformSpecificSpaceUnits } from '../theme/tools/utils';
<mask> NativeBaseConfigProvider, <mask> } from './NativeBaseContext'; <mask> import { Platform } from 'react-native'; <mask> <mask> // For SSR to work, we need to pass initial insets as 0 values on web. <mask> <mask> // https://github.com/th3rdwave/react-native-safe-area-context/issues/132 </s> feat: add rem support on web </s> remove <ThemeProvider theme={theme}> </s> add <ThemeProvider theme={newTheme}> </s> remove "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/checkbox|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils|@react-native-aria/*)" </s> add "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/checkbox|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils|@react-native-aria/*))"
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/03ebe1d9d1c17d5f54a22b4713dd57799d7c4e19
src/core/NativeBaseProvider.tsx
const newTheme = React.useMemo(() => platformSpecificSpaceUnits(theme), [ theme, ]);
<mask> initialWindowMetrics, <mask> } = props; <mask> const theme = config.theme ?? propsTheme; <mask> <mask> return ( <mask> <ThemeProvider theme={newTheme}> <mask> <NativeBaseConfigProvider config={config}> <mask> <SafeAreaProvider <mask> initialMetrics={ <mask> initialWindowMetrics ?? defaultInitialWindowMetricsBasedOnPlatform </s> feat: add rem support on web </s> remove <ThemeProvider theme={theme}> </s> add <ThemeProvider theme={newTheme}> </s> remove "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/checkbox|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils|@react-native-aria/*)" </s> add "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/checkbox|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils|@react-native-aria/*))"
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/03ebe1d9d1c17d5f54a22b4713dd57799d7c4e19
src/core/NativeBaseProvider.tsx
<ThemeProvider theme={newTheme}>
<mask> } = props; <mask> const theme = config.theme ?? propsTheme; <mask> <mask> return ( <mask> <ThemeProvider theme={theme}> <mask> <NativeBaseConfigProvider config={config}> <mask> <SafeAreaProvider <mask> initialMetrics={ <mask> initialWindowMetrics ?? defaultInitialWindowMetricsBasedOnPlatform <mask> } </s> feat: add rem support on web </s> remove "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/checkbox|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils|@react-native-aria/*)" </s> add "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/checkbox|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils|@react-native-aria/*))"
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/03ebe1d9d1c17d5f54a22b4713dd57799d7c4e19
src/core/NativeBaseProvider.tsx
import get from 'lodash.get'; import type { ITheme } from '../base'; import { Platform } from 'react-native';
<mask> import pick from 'lodash.pick'; <mask> import omit from 'lodash.omit'; <mask> <mask> export const stylingProps = { <mask> margin: [ <mask> 'margin', </s> feat: add rem support on web </s> remove <ThemeProvider theme={theme}> </s> add <ThemeProvider theme={newTheme}> </s> remove "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/checkbox|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils|@react-native-aria/*)" </s> add "node_modules/(?!(react-native|styled-components|expo-asset|expo-constants|@unimodules|react-native-unimodules|expo-font|react-native-svg|@expo/vector-icons|styled-system|react-native-vector-icons|@react-native-aria/checkbox|@react-native-aria/interactions|@react-native-aria/button|@react-native-aria/switch|@react-native-aria/toggle|@react-native-aria/utils|@react-native-aria/*))"
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/03ebe1d9d1c17d5f54a22b4713dd57799d7c4e19
src/theme/tools/utils.ts
import { View } from 'react-native';
<mask> import React from 'react'; <mask> import { storiesOf } from '@storybook/react-native'; <mask> import { withKnobs } from '@storybook/addon-knobs'; <mask> import Flexible from './Flexible'; <mask> import Fixed from './Fixed'; </s> feat: added use cases for safeareaview props </s> remove import Basic from './Basic'; import { View } from 'react-native'; </s> add import Flexible from './Flexible'; import Fixed from './Fixed'; import Hook from './Hook'; </s> remove propKeys: any, </s> add paddingKeys: any, </s> remove if (!insets.top && (!manualInset || typeof manualInset === 'boolean')) { </s> add if (!insets.top && (typeof manualInset === 'boolean' || !manualInset)) {
[ "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/049112371ab48df8c788e913752da3ead1c61265
example/storybook/stories/hooks/useSafeArea/index.tsx
import Flexible from './Flexible'; import Fixed from './Fixed'; import Hook from './Hook';
<mask> import React from 'react'; <mask> import { storiesOf } from '@storybook/react-native'; <mask> import { withKnobs } from '@storybook/addon-knobs'; <mask> import Basic from './Basic'; <mask> import { View } from 'react-native'; <mask> <mask> storiesOf('useSafeArea', module) <mask> .addDecorator(withKnobs) <mask> .addDecorator((getStory: any) => <View>{getStory()}</View>) <mask> .add('Basic', () => <Basic />); </s> feat: added use cases for safeareaview props </s> remove .add('Basic', () => <Basic />); </s> add .add('Flexible', () => <Flexible />) .add('Fixed', () => <Fixed />) .add('Hook', () => <Hook />); </s> remove const safeProps = useSafeArea(viewProps); return <StyledView {...safeProps} ref={ref} />; </s> add const safeAreaProps = useSafeArea(viewProps); return <StyledView {...safeAreaProps} ref={ref} />; </s> remove propKeys: any, </s> add paddingKeys: any,
[ "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/049112371ab48df8c788e913752da3ead1c61265
example/storybook/stories/hooks/useSafeArea/index.tsx
.add('Flexible', () => <Flexible />) .add('Fixed', () => <Fixed />) .add('Hook', () => <Hook />);
<mask> <mask> storiesOf('useSafeArea', module) <mask> .addDecorator(withKnobs) <mask> .addDecorator((getStory: any) => <View>{getStory()}</View>) <mask> .add('Basic', () => <Basic />); </s> feat: added use cases for safeareaview props </s> remove import Basic from './Basic'; import { View } from 'react-native'; </s> add import Flexible from './Flexible'; import Fixed from './Fixed'; import Hook from './Hook'; </s> remove const safeProps = useSafeArea(viewProps); return <StyledView {...safeProps} ref={ref} />; </s> add const safeAreaProps = useSafeArea(viewProps); return <StyledView {...safeAreaProps} ref={ref} />; </s> remove if (!insets.top && (!manualInset || typeof manualInset === 'boolean')) { </s> add if (!insets.top && (typeof manualInset === 'boolean' || !manualInset)) {
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/049112371ab48df8c788e913752da3ead1c61265
example/storybook/stories/hooks/useSafeArea/index.tsx
const safeAreaProps = useSafeArea(viewProps); return <StyledView {...safeAreaProps} ref={ref} />;
<mask> ); <mask> <mask> const View = (props: IViewProps, ref: any) => { <mask> const viewProps = useThemeProps('View', props); <mask> const safeProps = useSafeArea(viewProps); <mask> return <StyledView {...safeProps} ref={ref} />; <mask> }; <mask> export default React.memo(React.forwardRef(View)); <mask> export type { IViewProps }; </s> feat: added use cases for safeareaview props </s> remove if (!insets.top && (!manualInset || typeof manualInset === 'boolean')) { </s> add if (!insets.top && (typeof manualInset === 'boolean' || !manualInset)) { </s> remove import Basic from './Basic'; import { View } from 'react-native'; </s> add import Flexible from './Flexible'; import Fixed from './Fixed'; import Hook from './Hook'; </s> remove let originalValue = propKeys.length ? sizes[paddingProps[propKeys[propKeys.length - 1]]] </s> add let originalValue = paddingKeys.length ? sizes[paddingProps[paddingKeys[paddingKeys.length - 1]]]
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/049112371ab48df8c788e913752da3ead1c61265
src/components/primitives/View/index.tsx
paddingKeys: any,
<mask> }); <mask> } <mask> function getValueInPixels( <mask> paddingProps: any, <mask> propKeys: any, <mask> sizes: any, <mask> inset: any, <mask> manualInset: number | string <mask> ) { <mask> let appliedInset: any = 0; </s> feat: added use cases for safeareaview props </s> remove let originalValue = propKeys.length ? sizes[paddingProps[propKeys[propKeys.length - 1]]] </s> add let originalValue = paddingKeys.length ? sizes[paddingProps[paddingKeys[paddingKeys.length - 1]]] </s> remove if (!insets.top && (!manualInset || typeof manualInset === 'boolean')) { </s> add if (!insets.top && (typeof manualInset === 'boolean' || !manualInset)) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/049112371ab48df8c788e913752da3ead1c61265
src/hooks/useSafeArea/utils.ts
let originalValue = paddingKeys.length ? sizes[paddingProps[paddingKeys[paddingKeys.length - 1]]]
<mask> inset: any, <mask> manualInset: number | string <mask> ) { <mask> let appliedInset: any = 0; <mask> let originalValue = propKeys.length <mask> ? sizes[paddingProps[propKeys[propKeys.length - 1]]] <mask> : 0; <mask> <mask> if (!isNil(manualInset) && typeof manualInset !== 'boolean') { <mask> appliedInset = <mask> typeof manualInset === 'string' && manualInset.includes('px') </s> feat: added use cases for safeareaview props </s> remove propKeys: any, </s> add paddingKeys: any, </s> remove if (!insets.top && (!manualInset || typeof manualInset === 'boolean')) { </s> add if (!insets.top && (typeof manualInset === 'boolean' || !manualInset)) {
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/049112371ab48df8c788e913752da3ead1c61265
src/hooks/useSafeArea/utils.ts
// DOC: Handles case of manually passed inset
<mask> : 0; <mask> <mask> if (!isNil(manualInset) && typeof manualInset !== 'boolean') { <mask> appliedInset = <mask> typeof manualInset === 'string' && manualInset.includes('px') <mask> ? parseInt(manualInset, 10) <mask> : sizes[manualInset]; <mask> } else { <mask> // DOC: Handles case of auto inset </s> feat: added use cases for safeareaview props </s> remove let originalValue = propKeys.length ? sizes[paddingProps[propKeys[propKeys.length - 1]]] </s> add let originalValue = paddingKeys.length ? sizes[paddingProps[paddingKeys[paddingKeys.length - 1]]] </s> remove if (!insets.top && (!manualInset || typeof manualInset === 'boolean')) { </s> add if (!insets.top && (typeof manualInset === 'boolean' || !manualInset)) { </s> remove propKeys: any, </s> add paddingKeys: any,
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/049112371ab48df8c788e913752da3ead1c61265
src/hooks/useSafeArea/utils.ts
// DOC: Handles case of auto inset
<mask> : sizes[manualInset]; <mask> } else { <mask> appliedInset = inset; <mask> } <mask> return originalValue <mask> ? parseInt(originalValue, 10) + parseInt(appliedInset, 10) + 'px' <mask> : parseInt(appliedInset, 10) + 'px'; </s> feat: added use cases for safeareaview props </s> remove let originalValue = propKeys.length ? sizes[paddingProps[propKeys[propKeys.length - 1]]] </s> add let originalValue = paddingKeys.length ? sizes[paddingProps[paddingKeys[paddingKeys.length - 1]]] </s> remove const safeProps = useSafeArea(viewProps); return <StyledView {...safeProps} ref={ref} />; </s> add const safeAreaProps = useSafeArea(viewProps); return <StyledView {...safeAreaProps} ref={ref} />; </s> remove if (!insets.top && (!manualInset || typeof manualInset === 'boolean')) { </s> add if (!insets.top && (typeof manualInset === 'boolean' || !manualInset)) {
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/049112371ab48df8c788e913752da3ead1c61265
src/hooks/useSafeArea/utils.ts
if (!insets.top && (typeof manualInset === 'boolean' || !manualInset)) {
<mask> let topSafeAreaArray = Object.keys(topSafeAreaProps); <mask> const manualInset = topSafeAreaArray.length <mask> ? topSafeAreaProps[topSafeAreaArray[topSafeAreaArray.length - 1]] <mask> : undefined; <mask> if (!insets.top && (!manualInset || typeof manualInset === 'boolean')) { <mask> return; <mask> } <mask> const propKeys = getRelatedPaddingProps(paddingProps, [ <mask> 'p', <mask> 'padding', </s> feat: added use cases for safeareaview props </s> remove let originalValue = propKeys.length ? sizes[paddingProps[propKeys[propKeys.length - 1]]] </s> add let originalValue = paddingKeys.length ? sizes[paddingProps[paddingKeys[paddingKeys.length - 1]]] </s> remove const safeProps = useSafeArea(viewProps); return <StyledView {...safeProps} ref={ref} />; </s> add const safeAreaProps = useSafeArea(viewProps); return <StyledView {...safeAreaProps} ref={ref} />; </s> remove propKeys: any, </s> add paddingKeys: any,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/049112371ab48df8c788e913752da3ead1c61265
src/hooks/useSafeArea/utils.ts
// DOC: Since last value takes precedence so, directly takes last value
<mask> 'safeAreaX', <mask> ]); <mask> let leftSafeAreaArray = Object.keys(leftSafeAreaProps); <mask> const manualInset = leftSafeAreaArray.length <mask> ? leftSafeAreaProps[leftSafeAreaArray[leftSafeAreaArray.length - 1]] <mask> : undefined; <mask> if (!insets.left && (!manualInset || typeof manualInset === 'boolean')) { <mask> return; </s> feat: added use cases for safeareaview props </s> remove if (!insets.top && (!manualInset || typeof manualInset === 'boolean')) { </s> add if (!insets.top && (typeof manualInset === 'boolean' || !manualInset)) { </s> remove let originalValue = propKeys.length ? sizes[paddingProps[propKeys[propKeys.length - 1]]] </s> add let originalValue = paddingKeys.length ? sizes[paddingProps[paddingKeys[paddingKeys.length - 1]]] </s> remove const safeProps = useSafeArea(viewProps); return <StyledView {...safeProps} ref={ref} />; </s> add const safeAreaProps = useSafeArea(viewProps); return <StyledView {...safeAreaProps} ref={ref} />; </s> remove propKeys: any, </s> add paddingKeys: any,
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/049112371ab48df8c788e913752da3ead1c61265
src/hooks/useSafeArea/utils.ts
// import React from 'react'; // import { Spinner } from 'native-base';
<mask> import React from 'react'; <mask> import { Spinner } from 'native-base'; <mask> <mask> export default function () { <mask> return ( <mask> <Spinner color="danger.400" variant="dotted" size="lg" duration={1000} /> <mask> ); </s> fix: remove variants from spinner and related props </s> remove export default function () { return ( <Spinner color="danger.400" variant="dotted" size="lg" duration={1000} /> ); } </s> add // export default function () { // // return <Spinner color="danger.400" size="lg" duration={1000} />; // } </s> remove export default function () { return ( <HStack space={2}> <Spinner /> <Spinner color="danger.400" variant="dotted" /> <Spinner color="blue.500" variant="stroked" /> <Spinner color="gray.900" variant="multiColorDotted" /> <Spinner color="yellow.500" variant="squareDotted" /> <Spinner variant="custom" renderProp={<Icon name="bat" type="MaterialCommunityIcons" size={12} />} /> </HStack> ); } </s> add // export default function () { // return ( // <HStack space={2}> // <Spinner /> // {/* <Spinner color="danger.400" variant="dotted" /> // <Spinner color="blue.500" variant="stroked" /> // <Spinner color="gray.900" variant="multiColorDotted" /> // <Spinner color="yellow.500" variant="squareDotted" /> // <Spinner // variant="custom" // renderProp={<Icon name="bat" type="MaterialCommunityIcons" size={12} />} // /> */} // </HStack> // ); // } </s> remove import React from 'react'; import { Spinner, HStack, Icon } from 'native-base'; </s> add // import React from 'react'; // import { Spinner, HStack, Icon } from 'native-base'; </s> remove import { ActivityIndicator, Animated, Easing, StyleSheet } from 'react-native'; </s> add import { ActivityIndicator } from 'react-native'; </s> remove import { color, space, position, border } from 'styled-system'; </s> add import { color, space, position } from 'styled-system';
[ "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
example/storybook/stories/components/primitives/Spinner/duration.tsx
// export default function () { // // return <Spinner color="danger.400" size="lg" duration={1000} />; // }
<mask> import React from 'react'; <mask> import { Spinner } from 'native-base'; <mask> <mask> export default function () { <mask> return ( <mask> <Spinner color="danger.400" variant="dotted" size="lg" duration={1000} /> <mask> ); <mask> } </s> fix: remove variants from spinner and related props </s> remove import React from 'react'; import { Spinner } from 'native-base'; </s> add // import React from 'react'; // import { Spinner } from 'native-base'; </s> remove export default function () { return ( <HStack space={2}> <Spinner /> <Spinner color="danger.400" variant="dotted" /> <Spinner color="blue.500" variant="stroked" /> <Spinner color="gray.900" variant="multiColorDotted" /> <Spinner color="yellow.500" variant="squareDotted" /> <Spinner variant="custom" renderProp={<Icon name="bat" type="MaterialCommunityIcons" size={12} />} /> </HStack> ); } </s> add // export default function () { // return ( // <HStack space={2}> // <Spinner /> // {/* <Spinner color="danger.400" variant="dotted" /> // <Spinner color="blue.500" variant="stroked" /> // <Spinner color="gray.900" variant="multiColorDotted" /> // <Spinner color="yellow.500" variant="squareDotted" /> // <Spinner // variant="custom" // renderProp={<Icon name="bat" type="MaterialCommunityIcons" size={12} />} // /> */} // </HStack> // ); // } </s> remove import React from 'react'; import { Spinner, HStack, Icon } from 'native-base'; </s> add // import React from 'react'; // import { Spinner, HStack, Icon } from 'native-base'; </s> remove import { ActivityIndicator, Animated, Easing, StyleSheet } from 'react-native'; </s> add import { ActivityIndicator } from 'react-native'; </s> remove import { color, space, position, border } from 'styled-system'; </s> add import { color, space, position } from 'styled-system';
[ "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
example/storybook/stories/components/primitives/Spinner/duration.tsx
// import Variant from './variant'; // import Duration from './duration';
<mask> import Usage from './usage'; <mask> import Color from './color'; <mask> import Size from './size'; <mask> import Playground from './withKnob'; <mask> import Variant from './variant'; <mask> import Duration from './duration'; <mask> <mask> storiesOf('Spinner', module) <mask> .addDecorator(withKnobs) <mask> .addDecorator((getStory: any) => <Wrapper>{getStory()}</Wrapper>) <mask> .add('Playground', () => <Playground />) </s> fix: remove variants from spinner and related props </s> remove .add('Size', () => <Size />) .add('Variant', () => <Variant />) .add('Duration', () => <Duration />); </s> add .add('Size', () => <Size />); // .add('Variant', () => <Variant />); // .add('Duration', () => <Duration />); </s> remove import React from 'react'; import { Spinner } from 'native-base'; </s> add // import React from 'react'; // import { Spinner } from 'native-base'; </s> remove import React from 'react'; import { Spinner, HStack, Icon } from 'native-base'; </s> add // import React from 'react'; // import { Spinner, HStack, Icon } from 'native-base'; </s> remove import { color, space, position, border } from 'styled-system'; </s> add import { color, space, position } from 'styled-system'; </s> remove import { ActivityIndicator, Animated, Easing, StyleSheet } from 'react-native'; </s> add import { ActivityIndicator } from 'react-native';
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
example/storybook/stories/components/primitives/Spinner/index.tsx
.add('Size', () => <Size />); // .add('Variant', () => <Variant />); // .add('Duration', () => <Duration />);
<mask> .addDecorator((getStory: any) => <Wrapper>{getStory()}</Wrapper>) <mask> .add('Playground', () => <Playground />) <mask> .add('Usage', () => <Usage />) <mask> .add('Color', () => <Color />) <mask> .add('Size', () => <Size />) <mask> .add('Variant', () => <Variant />) <mask> .add('Duration', () => <Duration />); </s> fix: remove variants from spinner and related props </s> remove import Variant from './variant'; import Duration from './duration'; </s> add // import Variant from './variant'; // import Duration from './duration'; </s> remove const Spinner: any = ({ renderProp, ...props }: ISpinnerProps, ref: any) => { </s> add const Spinner: any = ({ ...props }: ISpinnerProps, ref: any) => { </s> remove const iconSize: any = { sm: 10, lg: 20 }; </s> add // const iconSize: any = { sm: 10, lg: 20 }; </s> remove export default function () { return ( <Spinner color="danger.400" variant="dotted" size="lg" duration={1000} /> ); } </s> add // export default function () { // // return <Spinner color="danger.400" size="lg" duration={1000} />; // } </s> remove import React from 'react'; import { Spinner } from 'native-base'; </s> add // import React from 'react'; // import { Spinner } from 'native-base';
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
example/storybook/stories/components/primitives/Spinner/index.tsx
// import React from 'react'; // import { Spinner, HStack, Icon } from 'native-base';
<mask> import React from 'react'; <mask> import { Spinner, HStack, Icon } from 'native-base'; <mask> <mask> export default function () { <mask> return ( <mask> <HStack space={2}> <mask> <Spinner /> </s> fix: remove variants from spinner and related props </s> remove export default function () { return ( <HStack space={2}> <Spinner /> <Spinner color="danger.400" variant="dotted" /> <Spinner color="blue.500" variant="stroked" /> <Spinner color="gray.900" variant="multiColorDotted" /> <Spinner color="yellow.500" variant="squareDotted" /> <Spinner variant="custom" renderProp={<Icon name="bat" type="MaterialCommunityIcons" size={12} />} /> </HStack> ); } </s> add // export default function () { // return ( // <HStack space={2}> // <Spinner /> // {/* <Spinner color="danger.400" variant="dotted" /> // <Spinner color="blue.500" variant="stroked" /> // <Spinner color="gray.900" variant="multiColorDotted" /> // <Spinner color="yellow.500" variant="squareDotted" /> // <Spinner // variant="custom" // renderProp={<Icon name="bat" type="MaterialCommunityIcons" size={12} />} // /> */} // </HStack> // ); // } </s> remove export default function () { return ( <Spinner color="danger.400" variant="dotted" size="lg" duration={1000} /> ); } </s> add // export default function () { // // return <Spinner color="danger.400" size="lg" duration={1000} />; // } </s> remove import React from 'react'; import { Spinner } from 'native-base'; </s> add // import React from 'react'; // import { Spinner } from 'native-base'; </s> remove import { ActivityIndicator, Animated, Easing, StyleSheet } from 'react-native'; </s> add import { ActivityIndicator } from 'react-native'; </s> remove import { color, space, position, border } from 'styled-system'; </s> add import { color, space, position } from 'styled-system';
[ "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
example/storybook/stories/components/primitives/Spinner/variant.tsx
// export default function () { // return ( // <HStack space={2}> // <Spinner /> // {/* <Spinner color="danger.400" variant="dotted" /> // <Spinner color="blue.500" variant="stroked" /> // <Spinner color="gray.900" variant="multiColorDotted" /> // <Spinner color="yellow.500" variant="squareDotted" /> // <Spinner // variant="custom" // renderProp={<Icon name="bat" type="MaterialCommunityIcons" size={12} />} // /> */} // </HStack> // ); // }
<mask> import React from 'react'; <mask> import { Spinner, HStack, Icon } from 'native-base'; <mask> <mask> export default function () { <mask> return ( <mask> <HStack space={2}> <mask> <Spinner /> <mask> <Spinner color="danger.400" variant="dotted" /> <mask> <Spinner color="blue.500" variant="stroked" /> <mask> <Spinner color="gray.900" variant="multiColorDotted" /> <mask> <Spinner color="yellow.500" variant="squareDotted" /> <mask> <Spinner <mask> variant="custom" <mask> renderProp={<Icon name="bat" type="MaterialCommunityIcons" size={12} />} <mask> /> <mask> </HStack> <mask> ); <mask> } </s> fix: remove variants from spinner and related props </s> remove import React from 'react'; import { Spinner, HStack, Icon } from 'native-base'; </s> add // import React from 'react'; // import { Spinner, HStack, Icon } from 'native-base'; </s> remove export default function () { return ( <Spinner color="danger.400" variant="dotted" size="lg" duration={1000} /> ); } </s> add // export default function () { // // return <Spinner color="danger.400" size="lg" duration={1000} />; // } </s> remove import React from 'react'; import { Spinner } from 'native-base'; </s> add // import React from 'react'; // import { Spinner } from 'native-base'; </s> remove color={color('color', 'blue')} </s> add color={color('color', 'green.400')} </s> remove const styles = StyleSheet.create({ animateStyle: { transform: [ { rotateZ: degree.interpolate({ inputRange: [0, 1], outputRange: ['0deg', '360deg'], }), }, ], }, }); if (!newProps.variant) { return ( <StyledSpinner {...spinnerProps} {...newProps} color={spinnerColor} ref={ref} /> ); } else { if (newProps.variant === 'custom' && renderProp) { return ( <StyleAnimatedView style={styles.animateStyle}> {renderProp} </StyleAnimatedView> ); } else { let SpinnerVariant = null; switch (newProps.variant) { case 'dotted': SpinnerVariant = ( <Dotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'multiColorDotted': SpinnerVariant = ( <MultiColorDotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'stroked': SpinnerVariant = ( <Stroked color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'squareDotted': SpinnerVariant = ( <SquareDotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; default: SpinnerVariant = ( <Default color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); } return ( <StyleAnimatedView style={styles.animateStyle}> {SpinnerVariant} </StyleAnimatedView> ); } } </s> add // const styles = StyleSheet.create({ // animateStyle: { // transform: [ // { // rotateZ: degree.interpolate({ // inputRange: [0, 1], // outputRange: ['0deg', '360deg'], // }), // }, // ], // }, // }); // if (!newProps.variant) { return ( <StyledSpinner {...spinnerProps} {...newProps} color={spinnerColor} ref={ref} /> ); // } else { // if (newProps.variant === 'custom' && renderProp) { // return ( // <StyleAnimatedView style={styles.animateStyle}> // {renderProp} // </StyleAnimatedView> // ); // } else { // let SpinnerVariant = null; // switch (newProps.variant) { // case 'dotted': // SpinnerVariant = ( // <Dotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'multiColorDotted': // SpinnerVariant = ( // <MultiColorDotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'stroked': // SpinnerVariant = ( // <Stroked // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'squareDotted': // SpinnerVariant = ( // <SquareDotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // default: // SpinnerVariant = ( // <Default // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // } // return ( // <StyleAnimatedView style={styles.animateStyle}> // {SpinnerVariant} // </StyleAnimatedView> // ); // } // }
[ "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
example/storybook/stories/components/primitives/Spinner/variant.tsx
color={color('color', 'green.400')}
<mask> return ( <mask> <View display="flex" justifyContent="space-between" alignItems="center"> <mask> <Spinner <mask> size={select('size', ['sm', 'lg'], 'lg')} <mask> color={color('color', 'blue')} <mask> /> <mask> </View> <mask> ); <mask> } </s> fix: remove variants from spinner and related props </s> remove export default function () { return ( <HStack space={2}> <Spinner /> <Spinner color="danger.400" variant="dotted" /> <Spinner color="blue.500" variant="stroked" /> <Spinner color="gray.900" variant="multiColorDotted" /> <Spinner color="yellow.500" variant="squareDotted" /> <Spinner variant="custom" renderProp={<Icon name="bat" type="MaterialCommunityIcons" size={12} />} /> </HStack> ); } </s> add // export default function () { // return ( // <HStack space={2}> // <Spinner /> // {/* <Spinner color="danger.400" variant="dotted" /> // <Spinner color="blue.500" variant="stroked" /> // <Spinner color="gray.900" variant="multiColorDotted" /> // <Spinner color="yellow.500" variant="squareDotted" /> // <Spinner // variant="custom" // renderProp={<Icon name="bat" type="MaterialCommunityIcons" size={12} />} // /> */} // </HStack> // ); // } </s> remove export default function () { return ( <Spinner color="danger.400" variant="dotted" size="lg" duration={1000} /> ); } </s> add // export default function () { // // return <Spinner color="danger.400" size="lg" duration={1000} />; // } </s> remove import React from 'react'; import { Spinner } from 'native-base'; </s> add // import React from 'react'; // import { Spinner } from 'native-base'; </s> remove import React from 'react'; import { Spinner, HStack, Icon } from 'native-base'; </s> add // import React from 'react'; // import { Spinner, HStack, Icon } from 'native-base'; </s> remove const styles = StyleSheet.create({ animateStyle: { transform: [ { rotateZ: degree.interpolate({ inputRange: [0, 1], outputRange: ['0deg', '360deg'], }), }, ], }, }); if (!newProps.variant) { return ( <StyledSpinner {...spinnerProps} {...newProps} color={spinnerColor} ref={ref} /> ); } else { if (newProps.variant === 'custom' && renderProp) { return ( <StyleAnimatedView style={styles.animateStyle}> {renderProp} </StyleAnimatedView> ); } else { let SpinnerVariant = null; switch (newProps.variant) { case 'dotted': SpinnerVariant = ( <Dotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'multiColorDotted': SpinnerVariant = ( <MultiColorDotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'stroked': SpinnerVariant = ( <Stroked color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'squareDotted': SpinnerVariant = ( <SquareDotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; default: SpinnerVariant = ( <Default color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); } return ( <StyleAnimatedView style={styles.animateStyle}> {SpinnerVariant} </StyleAnimatedView> ); } } </s> add // const styles = StyleSheet.create({ // animateStyle: { // transform: [ // { // rotateZ: degree.interpolate({ // inputRange: [0, 1], // outputRange: ['0deg', '360deg'], // }), // }, // ], // }, // }); // if (!newProps.variant) { return ( <StyledSpinner {...spinnerProps} {...newProps} color={spinnerColor} ref={ref} /> ); // } else { // if (newProps.variant === 'custom' && renderProp) { // return ( // <StyleAnimatedView style={styles.animateStyle}> // {renderProp} // </StyleAnimatedView> // ); // } else { // let SpinnerVariant = null; // switch (newProps.variant) { // case 'dotted': // SpinnerVariant = ( // <Dotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'multiColorDotted': // SpinnerVariant = ( // <MultiColorDotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'stroked': // SpinnerVariant = ( // <Stroked // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'squareDotted': // SpinnerVariant = ( // <SquareDotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // default: // SpinnerVariant = ( // <Default // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // } // return ( // <StyleAnimatedView style={styles.animateStyle}> // {SpinnerVariant} // </StyleAnimatedView> // ); // } // }
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
example/storybook/stories/components/primitives/Spinner/withKnob.tsx
import { ActivityIndicator } from 'react-native';
<mask> import React from 'react'; <mask> import { ActivityIndicator, Animated, Easing, StyleSheet } from 'react-native'; <mask> import type { ActivityIndicator as ActivityIndicatorType } from 'react-native'; <mask> import styled from 'styled-components/native'; <mask> import { color, space, position, border } from 'styled-system'; <mask> import { useToken, useThemeProps } from '../../../hooks'; <mask> import type { ISpinnerProps } from './types'; </s> fix: remove variants from spinner and related props </s> remove import { color, space, position, border } from 'styled-system'; </s> add import { color, space, position } from 'styled-system'; </s> remove import type { IBoxProps } from '../Box'; import { customLayout, customPosition } from '../../../utils/customProps'; import { Default, Dotted, MultiColorDotted, Stroked, SquareDotted, } from './variants'; </s> add // import type { IBoxProps } from '../Box'; // import { customLayout, customPosition } from '../../../utils/customProps'; // import { // Default, // Dotted, // MultiColorDotted, // Stroked, // SquareDotted, // } from './variants'; </s> remove import React from 'react'; import { Spinner } from 'native-base'; </s> add // import React from 'react'; // import { Spinner } from 'native-base'; </s> remove import React from 'react'; import { Spinner, HStack, Icon } from 'native-base'; </s> add // import React from 'react'; // import { Spinner, HStack, Icon } from 'native-base'; </s> remove export default function () { return ( <Spinner color="danger.400" variant="dotted" size="lg" duration={1000} /> ); } </s> add // export default function () { // // return <Spinner color="danger.400" size="lg" duration={1000} />; // }
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
src/components/primitives/Spinner/index.tsx
import { color, space, position } from 'styled-system';
<mask> import React from 'react'; <mask> import { ActivityIndicator, Animated, Easing, StyleSheet } from 'react-native'; <mask> import type { ActivityIndicator as ActivityIndicatorType } from 'react-native'; <mask> import styled from 'styled-components/native'; <mask> import { color, space, position, border } from 'styled-system'; <mask> import { useToken, useThemeProps } from '../../../hooks'; <mask> import type { ISpinnerProps } from './types'; <mask> import { useSpinner } from './useSpinner'; <mask> import type { IBoxProps } from '../Box'; <mask> import { customLayout, customPosition } from '../../../utils/customProps'; </s> fix: remove variants from spinner and related props </s> remove import { ActivityIndicator, Animated, Easing, StyleSheet } from 'react-native'; </s> add import { ActivityIndicator } from 'react-native'; </s> remove import type { IBoxProps } from '../Box'; import { customLayout, customPosition } from '../../../utils/customProps'; import { Default, Dotted, MultiColorDotted, Stroked, SquareDotted, } from './variants'; </s> add // import type { IBoxProps } from '../Box'; // import { customLayout, customPosition } from '../../../utils/customProps'; // import { // Default, // Dotted, // MultiColorDotted, // Stroked, // SquareDotted, // } from './variants'; </s> remove import React from 'react'; import { Spinner } from 'native-base'; </s> add // import React from 'react'; // import { Spinner } from 'native-base'; </s> remove import React from 'react'; import { Spinner, HStack, Icon } from 'native-base'; </s> add // import React from 'react'; // import { Spinner, HStack, Icon } from 'native-base'; </s> remove export default function () { return ( <Spinner color="danger.400" variant="dotted" size="lg" duration={1000} /> ); } </s> add // export default function () { // // return <Spinner color="danger.400" size="lg" duration={1000} />; // }
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
src/components/primitives/Spinner/index.tsx
// import type { IBoxProps } from '../Box'; // import { customLayout, customPosition } from '../../../utils/customProps'; // import { // Default, // Dotted, // MultiColorDotted, // Stroked, // SquareDotted, // } from './variants';
<mask> import { color, space, position, border } from 'styled-system'; <mask> import { useToken, useThemeProps } from '../../../hooks'; <mask> import type { ISpinnerProps } from './types'; <mask> import { useSpinner } from './useSpinner'; <mask> import type { IBoxProps } from '../Box'; <mask> import { customLayout, customPosition } from '../../../utils/customProps'; <mask> import { <mask> Default, <mask> Dotted, <mask> MultiColorDotted, <mask> Stroked, <mask> SquareDotted, <mask> } from './variants'; <mask> <mask> const StyleAnimatedView = styled(Animated.View)<IBoxProps>( <mask> color, <mask> border, <mask> position, </s> fix: remove variants from spinner and related props </s> remove import { color, space, position, border } from 'styled-system'; </s> add import { color, space, position } from 'styled-system'; </s> remove import { ActivityIndicator, Animated, Easing, StyleSheet } from 'react-native'; </s> add import { ActivityIndicator } from 'react-native'; </s> remove const StyleAnimatedView = styled(Animated.View)<IBoxProps>( color, border, position, customPosition, customLayout ); </s> add // const StyleAnimatedView = styled(Animated.View)<IBoxProps>( // color, // border, // position, // customPosition, // customLayout // ); </s> remove import React from 'react'; import { Spinner } from 'native-base'; </s> add // import React from 'react'; // import { Spinner } from 'native-base'; </s> remove import React from 'react'; import { Spinner, HStack, Icon } from 'native-base'; </s> add // import React from 'react'; // import { Spinner, HStack, Icon } from 'native-base';
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
src/components/primitives/Spinner/index.tsx
// const StyleAnimatedView = styled(Animated.View)<IBoxProps>( // color, // border, // position, // customPosition, // customLayout // );
<mask> Stroked, <mask> SquareDotted, <mask> } from './variants'; <mask> <mask> const StyleAnimatedView = styled(Animated.View)<IBoxProps>( <mask> color, <mask> border, <mask> position, <mask> customPosition, <mask> customLayout <mask> ); <mask> <mask> const StyledSpinner = styled(ActivityIndicator)<ISpinnerProps>( <mask> color, <mask> space, <mask> position </s> fix: remove variants from spinner and related props </s> remove import type { IBoxProps } from '../Box'; import { customLayout, customPosition } from '../../../utils/customProps'; import { Default, Dotted, MultiColorDotted, Stroked, SquareDotted, } from './variants'; </s> add // import type { IBoxProps } from '../Box'; // import { customLayout, customPosition } from '../../../utils/customProps'; // import { // Default, // Dotted, // MultiColorDotted, // Stroked, // SquareDotted, // } from './variants'; </s> remove const Spinner: any = ({ renderProp, ...props }: ISpinnerProps, ref: any) => { </s> add const Spinner: any = ({ ...props }: ISpinnerProps, ref: any) => { </s> remove import { color, space, position, border } from 'styled-system'; </s> add import { color, space, position } from 'styled-system'; </s> remove import { ActivityIndicator, Animated, Easing, StyleSheet } from 'react-native'; </s> add import { ActivityIndicator } from 'react-native'; </s> remove const iconSize: any = { sm: 10, lg: 20 }; </s> add // const iconSize: any = { sm: 10, lg: 20 };
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
src/components/primitives/Spinner/index.tsx
const Spinner: any = ({ ...props }: ISpinnerProps, ref: any) => {
<mask> color, <mask> space, <mask> position <mask> ); <mask> const Spinner: any = ({ renderProp, ...props }: ISpinnerProps, ref: any) => { <mask> const newProps = useThemeProps('Spinner', props); <mask> const spinnerColor = useToken('colors', newProps.color); <mask> const { spinnerProps } = useSpinner(props); <mask> const iconSize: any = { sm: 10, lg: 20 }; <mask> </s> fix: remove variants from spinner and related props </s> remove const iconSize: any = { sm: 10, lg: 20 }; </s> add // const iconSize: any = { sm: 10, lg: 20 }; </s> remove const degree: any = new Animated.Value(0); Animated.loop( Animated.timing(degree, { toValue: 1, duration: newProps.duration ?? 1900, easing: Easing.linear, useNativeDriver: false, }) ).start(); </s> add // const degree: any = new Animated.Value(0); // Animated.loop( // Animated.timing(degree, { // toValue: 1, // duration: newProps.duration ?? 1900, // easing: Easing.linear, // useNativeDriver: false, // }) // ).start(); </s> remove const StyleAnimatedView = styled(Animated.View)<IBoxProps>( color, border, position, customPosition, customLayout ); </s> add // const StyleAnimatedView = styled(Animated.View)<IBoxProps>( // color, // border, // position, // customPosition, // customLayout // ); </s> remove import type { IBoxProps } from '../Box'; import { customLayout, customPosition } from '../../../utils/customProps'; import { Default, Dotted, MultiColorDotted, Stroked, SquareDotted, } from './variants'; </s> add // import type { IBoxProps } from '../Box'; // import { customLayout, customPosition } from '../../../utils/customProps'; // import { // Default, // Dotted, // MultiColorDotted, // Stroked, // SquareDotted, // } from './variants'; </s> remove const styles = StyleSheet.create({ animateStyle: { transform: [ { rotateZ: degree.interpolate({ inputRange: [0, 1], outputRange: ['0deg', '360deg'], }), }, ], }, }); if (!newProps.variant) { return ( <StyledSpinner {...spinnerProps} {...newProps} color={spinnerColor} ref={ref} /> ); } else { if (newProps.variant === 'custom' && renderProp) { return ( <StyleAnimatedView style={styles.animateStyle}> {renderProp} </StyleAnimatedView> ); } else { let SpinnerVariant = null; switch (newProps.variant) { case 'dotted': SpinnerVariant = ( <Dotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'multiColorDotted': SpinnerVariant = ( <MultiColorDotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'stroked': SpinnerVariant = ( <Stroked color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'squareDotted': SpinnerVariant = ( <SquareDotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; default: SpinnerVariant = ( <Default color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); } return ( <StyleAnimatedView style={styles.animateStyle}> {SpinnerVariant} </StyleAnimatedView> ); } } </s> add // const styles = StyleSheet.create({ // animateStyle: { // transform: [ // { // rotateZ: degree.interpolate({ // inputRange: [0, 1], // outputRange: ['0deg', '360deg'], // }), // }, // ], // }, // }); // if (!newProps.variant) { return ( <StyledSpinner {...spinnerProps} {...newProps} color={spinnerColor} ref={ref} /> ); // } else { // if (newProps.variant === 'custom' && renderProp) { // return ( // <StyleAnimatedView style={styles.animateStyle}> // {renderProp} // </StyleAnimatedView> // ); // } else { // let SpinnerVariant = null; // switch (newProps.variant) { // case 'dotted': // SpinnerVariant = ( // <Dotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'multiColorDotted': // SpinnerVariant = ( // <MultiColorDotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'stroked': // SpinnerVariant = ( // <Stroked // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'squareDotted': // SpinnerVariant = ( // <SquareDotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // default: // SpinnerVariant = ( // <Default // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // } // return ( // <StyleAnimatedView style={styles.animateStyle}> // {SpinnerVariant} // </StyleAnimatedView> // ); // } // }
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
src/components/primitives/Spinner/index.tsx
// const iconSize: any = { sm: 10, lg: 20 };
<mask> const Spinner: any = ({ renderProp, ...props }: ISpinnerProps, ref: any) => { <mask> const newProps = useThemeProps('Spinner', props); <mask> const spinnerColor = useToken('colors', newProps.color); <mask> const { spinnerProps } = useSpinner(props); <mask> const iconSize: any = { sm: 10, lg: 20 }; <mask> <mask> const degree: any = new Animated.Value(0); <mask> Animated.loop( <mask> Animated.timing(degree, { <mask> toValue: 1, </s> fix: remove variants from spinner and related props </s> remove const Spinner: any = ({ renderProp, ...props }: ISpinnerProps, ref: any) => { </s> add const Spinner: any = ({ ...props }: ISpinnerProps, ref: any) => { </s> remove const degree: any = new Animated.Value(0); Animated.loop( Animated.timing(degree, { toValue: 1, duration: newProps.duration ?? 1900, easing: Easing.linear, useNativeDriver: false, }) ).start(); </s> add // const degree: any = new Animated.Value(0); // Animated.loop( // Animated.timing(degree, { // toValue: 1, // duration: newProps.duration ?? 1900, // easing: Easing.linear, // useNativeDriver: false, // }) // ).start(); </s> remove const StyleAnimatedView = styled(Animated.View)<IBoxProps>( color, border, position, customPosition, customLayout ); </s> add // const StyleAnimatedView = styled(Animated.View)<IBoxProps>( // color, // border, // position, // customPosition, // customLayout // ); </s> remove const styles = StyleSheet.create({ animateStyle: { transform: [ { rotateZ: degree.interpolate({ inputRange: [0, 1], outputRange: ['0deg', '360deg'], }), }, ], }, }); if (!newProps.variant) { return ( <StyledSpinner {...spinnerProps} {...newProps} color={spinnerColor} ref={ref} /> ); } else { if (newProps.variant === 'custom' && renderProp) { return ( <StyleAnimatedView style={styles.animateStyle}> {renderProp} </StyleAnimatedView> ); } else { let SpinnerVariant = null; switch (newProps.variant) { case 'dotted': SpinnerVariant = ( <Dotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'multiColorDotted': SpinnerVariant = ( <MultiColorDotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'stroked': SpinnerVariant = ( <Stroked color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'squareDotted': SpinnerVariant = ( <SquareDotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; default: SpinnerVariant = ( <Default color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); } return ( <StyleAnimatedView style={styles.animateStyle}> {SpinnerVariant} </StyleAnimatedView> ); } } </s> add // const styles = StyleSheet.create({ // animateStyle: { // transform: [ // { // rotateZ: degree.interpolate({ // inputRange: [0, 1], // outputRange: ['0deg', '360deg'], // }), // }, // ], // }, // }); // if (!newProps.variant) { return ( <StyledSpinner {...spinnerProps} {...newProps} color={spinnerColor} ref={ref} /> ); // } else { // if (newProps.variant === 'custom' && renderProp) { // return ( // <StyleAnimatedView style={styles.animateStyle}> // {renderProp} // </StyleAnimatedView> // ); // } else { // let SpinnerVariant = null; // switch (newProps.variant) { // case 'dotted': // SpinnerVariant = ( // <Dotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'multiColorDotted': // SpinnerVariant = ( // <MultiColorDotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'stroked': // SpinnerVariant = ( // <Stroked // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'squareDotted': // SpinnerVariant = ( // <SquareDotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // default: // SpinnerVariant = ( // <Default // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // } // return ( // <StyleAnimatedView style={styles.animateStyle}> // {SpinnerVariant} // </StyleAnimatedView> // ); // } // } </s> remove import type { IBoxProps } from '../Box'; import { customLayout, customPosition } from '../../../utils/customProps'; import { Default, Dotted, MultiColorDotted, Stroked, SquareDotted, } from './variants'; </s> add // import type { IBoxProps } from '../Box'; // import { customLayout, customPosition } from '../../../utils/customProps'; // import { // Default, // Dotted, // MultiColorDotted, // Stroked, // SquareDotted, // } from './variants';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
src/components/primitives/Spinner/index.tsx
// const degree: any = new Animated.Value(0); // Animated.loop( // Animated.timing(degree, { // toValue: 1, // duration: newProps.duration ?? 1900, // easing: Easing.linear, // useNativeDriver: false, // }) // ).start();
<mask> const spinnerColor = useToken('colors', newProps.color); <mask> const { spinnerProps } = useSpinner(props); <mask> const iconSize: any = { sm: 10, lg: 20 }; <mask> <mask> const degree: any = new Animated.Value(0); <mask> Animated.loop( <mask> Animated.timing(degree, { <mask> toValue: 1, <mask> duration: newProps.duration ?? 1900, <mask> easing: Easing.linear, <mask> useNativeDriver: false, <mask> }) <mask> ).start(); <mask> <mask> const styles = StyleSheet.create({ <mask> animateStyle: { <mask> transform: [ <mask> { </s> fix: remove variants from spinner and related props </s> remove const iconSize: any = { sm: 10, lg: 20 }; </s> add // const iconSize: any = { sm: 10, lg: 20 }; </s> remove const Spinner: any = ({ renderProp, ...props }: ISpinnerProps, ref: any) => { </s> add const Spinner: any = ({ ...props }: ISpinnerProps, ref: any) => { </s> remove const styles = StyleSheet.create({ animateStyle: { transform: [ { rotateZ: degree.interpolate({ inputRange: [0, 1], outputRange: ['0deg', '360deg'], }), }, ], }, }); if (!newProps.variant) { return ( <StyledSpinner {...spinnerProps} {...newProps} color={spinnerColor} ref={ref} /> ); } else { if (newProps.variant === 'custom' && renderProp) { return ( <StyleAnimatedView style={styles.animateStyle}> {renderProp} </StyleAnimatedView> ); } else { let SpinnerVariant = null; switch (newProps.variant) { case 'dotted': SpinnerVariant = ( <Dotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'multiColorDotted': SpinnerVariant = ( <MultiColorDotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'stroked': SpinnerVariant = ( <Stroked color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'squareDotted': SpinnerVariant = ( <SquareDotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; default: SpinnerVariant = ( <Default color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); } return ( <StyleAnimatedView style={styles.animateStyle}> {SpinnerVariant} </StyleAnimatedView> ); } } </s> add // const styles = StyleSheet.create({ // animateStyle: { // transform: [ // { // rotateZ: degree.interpolate({ // inputRange: [0, 1], // outputRange: ['0deg', '360deg'], // }), // }, // ], // }, // }); // if (!newProps.variant) { return ( <StyledSpinner {...spinnerProps} {...newProps} color={spinnerColor} ref={ref} /> ); // } else { // if (newProps.variant === 'custom' && renderProp) { // return ( // <StyleAnimatedView style={styles.animateStyle}> // {renderProp} // </StyleAnimatedView> // ); // } else { // let SpinnerVariant = null; // switch (newProps.variant) { // case 'dotted': // SpinnerVariant = ( // <Dotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'multiColorDotted': // SpinnerVariant = ( // <MultiColorDotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'stroked': // SpinnerVariant = ( // <Stroked // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'squareDotted': // SpinnerVariant = ( // <SquareDotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // default: // SpinnerVariant = ( // <Default // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // } // return ( // <StyleAnimatedView style={styles.animateStyle}> // {SpinnerVariant} // </StyleAnimatedView> // ); // } // } </s> remove import type { IBoxProps } from '../Box'; import { customLayout, customPosition } from '../../../utils/customProps'; import { Default, Dotted, MultiColorDotted, Stroked, SquareDotted, } from './variants'; </s> add // import type { IBoxProps } from '../Box'; // import { customLayout, customPosition } from '../../../utils/customProps'; // import { // Default, // Dotted, // MultiColorDotted, // Stroked, // SquareDotted, // } from './variants'; </s> remove const StyleAnimatedView = styled(Animated.View)<IBoxProps>( color, border, position, customPosition, customLayout ); </s> add // const StyleAnimatedView = styled(Animated.View)<IBoxProps>( // color, // border, // position, // customPosition, // customLayout // );
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
src/components/primitives/Spinner/index.tsx
// const styles = StyleSheet.create({ // animateStyle: { // transform: [ // { // rotateZ: degree.interpolate({ // inputRange: [0, 1], // outputRange: ['0deg', '360deg'], // }), // }, // ], // }, // }); // if (!newProps.variant) { return ( <StyledSpinner {...spinnerProps} {...newProps} color={spinnerColor} ref={ref} /> ); // } else { // if (newProps.variant === 'custom' && renderProp) { // return ( // <StyleAnimatedView style={styles.animateStyle}> // {renderProp} // </StyleAnimatedView> // ); // } else { // let SpinnerVariant = null; // switch (newProps.variant) { // case 'dotted': // SpinnerVariant = ( // <Dotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'multiColorDotted': // SpinnerVariant = ( // <MultiColorDotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'stroked': // SpinnerVariant = ( // <Stroked // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'squareDotted': // SpinnerVariant = ( // <SquareDotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // default: // SpinnerVariant = ( // <Default // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // } // return ( // <StyleAnimatedView style={styles.animateStyle}> // {SpinnerVariant} // </StyleAnimatedView> // ); // } // }
<mask> useNativeDriver: false, <mask> }) <mask> ).start(); <mask> <mask> const styles = StyleSheet.create({ <mask> animateStyle: { <mask> transform: [ <mask> { <mask> rotateZ: degree.interpolate({ <mask> inputRange: [0, 1], <mask> outputRange: ['0deg', '360deg'], <mask> }), <mask> }, <mask> ], <mask> }, <mask> }); <mask> if (!newProps.variant) { <mask> return ( <mask> <StyledSpinner <mask> {...spinnerProps} <mask> {...newProps} <mask> color={spinnerColor} <mask> ref={ref} <mask> /> <mask> ); <mask> } else { <mask> if (newProps.variant === 'custom' && renderProp) { <mask> return ( <mask> <StyleAnimatedView style={styles.animateStyle}> <mask> {renderProp} <mask> </StyleAnimatedView> <mask> ); <mask> } else { <mask> let SpinnerVariant = null; <mask> switch (newProps.variant) { <mask> case 'dotted': <mask> SpinnerVariant = ( <mask> <Dotted <mask> color={spinnerColor} <mask> size={props.size ? iconSize[props.size] : 12} <mask> /> <mask> ); <mask> break; <mask> case 'multiColorDotted': <mask> SpinnerVariant = ( <mask> <MultiColorDotted <mask> color={spinnerColor} <mask> size={props.size ? iconSize[props.size] : 12} <mask> /> <mask> ); <mask> break; <mask> case 'stroked': <mask> SpinnerVariant = ( <mask> <Stroked <mask> color={spinnerColor} <mask> size={props.size ? iconSize[props.size] : 12} <mask> /> <mask> ); <mask> break; <mask> case 'squareDotted': <mask> SpinnerVariant = ( <mask> <SquareDotted <mask> color={spinnerColor} <mask> size={props.size ? iconSize[props.size] : 12} <mask> /> <mask> ); <mask> break; <mask> default: <mask> SpinnerVariant = ( <mask> <Default <mask> color={spinnerColor} <mask> size={props.size ? iconSize[props.size] : 12} <mask> /> <mask> ); <mask> } <mask> return ( <mask> <StyleAnimatedView style={styles.animateStyle}> <mask> {SpinnerVariant} <mask> </StyleAnimatedView> <mask> ); <mask> } <mask> } <mask> }; <mask> <mask> export default React.memo( <mask> React.forwardRef<ActivityIndicatorType, ISpinnerProps>(Spinner) <mask> ); </s> fix: remove variants from spinner and related props </s> remove const degree: any = new Animated.Value(0); Animated.loop( Animated.timing(degree, { toValue: 1, duration: newProps.duration ?? 1900, easing: Easing.linear, useNativeDriver: false, }) ).start(); </s> add // const degree: any = new Animated.Value(0); // Animated.loop( // Animated.timing(degree, { // toValue: 1, // duration: newProps.duration ?? 1900, // easing: Easing.linear, // useNativeDriver: false, // }) // ).start(); </s> remove export default function () { return ( <Spinner color="danger.400" variant="dotted" size="lg" duration={1000} /> ); } </s> add // export default function () { // // return <Spinner color="danger.400" size="lg" duration={1000} />; // } </s> remove export default function () { return ( <HStack space={2}> <Spinner /> <Spinner color="danger.400" variant="dotted" /> <Spinner color="blue.500" variant="stroked" /> <Spinner color="gray.900" variant="multiColorDotted" /> <Spinner color="yellow.500" variant="squareDotted" /> <Spinner variant="custom" renderProp={<Icon name="bat" type="MaterialCommunityIcons" size={12} />} /> </HStack> ); } </s> add // export default function () { // return ( // <HStack space={2}> // <Spinner /> // {/* <Spinner color="danger.400" variant="dotted" /> // <Spinner color="blue.500" variant="stroked" /> // <Spinner color="gray.900" variant="multiColorDotted" /> // <Spinner color="yellow.500" variant="squareDotted" /> // <Spinner // variant="custom" // renderProp={<Icon name="bat" type="MaterialCommunityIcons" size={12} />} // /> */} // </HStack> // ); // } </s> remove import React from 'react'; import { Spinner } from 'native-base'; </s> add // import React from 'react'; // import { Spinner } from 'native-base'; </s> remove import React from 'react'; import { Spinner, HStack, Icon } from 'native-base'; </s> add // import React from 'react'; // import { Spinner, HStack, Icon } from 'native-base';
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "re...
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
src/components/primitives/Spinner/index.tsx
// variant?: // | 'custom' // | 'dotted' // | 'multiColorDotted' // | 'stroked' // | 'squareDotted'; // duration?: number; // renderProp?: JSX.Element | JSX.Element[];
<mask> PositionProps & { <mask> style?: any | undefined; <mask> size?: 'sm' | 'lg' | 'small' | 'large'; <mask> accessibilityLabel?: string; <mask> variant?: <mask> | 'custom' <mask> | 'dotted' <mask> | 'multiColorDotted' <mask> | 'stroked' <mask> | 'squareDotted'; <mask> duration?: number; <mask> renderProp?: JSX.Element | JSX.Element[]; <mask> }; </s> fix: remove variants from spinner and related props </s> remove const iconSize: any = { sm: 10, lg: 20 }; </s> add // const iconSize: any = { sm: 10, lg: 20 }; </s> remove const Spinner: any = ({ renderProp, ...props }: ISpinnerProps, ref: any) => { </s> add const Spinner: any = ({ ...props }: ISpinnerProps, ref: any) => { </s> remove const degree: any = new Animated.Value(0); Animated.loop( Animated.timing(degree, { toValue: 1, duration: newProps.duration ?? 1900, easing: Easing.linear, useNativeDriver: false, }) ).start(); </s> add // const degree: any = new Animated.Value(0); // Animated.loop( // Animated.timing(degree, { // toValue: 1, // duration: newProps.duration ?? 1900, // easing: Easing.linear, // useNativeDriver: false, // }) // ).start(); </s> remove const styles = StyleSheet.create({ animateStyle: { transform: [ { rotateZ: degree.interpolate({ inputRange: [0, 1], outputRange: ['0deg', '360deg'], }), }, ], }, }); if (!newProps.variant) { return ( <StyledSpinner {...spinnerProps} {...newProps} color={spinnerColor} ref={ref} /> ); } else { if (newProps.variant === 'custom' && renderProp) { return ( <StyleAnimatedView style={styles.animateStyle}> {renderProp} </StyleAnimatedView> ); } else { let SpinnerVariant = null; switch (newProps.variant) { case 'dotted': SpinnerVariant = ( <Dotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'multiColorDotted': SpinnerVariant = ( <MultiColorDotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'stroked': SpinnerVariant = ( <Stroked color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; case 'squareDotted': SpinnerVariant = ( <SquareDotted color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); break; default: SpinnerVariant = ( <Default color={spinnerColor} size={props.size ? iconSize[props.size] : 12} /> ); } return ( <StyleAnimatedView style={styles.animateStyle}> {SpinnerVariant} </StyleAnimatedView> ); } } </s> add // const styles = StyleSheet.create({ // animateStyle: { // transform: [ // { // rotateZ: degree.interpolate({ // inputRange: [0, 1], // outputRange: ['0deg', '360deg'], // }), // }, // ], // }, // }); // if (!newProps.variant) { return ( <StyledSpinner {...spinnerProps} {...newProps} color={spinnerColor} ref={ref} /> ); // } else { // if (newProps.variant === 'custom' && renderProp) { // return ( // <StyleAnimatedView style={styles.animateStyle}> // {renderProp} // </StyleAnimatedView> // ); // } else { // let SpinnerVariant = null; // switch (newProps.variant) { // case 'dotted': // SpinnerVariant = ( // <Dotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'multiColorDotted': // SpinnerVariant = ( // <MultiColorDotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'stroked': // SpinnerVariant = ( // <Stroked // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // case 'squareDotted': // SpinnerVariant = ( // <SquareDotted // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // break; // default: // SpinnerVariant = ( // <Default // color={spinnerColor} // size={props.size ? iconSize[props.size] : 12} // /> // ); // } // return ( // <StyleAnimatedView style={styles.animateStyle}> // {SpinnerVariant} // </StyleAnimatedView> // ); // } // } </s> remove import { color, space, position, border } from 'styled-system'; </s> add import { color, space, position } from 'styled-system';
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/05d0486d6b23b5ca660cc332c279783ebcba8ac3
src/components/primitives/Spinner/types.tsx
* If true and the keyboard is opened, the AlertDialog will move up equivalent to the keyboard height.
<mask> * The ref of element to receive focus when the AlertDialog closes. <mask> */ <mask> finalFocusRef?: React.RefObject<any> | any; <mask> /** <mask> * If true and the keyboard is opened, the AlertDialog will move up equvivalent to the keyboard height. <mask> * @default false <mask> */ <mask> avoidKeyboard?: boolean; <mask> /** <mask> * If true, the AlertDialog will close when the overlay is clicked </s> fix: typo in prop description </s> remove * If true and the keyboard is opened, the Toast will move up equvivalent to the keyboard height. </s> add * If true and the keyboard is opened, the Toast will move up equivalent to the keyboard height. </s> remove * If true and the keyboard is opened, the modal will move up equvivalent to the keyboard height. </s> add * If true and the keyboard is opened, the modal will move up equivalent to the keyboard height.
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/05ffb43b3ee91f3a3db6e030d8b9bf922635ca3f
src/components/composites/AlertDialog/types.ts
* If true and the keyboard is opened, the modal will move up equivalent to the keyboard height.
<mask> * The ref of element to receive focus when the modal closes. <mask> */ <mask> finalFocusRef?: React.RefObject<any>; <mask> /** <mask> * If true and the keyboard is opened, the modal will move up equvivalent to the keyboard height. <mask> * @default false <mask> */ <mask> avoidKeyboard?: boolean; <mask> /** <mask> * If true, the modal will close when the overlay is clicked. </s> fix: typo in prop description </s> remove * If true and the keyboard is opened, the Toast will move up equvivalent to the keyboard height. </s> add * If true and the keyboard is opened, the Toast will move up equivalent to the keyboard height. </s> remove * If true and the keyboard is opened, the AlertDialog will move up equvivalent to the keyboard height. </s> add * If true and the keyboard is opened, the AlertDialog will move up equivalent to the keyboard height.
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/05ffb43b3ee91f3a3db6e030d8b9bf922635ca3f
src/components/composites/Modal/types.ts
* If true and the keyboard is opened, the Toast will move up equivalent to the keyboard height.
<mask> * Determines the [accessibility announcement tone](https://reactnative.dev/docs/accessibility#accessibilityliveregion-android). <mask> */ <mask> accessibilityLiveRegion?: 'none' | 'polite' | 'assertive'; <mask> /** <mask> * If true and the keyboard is opened, the Toast will move up equvivalent to the keyboard height. <mask> * @default false <mask> */ <mask> avoidKeyboard?: boolean; <mask> } <mask> </s> fix: typo in prop description </s> remove * If true and the keyboard is opened, the modal will move up equvivalent to the keyboard height. </s> add * If true and the keyboard is opened, the modal will move up equivalent to the keyboard height. </s> remove * If true and the keyboard is opened, the AlertDialog will move up equvivalent to the keyboard height. </s> add * If true and the keyboard is opened, the AlertDialog will move up equivalent to the keyboard height.
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/05ffb43b3ee91f3a3db6e030d8b9bf922635ca3f
src/components/composites/Toast/types.ts
<Fab icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} />
<mask> import React from 'react'; <mask> <mask> export default function () { <mask> return ( <mask> <Fab <mask> bg="#6200ee" <mask> icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} <mask> /> <mask> ); <mask> } </s> fix: slider and fab matched </s> remove icon={<Icon name="plus" color="white" type="AntDesign" />} </s> add icon={<Icon name="plus" color="white" type="AntDesign" size={4} />} </s> remove Click </s> add BUTTON </s> remove <Box ml={offset?.x} mt={offset?.y} {...newProps}> <Text {..._title}>{title}</Text> </Box> </s> add <View safeArea> <Box ml={offset?.x} mt={offset?.y} {...newProps}> <Text {..._title}>{title}</Text> </Box> </View> </s> remove import type { IIconButtonProps } from '../IconButton'; </s> add import type { IButtonProps } from '../../primitives/Button/types';
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/060817ea01501774c39ca0c3882b321e66e2fdc5
example/storybook/stories/components/composites/Fab/Basic.tsx
icon={<Icon name="plus" color="white" type="AntDesign" size={4} />}
<mask> export default function () { <mask> return ( <mask> <Fab <mask> placement="top-left" <mask> icon={<Icon name="plus" color="white" type="AntDesign" />} <mask> label={ <mask> <Text color="white" fontSize="sm"> <mask> Click <mask> </Text> <mask> } </s> fix: slider and fab matched </s> remove Click </s> add BUTTON </s> remove <Fab bg="#6200ee" icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} /> </s> add <Fab icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} /> </s> remove <Box ml={offset?.x} mt={offset?.y} {...newProps}> <Text {..._title}>{title}</Text> </Box> </s> add <View safeArea> <Box ml={offset?.x} mt={offset?.y} {...newProps}> <Text {..._title}>{title}</Text> </Box> </View> </s> remove export type IFabProps = IIconButtonProps & { </s> add export type IFabProps = IButtonProps & { </s> remove import type { IIconButtonProps } from '../IconButton'; </s> add import type { IButtonProps } from '../../primitives/Button/types';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/060817ea01501774c39ca0c3882b321e66e2fdc5
example/storybook/stories/components/composites/Fab/Placement.tsx
BUTTON
<mask> placement="top-left" <mask> icon={<Icon name="plus" color="white" type="AntDesign" />} <mask> label={ <mask> <Text color="white" fontSize="sm"> <mask> Click <mask> </Text> <mask> } <mask> /> <mask> ); <mask> } </s> fix: slider and fab matched </s> remove icon={<Icon name="plus" color="white" type="AntDesign" />} </s> add icon={<Icon name="plus" color="white" type="AntDesign" size={4} />} </s> remove <Fab bg="#6200ee" icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} /> </s> add <Fab icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} /> </s> remove <Box ml={offset?.x} mt={offset?.y} {...newProps}> <Text {..._title}>{title}</Text> </Box> </s> add <View safeArea> <Box ml={offset?.x} mt={offset?.y} {...newProps}> <Text {..._title}>{title}</Text> </Box> </View> </s> remove <Slider defaultValue={60} colorScheme="purple"> </s> add <Slider defaultValue={60}>
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/060817ea01501774c39ca0c3882b321e66e2fdc5
example/storybook/stories/components/composites/Fab/Placement.tsx
<Slider defaultValue={60}>
<mask> <Slider.FilledTrack /> <mask> </Slider.Track> <mask> <Slider.Thumb /> <mask> </Slider> <mask> <Slider defaultValue={60} colorScheme="purple"> <mask> <Slider.Track> <mask> <Slider.FilledTrack /> <mask> </Slider.Track> <mask> <Slider.Thumb /> <mask> </Slider> </s> fix: slider and fab matched </s> remove <Fab bg="#6200ee" icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} /> </s> add <Fab icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} /> </s> remove Click </s> add BUTTON </s> remove lg: { thumbSize: 10, sliderSize: 9 }, md: { thumbSize: 8, sliderSize: 8 }, sm: { thumbSize: 6, sliderSize: 6 }, </s> add lg: { thumbSize: 14, sliderSize: 9 }, md: { thumbSize: 10, sliderSize: 6 }, sm: { thumbSize: 6, sliderSize: 3 }, </s> remove p: 2, </s> add p: 5, </s> remove <Box ml={offset?.x} mt={offset?.y} {...newProps}> <Text {..._title}>{title}</Text> </Box> </s> add <View safeArea> <Box ml={offset?.x} mt={offset?.y} {...newProps}> <Text {..._title}>{title}</Text> </Box> </View>
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/060817ea01501774c39ca0c3882b321e66e2fdc5
example/storybook/stories/components/primitives/Slider/Size.tsx
import type { IButtonProps } from '../../primitives/Button/types';
<mask> import type { IIconButtonProps } from '../IconButton'; <mask> <mask> export type IFabProps = IIconButtonProps & { <mask> placement?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left'; <mask> label?: JSX.Element; <mask> }; </s> fix: slider and fab matched </s> remove export type IFabProps = IIconButtonProps & { </s> add export type IFabProps = IButtonProps & { </s> remove <Fab bg="#6200ee" icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} /> </s> add <Fab icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} /> </s> remove lg: { thumbSize: 10, sliderSize: 9 }, md: { thumbSize: 8, sliderSize: 8 }, sm: { thumbSize: 6, sliderSize: 6 }, </s> add lg: { thumbSize: 14, sliderSize: 9 }, md: { thumbSize: 10, sliderSize: 6 }, sm: { thumbSize: 6, sliderSize: 3 },
[ "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/060817ea01501774c39ca0c3882b321e66e2fdc5
src/components/composites/Fab/types.tsx
export type IFabProps = IButtonProps & {
<mask> import type { IIconButtonProps } from '../IconButton'; <mask> <mask> export type IFabProps = IIconButtonProps & { <mask> placement?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left'; <mask> label?: JSX.Element; <mask> }; </s> fix: slider and fab matched </s> remove import type { IIconButtonProps } from '../IconButton'; </s> add import type { IButtonProps } from '../../primitives/Button/types'; </s> remove <Fab bg="#6200ee" icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} /> </s> add <Fab icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} /> </s> remove lg: { thumbSize: 10, sliderSize: 9 }, md: { thumbSize: 8, sliderSize: 8 }, sm: { thumbSize: 6, sliderSize: 6 }, </s> add lg: { thumbSize: 14, sliderSize: 9 }, md: { thumbSize: 10, sliderSize: 6 }, sm: { thumbSize: 6, sliderSize: 3 },
[ "keep", "keep", "replace", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/060817ea01501774c39ca0c3882b321e66e2fdc5
src/components/composites/Fab/types.tsx
icon?: JSX.Element;
<mask> export type IFabProps = IButtonProps & { <mask> placement?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left'; <mask> label?: JSX.Element; <mask> }; </s> fix: slider and fab matched </s> remove export type IFabProps = IIconButtonProps & { </s> add export type IFabProps = IButtonProps & { </s> remove import type { IIconButtonProps } from '../IconButton'; </s> add import type { IButtonProps } from '../../primitives/Button/types'; </s> remove lg: { thumbSize: 10, sliderSize: 9 }, md: { thumbSize: 8, sliderSize: 8 }, sm: { thumbSize: 6, sliderSize: 6 }, </s> add lg: { thumbSize: 14, sliderSize: 9 }, md: { thumbSize: 10, sliderSize: 6 }, sm: { thumbSize: 6, sliderSize: 3 }, </s> remove p: 2, </s> add p: 5,
[ "keep", "keep", "add", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/060817ea01501774c39ca0c3882b321e66e2fdc5
src/components/composites/Fab/types.tsx
import View from '../../primitives/View';
<mask> import Box from '../../primitives/Box'; <mask> import Text from '../../primitives/Text'; <mask> import type { IToastProps } from './types'; <mask> import { useThemeProps } from '../../../hooks'; <mask> import { AccessibilityInfo, Platform } from 'react-native'; <mask> <mask> const ToastItem = ({ </s> fix: slider and fab matched </s> remove import type { IIconButtonProps } from '../IconButton'; </s> add import type { IButtonProps } from '../../primitives/Button/types'; </s> remove export type IFabProps = IIconButtonProps & { </s> add export type IFabProps = IButtonProps & { </s> remove <Fab bg="#6200ee" icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} /> </s> add <Fab icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} /> </s> remove lg: { thumbSize: 10, sliderSize: 9 }, md: { thumbSize: 8, sliderSize: 8 }, sm: { thumbSize: 6, sliderSize: 6 }, </s> add lg: { thumbSize: 14, sliderSize: 9 }, md: { thumbSize: 10, sliderSize: 6 }, sm: { thumbSize: 6, sliderSize: 3 }, </s> remove p: 2, </s> add p: 5,
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/060817ea01501774c39ca0c3882b321e66e2fdc5
src/components/composites/Toast/ToastItem.tsx
<View safeArea> <Box ml={offset?.x} mt={offset?.y} {...newProps}> <Text {..._title}>{title}</Text> </Box> </View>
<mask> } <mask> }, [accessibilityAnnouncement]); <mask> <mask> return ( <mask> <Box ml={offset?.x} mt={offset?.y} {...newProps}> <mask> <Text {..._title}>{title}</Text> <mask> </Box> <mask> ); <mask> }; <mask> <mask> export default React.memo(ToastItem); </s> fix: slider and fab matched </s> remove icon={<Icon name="plus" color="white" type="AntDesign" />} </s> add icon={<Icon name="plus" color="white" type="AntDesign" size={4} />} </s> remove <Fab bg="#6200ee" icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} /> </s> add <Fab icon={<Icon name="plus" color="white" type="AntDesign" size="sm" />} /> </s> remove Click </s> add BUTTON </s> remove lg: { thumbSize: 10, sliderSize: 9 }, md: { thumbSize: 8, sliderSize: 8 }, sm: { thumbSize: 6, sliderSize: 6 }, </s> add lg: { thumbSize: 14, sliderSize: 9 }, md: { thumbSize: 10, sliderSize: 6 }, sm: { thumbSize: 6, sliderSize: 3 }, </s> remove export type IFabProps = IIconButtonProps & { </s> add export type IFabProps = IButtonProps & {
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/060817ea01501774c39ca0c3882b321e66e2fdc5
src/components/composites/Toast/ToastItem.tsx
p: 5,
<mask> colorScheme: 'primary', <mask> rounded: 'full', <mask> zIndex: 20, <mask> placementProps, <mask> p: 2, <mask> placement: 'bottom-right', <mask> }; <mask> const baseStyle = { <mask> shadow: 7, <mask> }; </s> fix: slider and fab matched </s> remove lg: { thumbSize: 10, sliderSize: 9 }, md: { thumbSize: 8, sliderSize: 8 }, sm: { thumbSize: 6, sliderSize: 6 }, </s> add lg: { thumbSize: 14, sliderSize: 9 }, md: { thumbSize: 10, sliderSize: 6 }, sm: { thumbSize: 6, sliderSize: 3 }, </s> remove export type IFabProps = IIconButtonProps & { </s> add export type IFabProps = IButtonProps & { </s> remove import type { IIconButtonProps } from '../IconButton'; </s> add import type { IButtonProps } from '../../primitives/Button/types';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/060817ea01501774c39ca0c3882b321e66e2fdc5
src/theme/components/fab.ts
lg: { thumbSize: 14, sliderSize: 9 }, md: { thumbSize: 10, sliderSize: 6 }, sm: { thumbSize: 6, sliderSize: 3 },
<mask> }; <mask> <mask> const sizes = { <mask> // sizes mentioned here are used in pxiles. <mask> lg: { thumbSize: 10, sliderSize: 9 }, <mask> md: { thumbSize: 8, sliderSize: 8 }, <mask> sm: { thumbSize: 6, sliderSize: 6 }, <mask> }; <mask> <mask> const defaultProps = { <mask> colorScheme: 'primary', <mask> size: 'md', </s> fix: slider and fab matched </s> remove p: 2, </s> add p: 5, </s> remove export type IFabProps = IIconButtonProps & { </s> add export type IFabProps = IButtonProps & { </s> remove <Box ml={offset?.x} mt={offset?.y} {...newProps}> <Text {..._title}>{title}</Text> </Box> </s> add <View safeArea> <Box ml={offset?.x} mt={offset?.y} {...newProps}> <Text {..._title}>{title}</Text> </Box> </View> </s> remove import type { IIconButtonProps } from '../IconButton'; </s> add import type { IButtonProps } from '../../primitives/Button/types';
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/060817ea01501774c39ca0c3882b321e66e2fdc5
src/theme/components/slider.ts
const { theme, colorScheme: c, status, variant } = props;
<mask> import type { InterfaceAlertProps } from '../../components/composites/Alert/types'; <mask> function getBg( <mask> props: InterfaceAlertProps & { theme: any } & { colorScheme: any } <mask> ) { <mask> let { theme, colorScheme, status, variant } = props; <mask> <mask> colorScheme = getColorScheme(props, !status ? colorScheme : status); <mask> <mask> const lightBg = <mask> variant === 'solid' </s> fix: remove light pseudo props from base style </s> remove colorScheme = getColorScheme(props, !status ? colorScheme : status); </s> add const colorScheme = getColorScheme(props, !status ? c : status); </s> remove _light: { bg: lightBg, }, </s> add bg: lightBg, </s> remove import { mode } from './../tools'; </s> add </s> remove const focusRing = mode( { outlineWidth: '2px', outlineColor: `${colors[colorScheme][600]}`, outlineStyle: 'solid', }, { outlineWidth: '2px', outlineColor: `${colors[colorScheme][500]}`, outlineStyle: 'solid', } )(props); </s> add </s> remove _light: { _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`, }, </s> add _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/alert.ts
const colorScheme = getColorScheme(props, !status ? c : status);
<mask> props: InterfaceAlertProps & { theme: any } & { colorScheme: any } <mask> ) { <mask> let { theme, colorScheme, status, variant } = props; <mask> <mask> colorScheme = getColorScheme(props, !status ? colorScheme : status); <mask> <mask> const lightBg = <mask> variant === 'solid' <mask> ? getColor(theme, `${colorScheme}.700`, colorScheme) <mask> : getColor(theme, `${colorScheme}.200`, colorScheme); </s> fix: remove light pseudo props from base style </s> remove let { theme, colorScheme, status, variant } = props; </s> add const { theme, colorScheme: c, status, variant } = props; </s> remove _light: { bg: lightBg, }, </s> add bg: lightBg, </s> remove import { mode } from './../tools'; </s> add </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderLeftColor: `${colorScheme}.700`, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderLeftColor: `${colorScheme}.700`,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/alert.ts
bg: lightBg, _icon: { color: `${colorScheme}.700` },
<mask> <mask> colorScheme = getColorScheme(props, !status ? colorScheme : status); <mask> <mask> return { <mask> _light: { <mask> bg: lightBg, <mask> _icon: { color: `${colorScheme}.700` }, <mask> }, <mask> _dark: { <mask> bg: darkBg, <mask> _icon: { color: `${colorScheme}.600` }, <mask> }, <mask> }; </s> fix: remove light pseudo props from base style </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderTopColor: `${colorScheme}.700`, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderTopColor: `${colorScheme}.700`, </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderLeftColor: `${colorScheme}.700`, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderLeftColor: `${colorScheme}.700`, </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme), }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme), </s> remove _light: { bg: lightBg, }, </s> add bg: lightBg,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/alert.ts
_icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`,
<mask> colorScheme = getColorScheme(props, !status ? colorScheme : status); <mask> <mask> return { <mask> borderWidth: 1, <mask> _light: { <mask> _icon: { color: `${colorScheme}.700` }, <mask> borderColor: `${colorScheme}.700`, <mask> }, <mask> _dark: { <mask> _icon: { color: `${colorScheme}.600` }, <mask> borderColor: `${colorScheme}.600`, <mask> }, <mask> }; </s> fix: remove light pseudo props from base style </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme), }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme), </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderLeftColor: `${colorScheme}.700`, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderLeftColor: `${colorScheme}.700`, </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderTopColor: `${colorScheme}.700`, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderTopColor: `${colorScheme}.700`, </s> remove _light: { _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`, }, </s> add _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/alert.ts
_icon: { color: `${colorScheme}.700` }, borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme),
<mask> colorScheme = getColorScheme(props, !status ? colorScheme : status); <mask> <mask> return { <mask> borderWidth: 1, <mask> _light: { <mask> _icon: { color: `${colorScheme}.700` }, <mask> borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme), <mask> }, <mask> _dark: { <mask> _icon: { color: `${colorScheme}.600` }, <mask> borderColor: transparentize(`${colorScheme}.600`, 0.4)(theme), <mask> }, <mask> }; </s> fix: remove light pseudo props from base style </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderLeftColor: `${colorScheme}.700`, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderLeftColor: `${colorScheme}.700`, </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderTopColor: `${colorScheme}.700`, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderTopColor: `${colorScheme}.700`, </s> remove _light: { _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`, }, </s> add _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/alert.ts
bg: lightBg,
<mask> props: InterfaceAlertProps & { theme: any } & { colorScheme: any } <mask> ) => { <mask> const { lightBg, darkBg } = getBg(props); <mask> return { <mask> _light: { <mask> bg: lightBg, <mask> }, <mask> _dark: { <mask> bg: darkBg, <mask> }, <mask> _icon: { color: `muted.50` }, <mask> }; </s> fix: remove light pseudo props from base style </s> remove let { theme, colorScheme, status, variant } = props; </s> add const { theme, colorScheme: c, status, variant } = props; </s> remove colorScheme = getColorScheme(props, !status ? colorScheme : status); </s> add const colorScheme = getColorScheme(props, !status ? c : status); </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, </s> remove _light: { _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`, }, </s> add _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`, </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderLeftColor: `${colorScheme}.700`, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderLeftColor: `${colorScheme}.700`,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/alert.ts
bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderLeftColor: `${colorScheme}.700`,
<mask> colorScheme = getColorScheme(props, !status ? colorScheme : status); <mask> <mask> return { <mask> borderLeftWidth: 4, <mask> _light: { <mask> bg: lightBg, <mask> _icon: { color: `${colorScheme}.700` }, <mask> borderLeftColor: `${colorScheme}.700`, <mask> }, <mask> _dark: { <mask> bg: darkBg, <mask> _icon: { color: `${colorScheme}.600` }, <mask> borderLeftColor: `${colorScheme}.600`, <mask> }, </s> fix: remove light pseudo props from base style </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderTopColor: `${colorScheme}.700`, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderTopColor: `${colorScheme}.700`, </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme), }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme), </s> remove _light: { _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`, }, </s> add _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/alert.ts
bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderTopColor: `${colorScheme}.700`,
<mask> colorScheme = getColorScheme(props, !status ? colorScheme : status); <mask> <mask> return { <mask> borderTopWidth: 4, <mask> _light: { <mask> bg: lightBg, <mask> _icon: { color: `${colorScheme}.700` }, <mask> borderTopColor: `${colorScheme}.700`, <mask> }, <mask> _dark: { <mask> bg: darkBg, <mask> _icon: { color: `${colorScheme}.600` }, <mask> borderTopColor: `${colorScheme}.600`, <mask> }, </s> fix: remove light pseudo props from base style </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderLeftColor: `${colorScheme}.700`, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, borderLeftColor: `${colorScheme}.700`, </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme), }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme), </s> remove _light: { _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`, }, </s> add _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/alert.ts
borderColor: 'gray.800',
<mask> height: '100%', <mask> width: '100%', <mask> }, <mask> }, <mask> _light: { <mask> borderColor: 'gray.800', <mask> }, <mask> _dark: { <mask> borderColor: 'white', <mask> }, <mask> }; <mask> }; </s> fix: remove light pseudo props from base style </s> remove _light: { bg: `${colorScheme}.600`, }, </s> add bg: `${colorScheme}.600`, </s> remove _light: { bg: 'muted.300', }, </s> add bg: 'muted.300', </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme), }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme),
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/avatar.ts
bg: `${colorScheme}.100`,
<mask> const colorScheme = getColorScheme(props); <mask> return { <mask> _text: { color: `${colorScheme}.900` }, <mask> _icon: { color: `${colorScheme}.900` }, <mask> _light: { bg: `${colorScheme}.100` }, <mask> _dark: { bg: `${colorScheme}.300` }, <mask> borderWidth: '1', <mask> borderRadius: '2', <mask> borderColor: 'transparent', <mask> }; </s> fix: remove light pseudo props from base style </s> remove _light: { _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`, }, </s> add _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`, </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme), }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme), </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` }, </s> remove }, _light: { _text: { color: 'text.500', }, </s> add color: 'text.500',
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/badge.ts
_text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`,
<mask> <mask> function variantOutline(props: InterfaceBadgeProps & { colorScheme: any }) { <mask> const colorScheme = getColorScheme(props); <mask> return { <mask> _light: { <mask> _text: { color: `${colorScheme}.600` }, <mask> _icon: { color: `${colorScheme}.600` }, <mask> borderColor: `${colorScheme}.600`, <mask> }, <mask> _dark: { <mask> _text: { <mask> color: `${colorScheme}.300`, <mask> }, <mask> _icon: { </s> fix: remove light pseudo props from base style </s> remove _light: { bg: lightBg, }, </s> add bg: lightBg, </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, </s> remove _light: { bg: `${colorScheme}.100` }, </s> add bg: `${colorScheme}.100`, </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme), }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: transparentize(`${colorScheme}.700`, 0.4)(theme), </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` },
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/badge.ts
bg: 'muted.300',
<mask> height: `${thickness}px`, <mask> }; <mask> <mask> return { <mask> _light: { <mask> bg: 'muted.300', <mask> }, <mask> _dark: { <mask> bg: 'muted.600', <mask> }, <mask> ...orientationProps, <mask> }; </s> fix: remove light pseudo props from base style </s> remove _light: { bg: `${colorScheme}.600`, }, </s> add bg: `${colorScheme}.600`, </s> remove _light: { borderColor: 'gray.800', }, </s> add borderColor: 'gray.800', </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _light: { bg: lightBg, _icon: { color: `${colorScheme}.700` }, }, </s> add bg: lightBg, _icon: { color: `${colorScheme}.700` },
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/divider.ts
color: 'error.600',
<mask> _text: { <mask> fontSize: 'xs', <mask> }, <mask> _stack: { space: 1, alignItems: 'center' }, <mask> _dark: { <mask> _text: { </s> fix: remove light pseudo props from base style </s> remove _light: { _text: { color: 'error.600', }, }, </s> add </s> remove }, _light: { _text: { color: 'text.500', }, </s> add color: 'text.500', </s> remove _light: { color: 'text.500', }, </s> add color: 'text.500', </s> remove _light: { bg: `muted.800`, _text: { color: `text.50`, }, }, </s> add bg: `muted.800`, </s> remove _light: { _text: { color: 'text.500', }, _astrick: { color: 'error.600', }, </s> add _astrick: { color: 'error.600',
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/form-control.ts
<mask> _text: { <mask> fontSize: 'xs', <mask> }, <mask> _stack: { space: 1, alignItems: 'center' }, <mask> _light: { <mask> _text: { <mask> color: 'error.600', <mask> }, <mask> }, <mask> _dark: { <mask> _text: { <mask> color: 'error.500', <mask> }, <mask> }, </s> fix: remove light pseudo props from base style </s> remove _light: { _text: { color: 'text.500', }, _astrick: { color: 'error.600', }, </s> add _astrick: { color: 'error.600', </s> remove }, _light: { _text: { color: 'text.500', }, </s> add color: 'text.500', </s> remove _light: { bg: `muted.800`, _text: { color: `text.50`, }, }, </s> add bg: `muted.800`,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/form-control.ts
color: 'text.500',
<mask> _text: { <mask> fontSize: 'sm', <mask> fontWeight: 'medium', <mask> }, <mask> my: '1', <mask> _astrick: { <mask> color: 'error.600', <mask> }, <mask> _dark: { </s> fix: remove light pseudo props from base style </s> remove _light: { _text: { color: 'text.500', }, _astrick: { color: 'error.600', }, </s> add _astrick: { color: 'error.600', </s> remove _light: { _text: { color: 'error.600', }, }, </s> add </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300',
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/form-control.ts
_astrick: { color: 'error.600',
<mask> fontSize: 'sm', <mask> fontWeight: 'medium', <mask> }, <mask> my: '1', <mask> _light: { <mask> _text: { <mask> color: 'text.500', <mask> }, <mask> _astrick: { <mask> color: 'error.600', <mask> }, <mask> }, <mask> _dark: { <mask> _text: { <mask> color: 'text.400', <mask> }, </s> fix: remove light pseudo props from base style </s> remove }, _light: { _text: { color: 'text.500', }, </s> add color: 'text.500', </s> remove _light: { color: 'text.500', }, </s> add color: 'text.500', </s> remove _light: { _text: { color: 'error.600', }, }, </s> add </s> remove _light: { bg: `muted.800`, _text: { color: `text.50`, }, }, </s> add bg: `muted.800`,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/form-control.ts
color: 'text.500',
<mask> return { <mask> mt: '2', <mask> _text: { <mask> fontSize: 'xs', <mask> }, <mask> _light: { <mask> _text: { <mask> color: 'text.500', <mask> }, <mask> }, <mask> _dark: { <mask> _text: { <mask> color: 'text.400', <mask> }, </s> fix: remove light pseudo props from base style </s> remove _light: { color: 'text.500', }, </s> add color: 'text.500', </s> remove _light: { _text: { color: 'text.500', }, _astrick: { color: 'error.600', }, </s> add _astrick: { color: 'error.600', </s> remove _light: { _text: { color: 'error.600', }, }, </s> add </s> remove color: 'text.900', }, _disabled: { _text: { color: 'text.400', }, }, _hover: { bg: 'muted.200', </s> add color: 'text.400',
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/form-control.ts
<mask> import { mode } from './../tools'; <mask> <mask> const baseStyle = (props: any) => { <mask> const { colorScheme } = props; <mask> const colors = props.theme.colors; <mask> const focusRing = mode( <mask> { </s> fix: remove light pseudo props from base style </s> remove const focusRing = mode( { outlineWidth: '2px', outlineColor: `${colors[colorScheme][600]}`, outlineStyle: 'solid', }, { outlineWidth: '2px', outlineColor: `${colors[colorScheme][500]}`, outlineStyle: 'solid', } )(props); </s> add </s> remove let { theme, colorScheme, status, variant } = props; </s> add const { theme, colorScheme: c, status, variant } = props; </s> remove colorScheme = getColorScheme(props, !status ? colorScheme : status); </s> add const colorScheme = getColorScheme(props, !status ? c : status); </s> remove _light: { bg: lightBg, }, </s> add bg: lightBg, </s> remove _light: { bg: 'muted.50', }, </s> add bg: 'muted.50',
[ "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/icon-button.ts
<mask> <mask> const baseStyle = (props: any) => { <mask> const { colorScheme } = props; <mask> const colors = props.theme.colors; <mask> const focusRing = mode( <mask> { <mask> outlineWidth: '2px', <mask> outlineColor: `${colors[colorScheme][600]}`, <mask> outlineStyle: 'solid', <mask> }, <mask> { <mask> outlineWidth: '2px', <mask> outlineColor: `${colors[colorScheme][500]}`, <mask> outlineStyle: 'solid', <mask> } <mask> )(props); <mask> <mask> return { <mask> borderRadius: 'sm', // '4px' <mask> flexDirection: 'row', <mask> justifyContent: 'center', </s> fix: remove light pseudo props from base style </s> remove import { mode } from './../tools'; </s> add </s> remove _light: { bg: `${colorScheme}.600`, _hover: { _web: { outlineWidth: '4px', outlineColor: primary[300], outlineStyle: 'solid', }, </s> add bg: `${colorScheme}.600`, _hover: { _web: { outlineWidth: '4px', outlineColor: primary[300], outlineStyle: 'solid', </s> remove _focus: { _web: { outlineWidth: '2px', outlineColor: primary[400], outlineStyle: 'solid', }, </s> add }, _focus: { _web: { outlineWidth: '2px', outlineColor: primary[400], outlineStyle: 'solid', </s> remove style: { ...focusRing }, </s> add style: { outlineWidth: '2px', outlineColor: `${colors[colorScheme][600]}`, outlineStyle: 'solid', },
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/icon-button.ts
style: { outlineWidth: '2px', outlineColor: `${colors[colorScheme][600]}`, outlineStyle: 'solid', },
<mask> borderColor: `${colorScheme}.400`, <mask> }, <mask> _focusVisible: { <mask> _web: { <mask> style: { ...focusRing }, <mask> }, <mask> }, <mask> _loading: { <mask> opacity: '40', <mask> }, </s> fix: remove light pseudo props from base style </s> remove }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, bg: 'muted.600', </s> add _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, bg: 'muted.600', }, </s> remove _pressed: { bg: 'muted.400', }, _icon: { color: 'muted.500', }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, bg: 'muted.300', }, }, </s> add </s> remove _focus: { </s> add }, _hover: { bg: 'muted.200', }, _focus: { bg: 'muted.300', }, _pressed: { bg: 'muted.400', }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, </s> remove _focus: { _web: { outlineWidth: '2px', outlineColor: primary[400], outlineStyle: 'solid', }, </s> add }, _focus: { _web: { outlineWidth: '2px', outlineColor: primary[400], outlineStyle: 'solid',
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/icon-button.ts
_dark: { _focusVisible: { _web: { style: { outlineWidth: '2px', outlineColor: `${colors[colorScheme][500]}`, outlineStyle: 'solid', }, }, }, },
<mask> opacity: '40', <mask> }, <mask> }; <mask> }; <mask> <mask> function variantGhost({ colorScheme }: Record<string, any>) { <mask> return { </s> fix: remove light pseudo props from base style </s> remove _light: { _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`, }, </s> add _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`, </s> remove _light: { borderColor: `${colorScheme}.600`, </s> add borderColor: `${colorScheme}.600`, _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.700`, </s> remove _light: { bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', }, </s> add bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', </s> remove style: { ...focusRing }, </s> add style: { outlineWidth: '2px', outlineColor: `${colors[colorScheme][600]}`, outlineStyle: 'solid', }, </s> remove _light: { bg: 'muted.300', }, </s> add bg: 'muted.300',
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/icon-button.ts
_icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`,
<mask> }; <mask> <mask> function variantGhost({ colorScheme }: Record<string, any>) { <mask> return { <mask> _light: { <mask> _icon: { <mask> color: `${colorScheme}.600`, <mask> }, <mask> _hover: { <mask> bg: `${colorScheme}.600:alpha.10`, <mask> }, <mask> _pressed: { <mask> bg: `${colorScheme}.600:alpha.20`, <mask> }, <mask> }, <mask> _dark: { <mask> _icon: { <mask> color: `${colorScheme}.500`, <mask> }, </s> fix: remove light pseudo props from base style </s> remove _light: { bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', }, </s> add bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', </s> remove _light: { borderColor: `${colorScheme}.600`, </s> add borderColor: `${colorScheme}.600`, _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.700`, </s> remove _focus: { bg: `${colorScheme}.600`, _icon: { color: 'muted.50', }, </s> add }, _focus: { bg: `${colorScheme}.600`, _icon: { color: 'muted.50', </s> remove _light: { bg: `${colorScheme}.100`, _hover: { bg: `${colorScheme}.200`, }, _pressed: { bg: `${colorScheme}.300`, }, </s> add bg: `${colorScheme}.100`, _hover: { bg: `${colorScheme}.200`, }, _pressed: { bg: `${colorScheme}.300`,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/icon-button.ts
borderColor: `${colorScheme}.600`, _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.700`,
<mask> <mask> function variantOutline({ colorScheme }: Record<string, any>) { <mask> return { <mask> borderWidth: '1px', <mask> _light: { <mask> borderColor: `${colorScheme}.600`, <mask> _icon: { <mask> color: `${colorScheme}.600`, <mask> }, <mask> _hover: { <mask> bg: `${colorScheme}.700`, </s> fix: remove light pseudo props from base style </s> remove _light: { bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', }, </s> add bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', </s> remove _light: { _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`, }, </s> add _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`, </s> remove color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.700`, _icon: { color: 'muted.50', }, </s> add color: 'muted.50', </s> remove _light: { _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`, }, </s> add _icon: { color: `${colorScheme}.700` }, borderColor: `${colorScheme}.700`,
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/icon-button.ts
color: 'muted.50',
<mask> borderWidth: '1px', <mask> _light: { <mask> borderColor: `${colorScheme}.600`, <mask> _icon: { <mask> color: `${colorScheme}.600`, <mask> }, <mask> _hover: { <mask> bg: `${colorScheme}.700`, <mask> _icon: { <mask> color: 'muted.50', <mask> }, <mask> }, <mask> _pressed: { <mask> bg: `${colorScheme}.800`, <mask> _icon: { <mask> color: 'muted.50', </s> fix: remove light pseudo props from base style </s> remove _light: { bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', }, </s> add bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', </s> remove _pressed: { bg: `${colorScheme}.800`, _icon: { color: 'muted.50', }, </s> add }, _pressed: { bg: `${colorScheme}.800`, _icon: { color: 'muted.50', </s> remove _light: { borderColor: `${colorScheme}.600`, </s> add borderColor: `${colorScheme}.600`, _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.700`, </s> remove color: `${colorScheme}.600`, }, _hover: { _icon: { color: `${colorScheme}.700`, }, </s> add color: `${colorScheme}.700`, </s> remove _focus: { bg: `${colorScheme}.600`, _icon: { color: 'muted.50', }, </s> add }, _focus: { bg: `${colorScheme}.600`, _icon: { color: 'muted.50',
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/icon-button.ts
}, _pressed: { bg: `${colorScheme}.800`, _icon: { color: 'muted.50',
<mask> _icon: { <mask> color: 'muted.50', <mask> }, <mask> }, <mask> _pressed: { <mask> bg: `${colorScheme}.800`, <mask> _icon: { <mask> color: 'muted.50', <mask> }, <mask> }, <mask> _focus: { <mask> bg: `${colorScheme}.600`, <mask> _icon: { <mask> color: 'muted.50', </s> fix: remove light pseudo props from base style </s> remove color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.700`, _icon: { color: 'muted.50', }, </s> add color: 'muted.50', </s> remove _focus: { bg: `${colorScheme}.600`, _icon: { color: 'muted.50', }, </s> add }, _focus: { bg: `${colorScheme}.600`, _icon: { color: 'muted.50', </s> remove _light: { bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', }, </s> add bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', </s> remove _pressed: { _icon: { color: `${colorScheme}.800`, }, </s> add }, _pressed: { _icon: { color: `${colorScheme}.800`, </s> remove color: `${colorScheme}.600`, }, _hover: { _icon: { color: `${colorScheme}.700`, }, </s> add color: `${colorScheme}.700`,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/icon-button.ts
}, _focus: { bg: `${colorScheme}.600`, _icon: { color: 'muted.50',
<mask> _icon: { <mask> color: 'muted.50', <mask> }, <mask> }, <mask> _focus: { <mask> bg: `${colorScheme}.600`, <mask> _icon: { <mask> color: 'muted.50', <mask> }, <mask> }, <mask> }, <mask> _dark: { <mask> borderColor: `${colorScheme}.500`, <mask> _icon: { </s> fix: remove light pseudo props from base style </s> remove _pressed: { bg: `${colorScheme}.800`, _icon: { color: 'muted.50', }, </s> add }, _pressed: { bg: `${colorScheme}.800`, _icon: { color: 'muted.50', </s> remove color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.700`, _icon: { color: 'muted.50', }, </s> add color: 'muted.50', </s> remove _light: { bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', }, </s> add bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', </s> remove _light: { _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`, }, </s> add _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`, </s> remove _pressed: { _icon: { color: `${colorScheme}.800`, }, </s> add }, _pressed: { _icon: { color: `${colorScheme}.800`,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/icon-button.ts
bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50',
<mask> } <mask> <mask> function variantSolid({ colorScheme }: Record<string, any>) { <mask> return { <mask> _light: { <mask> bg: `${colorScheme}.600`, <mask> _hover: { <mask> bg: `${colorScheme}.700`, <mask> }, <mask> _pressed: { <mask> bg: `${colorScheme}.800`, <mask> }, <mask> _icon: { <mask> color: 'muted.50', <mask> }, <mask> }, <mask> _dark: { <mask> bg: `${colorScheme}.500`, <mask> _hover: { <mask> bg: `${colorScheme}.400`, </s> fix: remove light pseudo props from base style </s> remove _light: { _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`, }, </s> add _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`, </s> remove _light: { borderColor: `${colorScheme}.600`, </s> add borderColor: `${colorScheme}.600`, _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.700`, </s> remove color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.700`, _icon: { color: 'muted.50', }, </s> add color: 'muted.50', </s> remove _pressed: { bg: `${colorScheme}.800`, _icon: { color: 'muted.50', }, </s> add }, _pressed: { bg: `${colorScheme}.800`, _icon: { color: 'muted.50', </s> remove _light: { bg: `${colorScheme}.100`, _hover: { bg: `${colorScheme}.200`, }, _pressed: { bg: `${colorScheme}.300`, }, </s> add bg: `${colorScheme}.100`, _hover: { bg: `${colorScheme}.200`, }, _pressed: { bg: `${colorScheme}.300`,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/icon-button.ts
bg: `${colorScheme}.100`, _hover: { bg: `${colorScheme}.200`, }, _pressed: { bg: `${colorScheme}.300`,
<mask> }, <mask> _icon: { <mask> color: `${colorScheme}.900`, <mask> }, <mask> _light: { <mask> bg: `${colorScheme}.100`, <mask> _hover: { <mask> bg: `${colorScheme}.200`, <mask> }, <mask> _pressed: { <mask> bg: `${colorScheme}.300`, <mask> }, <mask> }, <mask> _dark: { <mask> bg: `${colorScheme}.300`, <mask> _hover: { <mask> bg: `${colorScheme}.200`, </s> fix: remove light pseudo props from base style </s> remove _pressed: { _interactionBox: { borderWidth: '8', borderColor: `${colorScheme}.300`, }, </s> add }, _pressed: { _interactionBox: { borderWidth: '8', borderColor: `${colorScheme}.300`, </s> remove _light: { bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', }, </s> add bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', </s> remove _light: { _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`, }, </s> add _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`, </s> remove _focus: { </s> add }, _hover: { bg: 'muted.200', }, _focus: { bg: 'muted.300', }, _pressed: { bg: 'muted.400', }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, </s> remove color: 'text.900', }, _disabled: { _text: { color: 'text.400', }, }, _hover: { bg: 'muted.200', </s> add color: 'text.400',
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/icon-button.ts
_icon: { color: `${colorScheme}.600`, }, _hover: {
<mask> _spinner: { <mask> color: `${colorScheme}.600`, <mask> }, <mask> <mask> _light: { <mask> _icon: { <mask> color: `${colorScheme}.600`, <mask> }, <mask> _hover: { <mask> _icon: { </s> fix: remove light pseudo props from base style </s> remove color: `${colorScheme}.600`, }, _hover: { _icon: { color: `${colorScheme}.700`, }, </s> add color: `${colorScheme}.700`, </s> remove _light: { borderColor: `${colorScheme}.600`, </s> add borderColor: `${colorScheme}.600`, _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.700`, </s> remove color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.700`, _icon: { color: 'muted.50', }, </s> add color: 'muted.50', </s> remove _light: { _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`, }, </s> add _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`, </s> remove _light: { bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', }, </s> add bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50',
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/icon-button.ts
color: `${colorScheme}.700`,
<mask> }, <mask> <mask> _light: { <mask> _icon: { <mask> color: `${colorScheme}.600`, <mask> }, <mask> _hover: { <mask> _icon: { <mask> color: `${colorScheme}.700`, <mask> }, <mask> }, <mask> _pressed: { <mask> _icon: { <mask> color: `${colorScheme}.800`, <mask> }, </s> fix: remove light pseudo props from base style </s> remove color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.700`, _icon: { color: 'muted.50', }, </s> add color: 'muted.50', </s> remove _pressed: { _icon: { color: `${colorScheme}.800`, }, </s> add }, _pressed: { _icon: { color: `${colorScheme}.800`, </s> remove _light: { bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', }, </s> add bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', </s> remove _pressed: { bg: `${colorScheme}.800`, _icon: { color: 'muted.50', }, </s> add }, _pressed: { bg: `${colorScheme}.800`, _icon: { color: 'muted.50', </s> remove _light: { </s> add _icon: { color: `${colorScheme}.600`, }, _hover: {
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/icon-button.ts
}, _pressed: { _icon: { color: `${colorScheme}.800`,
<mask> _icon: { <mask> color: `${colorScheme}.700`, <mask> }, <mask> }, <mask> _pressed: { <mask> _icon: { <mask> color: `${colorScheme}.800`, <mask> }, <mask> }, <mask> }, <mask> _dark: { <mask> _icon: { <mask> color: `${colorScheme}.500`, </s> fix: remove light pseudo props from base style </s> remove color: `${colorScheme}.600`, }, _hover: { _icon: { color: `${colorScheme}.700`, }, </s> add color: `${colorScheme}.700`, </s> remove _light: { bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', }, </s> add bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', </s> remove _pressed: { bg: `${colorScheme}.800`, _icon: { color: 'muted.50', }, </s> add }, _pressed: { bg: `${colorScheme}.800`, _icon: { color: 'muted.50', </s> remove color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.700`, _icon: { color: 'muted.50', }, </s> add color: 'muted.50', </s> remove _light: { _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`, }, </s> add _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/icon-button.ts
_icon: { color: 'muted.900',
<mask> } <mask> <mask> function variantUnstyled() { <mask> return { <mask> _light: { <mask> _icon: { <mask> color: 'muted.900', <mask> }, <mask> }, <mask> _dark: { <mask> _icon: { <mask> color: 'muted.50', <mask> }, </s> fix: remove light pseudo props from base style </s> remove _light: { bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', }, </s> add bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', </s> remove _focus: { bg: `${colorScheme}.600`, _icon: { color: 'muted.50', }, </s> add }, _focus: { bg: `${colorScheme}.600`, _icon: { color: 'muted.50', </s> remove _light: { _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`, }, </s> add _text: { color: `${colorScheme}.600` }, _icon: { color: `${colorScheme}.600` }, borderColor: `${colorScheme}.600`, </s> remove _light: { _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`, }, </s> add _icon: { color: `${colorScheme}.600`, }, _hover: { bg: `${colorScheme}.600:alpha.10`, }, _pressed: { bg: `${colorScheme}.600:alpha.20`, </s> remove _pressed: { bg: `${colorScheme}.800`, _icon: { color: 'muted.50', }, </s> add }, _pressed: { bg: `${colorScheme}.800`, _icon: { color: 'muted.50',
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/icon-button.ts
bg: 'muted.50',
<mask> const baseStyle = { <mask> py: 2, <mask> borderRadius: 'sm', <mask> shadow: 6, <mask> _light: { <mask> bg: 'muted.50', <mask> }, <mask> _dark: { <mask> bg: 'muted.800', <mask> }, <mask> _presenceTransition: { <mask> initial: { opacity: 0 }, </s> fix: remove light pseudo props from base style </s> remove _light: { bg: 'muted.50', _text: { color: 'text.900', }, </s> add bg: 'muted.50', _text: { color: 'text.900', </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _light: { bg: `${colorScheme}.100` }, </s> add bg: `${colorScheme}.100`,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/menu.ts
color: 'text.500',
<mask> baseStyle: { <mask> _title: { <mask> fontSize: 'xs', <mask> textTransform: 'uppercase', <mask> _light: { <mask> color: 'text.500', <mask> }, <mask> _dark: { <mask> color: 'text.400', <mask> }, <mask> }, <mask> p: 3, </s> fix: remove light pseudo props from base style </s> remove }, _light: { _text: { color: 'text.500', }, </s> add color: 'text.500', </s> remove _light: { _text: { color: 'text.500', }, _astrick: { color: 'error.600', }, </s> add _astrick: { color: 'error.600', </s> remove _light: { _text: { color: 'error.600', }, }, </s> add </s> remove _light: { bg: 'muted.50', _text: { color: 'text.900', }, </s> add bg: 'muted.50', _text: { color: 'text.900',
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/menu.ts
color: 'muted.500', }, _text: { color: 'text.900',
<mask> }, <mask> _icon: { <mask> size: 4, <mask> opacity: 0, <mask> }, <mask> _disabled: { <mask> _text: { <mask> color: 'text.400', <mask> }, </s> fix: remove light pseudo props from base style </s> remove _light: { </s> add _disabled: { </s> remove color: 'text.900', }, _disabled: { _text: { color: 'text.400', }, }, _hover: { bg: 'muted.200', </s> add color: 'text.400', </s> remove }, _light: { _text: { color: 'text.500', }, </s> add color: 'text.500', </s> remove _light: { _text: { color: 'text.500', }, _astrick: { color: 'error.600', }, </s> add _astrick: { color: 'error.600', </s> remove _light: { color: 'text.500', }, </s> add color: 'text.500',
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/menu.ts
_disabled: {
<mask> _icon: { <mask> size: 4, <mask> opacity: 0, <mask> }, <mask> _light: { <mask> _text: { <mask> color: 'text.900', <mask> }, <mask> _disabled: { <mask> _text: { </s> fix: remove light pseudo props from base style </s> remove color: 'text.900', }, _disabled: { _text: { color: 'text.400', }, }, _hover: { bg: 'muted.200', </s> add color: 'text.400', </s> remove _light: { bg: 'muted.50', _text: { color: 'text.900', }, </s> add bg: 'muted.50', _text: { color: 'text.900', </s> remove _light: { borderColor: 'muted.300', _text: { color: 'text.900', }, </s> add borderColor: 'muted.300', _text: { color: 'text.900', </s> remove }, _light: { _text: { color: 'text.500', }, </s> add color: 'text.500',
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/menu.ts
color: 'text.400',
<mask> opacity: 0, <mask> }, <mask> _light: { <mask> _text: { <mask> color: 'text.900', <mask> }, <mask> _disabled: { <mask> _text: { <mask> color: 'text.400', <mask> }, <mask> }, <mask> _hover: { <mask> bg: 'muted.200', <mask> }, <mask> _focus: { <mask> bg: 'muted.300', <mask> }, <mask> _pressed: { </s> fix: remove light pseudo props from base style </s> remove _light: { </s> add _disabled: { </s> remove _focus: { </s> add }, _hover: { bg: 'muted.200', }, _focus: { bg: 'muted.300', }, _pressed: { bg: 'muted.400', }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, </s> remove _pressed: { bg: 'muted.400', }, _icon: { color: 'muted.500', }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, bg: 'muted.300', }, }, </s> add </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300',
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/menu.ts
}, _hover: { bg: 'muted.200', }, _focus: { bg: 'muted.300', }, _pressed: { bg: 'muted.400', }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` },
<mask> }, <mask> _hover: { <mask> bg: 'muted.200', <mask> }, <mask> _focus: { <mask> bg: 'muted.300', <mask> }, <mask> _pressed: { <mask> bg: 'muted.400', <mask> }, </s> fix: remove light pseudo props from base style </s> remove color: 'text.900', }, _disabled: { _text: { color: 'text.400', }, }, _hover: { bg: 'muted.200', </s> add color: 'text.400', </s> remove _pressed: { bg: 'muted.400', }, _icon: { color: 'muted.500', }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, bg: 'muted.300', }, }, </s> add </s> remove _light: { bg: `${colorScheme}.100`, _hover: { bg: `${colorScheme}.200`, }, _pressed: { bg: `${colorScheme}.300`, }, </s> add bg: `${colorScheme}.100`, _hover: { bg: `${colorScheme}.200`, }, _pressed: { bg: `${colorScheme}.300`, </s> remove _light: { bg: 'muted.200', _filledTrack: { bg: `${c}.600`, }, }, </s> add bg: 'muted.200', </s> remove _light: { bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50', }, </s> add bg: `${colorScheme}.600`, _hover: { bg: `${colorScheme}.700`, }, _pressed: { bg: `${colorScheme}.800`, }, _icon: { color: 'muted.50',
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/menu.ts
<mask> }, <mask> _focus: { <mask> bg: 'muted.300', <mask> }, <mask> _pressed: { <mask> bg: 'muted.400', <mask> }, <mask> <mask> _icon: { <mask> color: 'muted.500', <mask> }, <mask> _focusVisible: { <mask> _web: { <mask> outlineWidth: '0', <mask> style: { boxShadow: `none` }, <mask> bg: 'muted.300', <mask> }, <mask> }, <mask> }, <mask> _dark: { <mask> _text: { <mask> color: 'text.50', <mask> }, </s> fix: remove light pseudo props from base style </s> remove _focus: { </s> add }, _hover: { bg: 'muted.200', }, _focus: { bg: 'muted.300', }, _pressed: { bg: 'muted.400', }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, </s> remove }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, bg: 'muted.600', </s> add _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, bg: 'muted.600', }, </s> remove color: 'text.900', }, _disabled: { _text: { color: 'text.400', }, }, _hover: { bg: 'muted.200', </s> add color: 'text.400', </s> remove _light: { bg: 'muted.50', borderColor: 'muted.300', _text: { color: 'text.900', }, }, </s> add bg: 'muted.50', borderColor: 'muted.300', </s> remove _pressed: { bg: `${colorScheme}.800`, _icon: { color: 'muted.50', }, </s> add }, _pressed: { bg: `${colorScheme}.800`, _icon: { color: 'muted.50',
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/menu.ts
_focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, bg: 'muted.600', },
<mask> <mask> _icon: { <mask> color: 'muted.400', <mask> }, <mask> }, <mask> _focusVisible: { <mask> _web: { <mask> outlineWidth: '0', <mask> style: { boxShadow: `none` }, <mask> bg: 'muted.600', <mask> }, <mask> }, <mask> _checked: { <mask> _icon: { <mask> opacity: 1, </s> fix: remove light pseudo props from base style </s> remove _pressed: { bg: 'muted.400', }, _icon: { color: 'muted.500', }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, bg: 'muted.300', }, }, </s> add </s> remove _focus: { </s> add }, _hover: { bg: 'muted.200', }, _focus: { bg: 'muted.300', }, _pressed: { bg: 'muted.400', }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, </s> remove style: { ...focusRing }, </s> add style: { outlineWidth: '2px', outlineColor: `${colors[colorScheme][600]}`, outlineStyle: 'solid', }, </s> remove _light: { bg: `${colorScheme}.600`, _hover: { _web: { outlineWidth: '4px', outlineColor: primary[300], outlineStyle: 'solid', }, </s> add bg: `${colorScheme}.600`, _hover: { _web: { outlineWidth: '4px', outlineColor: primary[300], outlineStyle: 'solid',
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/06b901fcf7960c0af5159ed3f38fe90d286d2e3a
src/theme/components/menu.ts