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
<mask> color: mode('muted.400', 'muted.500')(props), <mask> }, <mask> }; <mask> }, <mask> defaultProps: {}, <mask> }; </s> feat: added support for component prop to provide select and textarea </s> remove baseStyle: (props: Record<string, any>) => { return { _errorMessageProps: { mt: 1, ml: 3, fontSize: 'xs', color: 'error.400', }, _helperTextProps: { mt: 1, ml: 3, fontSize: 'xs', color: mode('muted.400', 'muted.500')(props), }, }; </s> add baseStyle, defaultProps: { component: 'input', </s> remove {!inputProps.isInvalid && <Text {..._helperTextProps}>{helperText}</Text>} </s> add {!componentProps.isInvalid && ( <Text {..._helperTextProps}>{helperText}</Text> )} </s> remove export type ITextFieldProps = IInputProps & </s> add type componentsSpecificProps = | ({ component?: 'input' } & IInputProps) | ({ component?: 'textarea' } & ITextAreaProps) | ({ component?: 'select' } & ISelectProps); export type ITextFieldProps = componentsSpecificProps & </s> remove <Input InputLeftElement={InputLeftElement} InputRightElement={InputRightElement} {...inputProps} ref={ref} /> {inputProps.isInvalid && ( </s> add {activeComponent()} {componentProps.isInvalid && (
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0a8486af075a289ddda35bebe4225483ebc97941
src/theme/components/textField.ts
import { Platform } from 'react-native';
<mask> import { usePropsResolution } from '../../../hooks'; <mask> import { ActionSheetContext } from './ActionSheetContext'; <mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps'; <mask> <mask> const Actionsheet = ( <mask> { children, hideDragIndicator = false, ...props }: IActionsheetProps, <mask> ref: any <mask> ) => { <mask> const { </s> fix: actionsheet scrollview for web
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b0431a64d38cfb4de94cc09ffe59e786a0c78cb
src/components/composites/Actionsheet/Actionsheet.tsx
//Fixing overlay position for Web due to scrollView issue let overlayStyle = Platform.OS === 'web' ? { position: 'fixed' } : {};
<mask> return null; <mask> } <mask> return ( <mask> <Modal <mask> isOpen={isOpen} <mask> onClose={onClose} <mask> {...resolvedProps} </s> fix: actionsheet scrollview for web
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b0431a64d38cfb4de94cc09ffe59e786a0c78cb
src/components/composites/Actionsheet/Actionsheet.tsx
_overlay={{ style: overlayStyle }}
<mask> closeOnOverlayClick={disableOverlay ? false : true} <mask> ref={ref} <mask> > <mask> <ActionSheetContext.Provider value={{ hideDragIndicator }}> <mask> {children} <mask> </ActionSheetContext.Provider> <mask> </Modal> <mask> ); </s> fix: actionsheet scrollview for web
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b0431a64d38cfb4de94cc09ffe59e786a0c78cb
src/components/composites/Actionsheet/Actionsheet.tsx
_overlay,
<mask> _fade, <mask> _slide, <mask> ...resolvedProps <mask> } = usePropsResolution('Modal', rest); <mask> <mask> const [visible, setVisible] = useControllableState({ <mask> value: isOpen, <mask> defaultValue: defaultIsOpen, </s> fix: actionsheet scrollview for web
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b0431a64d38cfb4de94cc09ffe59e786a0c78cb
src/components/composites/Modal/Modal.tsx
{..._overlay}
<mask> isKeyboardDismissable={isKeyboardDismissable} <mask> animationPreset={animationPreset} <mask> useRNModalOnAndroid <mask> > <mask> <ModalContext.Provider value={contextValue}> <mask> <Fade in={visible} style={StyleSheet.absoluteFill} {..._backdropFade}> <mask> {overlayVisible && backdropVisible && ( </s> fix: actionsheet scrollview for web
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b0431a64d38cfb4de94cc09ffe59e786a0c78cb
src/components/composites/Modal/Modal.tsx
import type { IOverlayProps } from '../../primitives/Overlay';
<mask> import type { CustomProps } from '../../../components/types'; <mask> import type { IScrollViewProps } from '../../basic/ScrollView'; <mask> import type { IFadeProps, ISlideProps } from '../Transitions'; <mask> import type { ThemeComponentSizeType } from '../../../components/types/utils'; <mask> export interface InterfaceModalProps extends InterfaceBoxProps<IModalProps> { <mask> /** <mask> * If true, the modal will open. Useful for controllable state behaviour <mask> */ <mask> isOpen?: boolean; <mask> /** </s> fix: actionsheet scrollview for web
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b0431a64d38cfb4de94cc09ffe59e786a0c78cb
src/components/composites/Modal/types.ts
/** * Props to be passed to the Overlay used inside of Modal. */ _overlay?: IOverlayProps;
<mask> */ <mask> _slide?: Partial<ISlideProps>; <mask> } <mask> <mask> export type IModalComponentType = (( <mask> props: IModalProps & { ref?: MutableRefObject<any> } <mask> ) => JSX.Element) & { <mask> Body: React.MemoExoticComponent< </s> fix: actionsheet scrollview for web
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b0431a64d38cfb4de94cc09ffe59e786a0c78cb
src/components/composites/Modal/types.ts
import Controlled from './Controlled';
<mask> import Wrapper from '../../Wrapper'; <mask> import Usage from './Usage'; <mask> import TabBarOnly from './TabBarOnly'; <mask> import FittedTabs from './FittedTabs'; <mask> import Size from './Size'; <mask> import Colors from './Colors'; <mask> import TabsAlignment from './TabsAlignment'; </s> fix: tabs typescript add missing types </s> remove import type { ITabsContextProps } from './types'; </s> add import type { ITabsContextProps, ITabBarProps } from './types'; </s> remove const TabBar = ({ tablistRef, tabListProps, ...props }: any) => { </s> add const TabBar = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => { </s> remove onChange?: (index?: number) => void; </s> add onChange?: (index: number) => void; </s> remove <Item key={index} title={bar}> </s> add <Item key={index} title={bar} textValue={textValue}>
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b09e50834a57c4adc6afa800111e50fc4e5d27e
example/storybook/stories/components/composites/Tabs/index.tsx
.add('Controlled', () => <Controlled />)
<mask> storiesOf('Tabs', module) <mask> .addDecorator(withKnobs) <mask> .addDecorator((getStory: any) => <Wrapper>{getStory()}</Wrapper>) <mask> .add('Usage', () => <Usage />) <mask> .add('Composition', () => <Composition />) <mask> .add('Variants', () => <Variants />) <mask> .add('TabsAlignment', () => <TabsAlignment />) <mask> .add('Colors', () => <Colors />) </s> fix: tabs typescript add missing types </s> remove const TabBar = ({ tablistRef, tabListProps, ...props }: any) => { </s> add const TabBar = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => { </s> remove onChange?: (index?: number) => void; </s> add onChange?: (index: number) => void; </s> remove import type { ITabsContextProps } from './types'; </s> add import type { ITabsContextProps, ITabBarProps } from './types'; </s> remove <Item key={index} title={bar}> </s> add <Item key={index} title={bar} textValue={textValue}>
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b09e50834a57c4adc6afa800111e50fc4e5d27e
example/storybook/stories/components/composites/Tabs/index.tsx
import type { ITabsContextProps, ITabBarProps } from './types';
<mask> import React from 'react'; <mask> import Box from '../../primitives/Box'; <mask> import { TabsContext } from './Context'; <mask> import type { ITabsContextProps } from './types'; <mask> <mask> const TabBar = ({ tablistRef, tabListProps, ...props }: any) => { <mask> const { <mask> tabBarStyle, <mask> align, </s> fix: tabs typescript add missing types </s> remove const TabBar = ({ tablistRef, tabListProps, ...props }: any) => { </s> add const TabBar = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => { </s> remove <Item key={index} title={bar}> </s> add <Item key={index} title={bar} textValue={textValue}> </s> remove onChange?: (index?: number) => void; </s> add onChange?: (index: number) => void;
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b09e50834a57c4adc6afa800111e50fc4e5d27e
src/components/composites/Tabs/TabBar.tsx
const TabBar = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => {
<mask> import Box from '../../primitives/Box'; <mask> import { TabsContext } from './Context'; <mask> import type { ITabsContextProps } from './types'; <mask> <mask> const TabBar = ({ tablistRef, tabListProps, ...props }: any) => { <mask> const { <mask> tabBarStyle, <mask> align, <mask> isFitted, <mask> state, </s> fix: tabs typescript add missing types </s> remove import type { ITabsContextProps } from './types'; </s> add import type { ITabsContextProps, ITabBarProps } from './types'; </s> remove <Item key={index} title={bar}> </s> add <Item key={index} title={bar} textValue={textValue}> </s> remove onChange?: (index?: number) => void; </s> add onChange?: (index: number) => void;
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b09e50834a57c4adc6afa800111e50fc4e5d27e
src/components/composites/Tabs/TabBar.tsx
let textValue; if (bar.props.accessibilityLabel) { textValue = bar.props.accessibilityLabel; } else if (typeof bar.props.children === 'string') { textValue = bar.props.children; } else if (__DEV__) { console.warn('Please pass accessibilityLabel into Tabs.Tab component'); }
<mask> <mask> return bars.map((bar: any, index: number) => { <mask> return ( <mask> <Item key={index} title={bar} textValue={textValue}> <mask> {views[index]} <mask> </Item> </s> fix: tabs typescript add missing types </s> remove <Item key={index} title={bar}> </s> add <Item key={index} title={bar} textValue={textValue}> </s> remove onChange?: (index?: number) => void; </s> add onChange?: (index: number) => void; </s> remove const TabBar = ({ tablistRef, tabListProps, ...props }: any) => { </s> add const TabBar = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => { </s> remove import type { ITabsContextProps } from './types'; </s> add import type { ITabsContextProps, ITabBarProps } from './types';
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b09e50834a57c4adc6afa800111e50fc4e5d27e
src/components/composites/Tabs/Tabs.tsx
<Item key={index} title={bar} textValue={textValue}>
<mask> const { views, bars } = getTabsAndBars(children); <mask> <mask> return bars.map((bar: any, index: number) => { <mask> return ( <mask> <Item key={index} title={bar}> <mask> {views[index]} <mask> </Item> <mask> ); <mask> }); <mask> }; </s> fix: tabs typescript add missing types </s> remove const TabBar = ({ tablistRef, tabListProps, ...props }: any) => { </s> add const TabBar = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => { </s> remove onChange?: (index?: number) => void; </s> add onChange?: (index: number) => void; </s> remove import type { ITabsContextProps } from './types'; </s> add import type { ITabsContextProps, ITabBarProps } from './types';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b09e50834a57c4adc6afa800111e50fc4e5d27e
src/components/composites/Tabs/Tabs.tsx
onChange?: (index: number) => void;
<mask> isManual?: boolean; <mask> orientation?: 'horizontal' | 'vertical'; <mask> size?: 'sm' | 'md' | 'lg'; <mask> variant?: string; <mask> onChange?: (index?: number) => void; <mask> }; <mask> <mask> export type ITabBarProps = IBoxProps & { <mask> align?: 'center' | 'end' | 'start'; <mask> isFitted?: boolean; </s> fix: tabs typescript add missing types </s> remove <Item key={index} title={bar}> </s> add <Item key={index} title={bar} textValue={textValue}> </s> remove import type { ITabsContextProps } from './types'; </s> add import type { ITabsContextProps, ITabBarProps } from './types'; </s> remove const TabBar = ({ tablistRef, tabListProps, ...props }: any) => { </s> add const TabBar = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b09e50834a57c4adc6afa800111e50fc4e5d27e
src/components/composites/Tabs/types.tsx
tablistRef?: RefObject<any>; tabListProps?: ViewProps;
<mask> isFitted?: boolean; <mask> size?: 'sm' | 'md' | 'lg'; <mask> }; <mask> export type ITabProps = IBoxProps & { <mask> isDisabled?: boolean; <mask> _active?: any; </s> fix: tabs typescript add missing types </s> remove onChange?: (index?: number) => void; </s> add onChange?: (index: number) => void; </s> remove <Item key={index} title={bar}> </s> add <Item key={index} title={bar} textValue={textValue}> </s> remove const TabBar = ({ tablistRef, tabListProps, ...props }: any) => { </s> add const TabBar = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => { </s> remove import type { ITabsContextProps } from './types'; </s> add import type { ITabsContextProps, ITabBarProps } from './types';
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b09e50834a57c4adc6afa800111e50fc4e5d27e
src/components/composites/Tabs/types.tsx
PlatformProps,
<mask> ShadowProps, <mask> BackgroundProps, <mask> SafeAreaProps, <mask> TransformProps, <mask> } from '../../types'; <mask> <mask> export interface IFlatListProps <mask> extends FlatListProps<any>, <mask> ColorProps, <mask> SpaceProps, </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove import type { BorderProps, ColorProps, FlexboxProps, LayoutProps, PositionProps, SpaceProps, ExtraProps, OutlineProps, ShadowProps, BackgroundProps, SafeAreaProps, TransformProps, } from '../../types'; </s> add </s> remove export interface IStatusBarProps extends StatusBarProps, Omit<ColorProps, 'backgroundColor'>, SpaceProps, LayoutProps, FlexboxProps, PositionProps, BorderProps, ExtraProps, OutlineProps, ShadowProps, Omit<BackgroundProps, 'backgroundColor'>, SafeAreaProps, TransformProps {} </s> add export interface IStatusBarProps extends StatusBarProps {}
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/basic/FlatList/types.ts
TransformProps, PlatformProps {}
<mask> OutlineProps, <mask> ShadowProps, <mask> BackgroundProps, <mask> SafeAreaProps, <mask> TransformProps {} </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove TransformProps {} </s> add TransformProps, PlatformProps {} </s> remove export interface IStatusBarProps extends StatusBarProps, Omit<ColorProps, 'backgroundColor'>, SpaceProps, LayoutProps, FlexboxProps, PositionProps, BorderProps, ExtraProps, OutlineProps, ShadowProps, Omit<BackgroundProps, 'backgroundColor'>, SafeAreaProps, TransformProps {} </s> add export interface IStatusBarProps extends StatusBarProps {} </s> remove TransformProps { </s> add TransformProps, PlatformProps { </s> remove TransformProps { </s> add TransformProps, PlatformProps { </s> remove TransformProps { </s> add TransformProps, PlatformProps {
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/basic/FlatList/types.ts
PlatformProps,
<mask> BackgroundProps, <mask> SafeAreaProps, <mask> TransformProps, <mask> } from '../../types'; <mask> <mask> export interface IKeyboardAvoidingViewProps <mask> extends KeyboardAvoidingViewProps, <mask> ColorProps, <mask> SpaceProps, </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove import type { BorderProps, ColorProps, FlexboxProps, LayoutProps, PositionProps, SpaceProps, ExtraProps, OutlineProps, ShadowProps, BackgroundProps, SafeAreaProps, TransformProps, } from '../../types'; </s> add </s> remove export interface IStatusBarProps extends StatusBarProps, Omit<ColorProps, 'backgroundColor'>, SpaceProps, LayoutProps, FlexboxProps, PositionProps, BorderProps, ExtraProps, OutlineProps, ShadowProps, Omit<BackgroundProps, 'backgroundColor'>, SafeAreaProps, TransformProps {} </s> add export interface IStatusBarProps extends StatusBarProps {}
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/basic/KeyboardAvoidingView/types.ts
TransformProps, PlatformProps {
<mask> OutlineProps, <mask> ShadowProps, <mask> BackgroundProps, <mask> SafeAreaProps, <mask> TransformProps { <mask> /** <mask> * Renders components as Box children. Accepts a JSX.Element or an array of JSX.Element. */ <mask> children?: JSX.Element | JSX.Element[] | string | any; <mask> } </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove TransformProps { </s> add TransformProps, PlatformProps { </s> remove TransformProps { </s> add TransformProps, PlatformProps { </s> remove _disabled?: IButtonProps; </s> add </s> remove /** * Passed props will be applied on hovered state. */ _hover?: IButtonProps; /** * Passed props will be applied on pressed state. */ _pressed?: IButtonProps; /** * Passed props will be applied on focused state. */ _focus?: IButtonProps; </s> add </s> remove * Props to be passed to the Button when state is disabled. </s> add * Passed props will be applied on hovered state.
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/basic/KeyboardAvoidingView/types.ts
PlatformProps,
<mask> ShadowProps, <mask> BackgroundProps, <mask> SafeAreaProps, <mask> TransformProps, <mask> } from '../../types'; <mask> <mask> export interface IScrollViewProps <mask> extends ScrollViewProps, <mask> ColorProps, <mask> SpaceProps, </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove import type { BorderProps, ColorProps, FlexboxProps, LayoutProps, PositionProps, SpaceProps, ExtraProps, OutlineProps, ShadowProps, BackgroundProps, SafeAreaProps, TransformProps, } from '../../types'; </s> add </s> remove export interface IStatusBarProps extends StatusBarProps, Omit<ColorProps, 'backgroundColor'>, SpaceProps, LayoutProps, FlexboxProps, PositionProps, BorderProps, ExtraProps, OutlineProps, ShadowProps, Omit<BackgroundProps, 'backgroundColor'>, SafeAreaProps, TransformProps {} </s> add export interface IStatusBarProps extends StatusBarProps {}
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/basic/ScrollView/types.ts
TransformProps, PlatformProps {
<mask> OutlineProps, <mask> ShadowProps, <mask> BackgroundProps, <mask> SafeAreaProps, <mask> TransformProps { <mask> /** <mask> * Renders components as Box children. Accepts a JSX.Element or an array of JSX.Element. */ <mask> children?: JSX.Element | JSX.Element[] | string | any; <mask> /** <mask> * pass props to contentContainerStyle, and this also resolved NB tokens. </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove TransformProps { </s> add TransformProps, PlatformProps { </s> remove TransformProps { </s> add TransformProps, PlatformProps { </s> remove _disabled?: IButtonProps; </s> add </s> remove * Props to be passed to the Button when state is disabled. </s> add * Passed props will be applied on hovered state. </s> remove /** * Passed props will be applied on hovered state. */ _hover?: IButtonProps; /** * Passed props will be applied on pressed state. */ _pressed?: IButtonProps; /** * Passed props will be applied on focused state. */ _focus?: IButtonProps; </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/basic/ScrollView/types.ts
PlatformProps,
<mask> BackgroundProps, <mask> SafeAreaProps, <mask> TransformProps, <mask> } from '../../types'; <mask> <mask> // TODO: any need to fixed <mask> export interface ISectionListProps <mask> extends SectionListProps<any, any>, </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove import type { BorderProps, ColorProps, FlexboxProps, LayoutProps, PositionProps, SpaceProps, ExtraProps, OutlineProps, ShadowProps, BackgroundProps, SafeAreaProps, TransformProps, } from '../../types'; </s> add
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/basic/SectionList/types.ts
TransformProps, PlatformProps {}
<mask> OutlineProps, <mask> ShadowProps, <mask> BackgroundProps, <mask> SafeAreaProps, <mask> TransformProps {} </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/basic/SectionList/types.ts
<mask> import type { StatusBarProps } from 'react-native'; <mask> import type { <mask> BorderProps, <mask> ColorProps, <mask> FlexboxProps, <mask> LayoutProps, <mask> PositionProps, <mask> SpaceProps, <mask> ExtraProps, <mask> OutlineProps, <mask> ShadowProps, <mask> BackgroundProps, <mask> SafeAreaProps, <mask> TransformProps, <mask> } from '../../types'; <mask> <mask> export interface IStatusBarProps <mask> extends StatusBarProps, <mask> Omit<ColorProps, 'backgroundColor'>, <mask> SpaceProps, </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove export interface IStatusBarProps extends StatusBarProps, Omit<ColorProps, 'backgroundColor'>, SpaceProps, LayoutProps, FlexboxProps, PositionProps, BorderProps, ExtraProps, OutlineProps, ShadowProps, Omit<BackgroundProps, 'backgroundColor'>, SafeAreaProps, TransformProps {} </s> add export interface IStatusBarProps extends StatusBarProps {} </s> remove import { useToken } from '../../../hooks'; </s> add </s> remove import { useSpinner } from './useSpinner'; // import type { IBoxProps } from '../Box'; // import { customLayout, customPosition } from '../../../utils/customProps'; // import { // Default, // Dotted, // MultiColorDotted, // Stroked, // SquareDotted, // } from './variants'; // const StyleAnimatedView = styled(Animated.View)<IBoxProps>( // color, // border, // position, // customPosition, // customLayout // ); </s> add
[ "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/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/basic/StatusBar/types.ts
export interface IStatusBarProps extends StatusBarProps {}
<mask> SafeAreaProps, <mask> TransformProps, <mask> } from '../../types'; <mask> <mask> export interface IStatusBarProps <mask> extends StatusBarProps, <mask> Omit<ColorProps, 'backgroundColor'>, <mask> SpaceProps, <mask> LayoutProps, <mask> FlexboxProps, <mask> PositionProps, <mask> BorderProps, <mask> ExtraProps, <mask> OutlineProps, <mask> ShadowProps, <mask> Omit<BackgroundProps, 'backgroundColor'>, <mask> SafeAreaProps, <mask> TransformProps {} </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove import type { BorderProps, ColorProps, FlexboxProps, LayoutProps, PositionProps, SpaceProps, ExtraProps, OutlineProps, ShadowProps, BackgroundProps, SafeAreaProps, TransformProps, } from '../../types'; </s> add </s> remove TransformProps {} </s> add TransformProps, PlatformProps {} </s> remove TransformProps {} </s> add TransformProps, PlatformProps {}
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/basic/StatusBar/types.ts
PlatformProps,
<mask> BackgroundProps, <mask> SafeAreaProps, <mask> TransformProps, <mask> } from '../../types'; <mask> <mask> export interface IViewProps <mask> extends ViewProps, </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove import type { BorderProps, ColorProps, FlexboxProps, LayoutProps, PositionProps, SpaceProps, ExtraProps, OutlineProps, ShadowProps, BackgroundProps, SafeAreaProps, TransformProps, } from '../../types'; </s> add
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/basic/View/types.ts
TransformProps, PlatformProps {
<mask> OutlineProps, <mask> ShadowProps, <mask> BackgroundProps, <mask> SafeAreaProps, <mask> TransformProps { <mask> /** <mask> * Renders components as Box children. Accepts a JSX.Element or an array of JSX.Element. */ <mask> children?: JSX.Element | JSX.Element[] | string | any; <mask> } </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/basic/View/types.ts
const disabledTextProps = isDisabled && _disabled?._text && { ..._disabled._text }; const focusVisibleTextProps = isFocused && _focusVisible?._text && { ..._focusVisible._text };
<mask> const hoverTextProps = isHovered && <mask> _hover?._text && { ..._hover._text }; <mask> const pressedTextProps = isPressed && <mask> _pressed?._text && { ..._pressed._text }; <mask> <mask> const boxChildren = <mask> isLoading && isLoadingText ? isLoadingText : children; <mask> </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove const newProps = usePropsResolution('Spinner', props); const spinnerColor = useToken('colors', newProps.color); const { spinnerProps } = useSpinner(props); // const iconSize: any = { sm: 10, lg: 20 }; // const degree: any = new Animated.Value(0); // Animated.loop( // Animated.timing(degree, { // toValue: 1, // duration: newProps.duration ?? 1900, // easing: Easing.linear, // useNativeDriver: false, // }) // ).start(); // const styles = StyleSheet.create({ // animateStyle: { // transform: [ // { // rotateZ: degree.interpolate({ // inputRange: [0, 1], // outputRange: ['0deg', '360deg'], // }), // }, // ], // }, // }); // if (!newProps.variant) { </s> add const resolvedProps = usePropsResolution('Spinner', props); </s> remove // } 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 </s> remove {...spinnerProps} {...newProps} color={spinnerColor} </s> add accessible accessibilityLabel="loading" {...resolvedProps} </s> remove import { useSpinner } from './useSpinner'; // import type { IBoxProps } from '../Box'; // import { customLayout, customPosition } from '../../../utils/customProps'; // import { // Default, // Dotted, // MultiColorDotted, // Stroked, // SquareDotted, // } from './variants'; // const StyleAnimatedView = styled(Animated.View)<IBoxProps>( // color, // border, // position, // customPosition, // customLayout // ); </s> add </s> remove /** * Passed props will be applied on hovered state. */ _hover?: IButtonProps; /** * Passed props will be applied on pressed state. */ _pressed?: IButtonProps; /** * Passed props will be applied on focused state. */ _focus?: IButtonProps; </s> add
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/primitives/Button/Button.tsx
* Passed props will be applied on hovered state.
<mask> */ <mask> _stack?: IStackProps; <mask> <mask> /** <mask> * Props to be passed to the Button when state is disabled. <mask> */ <mask> _disabled?: IButtonProps; <mask> } <mask> <mask> export interface IButtonGroupProps extends IStackProps { </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove _disabled?: IButtonProps; </s> add </s> remove /** * Passed props will be applied on hovered state. */ _hover?: IButtonProps; /** * Passed props will be applied on pressed state. */ _pressed?: IButtonProps; /** * Passed props will be applied on focused state. */ _focus?: IButtonProps; </s> add </s> remove TransformProps { </s> add TransformProps, PlatformProps { </s> remove TransformProps { </s> add TransformProps, PlatformProps {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/primitives/Button/types.ts
<mask> <mask> /** <mask> * Props to be passed to the Button when state is disabled. <mask> */ <mask> _disabled?: IButtonProps; <mask> } <mask> <mask> export interface IButtonGroupProps extends IStackProps { <mask> /** <mask> * The direction of the Stack Items. </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove * Props to be passed to the Button when state is disabled. </s> add * Passed props will be applied on hovered state. </s> remove /** * Passed props will be applied on hovered state. */ _hover?: IButtonProps; /** * Passed props will be applied on pressed state. */ _pressed?: IButtonProps; /** * Passed props will be applied on focused state. */ _focus?: IButtonProps; </s> add </s> remove TransformProps { </s> add TransformProps, PlatformProps { </s> remove TransformProps { </s> add TransformProps, PlatformProps { </s> remove TransformProps { </s> add TransformProps, PlatformProps {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/primitives/Button/types.ts
<mask> /** <mask> * If true, button will be atttached together. <mask> */ <mask> isAttached?: boolean; <mask> /** <mask> * Passed props will be applied on hovered state. <mask> */ <mask> _hover?: IButtonProps; <mask> /** <mask> * Passed props will be applied on pressed state. <mask> */ <mask> _pressed?: IButtonProps; <mask> /** <mask> * Passed props will be applied on focused state. <mask> */ <mask> _focus?: IButtonProps; <mask> } <mask> <mask> export type IButtonComponentType = (( <mask> props: IButtonProps & { ref?: any } <mask> ) => JSX.Element) & { </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove * Props to be passed to the Button when state is disabled. </s> add * Passed props will be applied on hovered state. </s> remove _disabled?: IButtonProps; </s> add </s> remove TransformProps { </s> add TransformProps, PlatformProps { </s> remove TransformProps { </s> add TransformProps, PlatformProps { </s> remove TransformProps { </s> add TransformProps, PlatformProps {
[ "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/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/primitives/Button/types.ts
<mask> import { ActivityIndicator } from 'react-native'; <mask> import styled from 'styled-components/native'; <mask> import { color, space, position } from 'styled-system'; <mask> import { usePropsResolution } from '../../../hooks/useThemeProps'; <mask> import { useToken } 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 { </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove import { useSpinner } from './useSpinner'; // import type { IBoxProps } from '../Box'; // import { customLayout, customPosition } from '../../../utils/customProps'; // import { // Default, // Dotted, // MultiColorDotted, // Stroked, // SquareDotted, // } from './variants'; // const StyleAnimatedView = styled(Animated.View)<IBoxProps>( // color, // border, // position, // customPosition, // customLayout // ); </s> add </s> remove import type { BorderProps, ColorProps, FlexboxProps, LayoutProps, PositionProps, SpaceProps, ExtraProps, OutlineProps, ShadowProps, BackgroundProps, SafeAreaProps, TransformProps, } from '../../types'; </s> add </s> remove // } 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 </s> remove {...spinnerProps} {...newProps} color={spinnerColor} </s> add accessible accessibilityLabel="loading" {...resolvedProps} </s> remove const newProps = usePropsResolution('Spinner', props); const spinnerColor = useToken('colors', newProps.color); const { spinnerProps } = useSpinner(props); // const iconSize: any = { sm: 10, lg: 20 }; // const degree: any = new Animated.Value(0); // Animated.loop( // Animated.timing(degree, { // toValue: 1, // duration: newProps.duration ?? 1900, // easing: Easing.linear, // useNativeDriver: false, // }) // ).start(); // const styles = StyleSheet.create({ // animateStyle: { // transform: [ // { // rotateZ: degree.interpolate({ // inputRange: [0, 1], // outputRange: ['0deg', '360deg'], // }), // }, // ], // }, // }); // if (!newProps.variant) { </s> add const resolvedProps = usePropsResolution('Spinner', props);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/primitives/Spinner/index.tsx
<mask> import { color, space, position } from 'styled-system'; <mask> import { usePropsResolution } from '../../../hooks/useThemeProps'; <mask> import { useToken } 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, <mask> // customPosition, <mask> // customLayout <mask> // ); <mask> <mask> const StyledSpinner = styled(ActivityIndicator)<ISpinnerProps>( <mask> color, <mask> space, <mask> position </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove import { useToken } from '../../../hooks'; </s> add </s> remove const newProps = usePropsResolution('Spinner', props); const spinnerColor = useToken('colors', newProps.color); const { spinnerProps } = useSpinner(props); // const iconSize: any = { sm: 10, lg: 20 }; // const degree: any = new Animated.Value(0); // Animated.loop( // Animated.timing(degree, { // toValue: 1, // duration: newProps.duration ?? 1900, // easing: Easing.linear, // useNativeDriver: false, // }) // ).start(); // const styles = StyleSheet.create({ // animateStyle: { // transform: [ // { // rotateZ: degree.interpolate({ // inputRange: [0, 1], // outputRange: ['0deg', '360deg'], // }), // }, // ], // }, // }); // if (!newProps.variant) { </s> add const resolvedProps = usePropsResolution('Spinner', props); </s> remove // } 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 </s> remove {...spinnerProps} {...newProps} color={spinnerColor} </s> add accessible accessibilityLabel="loading" {...resolvedProps} </s> remove import type { BorderProps, ColorProps, FlexboxProps, LayoutProps, PositionProps, SpaceProps, ExtraProps, OutlineProps, ShadowProps, BackgroundProps, SafeAreaProps, TransformProps, } from '../../types'; </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "k...
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/primitives/Spinner/index.tsx
const resolvedProps = usePropsResolution('Spinner', props);
<mask> space, <mask> position <mask> ); <mask> const Spinner = (props: ISpinnerProps, ref: any) => { <mask> const newProps = usePropsResolution('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, <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> // { <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} </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove import { useSpinner } from './useSpinner'; // import type { IBoxProps } from '../Box'; // import { customLayout, customPosition } from '../../../utils/customProps'; // import { // Default, // Dotted, // MultiColorDotted, // Stroked, // SquareDotted, // } from './variants'; // const StyleAnimatedView = styled(Animated.View)<IBoxProps>( // color, // border, // position, // customPosition, // customLayout // ); </s> add </s> remove // } 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 </s> remove {...spinnerProps} {...newProps} color={spinnerColor} </s> add accessible accessibilityLabel="loading" {...resolvedProps} </s> remove import { useToken } from '../../../hooks'; </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "re...
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/primitives/Spinner/index.tsx
accessible accessibilityLabel="loading" {...resolvedProps}
<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) { </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove // } 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 </s> remove const newProps = usePropsResolution('Spinner', props); const spinnerColor = useToken('colors', newProps.color); const { spinnerProps } = useSpinner(props); // const iconSize: any = { sm: 10, lg: 20 }; // const degree: any = new Animated.Value(0); // Animated.loop( // Animated.timing(degree, { // toValue: 1, // duration: newProps.duration ?? 1900, // easing: Easing.linear, // useNativeDriver: false, // }) // ).start(); // const styles = StyleSheet.create({ // animateStyle: { // transform: [ // { // rotateZ: degree.interpolate({ // inputRange: [0, 1], // outputRange: ['0deg', '360deg'], // }), // }, // ], // }, // }); // if (!newProps.variant) { </s> add const resolvedProps = usePropsResolution('Spinner', props); </s> remove import { useSpinner } from './useSpinner'; // import type { IBoxProps } from '../Box'; // import { customLayout, customPosition } from '../../../utils/customProps'; // import { // Default, // Dotted, // MultiColorDotted, // Stroked, // SquareDotted, // } from './variants'; // const StyleAnimatedView = styled(Animated.View)<IBoxProps>( // color, // border, // position, // customPosition, // customLayout // ); </s> add </s> remove import { useToken } from '../../../hooks'; </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/primitives/Spinner/index.tsx
<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 memo(forwardRef(Spinner)); <mask> export type { ISpinnerProps }; </s> fix: typings (#3770) Typings for View, ScrollView, StatusBar, KeyboardAvoidingView, FlatList, SelectionList, Spinner and Button </s> remove {...spinnerProps} {...newProps} color={spinnerColor} </s> add accessible accessibilityLabel="loading" {...resolvedProps} </s> remove const newProps = usePropsResolution('Spinner', props); const spinnerColor = useToken('colors', newProps.color); const { spinnerProps } = useSpinner(props); // const iconSize: any = { sm: 10, lg: 20 }; // const degree: any = new Animated.Value(0); // Animated.loop( // Animated.timing(degree, { // toValue: 1, // duration: newProps.duration ?? 1900, // easing: Easing.linear, // useNativeDriver: false, // }) // ).start(); // const styles = StyleSheet.create({ // animateStyle: { // transform: [ // { // rotateZ: degree.interpolate({ // inputRange: [0, 1], // outputRange: ['0deg', '360deg'], // }), // }, // ], // }, // }); // if (!newProps.variant) { </s> add const resolvedProps = usePropsResolution('Spinner', props); </s> remove import { useSpinner } from './useSpinner'; // import type { IBoxProps } from '../Box'; // import { customLayout, customPosition } from '../../../utils/customProps'; // import { // Default, // Dotted, // MultiColorDotted, // Stroked, // SquareDotted, // } from './variants'; // const StyleAnimatedView = styled(Animated.View)<IBoxProps>( // color, // border, // position, // customPosition, // customLayout // ); </s> add </s> remove import { useToken } from '../../../hooks'; </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "re...
https://github.com/GeekyAnts/NativeBase/commit/0b4431bb2b632b9b684e7e2265af9577b1ab065a
src/components/primitives/Spinner/index.tsx
<mask> "react-native-drawer": "2.5.1", <mask> "react-native-easy-grid": "0.2.2", <mask> "react-native-keyboard-aware-scroll-view": "0.9.1", <mask> "react-native-vector-icons": "^6.6.0", <mask> "react-timer-mixin": "^0.13.4", <mask> "react-tween-state": "^0.1.5", <mask> "tween-functions": "^1.0.1" <mask> }, <mask> "devDependencies": { <mask> "babel-cli": "^6.18.0", </s> Tabs not using react-timer-mixin (#3066) * Use timeout mixin * Revert change of code style * Remove react-timer-mixin dependency * Revert "Remove react-timer-mixin dependency" This reverts commit 7e28fef4682479d1f44f1c1c0c388dd9116b3cf1. * Remove react-timer-mixin dep * Run prepublish * Revert "Run prepublish" This reverts commit 37e5ed2643ed2de63fc38d979e53bab9e930a348. * Revert yarn.lock </s> remove mixins: [TimerMixin], </s> add </s> remove animated: false, </s> add animated: false </s> remove setTimeout(() => { </s> add this.scrollToTimer = setTimeout(() => { </s> remove const TimerMixin = require('react-timer-mixin'); </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b62d92dd829eab5e77b748f1739b89bda7336ce
package.json
<mask> ScrollView, <mask> StyleSheet, <mask> Platform <mask> } = ReactNative; <mask> const TimerMixin = require('react-timer-mixin'); <mask> <mask> const SceneComponent = require('./SceneComponent'); <mask> const { DefaultTabBar } = require('./DefaultTabBar'); <mask> const { ScrollableTabBar } = require('./ScrollableTabBar'); <mask> </s> Tabs not using react-timer-mixin (#3066) * Use timeout mixin * Revert change of code style * Remove react-timer-mixin dependency * Revert "Remove react-timer-mixin dependency" This reverts commit 7e28fef4682479d1f44f1c1c0c388dd9116b3cf1. * Remove react-timer-mixin dep * Run prepublish * Revert "Run prepublish" This reverts commit 37e5ed2643ed2de63fc38d979e53bab9e930a348. * Revert yarn.lock </s> remove mixins: [TimerMixin], </s> add </s> remove animated: false, </s> add animated: false </s> remove setTimeout(() => { </s> add this.scrollToTimer = setTimeout(() => { </s> remove "react-timer-mixin": "^0.13.4", </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b62d92dd829eab5e77b748f1739b89bda7336ce
src/basic/Tabs/index.js
<mask> const { DefaultTabBar } = require('./DefaultTabBar'); <mask> const { ScrollableTabBar } = require('./ScrollableTabBar'); <mask> <mask> const ScrollableTabView = createReactClass({ <mask> mixins: [TimerMixin], <mask> statics: { <mask> DefaultTabBar, <mask> ScrollableTabBar <mask> }, <mask> </s> Tabs not using react-timer-mixin (#3066) * Use timeout mixin * Revert change of code style * Remove react-timer-mixin dependency * Revert "Remove react-timer-mixin dependency" This reverts commit 7e28fef4682479d1f44f1c1c0c388dd9116b3cf1. * Remove react-timer-mixin dep * Run prepublish * Revert "Run prepublish" This reverts commit 37e5ed2643ed2de63fc38d979e53bab9e930a348. * Revert yarn.lock </s> remove const TimerMixin = require('react-timer-mixin'); </s> add </s> remove animated: false, </s> add animated: false </s> remove setTimeout(() => { </s> add this.scrollToTimer = setTimeout(() => { </s> remove "react-timer-mixin": "^0.13.4", </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b62d92dd829eab5e77b748f1739b89bda7336ce
src/basic/Tabs/index.js
this.scrollToTimer = setTimeout(() => {
<mask> } <mask> }; <mask> InteractionManager.runAfterInteractions(scrollFn); <mask> // because of contentOffset is not working on Android <mask> setTimeout(() => { <mask> if (this.scrollView) { <mask> this.scrollView.scrollTo({ <mask> x: this.props.initialPage * this.state.containerWidth, <mask> animated: false, <mask> }); </s> Tabs not using react-timer-mixin (#3066) * Use timeout mixin * Revert change of code style * Remove react-timer-mixin dependency * Revert "Remove react-timer-mixin dependency" This reverts commit 7e28fef4682479d1f44f1c1c0c388dd9116b3cf1. * Remove react-timer-mixin dep * Run prepublish * Revert "Run prepublish" This reverts commit 37e5ed2643ed2de63fc38d979e53bab9e930a348. * Revert yarn.lock </s> remove animated: false, </s> add animated: false </s> remove mixins: [TimerMixin], </s> add </s> remove const TimerMixin = require('react-timer-mixin'); </s> add </s> remove "react-timer-mixin": "^0.13.4", </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b62d92dd829eab5e77b748f1739b89bda7336ce
src/basic/Tabs/index.js
animated: false
<mask> setTimeout(() => { <mask> if (this.scrollView) { <mask> this.scrollView.scrollTo({ <mask> x: this.props.initialPage * this.state.containerWidth, <mask> animated: false, <mask> }); <mask> } <mask> }); <mask> }, <mask> </s> Tabs not using react-timer-mixin (#3066) * Use timeout mixin * Revert change of code style * Remove react-timer-mixin dependency * Revert "Remove react-timer-mixin dependency" This reverts commit 7e28fef4682479d1f44f1c1c0c388dd9116b3cf1. * Remove react-timer-mixin dep * Run prepublish * Revert "Run prepublish" This reverts commit 37e5ed2643ed2de63fc38d979e53bab9e930a348. * Revert yarn.lock </s> remove setTimeout(() => { </s> add this.scrollToTimer = setTimeout(() => { </s> remove mixins: [TimerMixin], </s> add </s> remove const TimerMixin = require('react-timer-mixin'); </s> add </s> remove "react-timer-mixin": "^0.13.4", </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b62d92dd829eab5e77b748f1739b89bda7336ce
src/basic/Tabs/index.js
componentWillUnmount() { if (this.scrollToTimer) { clearTimeout(this.scrollToTimer); } },
<mask> }); <mask> }, <mask> <mask> UNSAFE_componentWillReceiveProps(props) { <mask> if (props.children !== this.props.children) { <mask> this.updateSceneKeys({ <mask> page: this.state.currentPage, </s> Tabs not using react-timer-mixin (#3066) * Use timeout mixin * Revert change of code style * Remove react-timer-mixin dependency * Revert "Remove react-timer-mixin dependency" This reverts commit 7e28fef4682479d1f44f1c1c0c388dd9116b3cf1. * Remove react-timer-mixin dep * Run prepublish * Revert "Run prepublish" This reverts commit 37e5ed2643ed2de63fc38d979e53bab9e930a348. * Revert yarn.lock </s> remove mixins: [TimerMixin], </s> add </s> remove animated: false, </s> add animated: false </s> remove "react-timer-mixin": "^0.13.4", </s> add </s> remove setTimeout(() => { </s> add this.scrollToTimer = setTimeout(() => { </s> remove const TimerMixin = require('react-timer-mixin'); </s> add
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0b62d92dd829eab5e77b748f1739b89bda7336ce
src/basic/Tabs/index.js
<Select // variant="styled"
<mask> export default function () { <mask> let [language, setLanguage] = React.useState<string>(''); <mask> return ( <mask> <VStack w="80%" space={4}> <mask> <Select.Picker <mask> // placeholder="Pick language" <mask> selectedValue={language} <mask> width={150} <mask> onValueChange={(itemValue: string) => setLanguage(itemValue)} <mask> // borderRadius="md" </s> fix: merged styled and native select </s> remove return ( </s> add return variant === 'styled' ? ( </s> remove export const Select = { baseStyle: { </s> add export const styled = (props: Record<string, any>) => { return { </s> remove SelectTemp.Picker = Picker; </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
example/storybook/stories/components/primitives/Select/Basic.tsx
</Select>
<mask> <Select.Item label="TypeScript" value="ts" /> <mask> <Select.Item label="C" value="c" /> <mask> <Select.Item label="Python" value="py" /> <mask> <Select.Item label="Java" value="java" /> <mask> </Select.Picker> <mask> <Box>{language}</Box> <mask> </VStack> <mask> ); <mask> } </s> fix: merged styled and native select </s> remove const PickerItem = ({ ...props }) => { return <RNPicker.Item {...props} />; }; const Item = (props: any) => { const { isPicker } = React.useContext(SelectContext); return isPicker ? <PickerItem {...props} /> : <SelectItem {...props} />; }; </s> add </s> remove <Button onPress={openMenu} width={width} ref={ref ?? triggerRef} {...newProps} justifyContent="space-between" {...(isHovered && _hover)} style={style} > <Text opacity={selectedItem ? undefined : 0.5} {...placeholderProps}> {selectedItem ? selectedItem.label : placeholder} </Text> {icon} </Button> </s> add {variant === 'styled' ? StyledSelect : NativeSelect} </s> remove import type { ISelectItemProps } from './types'; </s> add import type { ISelectItemProps, ISelectContextProps } from './types';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
example/storybook/stories/components/primitives/Select/Basic.tsx
variant="styled"
<mask> <VStack w="80%" space={4}> <mask> <Select <mask> placeholder="Pick language" <mask> _placeholder={{ color: 'teal.500' }} <mask> selectedValue={language} <mask> width={150} </s> fix: merged styled and native select </s> remove <Select.Picker </s> add <Select // variant="styled" </s> remove export const Picker = { baseStyle: (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, _isInvalid: { borderColor: mode('danger.600', 'danger.200')(props), }, }; }, </s> add export const native = (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, }; }; const variants = { styled: styled, native: native, </s> remove isPicker: false, </s> add variant: variant, </s> remove <Button onPress={openMenu} width={width} ref={ref ?? triggerRef} {...newProps} justifyContent="space-between" {...(isHovered && _hover)} style={style} > <Text opacity={selectedItem ? undefined : 0.5} {...placeholderProps}> {selectedItem ? selectedItem.label : placeholder} </Text> {icon} </Button> </s> add {variant === 'styled' ? StyledSelect : NativeSelect} </s> remove </Select.Picker> </s> add </Select>
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
example/storybook/stories/components/primitives/Select/Universal.tsx
{ onValueChange, selectedValue, children, dropdownIcon, dropdownOpenIcon, dropdownCloseIcon, ...props }: ISelectProps,
<mask> import { useThemeProps } from '../../../hooks'; <mask> import { useHover } from '@react-native-aria/interactions'; <mask> <mask> const Select = ( <mask> { onValueChange, children, ...props }: ISelectProps, <mask> ref: any <mask> ) => { <mask> const { <mask> _item, <mask> _placeholder, </s> fix: merged styled and native select </s> remove import Picker from './Picker'; </s> add </s> remove import type { ISelectItemProps } from './types'; </s> add import type { ISelectItemProps, ISelectContextProps } from './types'; </s> remove export const Select = { baseStyle: { </s> add export const styled = (props: Record<string, any>) => { return { </s> remove export const SelectItem = ({ </s> add export const Item = ({
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/Select.tsx
variant,
<mask> ref: any <mask> ) => { <mask> const { <mask> _item, <mask> _ios, <mask> _web, <mask> _android, <mask> _placeholder, </s> fix: merged styled and native select </s> remove { onValueChange, children, ...props }: ISelectProps, </s> add { onValueChange, selectedValue, children, dropdownIcon, dropdownOpenIcon, dropdownCloseIcon, ...props }: ISelectProps, </s> remove selectedValue, </s> add </s> remove SelectTemp.Picker = Picker; </s> add
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/Select.tsx
_ios, _web, _android,
<mask> variant, <mask> _item, <mask> _placeholder, <mask> placeholder, <mask> selectedItemBg, <mask> _selectedItem, <mask> _hover, </s> fix: merged styled and native select </s> remove selectedValue, </s> add </s> remove dropdownIcon, dropdownOpenIcon, dropdownCloseIcon, </s> add
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/Select.tsx
<mask> ) => { <mask> const { <mask> _item, <mask> _placeholder, <mask> selectedValue, <mask> placeholder, <mask> selectedItemBg, <mask> _selectedItem, <mask> _hover, <mask> isDisabled, </s> fix: merged styled and native select </s> remove { onValueChange, children, ...props }: ISelectProps, </s> add { onValueChange, selectedValue, children, dropdownIcon, dropdownOpenIcon, dropdownCloseIcon, ...props }: ISelectProps,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/Select.tsx
isInvalid, _isInvalid,
<mask> selectedItemBg, <mask> _selectedItem, <mask> _hover, <mask> isDisabled, <mask> width, <mask> style, <mask> ...newProps <mask> } = useThemeProps('Select', props); </s> fix: merged styled and native select </s> remove dropdownIcon, dropdownOpenIcon, dropdownCloseIcon, </s> add </s> remove selectedValue, </s> add </s> remove export const SelectItem = ({ </s> add export const Item = ({
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/Select.tsx
<mask> selectedItemBg, <mask> _selectedItem, <mask> _hover, <mask> isDisabled, <mask> dropdownIcon, <mask> dropdownOpenIcon, <mask> dropdownCloseIcon, <mask> width, <mask> style, <mask> ...newProps <mask> } = useThemeProps('Select', props); <mask> let triggerRef = React.useRef(); </s> fix: merged styled and native select </s> remove selectedValue, </s> add </s> remove { onValueChange, children, ...props }: ISelectProps, </s> add { onValueChange, selectedValue, children, dropdownIcon, dropdownOpenIcon, dropdownCloseIcon, ...props }: ISelectProps, </s> remove export const SelectItem = ({ </s> add export const Item = ({
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/Select.tsx
variant: variant,
<mask> const placeholderProps = selectedItem ? {} : _placeholder; <mask> return ( <mask> <SelectContext.Provider <mask> value={{ <mask> isPicker: false, <mask> }} <mask> > <mask> <Button <mask> onPress={openMenu} <mask> width={width} </s> fix: merged styled and native select </s> remove <Button onPress={openMenu} width={width} ref={ref ?? triggerRef} {...newProps} justifyContent="space-between" {...(isHovered && _hover)} style={style} > <Text opacity={selectedItem ? undefined : 0.5} {...placeholderProps}> {selectedItem ? selectedItem.label : placeholder} </Text> {icon} </Button> </s> add {variant === 'styled' ? StyledSelect : NativeSelect} </s> remove return ( </s> add return variant === 'styled' ? ( </s> remove const PickerItem = ({ ...props }) => { return <RNPicker.Item {...props} />; }; const Item = (props: any) => { const { isPicker } = React.useContext(SelectContext); return isPicker ? <PickerItem {...props} /> : <SelectItem {...props} />; }; </s> add </s> remove <Select.Picker </s> add <Select // variant="styled"
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/Select.tsx
{variant === 'styled' ? StyledSelect : NativeSelect}
<mask> value={{ <mask> isPicker: false, <mask> }} <mask> > <mask> <Button <mask> onPress={openMenu} <mask> width={width} <mask> ref={ref ?? triggerRef} <mask> {...newProps} <mask> justifyContent="space-between" <mask> {...(isHovered && _hover)} <mask> style={style} <mask> > <mask> <Text opacity={selectedItem ? undefined : 0.5} {...placeholderProps}> <mask> {selectedItem ? selectedItem.label : placeholder} <mask> </Text> <mask> {icon} <mask> </Button> <mask> </SelectContext.Provider> <mask> ); <mask> }; <mask> export default React.forwardRef<any, ISelectProps>(Select); </s> fix: merged styled and native select </s> remove isPicker: false, </s> add variant: variant, </s> remove const PickerItem = ({ ...props }) => { return <RNPicker.Item {...props} />; }; const Item = (props: any) => { const { isPicker } = React.useContext(SelectContext); return isPicker ? <PickerItem {...props} /> : <SelectItem {...props} />; }; </s> add </s> remove return ( </s> add return variant === 'styled' ? (
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/Select.tsx
import type { ISelectItemProps, ISelectContextProps } from './types';
<mask> import React from 'react'; <mask> import type { ISelectItemProps } from './types'; <mask> import { usePopover } from '../../../core'; <mask> import Button from '../Button'; <mask> import Text from '../Text'; <mask> import { Picker as RNPicker } from '@react-native-picker/picker'; <mask> import { SelectContext } from './Context'; </s> fix: merged styled and native select </s> remove export const SelectItem = ({ </s> add export const Item = ({ </s> remove import Picker from './Picker'; </s> add </s> remove import type { ColorProps, SpaceProps, LayoutProps, FlexboxProps, BorderProps, TypographyProps, } from 'styled-system'; import type { TextInputProps } from 'react-native'; import type { customBorderProps, customExtraProps, customOutlineProps, customShadowProps, customLayoutProps, customBackgroundProps, customTypographyProps, } from '../../../utils/customProps'; export type IPickerProps = ColorProps & TextInputProps & SpaceProps & LayoutProps & FlexboxProps & TypographyProps & customBorderProps & customExtraProps & customOutlineProps & customShadowProps & customLayoutProps & customTypographyProps & customBackgroundProps & BorderProps & { children?: React.ReactElement; // Have direct implementation selectedValue?: string; onValueChange?: (itemValue: string, itemIndex?: number) => void; _item?: ITextProps; //itemStyle isDisabled?: boolean; //enabled // Can be mimic placeholder?: string; // Figureout a way _placeholder?: ITextProps; selectedItemBg?: string; _selectedItem?: ITextProps; dropdownIcon?: JSX.Element; // Don't think it can be mimic // dropdownOpenIcon?: JSX.Element; // dropdownCloseIcon?: JSX.Element; }; </s> add </s> remove { onValueChange, children, ...props }: ISelectProps, </s> add { onValueChange, selectedValue, children, dropdownIcon, dropdownOpenIcon, dropdownCloseIcon, ...props }: ISelectProps, </s> remove export const Select = { baseStyle: { </s> add export const styled = (props: Record<string, any>) => { return {
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/SelectItem.tsx
export const Item = ({
<mask> import Text from '../Text'; <mask> import { Picker as RNPicker } from '@react-native-picker/picker'; <mask> import { SelectContext } from './Context'; <mask> <mask> export const SelectItem = ({ <mask> isDisabled, <mask> label, <mask> value, <mask> _label, <mask> style, </s> fix: merged styled and native select </s> remove import type { ISelectItemProps } from './types'; </s> add import type { ISelectItemProps, ISelectContextProps } from './types'; </s> remove import Picker from './Picker'; </s> add </s> remove { onValueChange, children, ...props }: ISelectProps, </s> add { onValueChange, selectedValue, children, dropdownIcon, dropdownOpenIcon, dropdownCloseIcon, ...props }: ISelectProps, </s> remove import type { ColorProps, SpaceProps, LayoutProps, FlexboxProps, BorderProps, TypographyProps, } from 'styled-system'; import type { TextInputProps } from 'react-native'; import type { customBorderProps, customExtraProps, customOutlineProps, customShadowProps, customLayoutProps, customBackgroundProps, customTypographyProps, } from '../../../utils/customProps'; export type IPickerProps = ColorProps & TextInputProps & SpaceProps & LayoutProps & FlexboxProps & TypographyProps & customBorderProps & customExtraProps & customOutlineProps & customShadowProps & customLayoutProps & customTypographyProps & customBackgroundProps & BorderProps & { children?: React.ReactElement; // Have direct implementation selectedValue?: string; onValueChange?: (itemValue: string, itemIndex?: number) => void; _item?: ITextProps; //itemStyle isDisabled?: boolean; //enabled // Can be mimic placeholder?: string; // Figureout a way _placeholder?: ITextProps; selectedItemBg?: string; _selectedItem?: ITextProps; dropdownIcon?: JSX.Element; // Don't think it can be mimic // dropdownOpenIcon?: JSX.Element; // dropdownCloseIcon?: JSX.Element; }; </s> add </s> remove export const Select = { baseStyle: { </s> add export const styled = (props: Record<string, any>) => { return {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/SelectItem.tsx
const { variant }: ISelectContextProps = React.useContext(SelectContext);
<mask> ...props <mask> }: ISelectItemProps) => { <mask> const { <mask> parentComponentConfig: { <mask> selectedValue, <mask> closeMenu, <mask> selectedItemBg, <mask> _selectedItem, </s> fix: merged styled and native select </s> remove { onValueChange, children, ...props }: ISelectProps, </s> add { onValueChange, selectedValue, children, dropdownIcon, dropdownOpenIcon, dropdownCloseIcon, ...props }: ISelectProps, </s> remove selectedValue, </s> add </s> remove const PickerItem = ({ ...props }) => { return <RNPicker.Item {...props} />; }; const Item = (props: any) => { const { isPicker } = React.useContext(SelectContext); return isPicker ? <PickerItem {...props} /> : <SelectItem {...props} />; }; </s> add </s> remove Picker: React.MemoExoticComponent<(props: IPickerProps) => JSX.Element>; </s> add
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/SelectItem.tsx
console.log(variant);
<mask> itemsList, <mask> _item, <mask> }, <mask> } = usePopover(); <mask> <mask> let currentIndex = -1; <mask> itemsList.forEach((item: any, index: number) => { <mask> if (item.value === value) { <mask> currentIndex = index; <mask> } </s> fix: merged styled and native select </s> remove return ( </s> add return variant === 'styled' ? ( </s> remove export const Select = { baseStyle: { </s> add export const styled = (props: Record<string, any>) => { return { </s> remove export const Picker = { baseStyle: (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, _isInvalid: { borderColor: mode('danger.600', 'danger.200')(props), }, }; }, </s> add export const native = (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, }; }; const variants = { styled: styled, native: native, </s> remove }, </s> add };
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/SelectItem.tsx
return variant === 'styled' ? (
<mask> if (selectedValue === value) { <mask> textProps = { ..._selectedItem }; <mask> } <mask> <mask> return ( <mask> <Button <mask> p={1} <mask> px={2} <mask> rounded={0} <mask> minH={0} </s> fix: merged styled and native select </s> remove isPicker: false, </s> add variant: variant, </s> remove const PickerItem = ({ ...props }) => { return <RNPicker.Item {...props} />; }; const Item = (props: any) => { const { isPicker } = React.useContext(SelectContext); return isPicker ? <PickerItem {...props} /> : <SelectItem {...props} />; }; </s> add </s> remove export const Select = { baseStyle: { </s> add export const styled = (props: Record<string, any>) => { return { </s> remove { onValueChange, children, ...props }: ISelectProps, </s> add { onValueChange, selectedValue, children, dropdownIcon, dropdownOpenIcon, dropdownCloseIcon, ...props }: ISelectProps,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/SelectItem.tsx
) : ( <RNPicker.Item label={label} value={value} />
<mask> {label} <mask> </Text> <mask> </Button> <mask> ); <mask> }; <mask> <mask> export default React.memo(Item); </s> fix: merged styled and native select </s> remove const PickerItem = ({ ...props }) => { return <RNPicker.Item {...props} />; }; const Item = (props: any) => { const { isPicker } = React.useContext(SelectContext); return isPicker ? <PickerItem {...props} /> : <SelectItem {...props} />; }; </s> add </s> remove <Button onPress={openMenu} width={width} ref={ref ?? triggerRef} {...newProps} justifyContent="space-between" {...(isHovered && _hover)} style={style} > <Text opacity={selectedItem ? undefined : 0.5} {...placeholderProps}> {selectedItem ? selectedItem.label : placeholder} </Text> {icon} </Button> </s> add {variant === 'styled' ? StyledSelect : NativeSelect} </s> remove </Select.Picker> </s> add </Select> </s> remove SelectTemp.Picker = Picker; </s> add </s> remove <Select.Picker </s> add <Select // variant="styled"
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/SelectItem.tsx
<mask> </Text> <mask> </Button> <mask> ); <mask> }; <mask> const PickerItem = ({ ...props }) => { <mask> return <RNPicker.Item {...props} />; <mask> }; <mask> <mask> const Item = (props: any) => { <mask> const { isPicker } = React.useContext(SelectContext); <mask> <mask> return isPicker ? <PickerItem {...props} /> : <SelectItem {...props} />; <mask> }; <mask> <mask> export default React.memo(Item); </s> fix: merged styled and native select </s> remove export const SelectItem = ({ </s> add export const Item = ({ </s> remove export const Select = { baseStyle: { </s> add export const styled = (props: Record<string, any>) => { return { </s> remove export const Picker = { baseStyle: (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, _isInvalid: { borderColor: mode('danger.600', 'danger.200')(props), }, }; }, </s> add export const native = (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, }; }; const variants = { styled: styled, native: native,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/SelectItem.tsx
<mask> import SelectItem from './SelectItem'; <mask> import SelectMain from './Select'; <mask> import Picker from './Picker'; <mask> import type { <mask> ISelectProps, <mask> ISelectItemProps, <mask> ISelectComponentType, <mask> } from './types'; </s> fix: merged styled and native select </s> remove import type { ISelectItemProps } from './types'; </s> add import type { ISelectItemProps, ISelectContextProps } from './types'; </s> remove export const SelectItem = ({ </s> add export const Item = ({ </s> remove { onValueChange, children, ...props }: ISelectProps, </s> add { onValueChange, selectedValue, children, dropdownIcon, dropdownOpenIcon, dropdownCloseIcon, ...props }: ISelectProps, </s> remove import type { ColorProps, SpaceProps, LayoutProps, FlexboxProps, BorderProps, TypographyProps, } from 'styled-system'; import type { TextInputProps } from 'react-native'; import type { customBorderProps, customExtraProps, customOutlineProps, customShadowProps, customLayoutProps, customBackgroundProps, customTypographyProps, } from '../../../utils/customProps'; export type IPickerProps = ColorProps & TextInputProps & SpaceProps & LayoutProps & FlexboxProps & TypographyProps & customBorderProps & customExtraProps & customOutlineProps & customShadowProps & customLayoutProps & customTypographyProps & customBackgroundProps & BorderProps & { children?: React.ReactElement; // Have direct implementation selectedValue?: string; onValueChange?: (itemValue: string, itemIndex?: number) => void; _item?: ITextProps; //itemStyle isDisabled?: boolean; //enabled // Can be mimic placeholder?: string; // Figureout a way _placeholder?: ITextProps; selectedItemBg?: string; _selectedItem?: ITextProps; dropdownIcon?: JSX.Element; // Don't think it can be mimic // dropdownOpenIcon?: JSX.Element; // dropdownCloseIcon?: JSX.Element; }; </s> add </s> remove export const Select = { baseStyle: { </s> add export const styled = (props: Record<string, any>) => { return {
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/index.tsx
<mask> } from './types'; <mask> <mask> // const SelectTemp: any = SelectMain; <mask> const SelectTemp: any = SelectMain; <mask> SelectTemp.Picker = Picker; <mask> SelectTemp.Item = SelectItem; <mask> <mask> const Select = SelectTemp as ISelectComponentType; <mask> <mask> export default Select; </s> fix: merged styled and native select </s> remove { onValueChange, children, ...props }: ISelectProps, </s> add { onValueChange, selectedValue, children, dropdownIcon, dropdownOpenIcon, dropdownCloseIcon, ...props }: ISelectProps, </s> remove export const Select = { baseStyle: { </s> add export const styled = (props: Record<string, any>) => { return { </s> remove export const SelectItem = ({ </s> add export const Item = ({ </s> remove const PickerItem = ({ ...props }) => { return <RNPicker.Item {...props} />; }; const Item = (props: any) => { const { isPicker } = React.useContext(SelectContext); return isPicker ? <PickerItem {...props} /> : <SelectItem {...props} />; }; </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/index.tsx
<mask> import type { IButtonProps } from '../Button'; <mask> import type { ITextProps } from '../Text'; <mask> import type { <mask> ColorProps, <mask> SpaceProps, <mask> LayoutProps, <mask> FlexboxProps, <mask> BorderProps, <mask> TypographyProps, <mask> } from 'styled-system'; <mask> import type { TextInputProps } from 'react-native'; <mask> import type { <mask> customBorderProps, <mask> customExtraProps, <mask> customOutlineProps, <mask> customShadowProps, <mask> customLayoutProps, <mask> customBackgroundProps, <mask> customTypographyProps, <mask> } from '../../../utils/customProps'; <mask> <mask> export type IPickerProps = ColorProps & <mask> TextInputProps & <mask> SpaceProps & <mask> LayoutProps & <mask> FlexboxProps & <mask> TypographyProps & <mask> customBorderProps & <mask> customExtraProps & <mask> customOutlineProps & <mask> customShadowProps & <mask> customLayoutProps & <mask> customTypographyProps & <mask> customBackgroundProps & <mask> BorderProps & { <mask> children?: React.ReactElement; <mask> // Have direct implementation <mask> selectedValue?: string; <mask> onValueChange?: (itemValue: string, itemIndex?: number) => void; <mask> _item?: ITextProps; //itemStyle <mask> isDisabled?: boolean; //enabled <mask> <mask> // Can be mimic <mask> placeholder?: string; <mask> <mask> // Figureout a way <mask> _placeholder?: ITextProps; <mask> selectedItemBg?: string; <mask> _selectedItem?: ITextProps; <mask> dropdownIcon?: JSX.Element; <mask> <mask> // Don't think it can be mimic <mask> // dropdownOpenIcon?: JSX.Element; <mask> // dropdownCloseIcon?: JSX.Element; <mask> }; <mask> <mask> export type ISelectProps = IButtonProps & { <mask> placeholder?: string; <mask> _placeholder?: ITextProps; <mask> selectedValue?: string; </s> fix: merged styled and native select </s> remove onValueChange: (itemValue: string, itemIndex?: number) => void; </s> add onValueChange?: (itemValue: string, itemIndex?: number) => void; </s> remove import type { ISelectItemProps } from './types'; </s> add import type { ISelectItemProps, ISelectContextProps } from './types'; </s> remove Picker: React.MemoExoticComponent<(props: IPickerProps) => JSX.Element>; </s> add </s> remove import Picker from './Picker'; </s> add
[ "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace",...
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/types.ts
onValueChange?: (itemValue: string, itemIndex?: number) => void;
<mask> export type ISelectProps = IButtonProps & { <mask> placeholder?: string; <mask> _placeholder?: ITextProps; <mask> selectedValue?: string; <mask> onValueChange: (itemValue: string, itemIndex?: number) => void; <mask> _item?: ITextProps; <mask> selectedItemBg?: string; <mask> _selectedItem?: ITextProps; <mask> isDisabled?: boolean; <mask> dropdownIcon?: JSX.Element; </s> fix: merged styled and native select </s> remove import type { ColorProps, SpaceProps, LayoutProps, FlexboxProps, BorderProps, TypographyProps, } from 'styled-system'; import type { TextInputProps } from 'react-native'; import type { customBorderProps, customExtraProps, customOutlineProps, customShadowProps, customLayoutProps, customBackgroundProps, customTypographyProps, } from '../../../utils/customProps'; export type IPickerProps = ColorProps & TextInputProps & SpaceProps & LayoutProps & FlexboxProps & TypographyProps & customBorderProps & customExtraProps & customOutlineProps & customShadowProps & customLayoutProps & customTypographyProps & customBackgroundProps & BorderProps & { children?: React.ReactElement; // Have direct implementation selectedValue?: string; onValueChange?: (itemValue: string, itemIndex?: number) => void; _item?: ITextProps; //itemStyle isDisabled?: boolean; //enabled // Can be mimic placeholder?: string; // Figureout a way _placeholder?: ITextProps; selectedItemBg?: string; _selectedItem?: ITextProps; dropdownIcon?: JSX.Element; // Don't think it can be mimic // dropdownOpenIcon?: JSX.Element; // dropdownCloseIcon?: JSX.Element; }; </s> add </s> remove Picker: React.MemoExoticComponent<(props: IPickerProps) => JSX.Element>; </s> add </s> remove import type { ISelectItemProps } from './types'; </s> add import type { ISelectItemProps, ISelectContextProps } from './types';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/types.ts
export type ISelectContextProps = { variant?: string; };
<mask> value: string; <mask> _label?: ITextProps; <mask> }; <mask> <mask> export type ISelectComponentType = ((props: ISelectProps) => JSX.Element) & { <mask> Item: React.MemoExoticComponent<(props: ISelectItemProps) => JSX.Element>; <mask> }; </s> fix: merged styled and native select </s> remove Picker: React.MemoExoticComponent<(props: IPickerProps) => JSX.Element>; </s> add </s> remove import type { ColorProps, SpaceProps, LayoutProps, FlexboxProps, BorderProps, TypographyProps, } from 'styled-system'; import type { TextInputProps } from 'react-native'; import type { customBorderProps, customExtraProps, customOutlineProps, customShadowProps, customLayoutProps, customBackgroundProps, customTypographyProps, } from '../../../utils/customProps'; export type IPickerProps = ColorProps & TextInputProps & SpaceProps & LayoutProps & FlexboxProps & TypographyProps & customBorderProps & customExtraProps & customOutlineProps & customShadowProps & customLayoutProps & customTypographyProps & customBackgroundProps & BorderProps & { children?: React.ReactElement; // Have direct implementation selectedValue?: string; onValueChange?: (itemValue: string, itemIndex?: number) => void; _item?: ITextProps; //itemStyle isDisabled?: boolean; //enabled // Can be mimic placeholder?: string; // Figureout a way _placeholder?: ITextProps; selectedItemBg?: string; _selectedItem?: ITextProps; dropdownIcon?: JSX.Element; // Don't think it can be mimic // dropdownOpenIcon?: JSX.Element; // dropdownCloseIcon?: JSX.Element; }; </s> add </s> remove onValueChange: (itemValue: string, itemIndex?: number) => void; </s> add onValueChange?: (itemValue: string, itemIndex?: number) => void; </s> remove const PickerItem = ({ ...props }) => { return <RNPicker.Item {...props} />; }; const Item = (props: any) => { const { isPicker } = React.useContext(SelectContext); return isPicker ? <PickerItem {...props} /> : <SelectItem {...props} />; }; </s> add
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/types.ts
<mask> }; <mask> <mask> export type ISelectComponentType = ((props: ISelectProps) => JSX.Element) & { <mask> Item: React.MemoExoticComponent<(props: ISelectItemProps) => JSX.Element>; <mask> Picker: React.MemoExoticComponent<(props: IPickerProps) => JSX.Element>; <mask> }; </s> fix: merged styled and native select </s> remove import type { ColorProps, SpaceProps, LayoutProps, FlexboxProps, BorderProps, TypographyProps, } from 'styled-system'; import type { TextInputProps } from 'react-native'; import type { customBorderProps, customExtraProps, customOutlineProps, customShadowProps, customLayoutProps, customBackgroundProps, customTypographyProps, } from '../../../utils/customProps'; export type IPickerProps = ColorProps & TextInputProps & SpaceProps & LayoutProps & FlexboxProps & TypographyProps & customBorderProps & customExtraProps & customOutlineProps & customShadowProps & customLayoutProps & customTypographyProps & customBackgroundProps & BorderProps & { children?: React.ReactElement; // Have direct implementation selectedValue?: string; onValueChange?: (itemValue: string, itemIndex?: number) => void; _item?: ITextProps; //itemStyle isDisabled?: boolean; //enabled // Can be mimic placeholder?: string; // Figureout a way _placeholder?: ITextProps; selectedItemBg?: string; _selectedItem?: ITextProps; dropdownIcon?: JSX.Element; // Don't think it can be mimic // dropdownOpenIcon?: JSX.Element; // dropdownCloseIcon?: JSX.Element; }; </s> add </s> remove onValueChange: (itemValue: string, itemIndex?: number) => void; </s> add onValueChange?: (itemValue: string, itemIndex?: number) => void; </s> remove const PickerItem = ({ ...props }) => { return <RNPicker.Item {...props} />; }; const Item = (props: any) => { const { isPicker } = React.useContext(SelectContext); return isPicker ? <PickerItem {...props} /> : <SelectItem {...props} />; }; </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/components/primitives/Select/types.ts
export const styled = (props: Record<string, any>) => { return {
<mask> import { mode } from '../tools/colors'; <mask> <mask> // Select <mask> export const Select = { <mask> baseStyle: { <mask> pl: 2, <mask> pr: 0, <mask> _hover: { <mask> bg: 'teal.400', <mask> }, </s> fix: merged styled and native select </s> remove bg: 'teal.400', </s> add borderColor: 'default.500', </s> remove }, </s> add }; </s> remove export const Picker = { baseStyle: (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, _isInvalid: { borderColor: mode('danger.600', 'danger.200')(props), }, }; }, </s> add export const native = (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, }; }; const variants = { styled: styled, native: native, </s> remove { onValueChange, children, ...props }: ISelectProps, </s> add { onValueChange, selectedValue, children, dropdownIcon, dropdownOpenIcon, dropdownCloseIcon, ...props }: ISelectProps,
[ "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/theme/components/select.ts
border: 1, borderColor: mode('gray.600', 'gray.400')(props), _isInvalid: { borderColor: mode('danger.600', 'danger.200')(props), },
<mask> return { <mask> pl: 2, <mask> pr: 0, <mask> _hover: { <mask> borderColor: 'default.500', <mask> }, <mask> }; </s> fix: merged styled and native select </s> remove bg: 'teal.400', </s> add borderColor: 'default.500', </s> remove export const Picker = { baseStyle: (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, _isInvalid: { borderColor: mode('danger.600', 'danger.200')(props), }, }; }, </s> add export const native = (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, }; }; const variants = { styled: styled, native: native, </s> remove export const Select = { baseStyle: { </s> add export const styled = (props: Record<string, any>) => { return { </s> remove }, </s> add }; </s> remove return ( </s> add return variant === 'styled' ? (
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/theme/components/select.ts
borderColor: 'default.500',
<mask> baseStyle: { <mask> pl: 2, <mask> pr: 0, <mask> _hover: { <mask> bg: 'teal.400', <mask> }, <mask> }, <mask> }; <mask> <mask> // Picker </s> fix: merged styled and native select </s> remove }, </s> add }; </s> remove export const Select = { baseStyle: { </s> add export const styled = (props: Record<string, any>) => { return { </s> remove export const Picker = { baseStyle: (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, _isInvalid: { borderColor: mode('danger.600', 'danger.200')(props), }, }; }, </s> add export const native = (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, }; }; const variants = { styled: styled, native: native,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/theme/components/select.ts
};
<mask> pr: 0, <mask> _hover: { <mask> bg: 'teal.400', <mask> }, <mask> }, <mask> }; <mask> <mask> // Picker <mask> export const Picker = { <mask> baseStyle: (props: Record<string, any>) => { </s> fix: merged styled and native select </s> remove bg: 'teal.400', </s> add borderColor: 'default.500', </s> remove export const Select = { baseStyle: { </s> add export const styled = (props: Record<string, any>) => { return { </s> remove export const Picker = { baseStyle: (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, _isInvalid: { borderColor: mode('danger.600', 'danger.200')(props), }, }; }, </s> add export const native = (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, }; }; const variants = { styled: styled, native: native,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/theme/components/select.ts
export const native = (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, }; }; const variants = { styled: styled, native: native,
<mask> }, <mask> }; <mask> <mask> // Picker <mask> export const Picker = { <mask> baseStyle: (props: Record<string, any>) => { <mask> return { <mask> _android: { <mask> p: 2, <mask> color: mode('gray.800', 'gray.50')(props), <mask> }, <mask> _ios: {}, <mask> _web: { <mask> bg: 'transparent', <mask> borderRadius: 'md', <mask> borderColor: 'default.500', <mask> color: mode('gray.800', 'gray.50')(props), <mask> p: 3, <mask> }, <mask> _hover: { <mask> borderColor: 'default.500', <mask> }, <mask> _isInvalid: { <mask> borderColor: mode('danger.600', 'danger.200')(props), <mask> }, <mask> }; <mask> }, <mask> }; <mask> <mask> // SelectItem <mask> export const SelectItem = {}; <mask> </s> fix: merged styled and native select </s> remove bg: 'teal.400', </s> add borderColor: 'default.500', </s> remove }, </s> add }; </s> remove export const Select = { baseStyle: { </s> add export const styled = (props: Record<string, any>) => { return {
[ "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/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/theme/components/select.ts
export const Select = { variants, defaultProps: { variant: 'native', }, };
<mask> }; <mask> <mask> // SelectItem <mask> export const SelectItem = {}; <mask> <mask> // SelectIcon <mask> export const SelectIcon = {}; </s> fix: merged styled and native select </s> remove export const Picker = { baseStyle: (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, _isInvalid: { borderColor: mode('danger.600', 'danger.200')(props), }, }; }, </s> add export const native = (props: Record<string, any>) => { return { _android: { p: 2, color: mode('gray.800', 'gray.50')(props), }, _ios: {}, _web: { bg: 'transparent', borderRadius: 'md', borderColor: 'default.500', color: mode('gray.800', 'gray.50')(props), p: 3, }, _hover: { borderColor: 'default.500', }, }; }; const variants = { styled: styled, native: native, </s> remove export const SelectItem = ({ </s> add export const Item = ({ </s> remove SelectTemp.Picker = Picker; </s> add </s> remove }, </s> add }; </s> remove export const Select = { baseStyle: { </s> add export const styled = (props: Record<string, any>) => { return {
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0db13a80771519547a97d2d225eeb2dd5dc57b4e
src/theme/components/select.ts
bg: 'muted.400', }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, bg: 'muted.300', },
<mask> }, <mask> _pressed: { <mask> bg: 'muted.300', <mask> }, <mask> }, <mask> _dark: { <mask> _text: { </s> fix: matched Input Addons and Actionsheet design </s> remove bg: 'muted.600', </s> add bg: 'muted.500', }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, bg: 'muted.600', },
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0e645b091f1bb02f2e8374e234e231422d0a37e9
src/theme/components/actionsheet.ts
bg: 'muted.500', }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, bg: 'muted.600', },
<mask> _hover: { <mask> bg: 'muted.700', <mask> }, <mask> _pressed: { <mask> bg: 'muted.600', <mask> }, <mask> }, <mask> }), <mask> defaultProps: { <mask> variant: 'unstyled', </s> fix: matched Input Addons and Actionsheet design
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0e645b091f1bb02f2e8374e234e231422d0a37e9
src/theme/components/actionsheet.ts
borderLeftRadius: 'sm',
<mask> // roundedLeft: '4', <mask> p: '2', <mask> borderWidth: '1', <mask> borderRightWidth: '0', <mask> _text: { <mask> fontWeight: 400, <mask> }, <mask> alignItems: 'center', <mask> justifyContent: 'center', </s> fix: matched Input Addons and Actionsheet design </s> remove bg: 'muted.600', </s> add bg: 'muted.500', }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, bg: 'muted.600', },
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0e645b091f1bb02f2e8374e234e231422d0a37e9
src/theme/components/inputleftaddon.ts
borderRightRadius: 'sm',
<mask> // roundedRight: '4', <mask> p: '2', <mask> borderWidth: '1', <mask> borderLeftWidth: '0', <mask> _text: { <mask> fontWeight: 400, <mask> }, <mask> alignItems: 'center', </s> fix: matched Input Addons and Actionsheet design </s> remove bg: 'muted.600', </s> add bg: 'muted.500', }, _focusVisible: { _web: { outlineWidth: '0', style: { boxShadow: `none` }, bg: 'muted.600', },
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0e645b091f1bb02f2e8374e234e231422d0a37e9
src/theme/components/inputrightaddon.ts
import { useFocusRing } from '@react-native-aria/focus';
<mask> useHover, <mask> useFocus, <mask> useIsPressed, <mask> } from '../../primitives/Pressable/Pressable'; <mask> <mask> const IconButton = ( <mask> { icon, children, ...props }: IIconButtonProps, <mask> ref: any </s> fix: buttons reacting on _focusVisible prop
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0ef6fdd246bf295daef3305526096a8834f32b04
src/components/composites/IconButton/index.tsx
const { isFocusVisible, focusProps: focusRingProps }: any = useFocusRing();
<mask> const { hoverProps, isHovered } = useHover(); <mask> const { pressableProps, isPressed } = useIsPressed(); <mask> const { focusProps, isFocused } = useFocus(); <mask> <mask> const { <mask> _icon, <mask> onPressIn, <mask> onPressOut, </s> fix: buttons reacting on _focusVisible prop
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0ef6fdd246bf295daef3305526096a8834f32b04
src/components/composites/IconButton/index.tsx
isFocusVisible,
<mask> isPressed, <mask> isFocused, <mask> }); <mask> <mask> let clonedIcon; <mask> if (icon) { <mask> clonedIcon = React.cloneElement(icon, { </s> fix: buttons reacting on _focusVisible prop
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0ef6fdd246bf295daef3305526096a8834f32b04
src/components/composites/IconButton/index.tsx
composeEventHandlers(onFocus, focusProps.onFocus), focusRingProps.onFocus
<mask> // @ts-ignore - web only <mask> onHoverOut={composeEventHandlers(onHoverOut, hoverProps.onHoverOut)} <mask> // @ts-ignore - web only <mask> onFocus={composeEventHandlers( <mask> composeEventHandlers(onFocus, focusProps.onFocus) <mask> // focusRingProps.onFocu <mask> )} <mask> // @ts-ignore - web only <mask> onBlur={composeEventHandlers( <mask> composeEventHandlers(onBlur, focusProps.onBlur) <mask> // focusRingProps.onBlur </s> fix: buttons reacting on _focusVisible prop </s> remove composeEventHandlers(onFocus, focusProps.onFocus) // focusRingProps.onFocus </s> add composeEventHandlers(onFocus, focusProps.onFocus), focusRingProps.onFocus </s> remove composeEventHandlers(onBlur, focusProps.onBlur) // focusRingProps.onBlur </s> add composeEventHandlers(onBlur, focusProps.onBlur), focusRingProps.onBlur </s> remove composeEventHandlers(onBlur, focusProps.onBlur) // focusRingProps.onBlur </s> add composeEventHandlers(onBlur, focusProps.onBlur), focusRingProps.onBlur
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0ef6fdd246bf295daef3305526096a8834f32b04
src/components/composites/IconButton/index.tsx
composeEventHandlers(onBlur, focusProps.onBlur), focusRingProps.onBlur
<mask> // focusRingProps.onFocu <mask> )} <mask> // @ts-ignore - web only <mask> onBlur={composeEventHandlers( <mask> composeEventHandlers(onBlur, focusProps.onBlur) <mask> // focusRingProps.onBlur <mask> )} <mask> {...resolvedProps} <mask> > <mask> {clonedIcon || <Icon {..._icon}>{children}</Icon>} <mask> </Pressable> </s> fix: buttons reacting on _focusVisible prop </s> remove composeEventHandlers(onBlur, focusProps.onBlur) // focusRingProps.onBlur </s> add composeEventHandlers(onBlur, focusProps.onBlur), focusRingProps.onBlur </s> remove composeEventHandlers(onFocus, focusProps.onFocus) // focusRingProps.onFocu </s> add composeEventHandlers(onFocus, focusProps.onFocus), focusRingProps.onFocus </s> remove composeEventHandlers(onFocus, focusProps.onFocus) // focusRingProps.onFocus </s> add composeEventHandlers(onFocus, focusProps.onFocus), focusRingProps.onFocus
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0ef6fdd246bf295daef3305526096a8834f32b04
src/components/composites/IconButton/index.tsx
import { useFocusRing } from '@react-native-aria/focus';
<mask> useFocus, <mask> useIsPressed, <mask> } from '../../primitives/Pressable/Pressable'; <mask> import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps'; <mask> <mask> const Button = ( <mask> { <mask> children, </s> fix: buttons reacting on _focusVisible prop
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0ef6fdd246bf295daef3305526096a8834f32b04
src/components/primitives/Button/Button.tsx
const { isFocusVisible, focusProps: focusRingProps }: any = useFocusRing();
<mask> ) => { <mask> const { hoverProps, isHovered } = useHover(); <mask> const { pressableProps, isPressed } = useIsPressed(); <mask> const { focusProps, isFocused } = useFocus(); <mask> <mask> const { <mask> onPressIn, <mask> onPressOut, <mask> onHoverIn, <mask> onHoverOut, </s> fix: buttons reacting on _focusVisible prop
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0ef6fdd246bf295daef3305526096a8834f32b04
src/components/primitives/Button/Button.tsx
isFocusVisible,
<mask> isPressed, <mask> isLoading, <mask> }); <mask> <mask> //TODO: refactor for responsive prop <mask> if (useHasResponsiveProps(props)) { <mask> return null; </s> fix: buttons reacting on _focusVisible prop
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0ef6fdd246bf295daef3305526096a8834f32b04
src/components/primitives/Button/Button.tsx
composeEventHandlers(onFocus, focusProps.onFocus), focusRingProps.onFocus
<mask> // @ts-ignore - web only <mask> onHoverOut={composeEventHandlers(onHoverOut, hoverProps.onHoverOut)} <mask> // @ts-ignore - web only <mask> onFocus={composeEventHandlers( <mask> composeEventHandlers(onFocus, focusProps.onFocus) <mask> // focusRingProps.onFocus <mask> )} <mask> // @ts-ignore - web only <mask> onBlur={composeEventHandlers( <mask> composeEventHandlers(onBlur, focusProps.onBlur) <mask> // focusRingProps.onBlur </s> fix: buttons reacting on _focusVisible prop </s> remove composeEventHandlers(onFocus, focusProps.onFocus) // focusRingProps.onFocu </s> add composeEventHandlers(onFocus, focusProps.onFocus), focusRingProps.onFocus </s> remove composeEventHandlers(onBlur, focusProps.onBlur) // focusRingProps.onBlur </s> add composeEventHandlers(onBlur, focusProps.onBlur), focusRingProps.onBlur </s> remove composeEventHandlers(onBlur, focusProps.onBlur) // focusRingProps.onBlur </s> add composeEventHandlers(onBlur, focusProps.onBlur), focusRingProps.onBlur
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0ef6fdd246bf295daef3305526096a8834f32b04
src/components/primitives/Button/Button.tsx
composeEventHandlers(onBlur, focusProps.onBlur), focusRingProps.onBlur
<mask> // focusRingProps.onFocus <mask> )} <mask> // @ts-ignore - web only <mask> onBlur={composeEventHandlers( <mask> composeEventHandlers(onBlur, focusProps.onBlur) <mask> // focusRingProps.onBlur <mask> )} <mask> {...resolvedProps} <mask> accessibilityRole={props.accessibilityRole ?? 'button'} <mask> > <mask> <HStack {..._stack}> </s> fix: buttons reacting on _focusVisible prop </s> remove composeEventHandlers(onBlur, focusProps.onBlur) // focusRingProps.onBlur </s> add composeEventHandlers(onBlur, focusProps.onBlur), focusRingProps.onBlur </s> remove composeEventHandlers(onFocus, focusProps.onFocus) // focusRingProps.onFocus </s> add composeEventHandlers(onFocus, focusProps.onFocus), focusRingProps.onFocus </s> remove composeEventHandlers(onFocus, focusProps.onFocus) // focusRingProps.onFocu </s> add composeEventHandlers(onFocus, focusProps.onFocus), focusRingProps.onFocus
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0ef6fdd246bf295daef3305526096a8834f32b04
src/components/primitives/Button/Button.tsx
import { ActionSheetContext } from './ActionSheetContext';
<mask> import React, { memo, forwardRef } from 'react'; <mask> import { Modal } from '../../composites/Modal'; <mask> import type { IActionsheetProps } from './types'; <mask> import { usePropsResolution } from '../../../hooks'; <mask> <mask> const Actionsheet = ( <mask> { children, hideDragIndicator = false, ...props }: IActionsheetProps, <mask> ref: any <mask> ) => { </s> fix: 3376 drag indicator hide and styling props </s> remove const Actionsheet = ({ children, ...props }: IActionsheetProps, ref: any) => { </s> add const Actionsheet = ( { children, hideDragIndicator = false, ...props }: IActionsheetProps, ref: any ) => { </s> remove const newProps = usePropsResolution('ActionsheetContent', props); </s> add const { _dragIndicator, ...newProps } = usePropsResolution( 'ActionsheetContent', props );
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0efc7a9b0fd08cadbd2c844b890c9ebb07e21f84
src/components/composites/Actionsheet/Actionsheet.tsx
const Actionsheet = ( { children, hideDragIndicator = false, ...props }: IActionsheetProps, ref: any ) => {
<mask> import { Modal } from '../../composites/Modal'; <mask> import type { IActionsheetProps } from './types'; <mask> import { usePropsResolution } from '../../../hooks'; <mask> <mask> const Actionsheet = ({ children, ...props }: IActionsheetProps, ref: any) => { <mask> const { isOpen, disableOverlay, onClose, ...newProps } = usePropsResolution( <mask> 'Actionsheet', <mask> props <mask> ); <mask> </s> fix: 3376 drag indicator hide and styling props </s> remove const newProps = usePropsResolution('ActionsheetContent', props); </s> add const { _dragIndicator, ...newProps } = usePropsResolution( 'ActionsheetContent', props );
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0efc7a9b0fd08cadbd2c844b890c9ebb07e21f84
src/components/composites/Actionsheet/Actionsheet.tsx
<ActionSheetContext.Provider value={{ hideDragIndicator }}> {children} </ActionSheetContext.Provider>
<mask> overlayVisible={disableOverlay ? false : true} <mask> closeOnOverlayClick={disableOverlay ? false : true} <mask> ref={ref} <mask> > <mask> {children} <mask> </Modal> <mask> ); <mask> }; <mask> <mask> export default memo(forwardRef(Actionsheet)); </s> fix: 3376 drag indicator hide and styling props </s> remove {/* Hack. Fix later. Add -2 negative margin to remove the padding added by ActionSheetContent */} <Box py={5} mt={-2} {...panResponder.panHandlers} width="100%" alignItems="center" collapsable={false} > <Box bg="coolGray.400" height={1} width={9} borderRadius={2} /> </Box> </s> add {!hideDragIndicator ? ( <> {/* Hack. Fix later. Add -2 negative margin to remove the padding added by ActionSheetContent */} <Box py={5} mt={-2} {...panResponder.panHandlers} width="100%" alignItems="center" collapsable={false} > <Box {..._dragIndicator} /> </Box> </> ) : null} </s> remove {/* To increase the draggable area */} <Box py={5} {...panResponder.panHandlers} collapsable={false} /> </s> add {!hideDragIndicator ? ( <> {/* To increase the draggable area */} <Box py={5} {...panResponder.panHandlers} collapsable={false} /> </> ) : null}
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0efc7a9b0fd08cadbd2c844b890c9ebb07e21f84
src/components/composites/Actionsheet/Actionsheet.tsx
import { ActionSheetContext } from './ActionSheetContext';
<mask> import { ModalContext } from '../Modal/Context'; <mask> import Box from '../../primitives/Box'; <mask> <mask> const ActionsheetContent = ( <mask> { children, ...props }: IActionsheetContentProps, <mask> ref?: any <mask> ) => { <mask> const { _dragIndicator, ...newProps } = usePropsResolution( </s> fix: 3376 drag indicator hide and styling props </s> remove const Actionsheet = ({ children, ...props }: IActionsheetProps, ref: any) => { </s> add const Actionsheet = ( { children, hideDragIndicator = false, ...props }: IActionsheetProps, ref: any ) => { </s> remove const newProps = usePropsResolution('ActionsheetContent', props); </s> add const { _dragIndicator, ...newProps } = usePropsResolution( 'ActionsheetContent', props );
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0efc7a9b0fd08cadbd2c844b890c9ebb07e21f84
src/components/composites/Actionsheet/ActionsheetContent.tsx
const { _dragIndicator, ...newProps } = usePropsResolution( 'ActionsheetContent', props );
<mask> const ActionsheetContent = ( <mask> { children, ...props }: IActionsheetContentProps, <mask> ref?: any <mask> ) => { <mask> const newProps = usePropsResolution('ActionsheetContent', props); <mask> const { handleClose } = React.useContext(ModalContext); <mask> let pan = React.useRef(new Animated.ValueXY()).current; <mask> let sheetHeight = React.useRef(0); <mask> <mask> const panResponder = React.useRef( </s> fix: 3376 drag indicator hide and styling props </s> remove const Actionsheet = ({ children, ...props }: IActionsheetProps, ref: any) => { </s> add const Actionsheet = ( { children, hideDragIndicator = false, ...props }: IActionsheetProps, ref: any ) => { </s> remove {/* To increase the draggable area */} <Box py={5} {...panResponder.panHandlers} collapsable={false} /> </s> add {!hideDragIndicator ? ( <> {/* To increase the draggable area */} <Box py={5} {...panResponder.panHandlers} collapsable={false} /> </> ) : null}
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0efc7a9b0fd08cadbd2c844b890c9ebb07e21f84
src/components/composites/Actionsheet/ActionsheetContent.tsx
const { hideDragIndicator } = React.useContext(ActionSheetContext);
<mask> props <mask> ); <mask> const { handleClose } = React.useContext(ModalContext); <mask> let pan = React.useRef(new Animated.ValueXY()).current; <mask> let sheetHeight = React.useRef(0); <mask> <mask> const panResponder = React.useRef( </s> fix: 3376 drag indicator hide and styling props </s> remove const newProps = usePropsResolution('ActionsheetContent', props); </s> add const { _dragIndicator, ...newProps } = usePropsResolution( 'ActionsheetContent', props ); </s> remove const Actionsheet = ({ children, ...props }: IActionsheetProps, ref: any) => { </s> add const Actionsheet = ( { children, hideDragIndicator = false, ...props }: IActionsheetProps, ref: any ) => { </s> remove {/* To increase the draggable area */} <Box py={5} {...panResponder.panHandlers} collapsable={false} /> </s> add {!hideDragIndicator ? ( <> {/* To increase the draggable area */} <Box py={5} {...panResponder.panHandlers} collapsable={false} /> </> ) : null}
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0efc7a9b0fd08cadbd2c844b890c9ebb07e21f84
src/components/composites/Actionsheet/ActionsheetContent.tsx
{!hideDragIndicator ? ( <> {/* To increase the draggable area */} <Box py={5} {...panResponder.panHandlers} collapsable={false} /> </> ) : null}
<mask> sheetHeight.current = height; <mask> }} <mask> pointerEvents="box-none" <mask> > <mask> {/* To increase the draggable area */} <mask> <Box py={5} {...panResponder.panHandlers} collapsable={false} /> <mask> <mask> <Modal.Content {...newProps} ref={ref} safeAreaBottom> <mask> {/* Hack. Fix later. Add -2 negative margin to remove the padding added by ActionSheetContent */} <mask> <Box <mask> py={5} </s> fix: 3376 drag indicator hide and styling props </s> remove {/* Hack. Fix later. Add -2 negative margin to remove the padding added by ActionSheetContent */} <Box py={5} mt={-2} {...panResponder.panHandlers} width="100%" alignItems="center" collapsable={false} > <Box bg="coolGray.400" height={1} width={9} borderRadius={2} /> </Box> </s> add {!hideDragIndicator ? ( <> {/* Hack. Fix later. Add -2 negative margin to remove the padding added by ActionSheetContent */} <Box py={5} mt={-2} {...panResponder.panHandlers} width="100%" alignItems="center" collapsable={false} > <Box {..._dragIndicator} /> </Box> </> ) : null} </s> remove {children} </s> add <ActionSheetContext.Provider value={{ hideDragIndicator }}> {children} </ActionSheetContext.Provider> </s> remove const newProps = usePropsResolution('ActionsheetContent', props); </s> add const { _dragIndicator, ...newProps } = usePropsResolution( 'ActionsheetContent', props );
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0efc7a9b0fd08cadbd2c844b890c9ebb07e21f84
src/components/composites/Actionsheet/ActionsheetContent.tsx
{!hideDragIndicator ? ( <> {/* Hack. Fix later. Add -2 negative margin to remove the padding added by ActionSheetContent */} <Box py={5} mt={-2} {...panResponder.panHandlers} width="100%" alignItems="center" collapsable={false} > <Box {..._dragIndicator} /> </Box> </> ) : null}
<mask> {/* To increase the draggable area */} <mask> <Box py={5} {...panResponder.panHandlers} collapsable={false} /> <mask> <mask> <Modal.Content {...newProps} ref={ref} safeAreaBottom> <mask> {/* Hack. Fix later. Add -2 negative margin to remove the padding added by ActionSheetContent */} <mask> <Box <mask> py={5} <mask> mt={-2} <mask> {...panResponder.panHandlers} <mask> width="100%" <mask> alignItems="center" <mask> collapsable={false} <mask> > <mask> <Box bg="coolGray.400" height={1} width={9} borderRadius={2} /> <mask> </Box> <mask> {children} <mask> </Modal.Content> <mask> </Animated.View> <mask> ); <mask> }; </s> fix: 3376 drag indicator hide and styling props </s> remove {/* To increase the draggable area */} <Box py={5} {...panResponder.panHandlers} collapsable={false} /> </s> add {!hideDragIndicator ? ( <> {/* To increase the draggable area */} <Box py={5} {...panResponder.panHandlers} collapsable={false} /> </> ) : null} </s> remove {children} </s> add <ActionSheetContext.Provider value={{ hideDragIndicator }}> {children} </ActionSheetContext.Provider>
[ "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/0efc7a9b0fd08cadbd2c844b890c9ebb07e21f84
src/components/composites/Actionsheet/ActionsheetContent.tsx
/** * If true, hides the drag indicator. * @default false */ hideDragIndicator?: boolean;
<mask> */ <mask> disableOverlay?: boolean; <mask> } <mask> <mask> export interface IActionsheetContentProps extends IBoxProps {} <mask> export interface IActionsheetFooterProps extends IBoxProps {} <mask> export interface IActionsheetHeaderProps extends IBoxProps {} </s> fix: 3376 drag indicator hide and styling props </s> remove {children} </s> add <ActionSheetContext.Provider value={{ hideDragIndicator }}> {children} </ActionSheetContext.Provider> </s> remove const Actionsheet = ({ children, ...props }: IActionsheetProps, ref: any) => { </s> add const Actionsheet = ( { children, hideDragIndicator = false, ...props }: IActionsheetProps, ref: any ) => {
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0efc7a9b0fd08cadbd2c844b890c9ebb07e21f84
src/components/composites/Actionsheet/types.tsx
_dragIndicator: { bg: 'coolGray.400', height: 1, width: 9, borderRadius: 2, },
<mask> alignItems: 'center', <mask> p: 2, <mask> borderRadius: 'none', <mask> roundedTop: 10, <mask> }, <mask> }; <mask> <mask> // ActionsheetItem </s> fix: 3376 drag indicator hide and styling props </s> remove {children} </s> add <ActionSheetContext.Provider value={{ hideDragIndicator }}> {children} </ActionSheetContext.Provider> </s> remove {/* Hack. Fix later. Add -2 negative margin to remove the padding added by ActionSheetContent */} <Box py={5} mt={-2} {...panResponder.panHandlers} width="100%" alignItems="center" collapsable={false} > <Box bg="coolGray.400" height={1} width={9} borderRadius={2} /> </Box> </s> add {!hideDragIndicator ? ( <> {/* Hack. Fix later. Add -2 negative margin to remove the padding added by ActionSheetContent */} <Box py={5} mt={-2} {...panResponder.panHandlers} width="100%" alignItems="center" collapsable={false} > <Box {..._dragIndicator} /> </Box> </> ) : null} </s> remove {/* To increase the draggable area */} <Box py={5} {...panResponder.panHandlers} collapsable={false} /> </s> add {!hideDragIndicator ? ( <> {/* To increase the draggable area */} <Box py={5} {...panResponder.panHandlers} collapsable={false} /> </> ) : null}
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0efc7a9b0fd08cadbd2c844b890c9ebb07e21f84
src/theme/components/actionsheet.ts
const { onFocus, onBlur, _stack, _interactionBox, ...resolvedProps } = usePropsResolution(
<mask> thumbSize, <mask> isReadOnly, <mask> isDisabled, <mask> } = React.useContext(SliderContext); <mask> const resolvedProps = usePropsResolution( <mask> 'SliderThumb', <mask> { <mask> size: thumbSize, <mask> colorScheme, <mask> ...props, </s> feat: pressed, hover, focus state </s> remove { isDisabled, isReadOnly } </s> add { isDisabled, isReadOnly, isPressed, isFocused, isHovered, } </s> remove {props.children} {Platform.OS === 'web' && ( <VisuallyHidden> <input ref={inputRef} {...inputProps} /> </VisuallyHidden> )} </s> add <Stack {...layoutProps} {..._stack}> <Center> <Box {..._interactionBox} size={thumbSize} /> <Center {...nonAccessibilityProps}> <Box> {props.children} {Platform.OS === 'web' && ( <VisuallyHidden> <input ref={inputRef} {...inputProps} /> </VisuallyHidden> )} </Box> </Center> </Center> </Stack>
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0f0a034f428190546dedd23a562dfccd14168eb4
src/components/primitives/Slider/SliderThumb.tsx
{ isDisabled, isReadOnly, isPressed, isFocused, isHovered, }
<mask> size: thumbSize, <mask> colorScheme, <mask> ...props, <mask> }, <mask> { isDisabled, isReadOnly } <mask> ); <mask> const inputRef = React.useRef(null); <mask> const { thumbProps, inputProps } = useSliderThumb( <mask> { <mask> index: 0, </s> feat: pressed, hover, focus state </s> remove const resolvedProps = usePropsResolution( </s> add const { onFocus, onBlur, _stack, _interactionBox, ...resolvedProps } = usePropsResolution( </s> remove {props.children} {Platform.OS === 'web' && ( <VisuallyHidden> <input ref={inputRef} {...inputProps} /> </VisuallyHidden> )} </s> add <Stack {...layoutProps} {..._stack}> <Center> <Box {..._interactionBox} size={thumbSize} /> <Center {...nonAccessibilityProps}> <Box> {props.children} {Platform.OS === 'web' && ( <VisuallyHidden> <input ref={inputRef} {...inputProps} /> </VisuallyHidden> )} </Box> </Center> </Center> </Stack>
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0f0a034f428190546dedd23a562dfccd14168eb4
src/components/primitives/Slider/SliderThumb.tsx
React.useEffect(() => { setIsPressed(state.isThumbDragging(0)); }, [state]);
<mask> }, <mask> state <mask> ); <mask> <mask> const thumbAbsoluteSize = useToken('sizes', resolvedProps.size); <mask> <mask> const thumbStyles: any = { <mask> bottom: </s> feat: pressed, hover, focus state </s> remove { isDisabled, isReadOnly } </s> add { isDisabled, isReadOnly, isPressed, isFocused, isHovered, } </s> remove const resolvedProps = usePropsResolution( </s> add const { onFocus, onBlur, _stack, _interactionBox, ...resolvedProps } = usePropsResolution( </s> remove {props.children} {Platform.OS === 'web' && ( <VisuallyHidden> <input ref={inputRef} {...inputProps} /> </VisuallyHidden> )} </s> add <Stack {...layoutProps} {..._stack}> <Center> <Box {..._interactionBox} size={thumbSize} /> <Center {...nonAccessibilityProps}> <Box> {props.children} {Platform.OS === 'web' && ( <VisuallyHidden> <input ref={inputRef} {...inputProps} /> </VisuallyHidden> )} </Box> </Center> </Center> </Stack>
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/0f0a034f428190546dedd23a562dfccd14168eb4
src/components/primitives/Slider/SliderThumb.tsx