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
|
|---|---|---|---|---|
isTabActive ? activeTextStyle : textStyle,
{ color: textColor }
|
<mask> >
<mask> <Text
<mask> style={[
<mask> { fontSize: tabFontSize },
<mask> isTabActive ? activeTextStyle : textStyle
<mask> ]}
<mask> >
<mask> {name}
<mask> </Text>
<mask> </TabHeading>
</s> Adding TabBar disabled feature (#2760) </s> remove tabFontSize
</s> add tabFontSize,
disabled,
disabledTextColor </s> remove key={_.random(1.2, 5.2)}
</s> add key={`${name}_${page}`} </s> remove const textColor = isTabActive ? activeTextColor : inactiveTextColor;
</s> add const textColor = disabled
? disabledTextColor
: isTabActive
? activeTextColor
: inactiveTextColor;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/basic/Tabs/DefaultTabBar.js
|
disabled={isDisabled}
|
<mask> <Button
<mask> style={{ flex: 1 }}
<mask> key={_.random(1.2, 5.2)}
<mask> onPress={() => onPressHandler(page)}
<mask> >
<mask> <TabHeading style={tabHeaderStyle} active={isTabActive}>
<mask> {headerContent}
</s> Adding TabBar disabled feature (#2760) </s> remove key={_.random(1.2, 5.2)}
</s> add key={`${name}_${page}`} </s> remove // const fontSize = tabFontSize;
</s> add const isDisabled = disabled == undefined ? false : true;
</s> remove isTabActive ? activeTextStyle : textStyle
</s> add isTabActive ? activeTextStyle : textStyle,
{ color: textColor }
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/basic/Tabs/DefaultTabBar.js
|
variables.tabFontSize,
this.props.disabled[page],
this.props.disabledTextColor
|
<mask> this.props.activeTabStyle[page],
<mask> this.props.textStyle[page],
<mask> this.props.activeTextStyle[page],
<mask> this.props.tabHeaderStyle[page],
<mask> variables.tabFontSize
<mask> );
<mask> })}
<mask> <Animated.View
<mask> style={[tabUnderlineStyle, { left }, this.props.underlineStyle]}
<mask> />
</s> Adding TabBar disabled feature (#2760) </s> remove key={_.random(1.2, 5.2)}
</s> add key={`${name}_${page}`} </s> remove return `${child.props.heading }_${ idx}`;
</s> add return `${child.props.heading}_${idx}`; </s> remove isTabActive ? activeTextStyle : textStyle
</s> add isTabActive ? activeTextStyle : textStyle,
{ color: textColor } </s> remove !_.isEqual(this.props.tabs, nextProps.tabs) &&
</s> add !isEqual(this.props.tabs, nextProps.tabs) &&
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/basic/Tabs/DefaultTabBar.js
|
import { isEqual } from 'lodash';
|
<mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import createReactClass from 'create-react-class';
<mask> import _ from 'lodash';
<mask> import { connectStyle, StyleProvider } from 'native-base-shoutem-theme';
<mask> import mapPropsToStyleNames from '../../utils/mapPropsToStyleNames';
<mask> import variable from './../../theme/variables/platform';
<mask> import { TabHeading } from '../TabHeading';
<mask> import { Text } from '../Text';
</s> Adding TabBar disabled feature (#2760) </s> remove return `${child.props.heading }_${ idx}`;
</s> add return `${child.props.heading}_${idx}`; </s> remove isTabActive ? activeTextStyle : textStyle
</s> add isTabActive ? activeTextStyle : textStyle,
{ color: textColor } </s> remove !_.isEqual(this.props.tabs, nextProps.tabs) &&
</s> add !isEqual(this.props.tabs, nextProps.tabs) && </s> remove tabFontSize
</s> add tabFontSize,
disabled,
disabledTextColor </s> remove const textColor = isTabActive ? activeTextColor : inactiveTextColor;
</s> add const textColor = disabled
? disabledTextColor
: isTabActive
? activeTextColor
: inactiveTextColor;
|
[
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/basic/Tabs/ScrollableTabBar.js
|
<mask> typeof name !== 'string' ? name.props.children : undefined;
<mask> const { activeTextColor, inactiveTextColor } = this.props;
<mask> const textColor = isTabActive ? activeTextColor : inactiveTextColor;
<mask> const fontWeight = isTabActive ? 'bold' : 'normal';
<mask> // const fontSize = tabFontSize;
<mask>
<mask> if (typeof name === 'string') {
<mask> return (
<mask> <Button
<mask> key={`${name}_${page}`}
</s> Adding TabBar disabled feature (#2760) </s> remove const textColor = isTabActive ? activeTextColor : inactiveTextColor;
</s> add const textColor = disabled
? disabledTextColor
: isTabActive
? activeTextColor
: inactiveTextColor; </s> remove // const fontSize = tabFontSize;
</s> add const isDisabled = disabled == undefined ? false : true;
</s> remove tabFontSize
</s> add tabFontSize,
disabled,
disabledTextColor </s> remove return `${child.props.heading }_${ idx}`;
</s> add return `${child.props.heading}_${idx}`; </s> remove isTabActive ? activeTextStyle : textStyle
</s> add isTabActive ? activeTextStyle : textStyle,
{ color: textColor }
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/basic/Tabs/ScrollableTabBar.js
|
|
key={`${name}_${page}`}
|
<mask> );
<mask> }
<mask> return (
<mask> <Button
<mask> key={_.random(1.2, 5.2)}
<mask> onPress={() => onPressHandler(page)}
<mask> onLayout={onLayoutHandler}
<mask> >
<mask> <TabHeading scrollable style={tabHeaderStyle} active={isTabActive}>
<mask> {headerContent}
</s> Adding TabBar disabled feature (#2760) </s> remove return `${child.props.heading }_${ idx}`;
</s> add return `${child.props.heading}_${idx}`; </s> remove variables.tabFontSize
</s> add variables.tabFontSize,
this.props.disabled[page],
this.props.disabledTextColor </s> remove isTabActive ? activeTextStyle : textStyle
</s> add isTabActive ? activeTextStyle : textStyle,
{ color: textColor }
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/basic/Tabs/ScrollableTabBar.js
|
!isEqual(this.props.tabs, nextProps.tabs) &&
|
<mask>
<mask> componentWillReceiveProps(nextProps) {
<mask> // If the tabs change, force the width of the tabs container to be recalculated
<mask> if (
<mask> !_.isEqual(this.props.tabs, nextProps.tabs) &&
<mask> this.state._containerWidth
<mask> ) {
<mask> this.setState({ _containerWidth: null });
<mask> }
<mask> },
</s> Adding TabBar disabled feature (#2760) </s> remove const textColor = isTabActive ? activeTextColor : inactiveTextColor;
</s> add const textColor = disabled
? disabledTextColor
: isTabActive
? activeTextColor
: inactiveTextColor; </s> remove // const fontSize = tabFontSize;
</s> add </s> remove return `${child.props.heading }_${ idx}`;
</s> add return `${child.props.heading}_${idx}`; </s> remove tabFontSize
</s> add tabFontSize,
disabled,
disabledTextColor </s> remove // const fontSize = tabFontSize;
</s> add const isDisabled = disabled == undefined ? false : true;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/basic/Tabs/ScrollableTabBar.js
|
return `${child.props.heading}_${idx}`;
|
<mask> return sceneKeys.find(sceneKey => key === sceneKey);
<mask> },
<mask>
<mask> _makeSceneKey(child, idx) {
<mask> return `${child.props.heading }_${ idx}`;
<mask> },
<mask>
<mask> renderScrollableContent() {
<mask> const scenes = this._composeScenes();
<mask> return (
</s> Adding TabBar disabled feature (#2760) </s> remove // const fontSize = tabFontSize;
</s> add </s> remove const textColor = isTabActive ? activeTextColor : inactiveTextColor;
</s> add const textColor = disabled
? disabledTextColor
: isTabActive
? activeTextColor
: inactiveTextColor; </s> remove // const fontSize = tabFontSize;
</s> add const isDisabled = disabled == undefined ? false : true;
</s> remove key={_.random(1.2, 5.2)}
</s> add key={`${name}_${page}`} </s> remove tabFontSize
</s> add tabFontSize,
disabled,
disabledTextColor
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/basic/Tabs/index.js
|
disabled: this._children().map(child => child.props.disabled),
|
<mask> _.get(child.props.heading.props, 'style', undefined)
<mask> ),
<mask> activeTab: this.state.currentPage,
<mask> scrollValue: this.state.scrollValue,
<mask> containerWidth: this.state.containerWidth
<mask> };
<mask>
<mask> if (this.props.tabBarBackgroundColor) {
</s> Adding TabBar disabled feature (#2760) </s> remove !_.isEqual(this.props.tabs, nextProps.tabs) &&
</s> add !isEqual(this.props.tabs, nextProps.tabs) && </s> remove // const fontSize = tabFontSize;
</s> add </s> remove const textColor = isTabActive ? activeTextColor : inactiveTextColor;
</s> add const textColor = disabled
? disabledTextColor
: isTabActive
? activeTextColor
: inactiveTextColor; </s> remove // const fontSize = tabFontSize;
</s> add const isDisabled = disabled == undefined ? false : true;
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/basic/Tabs/index.js
|
tabBarDisabledTextColor: '#BDBDBD',
|
<mask> defaultSpinnerColor: '#45D56E',
<mask> inverseSpinnerColor: '#1A191B',
<mask>
<mask> // Tab
<mask> tabDefaultBg: platform === PLATFORM.IOS ? '#F8F8F8' : '#3F51B5',
<mask> topTabBarTextColor: platform === PLATFORM.IOS ? '#6b6b6b' : '#b3c7f9',
<mask> topTabBarActiveTextColor: platform === PLATFORM.IOS ? '#007aff' : '#fff',
<mask> topTabBarBorderColor: platform === PLATFORM.IOS ? '#a7a6ab' : '#fff',
</s> Adding TabBar disabled feature (#2760) </s> remove // const fontSize = tabFontSize;
</s> add </s> remove const textColor = isTabActive ? activeTextColor : inactiveTextColor;
</s> add const textColor = disabled
? disabledTextColor
: isTabActive
? activeTextColor
: inactiveTextColor; </s> remove // const fontSize = tabFontSize;
</s> add const isDisabled = disabled == undefined ? false : true;
</s> remove return `${child.props.heading }_${ idx}`;
</s> add return `${child.props.heading}_${idx}`; </s> remove isTabActive ? activeTextStyle : textStyle
</s> add isTabActive ? activeTextStyle : textStyle,
{ color: textColor }
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75341ac358a7208c10513da06dc9f9d4d2f795d6
|
src/theme/variables/platform.js
|
'none': 16,
'shorter': 20,
'short': 22,
'base': 24,
'tall': 26,
'taller': 32,
'3': 12,
'4': 16,
'5': 20,
'6': 24,
'7': 28,
'8': 32,
'9': 36,
'10': 40,
|
<mask> '4xl': 1.25,
<mask> '5xl': 1.5,
<mask> },
<mask> lineHeights: {
<mask> 'none': 1,
<mask> 'shorter': 1.25,
<mask> 'short': 1.375,
<mask> 'base': 1.5,
<mask> 'tall': 1.625,
<mask> 'taller': '2',
<mask> '3': '12px',
<mask> '4': '16px',
<mask> '5': '20px',
<mask> '6': '24px',
<mask> '7': '28px',
<mask> '8': '32px',
<mask> '9': '36px',
<mask> '10': '40px',
<mask> },
<mask> // fontConfig: {
<mask> // Roboto: {
<mask> // 100: {
<mask> // normal: 'Roboto-Light',
</s> feat: add letterspacing and lineheights for rem conversion on web </s> remove const scale = get(theme, key);
</s> add const scale = get(theme, key, {}); </s> remove const scales = ['space', 'sizes', 'typography.fontSizes'];
</s> add const scales = [
'space',
'sizes',
'fontSizes',
'lineHeights',
'letterSpacings',
];
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75bc556d08cc18988d8fd07cc10e42fc925645a6
|
src/theme/base/typography.ts
|
const scales = [
'space',
'sizes',
'fontSizes',
'lineHeights',
'letterSpacings',
];
|
<mask> * @param theme
<mask> * @description This function converts space, sizes and fontsizes to `rem` on web and numbers on native
<mask> */
<mask> export const platformSpecificSpaceUnits = (theme: ITheme) => {
<mask> const scales = ['space', 'sizes', 'typography.fontSizes'];
<mask> const newTheme = { ...theme };
<mask> const isWeb = Platform.OS === 'web';
<mask> scales.forEach((key) => {
<mask> const scale = get(theme, key);
<mask> const newScale = { ...scale };
</s> feat: add letterspacing and lineheights for rem conversion on web </s> remove const scale = get(theme, key);
</s> add const scale = get(theme, key, {}); </s> remove 'none': 1,
'shorter': 1.25,
'short': 1.375,
'base': 1.5,
'tall': 1.625,
'taller': '2',
'3': '12px',
'4': '16px',
'5': '20px',
'6': '24px',
'7': '28px',
'8': '32px',
'9': '36px',
'10': '40px',
</s> add 'none': 16,
'shorter': 20,
'short': 22,
'base': 24,
'tall': 26,
'taller': 32,
'3': 12,
'4': 16,
'5': 20,
'6': 24,
'7': 28,
'8': 32,
'9': 36,
'10': 40,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75bc556d08cc18988d8fd07cc10e42fc925645a6
|
src/theme/tools/utils.ts
|
const scale = get(theme, key, {});
|
<mask> const scales = ['space', 'sizes', 'typography.fontSizes'];
<mask> const newTheme = { ...theme };
<mask> const isWeb = Platform.OS === 'web';
<mask> scales.forEach((key) => {
<mask> const scale = get(theme, key);
<mask> const newScale = { ...scale };
<mask> for (let scaleKey in scale) {
<mask> const val = scale[scaleKey];
<mask> if (typeof val !== 'object') {
<mask> const isAbsolute = typeof val === 'number';
</s> feat: add letterspacing and lineheights for rem conversion on web </s> remove const scales = ['space', 'sizes', 'typography.fontSizes'];
</s> add const scales = [
'space',
'sizes',
'fontSizes',
'lineHeights',
'letterSpacings',
];
</s> remove 'none': 1,
'shorter': 1.25,
'short': 1.375,
'base': 1.5,
'tall': 1.625,
'taller': '2',
'3': '12px',
'4': '16px',
'5': '20px',
'6': '24px',
'7': '28px',
'8': '32px',
'9': '36px',
'10': '40px',
</s> add 'none': 16,
'shorter': 20,
'short': 22,
'base': 24,
'tall': 26,
'taller': 32,
'3': 12,
'4': 16,
'5': 20,
'6': 24,
'7': 28,
'8': 32,
'9': 36,
'10': 40,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/75bc556d08cc18988d8fd07cc10e42fc925645a6
|
src/theme/tools/utils.ts
|
// ...textCommon
|
<mask> },
<mask> alignSelf: null,
<mask> ...iconCommon,
<mask> ...iconNBCommon,
<mask> ...textCommon
<mask> },
<mask> flex: 1,
<mask> alignSelf: "center",
<mask> alignItems: "flex-start"
<mask> },
</s> Fixed - Button showing same text color for different button styles </s> remove ...textCommon
</s> add // ...textCommon </s> remove ...textCommon
</s> add // ...textCommon
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/770608e39ef4dc30a08770761d5332e287315709
|
src/theme/components/Footer.js
|
// ...textCommon
|
<mask> flex: 1
<mask> },
<mask> ...iconCommon,
<mask> ...iconNBCommon,
<mask> ...textCommon
<mask> }
<mask> },
<mask> "NativeBase.Right": {
<mask> "NativeBase.Button": {
<mask> ".transparent": {
</s> Fixed - Button showing same text color for different button styles </s> remove ...textCommon
</s> add // ...textCommon </s> remove ...textCommon
</s> add // ...textCommon
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/770608e39ef4dc30a08770761d5332e287315709
|
src/theme/components/Footer.js
|
// ...textCommon
|
<mask> },
<mask> alignSelf: null,
<mask> ...iconCommon,
<mask> ...iconNBCommon,
<mask> ...textCommon
<mask> },
<mask> flex: 1,
<mask> alignSelf: "center",
<mask> alignItems: "flex-end"
<mask> },
</s> Fixed - Button showing same text color for different button styles </s> remove ...textCommon
</s> add // ...textCommon </s> remove ...textCommon
</s> add // ...textCommon
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/770608e39ef4dc30a08770761d5332e287315709
|
src/theme/components/Footer.js
|
<mask> import { Box } from 'native-base';
<mask> export const Example = () => {
<mask> return (
<mask> <Box
<mask> w="90%"
<mask> bg="primary.400"
<mask> p={4}
<mask> _text={{ fontSize: 'md', fontWeight: 'bold', color: 'white' }}
<mask> >
<mask> This is a Box
</s> feat: linear gradiant on Box </s> remove p={4}
</s> add p={12}
rounded="lg" </s> remove let newProps = useThemeProps('Center', props);
</s> add let newProps = usePropsResolution('Center', props); </s> remove import { useThemeProps } from '../../../hooks/useThemeProps';
</s> add import { usePropsResolution } from '../../../hooks/useThemeProps';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/77bf599bb582dc295030cbb05012fbdf09bea50c
|
example/storybook/stories/components/primitives/Box/basic.tsx
|
|
p={12}
rounded="lg"
|
<mask> return (
<mask> <Box
<mask> w="90%"
<mask> bg="primary.400"
<mask> p={4}
<mask> _text={{ fontSize: 'md', fontWeight: 'bold', color: 'white' }}
<mask> >
<mask> This is a Box
<mask> </Box>
<mask> );
</s> feat: linear gradiant on Box </s> remove w="90%"
</s> add </s> remove let newProps = useThemeProps('Center', props);
</s> add let newProps = usePropsResolution('Center', props); </s> remove props: platformSpecificProps,
</s> add props: nonGradientProps,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/77bf599bb582dc295030cbb05012fbdf09bea50c
|
example/storybook/stories/components/primitives/Box/basic.tsx
|
import { Example as LinearGrad } from './LinearGrad';
|
<mask> import { storiesOf } from '@storybook/react-native';
<mask> import { withKnobs } from '@storybook/addon-knobs';
<mask> import { Example as Basic } from './basic';
<mask> import { Example as WithRef } from './WithRef';
<mask> import { Example as Composition } from './composition';
<mask> import { Example as CompositionCard } from './composition-card';
<mask> import { Example as CompositionCard1 } from './composition-card1';
<mask> import { Example as CompositionCard2 } from './composition-card2';
</s> feat: linear gradiant on Box </s> remove w="90%"
</s> add </s> remove import { usePropsResolution } from '../../../hooks/useThemeProps';
</s> add import { usePropsResolution } from '../../../hooks'; </s> remove import { useThemeProps } from '../../../hooks/useThemeProps';
</s> add import { usePropsResolution } from '../../../hooks/useThemeProps';
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/77bf599bb582dc295030cbb05012fbdf09bea50c
|
example/storybook/stories/components/primitives/Box/index.tsx
|
.add('LinearGradient Box', () => <LinearGrad />)
|
<mask> storiesOf('Box', module)
<mask> .addDecorator(withKnobs)
<mask> .addDecorator((getStory: any) => <Wrapper>{getStory()}</Wrapper>)
<mask> .add('Basic Box', () => <Basic />)
<mask> .add('Composition', () => <Composition />)
<mask> .add('With Ref', () => <WithRef />)
<mask> .add('Composition Card', () => <CompositionCard />)
<mask> .add('Composition Shoes Card', () => <CompositionShoesCard />)
<mask> .add('CompositionCard1', () => <CompositionCard1 />)
<mask> .add('CompositionCard2', () => <CompositionCard2 />)
</s> feat: linear gradiant on Box </s> remove w="90%"
</s> add </s> remove let newProps = useThemeProps('Center', props);
</s> add let newProps = usePropsResolution('Center', props); </s> remove import { useThemeProps } from '../../../hooks/useThemeProps';
</s> add import { usePropsResolution } from '../../../hooks/useThemeProps'; </s> remove const resolvedProps = omitUndefined({ ...translatedProps, ...ignoredProps });
</s> add const resolvedProps = omitUndefined({
...translatedProps,
...ignoredProps,
...gradientProps,
});
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/77bf599bb582dc295030cbb05012fbdf09bea50c
|
example/storybook/stories/components/primitives/Box/index.tsx
|
"expo-linear-gradient": "^9.1.0",
|
<mask> "@react-stately/radio": "^3.2.1",
<mask> "@types/styled-system": "^5.1.9",
<mask> "lodash.clonedeep": "^4.5.0",
<mask> "lodash.get": "^4.4.2",
<mask> "lodash.isempty": "^4.4.0",
<mask> "lodash.isequal": "^4.5.0",
</s> feat: linear gradiant on Box </s> remove const resolvedProps = omitUndefined({ ...translatedProps, ...ignoredProps });
</s> add const resolvedProps = omitUndefined({
...translatedProps,
...ignoredProps,
...gradientProps,
}); </s> remove props: platformSpecificProps,
</s> add props: nonGradientProps,
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/77bf599bb582dc295030cbb05012fbdf09bea50c
|
package.json
|
"react-native-unimodules": "^0.13.3",
|
<mask> "lodash.omitby": "^4.6.0",
<mask> "lodash.pick": "^4.4.0",
<mask> "tinycolor2": "^1.4.2"
<mask> },
<mask> "directories": {
<mask> "example": "example",
<mask> "lib": "lib"
<mask> },
</s> feat: linear gradiant on Box </s> remove import { useThemeProps } from '../../../hooks/useThemeProps';
</s> add import { usePropsResolution } from '../../../hooks/useThemeProps';
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/77bf599bb582dc295030cbb05012fbdf09bea50c
|
package.json
|
import { usePropsResolution } from '../../../hooks/useThemeProps';
|
<mask> import React, { memo, forwardRef } from 'react';
<mask> import { useThemeProps } from '../../../hooks/useThemeProps';
<mask> import Box from '../../primitives/Box';
<mask> import type { ICenterProps } from './types';
<mask>
<mask> const Center = (props: ICenterProps, ref: any) => {
<mask> let newProps = useThemeProps('Center', props);
</s> feat: linear gradiant on Box </s> remove let newProps = useThemeProps('Center', props);
</s> add let newProps = usePropsResolution('Center', props); </s> remove import { usePropsResolution } from '../../../hooks/useThemeProps';
</s> add import { usePropsResolution } from '../../../hooks';
|
[
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/77bf599bb582dc295030cbb05012fbdf09bea50c
|
src/components/composites/Center/Center.tsx
|
let newProps = usePropsResolution('Center', props);
|
<mask> import Box from '../../primitives/Box';
<mask> import type { ICenterProps } from './types';
<mask>
<mask> const Center = (props: ICenterProps, ref: any) => {
<mask> let newProps = useThemeProps('Center', props);
<mask> return (
<mask> <Box
<mask> ref={ref}
<mask> {...newProps}
<mask> display="flex"
</s> feat: linear gradiant on Box </s> remove import { useThemeProps } from '../../../hooks/useThemeProps';
</s> add import { usePropsResolution } from '../../../hooks/useThemeProps'; </s> remove w="90%"
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/77bf599bb582dc295030cbb05012fbdf09bea50c
|
src/components/composites/Center/Center.tsx
|
import { LinearGradient } from 'expo-linear-gradient';
|
<mask> import React, { memo, forwardRef } from 'react';
<mask> import { View } from 'react-native';
<mask> import styled from 'styled-components/native';
<mask> import {
<mask> border,
<mask> color,
<mask> flexbox,
<mask> layout,
</s> feat: linear gradiant on Box </s> remove import { useThemeProps } from '../../../hooks/useThemeProps';
</s> add import { usePropsResolution } from '../../../hooks/useThemeProps'; </s> remove import { usePropsResolution } from '../../../hooks/useThemeProps';
</s> add import { usePropsResolution } from '../../../hooks'; </s> remove let newProps = useThemeProps('Center', props);
</s> add let newProps = usePropsResolution('Center', props);
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/77bf599bb582dc295030cbb05012fbdf09bea50c
|
src/components/primitives/Box/index.tsx
|
import { usePropsResolution } from '../../../hooks';
|
<mask> position,
<mask> space,
<mask> typography,
<mask> } from 'styled-system';
<mask> import { usePropsResolution } from '../../../hooks/useThemeProps';
<mask> import Text from './../Text';
<mask> import {
<mask> customBackground,
<mask> customBorder,
<mask> customExtra,
</s> feat: linear gradiant on Box </s> remove import { useThemeProps } from '../../../hooks/useThemeProps';
</s> add import { usePropsResolution } from '../../../hooks/useThemeProps'; </s> remove let newProps = useThemeProps('Center', props);
</s> add let newProps = usePropsResolution('Center', props);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/77bf599bb582dc295030cbb05012fbdf09bea50c
|
src/components/primitives/Box/index.tsx
|
if (
resolvedProps.bg?.linearGradient ||
resolvedProps.background?.linearGradient ||
resolvedProps.backgroundColor?.linearGradient
) {
const lgrad =
resolvedProps.bg?.linearGradient ||
resolvedProps.background?.linearGradient ||
resolvedProps.backgroundColor?.linearGradient;
|
<mask> const { _text, ...resolvedProps } = usePropsResolution('Box', props);
<mask> const safeAreaProps = useSafeArea(resolvedProps);
<mask>
<mask> return (
<mask> <StyledLinearGradient
<mask> ref={ref}
<mask> {...safeAreaProps}
<mask> colors={lgrad.colors}
</s> feat: linear gradiant on Box </s> remove let newProps = useThemeProps('Center', props);
</s> add let newProps = usePropsResolution('Center', props); </s> remove import { useThemeProps } from '../../../hooks/useThemeProps';
</s> add import { usePropsResolution } from '../../../hooks/useThemeProps'; </s> remove w="90%"
</s> add </s> remove const resolvedProps = omitUndefined({ ...translatedProps, ...ignoredProps });
</s> add const resolvedProps = omitUndefined({
...translatedProps,
...ignoredProps,
...gradientProps,
});
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/77bf599bb582dc295030cbb05012fbdf09bea50c
|
src/components/primitives/Box/index.tsx
|
return (
<StyledLinearGradient
ref={ref}
{...safeAreaProps}
colors={lgrad.colors}
start={lgrad.start}
end={lgrad.end}
locations={lgrad.locations}
>
{React.Children.map(children, (child) =>
typeof child === 'string' ? <Text {..._text}>{child}</Text> : child
)}
</StyledLinearGradient>
);
}
|
<mask> resolvedProps.backgroundColor?.linearGradient;
<mask>
<mask> return (
<mask> <StyledBox ref={ref} {...safeAreaProps}>
<mask> {React.Children.map(children, (child) =>
<mask> typeof child === 'string' ? <Text {..._text}>{child}</Text> : child
<mask> )}
</s> feat: linear gradiant on Box </s> remove let newProps = useThemeProps('Center', props);
</s> add let newProps = usePropsResolution('Center', props); </s> remove const resolvedProps = omitUndefined({ ...translatedProps, ...ignoredProps });
</s> add const resolvedProps = omitUndefined({
...translatedProps,
...ignoredProps,
...gradientProps,
}); </s> remove w="90%"
</s> add
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/77bf599bb582dc295030cbb05012fbdf09bea50c
|
src/components/primitives/Box/index.tsx
|
import { useToken } from '../useToken';
|
<mask> import { useWindowDimensions } from 'react-native';
<mask> import { useNativeBase } from '../useNativeBase';
<mask> import { usePlatformProps } from '../usePlatformProps';
<mask> import { useColorMode } from '../../core/color-mode';
<mask> import {
<mask> resolveValueWithBreakpoint,
<mask> extractPropertyFromFunction,
<mask> } from './utils';
<mask> import {
</s> feat: linear gradiant on Box </s> remove import { usePropsResolution } from '../../../hooks/useThemeProps';
</s> add import { usePropsResolution } from '../../../hooks'; </s> remove import { useThemeProps } from '../../../hooks/useThemeProps';
</s> add import { usePropsResolution } from '../../../hooks/useThemeProps'; </s> remove let newProps = useThemeProps('Center', props);
</s> add let newProps = usePropsResolution('Center', props);
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/77bf599bb582dc295030cbb05012fbdf09bea50c
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
props: nonGradientProps,
|
<mask> );
<mask> const platformSpecificProps = usePlatformProps(componentThemeIntegratedProps);
<mask>
<mask> const translatedProps = propTranslator({
<mask> props: platformSpecificProps,
<mask> theme: notComponentTheme,
<mask> colorModeProps,
<mask> componentTheme,
<mask> currentBreakpoint,
<mask> });
</s> feat: linear gradiant on Box </s> remove const resolvedProps = omitUndefined({ ...translatedProps, ...ignoredProps });
</s> add const resolvedProps = omitUndefined({
...translatedProps,
...ignoredProps,
...gradientProps,
}); </s> remove let newProps = useThemeProps('Center', props);
</s> add let newProps = usePropsResolution('Center', props); </s> remove import { useThemeProps } from '../../../hooks/useThemeProps';
</s> add import { usePropsResolution } from '../../../hooks/useThemeProps'; </s> remove w="90%"
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/77bf599bb582dc295030cbb05012fbdf09bea50c
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
const resolvedProps = omitUndefined({
...translatedProps,
...ignoredProps,
...gradientProps,
});
|
<mask> ...translatedProps._text,
<mask> }
<mask> : translatedProps._text;
<mask>
<mask> const resolvedProps = omitUndefined({ ...translatedProps, ...ignoredProps });
<mask>
<mask> return resolvedProps;
<mask> }
</s> feat: linear gradiant on Box </s> remove props: platformSpecificProps,
</s> add props: nonGradientProps, </s> remove import { useThemeProps } from '../../../hooks/useThemeProps';
</s> add import { usePropsResolution } from '../../../hooks/useThemeProps'; </s> remove let newProps = useThemeProps('Center', props);
</s> add let newProps = usePropsResolution('Center', props);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/77bf599bb582dc295030cbb05012fbdf09bea50c
|
src/hooks/useThemeProps/usePropsResolution.tsx
|
_this2.state.callback(_this2.state.cancelButtonIndex);
|
<mask> animationType:"fade",
<mask> transparent:true,
<mask> visible:this.state.modalVisible,
<mask> onRequestClose:function onRequestClose(){
<mask> _this2.state.callback(-1);
<mask> _this2.setState({modalVisible:false});
<mask> },__source:{fileName:_jsxFileName,lineNumber:66}},
<mask>
<mask> _react2.default.createElement(_reactNative.TouchableOpacity,{
<mask> activeOpacity:1,
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _this2.state.callback(-1);
</s> add _this2.state.callback(_this2.state.cancelButtonIndex); </s> remove },__source:{fileName:_jsxFileName,lineNumber:172}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:176}}, </s> remove _react2.default.createElement(_Container.Container,{__source:{fileName:_jsxFileName,lineNumber:181}},
</s> add _react2.default.createElement(_Container.Container,{__source:{fileName:_jsxFileName,lineNumber:185}}, </s> remove _react2.default.createElement(_Text.Text,{style:this.props.textStyle,note:this.props.note,__source:{fileName:_jsxFileName,lineNumber:118}},
</s> add _react2.default.createElement(_Text.Text,{style:this.props.textStyle,note:this.props.note,__source:{fileName:_jsxFileName,lineNumber:122}}, </s> remove },__source:{fileName:_jsxFileName,lineNumber:140}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:144}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Actionsheet.js
|
_this2.state.callback(_this2.state.cancelButtonIndex);
|
<mask>
<mask> _react2.default.createElement(_reactNative.TouchableOpacity,{
<mask> activeOpacity:1,
<mask> onPress:function onPress(){
<mask> _this2.state.callback(-1);
<mask> _this2.setState({modalVisible:false});
<mask> },
<mask> style:{
<mask> backgroundColor:"rgba(0,0,0,0.4)",
<mask> flex:1,
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _this2.state.callback(-1);
</s> add _this2.state.callback(_this2.state.cancelButtonIndex); </s> remove _this2.state.callback(id);
</s> add _this2.state.callback(parseInt(id)); </s> remove _this2.state.callback(id);
</s> add _this2.state.callback(parseInt(id)); </s> remove style:{fontSize:22,lineHeight:26,color:"#7a7a7a"}});
</s> add style:{
fontSize:22,
lineHeight:26,
color:this.props.placeholderIconColor}});
</s> remove },__source:{fileName:_jsxFileName,lineNumber:140}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:144}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Actionsheet.js
|
_this2.state.callback(parseInt(id));
|
<mask> renderRow:function renderRow(data,i,id){
<mask> return typeof _this2.state.items[0]==="string"?
<mask> _react2.default.createElement(_ListItem.ListItem,{
<mask> onPress:function onPress(){
<mask> _this2.state.callback(id);
<mask> _this2.setState({modalVisible:false});
<mask> },
<mask> style:{borderColor:"transparent"},__source:{fileName:_jsxFileName,lineNumber:102}},
<mask>
<mask> _react2.default.createElement(_Text.Text,{__source:{fileName:_jsxFileName,lineNumber:109}},data)):
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _this2.state.callback(id);
</s> add _this2.state.callback(parseInt(id)); </s> remove _this2.state.callback(-1);
</s> add _this2.state.callback(_this2.state.cancelButtonIndex); </s> remove _react2.default.createElement(_Content.Content,{__source:{fileName:_jsxFileName,lineNumber:183}},
</s> add _react2.default.createElement(_Content.Content,{__source:{fileName:_jsxFileName,lineNumber:187}}, </s> remove },__source:{fileName:_jsxFileName,lineNumber:140}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:144}}, </s> remove _react2.default.createElement(_Text.Text,{style:this.props.headerBackButtonTextStyle,__source:{fileName:_jsxFileName,lineNumber:153}},
</s> add _react2.default.createElement(_Text.Text,{style:this.props.headerBackButtonTextStyle,__source:{fileName:_jsxFileName,lineNumber:157}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Actionsheet.js
|
_this2.state.callback(parseInt(id));
|
<mask>
<mask>
<mask> _react2.default.createElement(_ListItem.ListItem,{
<mask> onPress:function onPress(){
<mask> _this2.state.callback(id);
<mask> _this2.setState({modalVisible:false});
<mask> },
<mask> style:{borderColor:"transparent"},
<mask> icon:true,__source:{fileName:_jsxFileName,lineNumber:112}},
<mask>
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _this2.state.callback(id);
</s> add _this2.state.callback(parseInt(id)); </s> remove _this2.state.callback(-1);
</s> add _this2.state.callback(_this2.state.cancelButtonIndex); </s> remove },__source:{fileName:_jsxFileName,lineNumber:140}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:144}}, </s> remove _react2.default.createElement(_Text.Text,{style:this.props.headerBackButtonTextStyle,__source:{fileName:_jsxFileName,lineNumber:153}},
</s> add _react2.default.createElement(_Text.Text,{style:this.props.headerBackButtonTextStyle,__source:{fileName:_jsxFileName,lineNumber:157}}, </s> remove },__source:{fileName:_jsxFileName,lineNumber:187}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:191}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Actionsheet.js
|
style:{
fontSize:22,
lineHeight:26,
color:this.props.placeholderIconColor}});
|
<mask> }},{key:"renderIcon",value:function renderIcon()
<mask>
<mask> {
<mask> return _react2.default.cloneElement(this.props.iosIcon,{
<mask> style:{fontSize:22,lineHeight:26,color:"#7a7a7a"}});
<mask>
<mask> }},{key:"renderButton",value:function renderButton()
<mask>
<mask> {var _this3=this;
<mask> var onPress=function onPress(){
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove style: { fontSize: 22, lineHeight: 26, color: "#7a7a7a" }
</s> add style: {
fontSize: 22,
lineHeight: 26,
color: this.props.placeholderIconColor
} </s> remove _this2.state.callback(id);
</s> add _this2.state.callback(parseInt(id)); </s> remove _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:138}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:139}},
</s> add _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:142}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:143}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
onPress:onPress,__source:{fileName:_jsxFileName,lineNumber:114}},
|
<mask> style:this.props.style,
<mask> dark:true,
<mask> picker:true,
<mask> transparent:true,
<mask> onPress:onPress,__source:{fileName:_jsxFileName,lineNumber:110}},
<mask>
<mask> this.state.currentLabel?
<mask> _react2.default.createElement(_Text.Text,{style:this.props.textStyle,note:this.props.note,__source:{fileName:_jsxFileName,lineNumber:118}},
<mask> this.state.currentLabel):
<mask>
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Text.Text,{style:this.props.textStyle,note:this.props.note,__source:{fileName:_jsxFileName,lineNumber:118}},
</s> add _react2.default.createElement(_Text.Text,{style:this.props.textStyle,note:this.props.note,__source:{fileName:_jsxFileName,lineNumber:122}}, </s> remove style:this.props.textStyle,
note:this.props.note===false?false:true,__source:{fileName:_jsxFileName,lineNumber:122}},
</s> add style:[this.props.textStyle,this.props.placeholderStyle],
note:this.props.note===false?false:true,__source:{fileName:_jsxFileName,lineNumber:126}}, </s> remove },__source:{fileName:_jsxFileName,lineNumber:140}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:144}}, </s> remove _this2.state.callback(-1);
</s> add _this2.state.callback(_this2.state.cancelButtonIndex); </s> remove style:{fontSize:22,lineHeight:26,color:"#7a7a7a"}});
</s> add style:{
fontSize:22,
lineHeight:26,
color:this.props.placeholderIconColor}});
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
_react2.default.createElement(_Text.Text,{style:this.props.textStyle,note:this.props.note,__source:{fileName:_jsxFileName,lineNumber:122}},
|
<mask> transparent:true,
<mask> onPress:onPress,__source:{fileName:_jsxFileName,lineNumber:110}},
<mask>
<mask> this.state.currentLabel?
<mask> _react2.default.createElement(_Text.Text,{style:this.props.textStyle,note:this.props.note,__source:{fileName:_jsxFileName,lineNumber:118}},
<mask> this.state.currentLabel):
<mask>
<mask>
<mask> _react2.default.createElement(_Text.Text,{
<mask> style:this.props.textStyle,
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove onPress:onPress,__source:{fileName:_jsxFileName,lineNumber:110}},
</s> add onPress:onPress,__source:{fileName:_jsxFileName,lineNumber:114}}, </s> remove style:this.props.textStyle,
note:this.props.note===false?false:true,__source:{fileName:_jsxFileName,lineNumber:122}},
</s> add style:[this.props.textStyle,this.props.placeholderStyle],
note:this.props.note===false?false:true,__source:{fileName:_jsxFileName,lineNumber:126}}, </s> remove },__source:{fileName:_jsxFileName,lineNumber:140}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:144}}, </s> remove _this2.state.callback(-1);
</s> add _this2.state.callback(_this2.state.cancelButtonIndex); </s> remove style:{fontSize:22,lineHeight:26,color:"#7a7a7a"}});
</s> add style:{
fontSize:22,
lineHeight:26,
color:this.props.placeholderIconColor}});
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
style:[this.props.textStyle,this.props.placeholderStyle],
note:this.props.note===false?false:true,__source:{fileName:_jsxFileName,lineNumber:126}},
|
<mask> this.state.currentLabel):
<mask>
<mask>
<mask> _react2.default.createElement(_Text.Text,{
<mask> style:this.props.textStyle,
<mask> note:this.props.note===false?false:true,__source:{fileName:_jsxFileName,lineNumber:122}},
<mask>
<mask> this.props.placeholder),
<mask>
<mask>
<mask> this.props.iosIcon===undefined?null:this.renderIcon()));
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Text.Text,{style:this.props.textStyle,note:this.props.note,__source:{fileName:_jsxFileName,lineNumber:118}},
</s> add _react2.default.createElement(_Text.Text,{style:this.props.textStyle,note:this.props.note,__source:{fileName:_jsxFileName,lineNumber:122}}, </s> remove onPress:onPress,__source:{fileName:_jsxFileName,lineNumber:110}},
</s> add onPress:onPress,__source:{fileName:_jsxFileName,lineNumber:114}}, </s> remove _react2.default.createElement(_Body.Body,{__source:{fileName:_jsxFileName,lineNumber:158}},
_react2.default.createElement(_Title.Title,{style:this.props.headerTitleStyle,__source:{fileName:_jsxFileName,lineNumber:159}},
</s> add _react2.default.createElement(_Body.Body,{__source:{fileName:_jsxFileName,lineNumber:162}},
_react2.default.createElement(_Title.Title,{style:this.props.headerTitleStyle,__source:{fileName:_jsxFileName,lineNumber:163}}, </s> remove },__source:{fileName:_jsxFileName,lineNumber:187}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:191}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
_react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:142}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:143}},
|
<mask> {var _this4=this;
<mask> return this.props.renderHeader?
<mask> this.props.renderHeader(function(){return _this4._setModalVisible(false);}):
<mask>
<mask> _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:138}},
<mask> _react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:139}},
<mask> _react2.default.createElement(_Button.Button,{
<mask> style:_extends({
<mask> shadowOffset:null,
<mask> shadowColor:null,
<mask> shadowRadius:null,
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_reactNative.Animated.View,{style:this.getToastStyle(),__source:{fileName:_jsxFileName,lineNumber:92}},
</s> add _react2.default.createElement(_reactNative.Animated.View,{style:this.getToastStyle(),__source:{fileName:_jsxFileName,lineNumber:112}}, </s> remove style:{fontSize:22,lineHeight:26,color:"#7a7a7a"}});
</s> add style:{
fontSize:22,
lineHeight:26,
color:this.props.placeholderIconColor}});
</s> remove _react2.default.createElement(_Text.Text,{style:this.state.buttonTextStyle,__source:{fileName:_jsxFileName,lineNumber:105}},
</s> add _react2.default.createElement(_Text.Text,{style:this.state.buttonTextStyle,__source:{fileName:_jsxFileName,lineNumber:125}}, </s> remove return _react2.default.createElement(_reactNative.Picker.Item,_extends({},this.props(),{__source:{fileName:_jsxFileName,lineNumber:220}}));
</s> add return _react2.default.createElement(_reactNative.Picker.Item,_extends({},this.props(),{__source:{fileName:_jsxFileName,lineNumber:224}}));
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
},__source:{fileName:_jsxFileName,lineNumber:144}},
|
<mask>
<mask> transparent:true,
<mask> onPress:function onPress(){
<mask> _this4._setModalVisible(false);
<mask> },__source:{fileName:_jsxFileName,lineNumber:140}},
<mask>
<mask> _react2.default.createElement(_Text.Text,{style:this.props.headerBackButtonTextStyle,__source:{fileName:_jsxFileName,lineNumber:153}},
<mask> this.props.headerBackButtonText||"Back"))),
<mask>
<mask>
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Text.Text,{style:this.props.headerBackButtonTextStyle,__source:{fileName:_jsxFileName,lineNumber:153}},
</s> add _react2.default.createElement(_Text.Text,{style:this.props.headerBackButtonTextStyle,__source:{fileName:_jsxFileName,lineNumber:157}}, </s> remove _this2.state.callback(id);
</s> add _this2.state.callback(parseInt(id)); </s> remove },__source:{fileName:_jsxFileName,lineNumber:187}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:191}}, </s> remove _this2.state.callback(-1);
</s> add _this2.state.callback(_this2.state.cancelButtonIndex); </s> remove _react2.default.createElement(_Body.Body,{__source:{fileName:_jsxFileName,lineNumber:158}},
_react2.default.createElement(_Title.Title,{style:this.props.headerTitleStyle,__source:{fileName:_jsxFileName,lineNumber:159}},
</s> add _react2.default.createElement(_Body.Body,{__source:{fileName:_jsxFileName,lineNumber:162}},
_react2.default.createElement(_Title.Title,{style:this.props.headerTitleStyle,__source:{fileName:_jsxFileName,lineNumber:163}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
_react2.default.createElement(_Text.Text,{style:this.props.headerBackButtonTextStyle,__source:{fileName:_jsxFileName,lineNumber:157}},
|
<mask> onPress:function onPress(){
<mask> _this4._setModalVisible(false);
<mask> },__source:{fileName:_jsxFileName,lineNumber:140}},
<mask>
<mask> _react2.default.createElement(_Text.Text,{style:this.props.headerBackButtonTextStyle,__source:{fileName:_jsxFileName,lineNumber:153}},
<mask> this.props.headerBackButtonText||"Back"))),
<mask>
<mask>
<mask>
<mask> _react2.default.createElement(_Body.Body,{__source:{fileName:_jsxFileName,lineNumber:158}},
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove },__source:{fileName:_jsxFileName,lineNumber:140}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:144}}, </s> remove _react2.default.createElement(_Body.Body,{__source:{fileName:_jsxFileName,lineNumber:158}},
_react2.default.createElement(_Title.Title,{style:this.props.headerTitleStyle,__source:{fileName:_jsxFileName,lineNumber:159}},
</s> add _react2.default.createElement(_Body.Body,{__source:{fileName:_jsxFileName,lineNumber:162}},
_react2.default.createElement(_Title.Title,{style:this.props.headerTitleStyle,__source:{fileName:_jsxFileName,lineNumber:163}}, </s> remove _this2.state.callback(id);
</s> add _this2.state.callback(parseInt(id)); </s> remove },__source:{fileName:_jsxFileName,lineNumber:187}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:191}}, </s> remove _this2.state.callback(-1);
</s> add _this2.state.callback(_this2.state.cancelButtonIndex);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
_react2.default.createElement(_Body.Body,{__source:{fileName:_jsxFileName,lineNumber:162}},
_react2.default.createElement(_Title.Title,{style:this.props.headerTitleStyle,__source:{fileName:_jsxFileName,lineNumber:163}},
|
<mask> this.props.headerBackButtonText||"Back"))),
<mask>
<mask>
<mask>
<mask> _react2.default.createElement(_Body.Body,{__source:{fileName:_jsxFileName,lineNumber:158}},
<mask> _react2.default.createElement(_Title.Title,{style:this.props.headerTitleStyle,__source:{fileName:_jsxFileName,lineNumber:159}},
<mask> this.props.iosHeader||"Select One")),
<mask>
<mask>
<mask> _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:163}}));
<mask>
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:163}}));
</s> add _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:167}})); </s> remove _react2.default.createElement(_Text.Text,{style:this.props.headerBackButtonTextStyle,__source:{fileName:_jsxFileName,lineNumber:153}},
</s> add _react2.default.createElement(_Text.Text,{style:this.props.headerBackButtonTextStyle,__source:{fileName:_jsxFileName,lineNumber:157}}, </s> remove },__source:{fileName:_jsxFileName,lineNumber:140}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:144}}, </s> remove buttonText: config.buttonText,
</s> add buttonText: this.getButtonText(config.buttonText), </s> remove },__source:{fileName:_jsxFileName,lineNumber:187}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:191}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
_react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:167}}));
|
<mask> _react2.default.createElement(_Title.Title,{style:this.props.headerTitleStyle,__source:{fileName:_jsxFileName,lineNumber:159}},
<mask> this.props.iosHeader||"Select One")),
<mask>
<mask>
<mask> _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:163}}));
<mask>
<mask>
<mask> }},{key:"render",value:function render()
<mask>
<mask> {var _this5=this;
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Body.Body,{__source:{fileName:_jsxFileName,lineNumber:158}},
_react2.default.createElement(_Title.Title,{style:this.props.headerTitleStyle,__source:{fileName:_jsxFileName,lineNumber:159}},
</s> add _react2.default.createElement(_Body.Body,{__source:{fileName:_jsxFileName,lineNumber:162}},
_react2.default.createElement(_Title.Title,{style:this.props.headerTitleStyle,__source:{fileName:_jsxFileName,lineNumber:163}}, </s> remove _react2.default.createElement(_reactNative.View,{ref:function ref(c){return _this5._root=c;},__source:{fileName:_jsxFileName,lineNumber:170}},
</s> add _react2.default.createElement(_reactNative.View,{ref:function ref(c){return _this5._root=c;},__source:{fileName:_jsxFileName,lineNumber:174}}, </s> remove _react2.default.createElement(_reactNative.Animated.View,{style:this.getToastStyle(),__source:{fileName:_jsxFileName,lineNumber:92}},
</s> add _react2.default.createElement(_reactNative.Animated.View,{style:this.getToastStyle(),__source:{fileName:_jsxFileName,lineNumber:112}}, </s> remove buttonText:config.buttonText,
</s> add buttonText:this.getButtonText(config.buttonText), </s> remove _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:138}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:139}},
</s> add _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:142}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:143}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
_react2.default.createElement(_reactNative.View,{ref:function ref(c){return _this5._root=c;},__source:{fileName:_jsxFileName,lineNumber:174}},
|
<mask> }},{key:"render",value:function render()
<mask>
<mask> {var _this5=this;
<mask> return(
<mask> _react2.default.createElement(_reactNative.View,{ref:function ref(c){return _this5._root=c;},__source:{fileName:_jsxFileName,lineNumber:170}},
<mask> this.renderButton(),
<mask> _react2.default.createElement(_reactNative.Modal,{
<mask> supportedOrientations:this.props.supportedOrientations||null,
<mask> animationType:"slide",
<mask> transparent:false,
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:163}}));
</s> add _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:167}})); </s> remove _react2.default.createElement(_reactNative.Animated.View,{style:this.getToastStyle(),__source:{fileName:_jsxFileName,lineNumber:92}},
</s> add _react2.default.createElement(_reactNative.Animated.View,{style:this.getToastStyle(),__source:{fileName:_jsxFileName,lineNumber:112}}, </s> remove },__source:{fileName:_jsxFileName,lineNumber:172}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:176}}, </s> remove buttonText:config.buttonText,
</s> add buttonText:this.getButtonText(config.buttonText), </s> remove _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:138}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:139}},
</s> add _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:142}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:143}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
},__source:{fileName:_jsxFileName,lineNumber:176}},
|
<mask> transparent:false,
<mask> visible:this.state.modalVisible,
<mask> onRequestClose:function onRequestClose(){
<mask> _this5._setModalVisible(false);
<mask> },__source:{fileName:_jsxFileName,lineNumber:172}},
<mask>
<mask> _react2.default.createElement(_Container.Container,{__source:{fileName:_jsxFileName,lineNumber:181}},
<mask> this.renderHeader(),
<mask> _react2.default.createElement(_Content.Content,{__source:{fileName:_jsxFileName,lineNumber:183}},
<mask> _react2.default.createElement(_List.List,{
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Container.Container,{__source:{fileName:_jsxFileName,lineNumber:181}},
</s> add _react2.default.createElement(_Container.Container,{__source:{fileName:_jsxFileName,lineNumber:185}}, </s> remove _react2.default.createElement(_Content.Content,{__source:{fileName:_jsxFileName,lineNumber:183}},
</s> add _react2.default.createElement(_Content.Content,{__source:{fileName:_jsxFileName,lineNumber:187}}, </s> remove _this2.state.callback(-1);
</s> add _this2.state.callback(_this2.state.cancelButtonIndex); </s> remove },__source:{fileName:_jsxFileName,lineNumber:187}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:191}}, </s> remove _react2.default.createElement(_reactNative.View,{ref:function ref(c){return _this5._root=c;},__source:{fileName:_jsxFileName,lineNumber:170}},
</s> add _react2.default.createElement(_reactNative.View,{ref:function ref(c){return _this5._root=c;},__source:{fileName:_jsxFileName,lineNumber:174}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
_react2.default.createElement(_Container.Container,{__source:{fileName:_jsxFileName,lineNumber:185}},
|
<mask> onRequestClose:function onRequestClose(){
<mask> _this5._setModalVisible(false);
<mask> },__source:{fileName:_jsxFileName,lineNumber:172}},
<mask>
<mask> _react2.default.createElement(_Container.Container,{__source:{fileName:_jsxFileName,lineNumber:181}},
<mask> this.renderHeader(),
<mask> _react2.default.createElement(_Content.Content,{__source:{fileName:_jsxFileName,lineNumber:183}},
<mask> _react2.default.createElement(_List.List,{
<mask> dataArray:this.state.dataSource,
<mask> renderRow:function renderRow(child){return(
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Content.Content,{__source:{fileName:_jsxFileName,lineNumber:183}},
</s> add _react2.default.createElement(_Content.Content,{__source:{fileName:_jsxFileName,lineNumber:187}}, </s> remove },__source:{fileName:_jsxFileName,lineNumber:172}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:176}}, </s> remove _this2.state.callback(-1);
</s> add _this2.state.callback(_this2.state.cancelButtonIndex); </s> remove },__source:{fileName:_jsxFileName,lineNumber:187}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:191}}, </s> remove _this2.state.callback(id);
</s> add _this2.state.callback(parseInt(id));
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
_react2.default.createElement(_Content.Content,{__source:{fileName:_jsxFileName,lineNumber:187}},
|
<mask> },__source:{fileName:_jsxFileName,lineNumber:172}},
<mask>
<mask> _react2.default.createElement(_Container.Container,{__source:{fileName:_jsxFileName,lineNumber:181}},
<mask> this.renderHeader(),
<mask> _react2.default.createElement(_Content.Content,{__source:{fileName:_jsxFileName,lineNumber:183}},
<mask> _react2.default.createElement(_List.List,{
<mask> dataArray:this.state.dataSource,
<mask> renderRow:function renderRow(child){return(
<mask> _react2.default.createElement(_ListItem.ListItem,{
<mask> selected:child.props.value===_this5.props.selectedValue,
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Container.Container,{__source:{fileName:_jsxFileName,lineNumber:181}},
</s> add _react2.default.createElement(_Container.Container,{__source:{fileName:_jsxFileName,lineNumber:185}}, </s> remove },__source:{fileName:_jsxFileName,lineNumber:172}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:176}}, </s> remove _this2.state.callback(id);
</s> add _this2.state.callback(parseInt(id)); </s> remove _this2.state.callback(id);
</s> add _this2.state.callback(parseInt(id));
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
},__source:{fileName:_jsxFileName,lineNumber:191}},
|
<mask> onPress:function onPress(){
<mask> _this5._setModalVisible(false);
<mask> _this5.props.onValueChange(child.props.value);
<mask> _this5.setState({current:child.props.label});
<mask> },__source:{fileName:_jsxFileName,lineNumber:187}},
<mask>
<mask> _react2.default.createElement(_Text.Text,{style:_this5.props.itemTextStyle,__source:{fileName:_jsxFileName,lineNumber:197}},
<mask> child.props.label),
<mask>
<mask> _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:200}},
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Text.Text,{style:_this5.props.itemTextStyle,__source:{fileName:_jsxFileName,lineNumber:197}},
</s> add _react2.default.createElement(_Text.Text,{style:_this5.props.itemTextStyle,__source:{fileName:_jsxFileName,lineNumber:201}}, </s> remove _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:200}},
</s> add _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:204}}, </s> remove _react2.default.createElement(_Radio.Radio,{selected:true,__source:{fileName:_jsxFileName,lineNumber:202}}):
</s> add _react2.default.createElement(_Radio.Radio,{selected:true,__source:{fileName:_jsxFileName,lineNumber:206}}): </s> remove },__source:{fileName:_jsxFileName,lineNumber:140}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:144}}, </s> remove _react2.default.createElement(_Text.Text,{style:this.props.headerBackButtonTextStyle,__source:{fileName:_jsxFileName,lineNumber:153}},
</s> add _react2.default.createElement(_Text.Text,{style:this.props.headerBackButtonTextStyle,__source:{fileName:_jsxFileName,lineNumber:157}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
_react2.default.createElement(_Text.Text,{style:_this5.props.itemTextStyle,__source:{fileName:_jsxFileName,lineNumber:201}},
|
<mask> _this5.props.onValueChange(child.props.value);
<mask> _this5.setState({current:child.props.label});
<mask> },__source:{fileName:_jsxFileName,lineNumber:187}},
<mask>
<mask> _react2.default.createElement(_Text.Text,{style:_this5.props.itemTextStyle,__source:{fileName:_jsxFileName,lineNumber:197}},
<mask> child.props.label),
<mask>
<mask> _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:200}},
<mask> child.props.value===_this5.props.selectedValue?
<mask> _react2.default.createElement(_Radio.Radio,{selected:true,__source:{fileName:_jsxFileName,lineNumber:202}}):
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove },__source:{fileName:_jsxFileName,lineNumber:187}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:191}}, </s> remove _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:200}},
</s> add _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:204}}, </s> remove _react2.default.createElement(_Radio.Radio,{selected:true,__source:{fileName:_jsxFileName,lineNumber:202}}):
</s> add _react2.default.createElement(_Radio.Radio,{selected:true,__source:{fileName:_jsxFileName,lineNumber:206}}): </s> remove _react2.default.createElement(_Radio.Radio,{selected:false,__source:{fileName:_jsxFileName,lineNumber:204}}))));},__source:{fileName:_jsxFileName,lineNumber:184}}))))));
</s> add _react2.default.createElement(_Radio.Radio,{selected:false,__source:{fileName:_jsxFileName,lineNumber:208}}))));},__source:{fileName:_jsxFileName,lineNumber:188}})))))); </s> remove _this2.state.callback(id);
</s> add _this2.state.callback(parseInt(id));
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
_react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:204}},
|
<mask>
<mask> _react2.default.createElement(_Text.Text,{style:_this5.props.itemTextStyle,__source:{fileName:_jsxFileName,lineNumber:197}},
<mask> child.props.label),
<mask>
<mask> _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:200}},
<mask> child.props.value===_this5.props.selectedValue?
<mask> _react2.default.createElement(_Radio.Radio,{selected:true,__source:{fileName:_jsxFileName,lineNumber:202}}):
<mask>
<mask> _react2.default.createElement(_Radio.Radio,{selected:false,__source:{fileName:_jsxFileName,lineNumber:204}}))));},__source:{fileName:_jsxFileName,lineNumber:184}}))))));
<mask>
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Radio.Radio,{selected:true,__source:{fileName:_jsxFileName,lineNumber:202}}):
</s> add _react2.default.createElement(_Radio.Radio,{selected:true,__source:{fileName:_jsxFileName,lineNumber:206}}): </s> remove _react2.default.createElement(_Text.Text,{style:_this5.props.itemTextStyle,__source:{fileName:_jsxFileName,lineNumber:197}},
</s> add _react2.default.createElement(_Text.Text,{style:_this5.props.itemTextStyle,__source:{fileName:_jsxFileName,lineNumber:201}}, </s> remove _react2.default.createElement(_Radio.Radio,{selected:false,__source:{fileName:_jsxFileName,lineNumber:204}}))));},__source:{fileName:_jsxFileName,lineNumber:184}}))))));
</s> add _react2.default.createElement(_Radio.Radio,{selected:false,__source:{fileName:_jsxFileName,lineNumber:208}}))));},__source:{fileName:_jsxFileName,lineNumber:188}})))))); </s> remove },__source:{fileName:_jsxFileName,lineNumber:187}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:191}}, </s> remove style:{fontSize:22,lineHeight:26,color:"#7a7a7a"}});
</s> add style:{
fontSize:22,
lineHeight:26,
color:this.props.placeholderIconColor}});
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
_react2.default.createElement(_Radio.Radio,{selected:true,__source:{fileName:_jsxFileName,lineNumber:206}}):
|
<mask> child.props.label),
<mask>
<mask> _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:200}},
<mask> child.props.value===_this5.props.selectedValue?
<mask> _react2.default.createElement(_Radio.Radio,{selected:true,__source:{fileName:_jsxFileName,lineNumber:202}}):
<mask>
<mask> _react2.default.createElement(_Radio.Radio,{selected:false,__source:{fileName:_jsxFileName,lineNumber:204}}))));},__source:{fileName:_jsxFileName,lineNumber:184}}))))));
<mask>
<mask>
<mask>
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:200}},
</s> add _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:204}}, </s> remove _react2.default.createElement(_Radio.Radio,{selected:false,__source:{fileName:_jsxFileName,lineNumber:204}}))));},__source:{fileName:_jsxFileName,lineNumber:184}}))))));
</s> add _react2.default.createElement(_Radio.Radio,{selected:false,__source:{fileName:_jsxFileName,lineNumber:208}}))));},__source:{fileName:_jsxFileName,lineNumber:188}})))))); </s> remove _react2.default.createElement(_Text.Text,{style:_this5.props.itemTextStyle,__source:{fileName:_jsxFileName,lineNumber:197}},
</s> add _react2.default.createElement(_Text.Text,{style:_this5.props.itemTextStyle,__source:{fileName:_jsxFileName,lineNumber:201}}, </s> remove },__source:{fileName:_jsxFileName,lineNumber:187}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:191}}, </s> remove style:{fontSize:22,lineHeight:26,color:"#7a7a7a"}});
</s> add style:{
fontSize:22,
lineHeight:26,
color:this.props.placeholderIconColor}});
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
_react2.default.createElement(_Radio.Radio,{selected:false,__source:{fileName:_jsxFileName,lineNumber:208}}))));},__source:{fileName:_jsxFileName,lineNumber:188}}))))));
|
<mask> _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:200}},
<mask> child.props.value===_this5.props.selectedValue?
<mask> _react2.default.createElement(_Radio.Radio,{selected:true,__source:{fileName:_jsxFileName,lineNumber:202}}):
<mask>
<mask> _react2.default.createElement(_Radio.Radio,{selected:false,__source:{fileName:_jsxFileName,lineNumber:204}}))));},__source:{fileName:_jsxFileName,lineNumber:184}}))))));
<mask>
<mask>
<mask>
<mask>
<mask>
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Radio.Radio,{selected:true,__source:{fileName:_jsxFileName,lineNumber:202}}):
</s> add _react2.default.createElement(_Radio.Radio,{selected:true,__source:{fileName:_jsxFileName,lineNumber:206}}): </s> remove _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:200}},
</s> add _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:204}}, </s> remove _react2.default.createElement(_Text.Text,{style:_this5.props.itemTextStyle,__source:{fileName:_jsxFileName,lineNumber:197}},
</s> add _react2.default.createElement(_Text.Text,{style:_this5.props.itemTextStyle,__source:{fileName:_jsxFileName,lineNumber:201}}, </s> remove },__source:{fileName:_jsxFileName,lineNumber:187}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:191}}, </s> remove style:{fontSize:22,lineHeight:26,color:"#7a7a7a"}});
</s> add style:{
fontSize:22,
lineHeight:26,
color:this.props.placeholderIconColor}});
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
return _react2.default.createElement(_reactNative.Picker.Item,_extends({},this.props(),{__source:{fileName:_jsxFileName,lineNumber:224}}));
|
<mask>
<mask>
<mask> PickerNB.Item=(0,_createReactClass2.default)({displayName:"Item",
<mask> render:function render(){
<mask> return _react2.default.createElement(_reactNative.Picker.Item,_extends({},this.props(),{__source:{fileName:_jsxFileName,lineNumber:220}}));
<mask> }});
<mask>
<mask>
<mask> PickerNB.propTypes=_extends({},_reactNative.ViewPropTypes,{
<mask>
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _this2.state.callback(id);
</s> add _this2.state.callback(parseInt(id)); </s> remove _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:138}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:139}},
</s> add _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:142}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:143}}, </s> remove style:{fontSize:22,lineHeight:26,color:"#7a7a7a"}});
</s> add style:{
fontSize:22,
lineHeight:26,
color:this.props.placeholderIconColor}});
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/Picker.ios.js
|
}},{key:"getButtonText",value:function getButtonText(
buttonText){
if(buttonText){
if(buttonText.trim().length===0){
return undefined;
}else return buttonText;
}
return undefined;
|
<mask> return 30;
<mask> }else{
<mask> return 0;
<mask> }
<mask> }},{key:"showToast",value:function showToast(_ref)
<mask> {var _this2=this;var config=_ref.config;
<mask> this.setState({
<mask> modalVisible:true,
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove buttonText:config.buttonText,
</s> add buttonText:this.getButtonText(config.buttonText), </s> remove return _react2.default.createElement(_reactNative.Picker.Item,_extends({},this.props(),{__source:{fileName:_jsxFileName,lineNumber:220}}));
</s> add return _react2.default.createElement(_reactNative.Picker.Item,_extends({},this.props(),{__source:{fileName:_jsxFileName,lineNumber:224}})); </s> remove style: { fontSize: 22, lineHeight: 26, color: "#7a7a7a" }
</s> add style: {
fontSize: 22,
lineHeight: 26,
color: this.props.placeholderIconColor
}
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/ToastContainer.js
|
buttonText:this.getButtonText(config.buttonText),
|
<mask> {var _this2=this;var config=_ref.config;
<mask> this.setState({
<mask> modalVisible:true,
<mask> text:config.text,
<mask> buttonText:config.buttonText,
<mask> type:config.type,
<mask> position:config.position?config.position:"bottom",
<mask> supportedOrientations:config.supportedOrientations,
<mask> style:config.style,
<mask> buttonTextStyle:config.buttonTextStyle,
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:163}}));
</s> add _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:167}})); </s> remove _react2.default.createElement(_reactNative.Animated.View,{style:this.getToastStyle(),__source:{fileName:_jsxFileName,lineNumber:92}},
</s> add _react2.default.createElement(_reactNative.Animated.View,{style:this.getToastStyle(),__source:{fileName:_jsxFileName,lineNumber:112}}, </s> remove _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:138}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:139}},
</s> add _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:142}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:143}}, </s> remove _react2.default.createElement(_reactNative.View,{ref:function ref(c){return _this5._root=c;},__source:{fileName:_jsxFileName,lineNumber:170}},
</s> add _react2.default.createElement(_reactNative.View,{ref:function ref(c){return _this5._root=c;},__source:{fileName:_jsxFileName,lineNumber:174}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/ToastContainer.js
|
}else{
setTimeout(function(){
_reactNative.Animated.timing(_this2.state.fadeAnim,{
toValue:0,
duration:200}).
start();
setTimeout(function(){
_this2.setState({
modalVisible:false});
},500);
},1500);
|
<mask> modalVisible:false});
<mask>
<mask> },500);
<mask> },config.duration);
<mask> }
<mask> _reactNative.Animated.timing(this.state.fadeAnim,{
<mask> toValue:1,
<mask> duration:200}).
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove style: { fontSize: 22, lineHeight: 26, color: "#7a7a7a" }
</s> add style: {
fontSize: 22,
lineHeight: 26,
color: this.props.placeholderIconColor
} </s> remove },__source:{fileName:_jsxFileName,lineNumber:140}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:144}},
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/ToastContainer.js
|
_react2.default.createElement(_reactNative.Animated.View,{style:this.getToastStyle(),__source:{fileName:_jsxFileName,lineNumber:112}},
|
<mask> }},{key:"render",value:function render()
<mask> {var _this4=this;
<mask> if(this.state.modalVisible){
<mask> return(
<mask> _react2.default.createElement(_reactNative.Animated.View,{style:this.getToastStyle(),__source:{fileName:_jsxFileName,lineNumber:92}},
<mask> _react2.default.createElement(_Toast.Toast,{
<mask> style:this.state.style,
<mask> danger:this.state.type=="danger"?true:false,
<mask> success:this.state.type=="success"?true:false,
<mask> warning:this.state.type=="warning"?true:false,__source:{fileName:_jsxFileName,lineNumber:93}},
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove warning:this.state.type=="warning"?true:false,__source:{fileName:_jsxFileName,lineNumber:93}},
</s> add warning:this.state.type=="warning"?true:false,__source:{fileName:_jsxFileName,lineNumber:113}}, </s> remove _react2.default.createElement(_reactNative.View,{ref:function ref(c){return _this5._root=c;},__source:{fileName:_jsxFileName,lineNumber:170}},
</s> add _react2.default.createElement(_reactNative.View,{ref:function ref(c){return _this5._root=c;},__source:{fileName:_jsxFileName,lineNumber:174}}, </s> remove _react2.default.createElement(_Text.Text,{style:this.state.textStyle,__source:{fileName:_jsxFileName,lineNumber:99}},this.state.text),
</s> add _react2.default.createElement(_Text.Text,{style:this.state.textStyle,__source:{fileName:_jsxFileName,lineNumber:119}},this.state.text), </s> remove _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:163}}));
</s> add _react2.default.createElement(_Right.Right,{__source:{fileName:_jsxFileName,lineNumber:167}})); </s> remove _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:138}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:139}},
</s> add _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:142}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:143}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/ToastContainer.js
|
warning:this.state.type=="warning"?true:false,__source:{fileName:_jsxFileName,lineNumber:113}},
|
<mask> _react2.default.createElement(_Toast.Toast,{
<mask> style:this.state.style,
<mask> danger:this.state.type=="danger"?true:false,
<mask> success:this.state.type=="success"?true:false,
<mask> warning:this.state.type=="warning"?true:false,__source:{fileName:_jsxFileName,lineNumber:93}},
<mask>
<mask> _react2.default.createElement(_Text.Text,{style:this.state.textStyle,__source:{fileName:_jsxFileName,lineNumber:99}},this.state.text),
<mask> this.state.buttonText&&
<mask> _react2.default.createElement(_Button.Button,{
<mask> style:this.state.buttonStyle,
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Text.Text,{style:this.state.textStyle,__source:{fileName:_jsxFileName,lineNumber:99}},this.state.text),
</s> add _react2.default.createElement(_Text.Text,{style:this.state.textStyle,__source:{fileName:_jsxFileName,lineNumber:119}},this.state.text), </s> remove _react2.default.createElement(_reactNative.Animated.View,{style:this.getToastStyle(),__source:{fileName:_jsxFileName,lineNumber:92}},
</s> add _react2.default.createElement(_reactNative.Animated.View,{style:this.getToastStyle(),__source:{fileName:_jsxFileName,lineNumber:112}}, </s> remove onPress:function onPress(){return _this4.closeToast();},__source:{fileName:_jsxFileName,lineNumber:101}},
</s> add onPress:function onPress(){return _this4.closeToast();},__source:{fileName:_jsxFileName,lineNumber:121}}, </s> remove _react2.default.createElement(_Text.Text,{style:this.state.buttonTextStyle,__source:{fileName:_jsxFileName,lineNumber:105}},
</s> add _react2.default.createElement(_Text.Text,{style:this.state.buttonTextStyle,__source:{fileName:_jsxFileName,lineNumber:125}}, </s> remove _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:138}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:139}},
</s> add _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:142}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:143}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/ToastContainer.js
|
_react2.default.createElement(_Text.Text,{style:this.state.textStyle,__source:{fileName:_jsxFileName,lineNumber:119}},this.state.text),
|
<mask> danger:this.state.type=="danger"?true:false,
<mask> success:this.state.type=="success"?true:false,
<mask> warning:this.state.type=="warning"?true:false,__source:{fileName:_jsxFileName,lineNumber:93}},
<mask>
<mask> _react2.default.createElement(_Text.Text,{style:this.state.textStyle,__source:{fileName:_jsxFileName,lineNumber:99}},this.state.text),
<mask> this.state.buttonText&&
<mask> _react2.default.createElement(_Button.Button,{
<mask> style:this.state.buttonStyle,
<mask> onPress:function onPress(){return _this4.closeToast();},__source:{fileName:_jsxFileName,lineNumber:101}},
<mask>
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove warning:this.state.type=="warning"?true:false,__source:{fileName:_jsxFileName,lineNumber:93}},
</s> add warning:this.state.type=="warning"?true:false,__source:{fileName:_jsxFileName,lineNumber:113}}, </s> remove onPress:function onPress(){return _this4.closeToast();},__source:{fileName:_jsxFileName,lineNumber:101}},
</s> add onPress:function onPress(){return _this4.closeToast();},__source:{fileName:_jsxFileName,lineNumber:121}}, </s> remove _react2.default.createElement(_Text.Text,{style:this.state.buttonTextStyle,__source:{fileName:_jsxFileName,lineNumber:105}},
</s> add _react2.default.createElement(_Text.Text,{style:this.state.buttonTextStyle,__source:{fileName:_jsxFileName,lineNumber:125}}, </s> remove _react2.default.createElement(_reactNative.Animated.View,{style:this.getToastStyle(),__source:{fileName:_jsxFileName,lineNumber:92}},
</s> add _react2.default.createElement(_reactNative.Animated.View,{style:this.getToastStyle(),__source:{fileName:_jsxFileName,lineNumber:112}}, </s> remove _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:138}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:139}},
</s> add _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:142}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:143}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/ToastContainer.js
|
onPress:function onPress(){return _this4.closeToast();},__source:{fileName:_jsxFileName,lineNumber:121}},
|
<mask> _react2.default.createElement(_Text.Text,{style:this.state.textStyle,__source:{fileName:_jsxFileName,lineNumber:99}},this.state.text),
<mask> this.state.buttonText&&
<mask> _react2.default.createElement(_Button.Button,{
<mask> style:this.state.buttonStyle,
<mask> onPress:function onPress(){return _this4.closeToast();},__source:{fileName:_jsxFileName,lineNumber:101}},
<mask>
<mask> _react2.default.createElement(_Text.Text,{style:this.state.buttonTextStyle,__source:{fileName:_jsxFileName,lineNumber:105}},
<mask> this.state.buttonText)))));
<mask>
<mask>
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove _react2.default.createElement(_Text.Text,{style:this.state.buttonTextStyle,__source:{fileName:_jsxFileName,lineNumber:105}},
</s> add _react2.default.createElement(_Text.Text,{style:this.state.buttonTextStyle,__source:{fileName:_jsxFileName,lineNumber:125}}, </s> remove _react2.default.createElement(_Text.Text,{style:this.state.textStyle,__source:{fileName:_jsxFileName,lineNumber:99}},this.state.text),
</s> add _react2.default.createElement(_Text.Text,{style:this.state.textStyle,__source:{fileName:_jsxFileName,lineNumber:119}},this.state.text), </s> remove warning:this.state.type=="warning"?true:false,__source:{fileName:_jsxFileName,lineNumber:93}},
</s> add warning:this.state.type=="warning"?true:false,__source:{fileName:_jsxFileName,lineNumber:113}}, </s> remove _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:138}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:139}},
</s> add _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:142}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:143}}, </s> remove },__source:{fileName:_jsxFileName,lineNumber:140}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:144}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/ToastContainer.js
|
_react2.default.createElement(_Text.Text,{style:this.state.buttonTextStyle,__source:{fileName:_jsxFileName,lineNumber:125}},
|
<mask> _react2.default.createElement(_Button.Button,{
<mask> style:this.state.buttonStyle,
<mask> onPress:function onPress(){return _this4.closeToast();},__source:{fileName:_jsxFileName,lineNumber:101}},
<mask>
<mask> _react2.default.createElement(_Text.Text,{style:this.state.buttonTextStyle,__source:{fileName:_jsxFileName,lineNumber:105}},
<mask> this.state.buttonText)))));
<mask>
<mask>
<mask>
<mask>
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove onPress:function onPress(){return _this4.closeToast();},__source:{fileName:_jsxFileName,lineNumber:101}},
</s> add onPress:function onPress(){return _this4.closeToast();},__source:{fileName:_jsxFileName,lineNumber:121}}, </s> remove _react2.default.createElement(_Text.Text,{style:this.state.textStyle,__source:{fileName:_jsxFileName,lineNumber:99}},this.state.text),
</s> add _react2.default.createElement(_Text.Text,{style:this.state.textStyle,__source:{fileName:_jsxFileName,lineNumber:119}},this.state.text), </s> remove warning:this.state.type=="warning"?true:false,__source:{fileName:_jsxFileName,lineNumber:93}},
</s> add warning:this.state.type=="warning"?true:false,__source:{fileName:_jsxFileName,lineNumber:113}}, </s> remove _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:138}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:139}},
</s> add _react2.default.createElement(_Header.Header,{style:this.props.headerStyle,__source:{fileName:_jsxFileName,lineNumber:142}},
_react2.default.createElement(_Left.Left,{__source:{fileName:_jsxFileName,lineNumber:143}}, </s> remove },__source:{fileName:_jsxFileName,lineNumber:140}},
</s> add },__source:{fileName:_jsxFileName,lineNumber:144}},
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
dist/src/basic/ToastContainer.js
|
this.state.callback(this.state.cancelButtonIndex);
|
<mask> animationType={"fade"}
<mask> transparent={true}
<mask> visible={this.state.modalVisible}
<mask> onRequestClose={() => {
<mask> this.state.callback(-1);
<mask> this.setState({ modalVisible: false });
<mask> }}
<mask> >
<mask> <TouchableOpacity
<mask> activeOpacity={1}
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove this.state.callback(-1);
</s> add this.state.callback(this.state.cancelButtonIndex); </s> remove this.state.callback(id);
</s> add this.state.callback(parseInt(id)); </s> remove this.state.callback(id);
</s> add this.state.callback(parseInt(id)); </s> remove style: { fontSize: 22, lineHeight: 26, color: "#7a7a7a" }
</s> add style: {
fontSize: 22,
lineHeight: 26,
color: this.props.placeholderIconColor
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
src/basic/Actionsheet.js
|
this.state.callback(this.state.cancelButtonIndex);
|
<mask> >
<mask> <TouchableOpacity
<mask> activeOpacity={1}
<mask> onPress={() => {
<mask> this.state.callback(-1);
<mask> this.setState({ modalVisible: false });
<mask> }}
<mask> style={{
<mask> backgroundColor: "rgba(0,0,0,0.4)",
<mask> flex: 1,
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove this.state.callback(-1);
</s> add this.state.callback(this.state.cancelButtonIndex); </s> remove this.state.callback(id);
</s> add this.state.callback(parseInt(id)); </s> remove this.state.callback(id);
</s> add this.state.callback(parseInt(id)); </s> remove style: { fontSize: 22, lineHeight: 26, color: "#7a7a7a" }
</s> add style: {
fontSize: 22,
lineHeight: 26,
color: this.props.placeholderIconColor
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
src/basic/Actionsheet.js
|
this.state.callback(parseInt(id));
|
<mask> renderRow={(data, i, id) => {
<mask> return typeof this.state.items[0] === "string" ? (
<mask> <ListItem
<mask> onPress={() => {
<mask> this.state.callback(id);
<mask> this.setState({ modalVisible: false });
<mask> }}
<mask> style={{ borderColor: "transparent" }}
<mask> >
<mask> <Text>{data}</Text>
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove this.state.callback(id);
</s> add this.state.callback(parseInt(id)); </s> remove this.state.callback(-1);
</s> add this.state.callback(this.state.cancelButtonIndex); </s> remove this.state.callback(-1);
</s> add this.state.callback(this.state.cancelButtonIndex); </s> remove style={this.props.textStyle}
</s> add style={[this.props.textStyle, this.props.placeholderStyle]}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
src/basic/Actionsheet.js
|
this.state.callback(parseInt(id));
|
<mask> </ListItem>
<mask> ) : (
<mask> <ListItem
<mask> onPress={() => {
<mask> this.state.callback(id);
<mask> this.setState({ modalVisible: false });
<mask> }}
<mask> style={{ borderColor: "transparent" }}
<mask> icon
<mask> >
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove this.state.callback(id);
</s> add this.state.callback(parseInt(id)); </s> remove this.state.callback(-1);
</s> add this.state.callback(this.state.cancelButtonIndex); </s> remove this.state.callback(-1);
</s> add this.state.callback(this.state.cancelButtonIndex); </s> remove style={this.props.textStyle}
</s> add style={[this.props.textStyle, this.props.placeholderStyle]}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
src/basic/Actionsheet.js
|
style: {
fontSize: 22,
lineHeight: 26,
color: this.props.placeholderIconColor
}
|
<mask> }
<mask>
<mask> renderIcon() {
<mask> return React.cloneElement(this.props.iosIcon, {
<mask> style: { fontSize: 22, lineHeight: 26, color: "#7a7a7a" }
<mask> });
<mask> }
<mask>
<mask> renderButton() {
<mask> const onPress = () => {
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove style:{fontSize:22,lineHeight:26,color:"#7a7a7a"}});
</s> add style:{
fontSize:22,
lineHeight:26,
color:this.props.placeholderIconColor}});
</s> remove this.state.callback(id);
</s> add this.state.callback(parseInt(id)); </s> remove this.state.callback(-1);
</s> add this.state.callback(this.state.cancelButtonIndex);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
src/basic/Picker.ios.js
|
style={[this.props.textStyle, this.props.placeholderStyle]}
|
<mask> {this.state.currentLabel}
<mask> </Text>
<mask> ) : (
<mask> <Text
<mask> style={this.props.textStyle}
<mask> note={this.props.note === false ? false : true}
<mask> >
<mask> {this.props.placeholder}
<mask> </Text>
<mask> )}
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove this.state.callback(id);
</s> add this.state.callback(parseInt(id)); </s> remove this.state.callback(id);
</s> add this.state.callback(parseInt(id)); </s> remove buttonText: config.buttonText,
</s> add buttonText: this.getButtonText(config.buttonText), </s> remove this.state.callback(-1);
</s> add this.state.callback(this.state.cancelButtonIndex); </s> remove this.state.callback(-1);
</s> add this.state.callback(this.state.cancelButtonIndex);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
src/basic/Picker.ios.js
|
getButtonText(buttonText) {
if (buttonText) {
if (buttonText.trim().length === 0) {
return undefined;
} else return buttonText;
}
return undefined;
}
|
<mask> } else {
<mask> return 0;
<mask> }
<mask> }
<mask> showToast({ config }) {
<mask> this.setState({
<mask> modalVisible: true,
<mask> text: config.text,
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove buttonText: config.buttonText,
</s> add buttonText: this.getButtonText(config.buttonText), </s> remove style: { fontSize: 22, lineHeight: 26, color: "#7a7a7a" }
</s> add style: {
fontSize: 22,
lineHeight: 26,
color: this.props.placeholderIconColor
} </s> remove this.state.callback(id);
</s> add this.state.callback(parseInt(id));
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
src/basic/ToastContainer.js
|
buttonText: this.getButtonText(config.buttonText),
|
<mask> showToast({ config }) {
<mask> this.setState({
<mask> modalVisible: true,
<mask> text: config.text,
<mask> buttonText: config.buttonText,
<mask> type: config.type,
<mask> position: config.position ? config.position : "bottom",
<mask> supportedOrientations: config.supportedOrientations,
<mask> style: config.style,
<mask> buttonTextStyle: config.buttonTextStyle,
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove this.state.callback(id);
</s> add this.state.callback(parseInt(id)); </s> remove style={this.props.textStyle}
</s> add style={[this.props.textStyle, this.props.placeholderStyle]} </s> remove this.state.callback(id);
</s> add this.state.callback(parseInt(id)); </s> remove style: { fontSize: 22, lineHeight: 26, color: "#7a7a7a" }
</s> add style: {
fontSize: 22,
lineHeight: 26,
color: this.props.placeholderIconColor
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
src/basic/ToastContainer.js
|
} else {
setTimeout(() => {
Animated.timing(this.state.fadeAnim, {
toValue: 0,
duration: 200
}).start();
setTimeout(() => {
this.setState({
modalVisible: false
});
}, 500);
}, 1500);
|
<mask> });
<mask> }, 500);
<mask> }, config.duration);
<mask> }
<mask> Animated.timing(this.state.fadeAnim, {
<mask> toValue: 1,
<mask> duration: 200
</s> Revert and merged 1395, 1401, 1414, 1407, transpiled </s> remove style: { fontSize: 22, lineHeight: 26, color: "#7a7a7a" }
</s> add style: {
fontSize: 22,
lineHeight: 26,
color: this.props.placeholderIconColor
} </s> remove this.state.callback(-1);
</s> add this.state.callback(this.state.cancelButtonIndex); </s> remove _this2.state.callback(id);
</s> add _this2.state.callback(parseInt(id)); </s> remove _this2.state.callback(-1);
</s> add _this2.state.callback(_this2.state.cancelButtonIndex);
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/781956548cf0c3bfa760e7b53c282473a69ded8f
|
src/basic/ToastContainer.js
|
const TabBarImpl = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => {
|
<mask> import Box from '../../primitives/Box';
<mask> import { TabsContext } from './Context';
<mask> import type { ITabsContextProps, ITabBarProps } from './types';
<mask>
<mask> const TabBar = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => {
<mask> const {
<mask> tabBarStyle,
<mask> align,
<mask> isFitted,
<mask> state,
</s> fix: v3 tabs not working on prod build </s> remove const TabViews = ({ children, ...props }: ITabViewsProps) => {
</s> add const TabViewsImpl = ({ children, ...props }: ITabViewsProps) => { </s> remove export default React.memo(TabViews);
</s> add const TabViews = React.memo(TabViewsImpl);
TabViews.displayName = 'TabViews';
export default TabViews; </s> remove if (item.type.type.name === 'TabBar') {
</s> add if (item.type.displayName === 'TabBar') { </s> remove } else if (item.type.type.name === 'TabViews') {
</s> add } else if (item.type.displayName === 'TabViews') {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/794ba31c0970bcf4bc59bbee64aaecb909a2237b
|
src/components/composites/Tabs/TabBar.tsx
|
const TabBar = React.memo(TabBarImpl);
|
<mask> </>
<mask> );
<mask> };
<mask>
<mask> TabBar.displayName = 'TabBar';
<mask>
<mask> export default TabBar;
</s> fix: v3 tabs not working on prod build </s> remove export default React.memo(TabBar);
</s> add TabBar.displayName = 'TabBar';
export default TabBar; </s> remove export default React.memo(TabViews);
</s> add const TabViews = React.memo(TabViewsImpl);
TabViews.displayName = 'TabViews';
export default TabViews; </s> remove const TabViews = ({ children, ...props }: ITabViewsProps) => {
</s> add const TabViewsImpl = ({ children, ...props }: ITabViewsProps) => {
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/794ba31c0970bcf4bc59bbee64aaecb909a2237b
|
src/components/composites/Tabs/TabBar.tsx
|
TabBar.displayName = 'TabBar';
export default TabBar;
|
<mask> </>
<mask> );
<mask> };
<mask>
<mask> export default React.memo(TabBar);
</s> fix: v3 tabs not working on prod build </s> remove export default React.memo(TabViews);
</s> add const TabViews = React.memo(TabViewsImpl);
TabViews.displayName = 'TabViews';
export default TabViews; </s> remove const TabViews = ({ children, ...props }: ITabViewsProps) => {
</s> add const TabViewsImpl = ({ children, ...props }: ITabViewsProps) => {
|
[
"keep",
"keep",
"keep",
"keep",
"replace"
] |
https://github.com/GeekyAnts/NativeBase/commit/794ba31c0970bcf4bc59bbee64aaecb909a2237b
|
src/components/composites/Tabs/TabBar.tsx
|
const TabViewsImpl = ({ children, ...props }: ITabViewsProps) => {
|
<mask> import React from 'react';
<mask> import Box from '../../primitives/Box';
<mask> import type { ITabViewsProps } from './types';
<mask>
<mask> const TabViews = ({ children, ...props }: ITabViewsProps) => {
<mask> return <Box {...props}>{children}</Box>;
<mask> };
<mask>
<mask> export default React.memo(TabViews);
</s> fix: v3 tabs not working on prod build </s> remove const TabBar = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => {
</s> add const TabBarImpl = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => { </s> remove export default React.memo(TabViews);
</s> add const TabViews = React.memo(TabViewsImpl);
TabViews.displayName = 'TabViews';
export default TabViews; </s> remove if (item.type.type.name === 'TabBar') {
</s> add if (item.type.displayName === 'TabBar') {
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/794ba31c0970bcf4bc59bbee64aaecb909a2237b
|
src/components/composites/Tabs/TabViews.tsx
|
const TabViews = React.memo(TabViewsImpl);
TabViews.displayName = 'TabViews';
export default TabViews;
|
<mask> const TabViews = ({ children, ...props }: ITabViewsProps) => {
<mask> return <Box {...props}>{children}</Box>;
<mask> };
<mask>
<mask> export default React.memo(TabViews);
</s> fix: v3 tabs not working on prod build </s> remove const TabViews = ({ children, ...props }: ITabViewsProps) => {
</s> add const TabViewsImpl = ({ children, ...props }: ITabViewsProps) => { </s> remove const TabBar = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => {
</s> add const TabBarImpl = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => { </s> remove export default React.memo(TabBar);
</s> add TabBar.displayName = 'TabBar';
export default TabBar;
|
[
"keep",
"keep",
"keep",
"keep",
"replace"
] |
https://github.com/GeekyAnts/NativeBase/commit/794ba31c0970bcf4bc59bbee64aaecb909a2237b
|
src/components/composites/Tabs/TabViews.tsx
|
if (item.type.displayName === 'TabBar') {
|
<mask> let tabViewsProps = {};
<mask>
<mask> items.forEach((item: any) => {
<mask> if (item.type) {
<mask> if (item.type.type.name === 'TabBar') {
<mask> bars = bars.concat(item.props.children);
<mask> tabBarProps = item.props;
<mask> } else if (item.type.type.name === 'TabViews') {
<mask> views = views.concat(item.props.children);
<mask> tabViewsProps = item.props;
</s> fix: v3 tabs not working on prod build </s> remove } else if (item.type.type.name === 'TabViews') {
</s> add } else if (item.type.displayName === 'TabViews') { </s> remove const TabBar = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => {
</s> add const TabBarImpl = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => { </s> remove const TabViews = ({ children, ...props }: ITabViewsProps) => {
</s> add const TabViewsImpl = ({ children, ...props }: ITabViewsProps) => { </s> remove export default React.memo(TabViews);
</s> add const TabViews = React.memo(TabViewsImpl);
TabViews.displayName = 'TabViews';
export default TabViews;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/794ba31c0970bcf4bc59bbee64aaecb909a2237b
|
src/components/composites/Tabs/Tabs.tsx
|
} else if (item.type.displayName === 'TabViews') {
|
<mask> if (item.type) {
<mask> if (item.type.type.name === 'TabBar') {
<mask> bars = bars.concat(item.props.children);
<mask> tabBarProps = item.props;
<mask> } else if (item.type.type.name === 'TabViews') {
<mask> views = views.concat(item.props.children);
<mask> tabViewsProps = item.props;
<mask> }
<mask> }
<mask> });
</s> fix: v3 tabs not working on prod build </s> remove if (item.type.type.name === 'TabBar') {
</s> add if (item.type.displayName === 'TabBar') { </s> remove const TabBar = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => {
</s> add const TabBarImpl = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => { </s> remove const TabViews = ({ children, ...props }: ITabViewsProps) => {
</s> add const TabViewsImpl = ({ children, ...props }: ITabViewsProps) => { </s> remove export default React.memo(TabViews);
</s> add const TabViews = React.memo(TabViewsImpl);
TabViews.displayName = 'TabViews';
export default TabViews;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/794ba31c0970bcf4bc59bbee64aaecb909a2237b
|
src/components/composites/Tabs/Tabs.tsx
|
keyboardActivation: props.keyboardActivation,
|
<mask> selectedKey: props.index !== undefined ? props.index.toString() : undefined,
<mask> onSelectionChange: (e: any) => onChange && onChange(parseInt(e)),
<mask> };
<mask>
<mask> // useTabsState needs collection children.
<mask> let state = useTabsState(mappedProps);
<mask>
<mask> const setAlign = () => {
</s> fix: v3 tabs not working on prod build </s> remove if (item.type.type.name === 'TabBar') {
</s> add if (item.type.displayName === 'TabBar') { </s> remove export default React.memo(TabViews);
</s> add const TabViews = React.memo(TabViewsImpl);
TabViews.displayName = 'TabViews';
export default TabViews; </s> remove const TabViews = ({ children, ...props }: ITabViewsProps) => {
</s> add const TabViewsImpl = ({ children, ...props }: ITabViewsProps) => { </s> remove const TabBar = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => {
</s> add const TabBarImpl = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => {
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/794ba31c0970bcf4bc59bbee64aaecb909a2237b
|
src/components/composites/Tabs/Tabs.tsx
|
keyboardActivation?: 'manual' | 'automatic';
|
<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';
</s> fix: v3 tabs not working on prod build </s> remove const TabBar = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => {
</s> add const TabBarImpl = ({ tablistRef, tabListProps, ...props }: ITabBarProps) => { </s> remove const TabViews = ({ children, ...props }: ITabViewsProps) => {
</s> add const TabViewsImpl = ({ children, ...props }: ITabViewsProps) => { </s> remove export default React.memo(TabViews);
</s> add const TabViews = React.memo(TabViewsImpl);
TabViews.displayName = 'TabViews';
export default TabViews; </s> remove if (item.type.type.name === 'TabBar') {
</s> add if (item.type.displayName === 'TabBar') {
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/794ba31c0970bcf4bc59bbee64aaecb909a2237b
|
src/components/composites/Tabs/types.tsx
|
<VStack space={3}>
|
<mask> value={copyText}
<mask> />
<mask> <Button onPress={() => onCopy(copyText)}>Copy</Button>
<mask> </HStack>
<mask> <HStack space={3}>
<mask> <Text>{hasCopied ? 'Copied' : 'Press here'}</Text>
<mask> <Input
<mask> w="60%"
<mask> placeholder="Paste To"
<mask> onChangeText={(v) => setPasteText(v)}
</s> fix: clipboard fix on native </s> remove </HStack>
</s> add </VStack> </s> remove const newProps = useThemeProps('Container', props);
</s> add const newProps = usePropsResolution('Container', props); </s> remove import { NativeModules } from 'react-native';
</s> add import { Clipboard } from 'react-native'; </s> remove if (typeof window !== 'undefined') {
const textField = document.createElement('textarea');
textField.innerText = copiedValue;
document.body.appendChild(textField);
if (window.navigator.platform === 'iPhone') {
textField.setSelectionRange(0, 99999);
} else {
textField.select();
}
document.execCommand('copy');
textField.remove();
} else if (NativeModules && NativeModules.Clipboard) {
await NativeModules.Clipboard.setString(copiedValue);
</s> add if (Clipboard) {
await Clipboard.setString(copiedValue); </s> remove import { useThemeProps } from '../../../hooks';
</s> add import { usePropsResolution } from '../../../hooks';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/797dae60dc2bce49ba3880bd1454e33482dc3c54
|
example/storybook/stories/hooks/useClipboard/Usage.tsx
|
</VStack>
|
<mask> onChangeText={(v) => setPasteText(v)}
<mask> value={pasteText}
<mask> />
<mask> <Button onPress={() => setPasteText(value)}>Paste</Button>
<mask> </HStack>
<mask> </VStack>
<mask> );
<mask> };
</s> fix: clipboard fix on native </s> remove <HStack space={3}>
</s> add <VStack space={3}> </s> remove if (typeof window !== 'undefined') {
const textField = document.createElement('textarea');
textField.innerText = copiedValue;
document.body.appendChild(textField);
if (window.navigator.platform === 'iPhone') {
textField.setSelectionRange(0, 99999);
} else {
textField.select();
}
document.execCommand('copy');
textField.remove();
} else if (NativeModules && NativeModules.Clipboard) {
await NativeModules.Clipboard.setString(copiedValue);
</s> add if (Clipboard) {
await Clipboard.setString(copiedValue); </s> remove import { NativeModules } from 'react-native';
</s> add import { Clipboard } from 'react-native'; </s> remove const newProps = useThemeProps('Container', props);
</s> add const newProps = usePropsResolution('Container', props); </s> remove import { useThemeProps } from '../../../hooks';
</s> add import { usePropsResolution } from '../../../hooks';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/797dae60dc2bce49ba3880bd1454e33482dc3c54
|
example/storybook/stories/hooks/useClipboard/Usage.tsx
|
"@react-native-aria/slider": "^0.2.5-alpha.1",
|
<mask> "@react-native-aria/interactions": "^0.2.2",
<mask> "@react-native-aria/listbox": "^0.2.4-alpha.0",
<mask> "@react-native-aria/overlays": "^0.2.9",
<mask> "@react-native-aria/radio": "^0.2.4",
<mask> "@react-native-aria/slider": "^0.2.5-alpha.0",
<mask> "@react-native-aria/tabs": "^0.2.7",
<mask> "@react-native-aria/utils": "^0.2.7",
<mask> "@react-stately/combobox": "^3.0.0-alpha.1",
<mask> "@react-stately/radio": "^3.2.1",
<mask> "@types/styled-system": "^5.1.9",
</s> fix: clipboard fix on native </s> remove if (typeof window !== 'undefined') {
const textField = document.createElement('textarea');
textField.innerText = copiedValue;
document.body.appendChild(textField);
if (window.navigator.platform === 'iPhone') {
textField.setSelectionRange(0, 99999);
} else {
textField.select();
}
document.execCommand('copy');
textField.remove();
} else if (NativeModules && NativeModules.Clipboard) {
await NativeModules.Clipboard.setString(copiedValue);
</s> add if (Clipboard) {
await Clipboard.setString(copiedValue); </s> remove import { NativeModules } from 'react-native';
</s> add import { Clipboard } from 'react-native'; </s> remove const newProps = useThemeProps('Container', props);
</s> add const newProps = usePropsResolution('Container', props); </s> remove import { useThemeProps } from '../../../hooks';
</s> add import { usePropsResolution } from '../../../hooks'; </s> remove </HStack>
</s> add </VStack>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/797dae60dc2bce49ba3880bd1454e33482dc3c54
|
package.json
|
import { usePropsResolution } from '../../../hooks';
|
<mask> import React from 'react';
<mask> import { useThemeProps } from '../../../hooks';
<mask> import Box from '../../primitives/Box';
<mask> import type { IContainerProps } from './types';
<mask>
<mask> const Container = (
<mask> { children, centerContent, ...props }: IContainerProps,
</s> fix: clipboard fix on native </s> remove import { NativeModules } from 'react-native';
</s> add import { Clipboard } from 'react-native'; </s> remove const newProps = useThemeProps('Container', props);
</s> add const newProps = usePropsResolution('Container', props); </s> remove if (typeof window !== 'undefined') {
const textField = document.createElement('textarea');
textField.innerText = copiedValue;
document.body.appendChild(textField);
if (window.navigator.platform === 'iPhone') {
textField.setSelectionRange(0, 99999);
} else {
textField.select();
}
document.execCommand('copy');
textField.remove();
} else if (NativeModules && NativeModules.Clipboard) {
await NativeModules.Clipboard.setString(copiedValue);
</s> add if (Clipboard) {
await Clipboard.setString(copiedValue); </s> remove "@react-native-aria/slider": "^0.2.5-alpha.0",
</s> add "@react-native-aria/slider": "^0.2.5-alpha.1", </s> remove </HStack>
</s> add </VStack>
|
[
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/797dae60dc2bce49ba3880bd1454e33482dc3c54
|
src/components/composites/Container/index.tsx
|
const newProps = usePropsResolution('Container', props);
|
<mask> const Container = (
<mask> { children, centerContent, ...props }: IContainerProps,
<mask> ref?: any
<mask> ) => {
<mask> const newProps = useThemeProps('Container', props);
<mask> return (
<mask> <Box
<mask> ref={ref}
<mask> alignItems={centerContent ? 'center' : 'flex-start'}
<mask> _text={{ textAlign: centerContent ? 'center' : 'left' }}
</s> fix: clipboard fix on native </s> remove import { useThemeProps } from '../../../hooks';
</s> add import { usePropsResolution } from '../../../hooks'; </s> remove <HStack space={3}>
</s> add <VStack space={3}> </s> remove if (typeof window !== 'undefined') {
const textField = document.createElement('textarea');
textField.innerText = copiedValue;
document.body.appendChild(textField);
if (window.navigator.platform === 'iPhone') {
textField.setSelectionRange(0, 99999);
} else {
textField.select();
}
document.execCommand('copy');
textField.remove();
} else if (NativeModules && NativeModules.Clipboard) {
await NativeModules.Clipboard.setString(copiedValue);
</s> add if (Clipboard) {
await Clipboard.setString(copiedValue); </s> remove import { NativeModules } from 'react-native';
</s> add import { Clipboard } from 'react-native'; </s> remove </HStack>
</s> add </VStack>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/797dae60dc2bce49ba3880bd1454e33482dc3c54
|
src/components/composites/Container/index.tsx
|
import { Clipboard } from 'react-native';
|
<mask> import React from 'react';
<mask> import { NativeModules } from 'react-native';
<mask>
<mask> export function useClipboard() {
<mask> const [hasCopied, setHasCopied] = React.useState(false);
<mask> const [value, setValue] = React.useState<string>('');
<mask> const onCopy = async (copiedValue: string) => {
</s> fix: clipboard fix on native </s> remove if (typeof window !== 'undefined') {
const textField = document.createElement('textarea');
textField.innerText = copiedValue;
document.body.appendChild(textField);
if (window.navigator.platform === 'iPhone') {
textField.setSelectionRange(0, 99999);
} else {
textField.select();
}
document.execCommand('copy');
textField.remove();
} else if (NativeModules && NativeModules.Clipboard) {
await NativeModules.Clipboard.setString(copiedValue);
</s> add if (Clipboard) {
await Clipboard.setString(copiedValue); </s> remove import { useThemeProps } from '../../../hooks';
</s> add import { usePropsResolution } from '../../../hooks'; </s> remove const newProps = useThemeProps('Container', props);
</s> add const newProps = usePropsResolution('Container', props); </s> remove </HStack>
</s> add </VStack> </s> remove <HStack space={3}>
</s> add <VStack space={3}>
|
[
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/797dae60dc2bce49ba3880bd1454e33482dc3c54
|
src/hooks/useClipboard.ts
|
if (Clipboard) {
await Clipboard.setString(copiedValue);
|
<mask> export function useClipboard() {
<mask> const [hasCopied, setHasCopied] = React.useState(false);
<mask> const [value, setValue] = React.useState<string>('');
<mask> const onCopy = async (copiedValue: string) => {
<mask> if (typeof window !== 'undefined') {
<mask> const textField = document.createElement('textarea');
<mask> textField.innerText = copiedValue;
<mask> document.body.appendChild(textField);
<mask> if (window.navigator.platform === 'iPhone') {
<mask> textField.setSelectionRange(0, 99999);
<mask> } else {
<mask> textField.select();
<mask> }
<mask> document.execCommand('copy');
<mask> textField.remove();
<mask> } else if (NativeModules && NativeModules.Clipboard) {
<mask> await NativeModules.Clipboard.setString(copiedValue);
<mask> }
<mask> setValue(copiedValue);
<mask> setHasCopied(true);
<mask> };
<mask> return {
</s> fix: clipboard fix on native </s> remove import { NativeModules } from 'react-native';
</s> add import { Clipboard } from 'react-native'; </s> remove const newProps = useThemeProps('Container', props);
</s> add const newProps = usePropsResolution('Container', props); </s> remove import { useThemeProps } from '../../../hooks';
</s> add import { usePropsResolution } from '../../../hooks'; </s> remove </HStack>
</s> add </VStack> </s> remove <HStack space={3}>
</s> add <VStack space={3}>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/797dae60dc2bce49ba3880bd1454e33482dc3c54
|
src/hooks/useClipboard.ts
|
import { Alert, Box } from 'native-base';
|
<mask> import React from 'react';
<mask> import { Alert, CloseButton, Box } from 'native-base';
<mask> export default function () {
<mask> return (
<mask> <Box mx={3}>
<mask> <Alert status="error">
<mask> <Alert.Icon />
</s> feat: primary colorscheme and update component themes to use primary as default colorscheme </s> remove <Alert status="error">
</s> add <Alert> </s> remove return <Code colorScheme="success">Hello World!</Code>;
</s> add return <Code>Hello World!</Code>; </s> remove <CloseButton />
</s> add </s> remove colorScheme: 'default',
size: 'md',
rounded: 50,
</s> add colorScheme: 'primary',
size: 'sm', </s> remove <AppBar shadow={1} colorScheme="lightBlue">
</s> add <AppBar shadow={1}>
|
[
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/79f4cb2f53dfdcb9160633860b47692492119bde
|
example/storybook/stories/components/composites/Alert/usage.tsx
|
<Alert>
|
<mask> import { Alert, CloseButton, Box } from 'native-base';
<mask> export default function () {
<mask> return (
<mask> <Box mx={3}>
<mask> <Alert status="error">
<mask> <Alert.Icon />
<mask> <Alert.Title>Error Alert</Alert.Title>
<mask> <Alert.Description>description goes here</Alert.Description>
<mask> <CloseButton />
<mask> </Alert>
</s> feat: primary colorscheme and update component themes to use primary as default colorscheme </s> remove import { Alert, CloseButton, Box } from 'native-base';
</s> add import { Alert, Box } from 'native-base'; </s> remove <CloseButton />
</s> add </s> remove return <Code colorScheme="success">Hello World!</Code>;
</s> add return <Code>Hello World!</Code>; </s> remove <AppBar shadow={1} colorScheme="lightBlue">
</s> add <AppBar shadow={1}> </s> remove colorScheme: 'default',
size: 'md',
rounded: 50,
</s> add colorScheme: 'primary',
size: 'sm',
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/79f4cb2f53dfdcb9160633860b47692492119bde
|
example/storybook/stories/components/composites/Alert/usage.tsx
|
<mask> <Alert status="error">
<mask> <Alert.Icon />
<mask> <Alert.Title>Error Alert</Alert.Title>
<mask> <Alert.Description>description goes here</Alert.Description>
<mask> <CloseButton />
<mask> </Alert>
<mask> </Box>
<mask> );
<mask> }
</s> feat: primary colorscheme and update component themes to use primary as default colorscheme </s> remove <Alert status="error">
</s> add <Alert> </s> remove import { Alert, CloseButton, Box } from 'native-base';
</s> add import { Alert, Box } from 'native-base'; </s> remove borderTopColor={colorProp ? colorProp : 'blue.700'}
borderRightColor={colorProp ? colorProp : 'blue.700'}
</s> add borderTopColor={colorProp ? colorProp : 'primary.700'}
borderRightColor={colorProp ? colorProp : 'primary.700'} </s> remove <AppBar shadow={1} colorScheme="lightBlue">
</s> add <AppBar shadow={1}> </s> remove borderTopColor={colorProp ? colorProp : 'blue.700'}
borderRightColor={colorProp ? colorProp : 'blue.700'}
</s> add borderTopColor={colorProp ? colorProp : 'primary.700'}
borderRightColor={colorProp ? colorProp : 'primary.700'}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/79f4cb2f53dfdcb9160633860b47692492119bde
|
example/storybook/stories/components/composites/Alert/usage.tsx
|
|
<AppBar shadow={1}>
|
<mask> }
<mask>
<mask> function Material() {
<mask> return (
<mask> <AppBar shadow={1} colorScheme="lightBlue">
<mask> <AppBar.Left>
<mask> <LeftArrowIconButton />
<mask> </AppBar.Left>
<mask>
<mask> <AppBar.Content>
</s> feat: primary colorscheme and update component themes to use primary as default colorscheme </s> remove <Alert status="error">
</s> add <Alert> </s> remove import { Alert, CloseButton, Box } from 'native-base';
</s> add import { Alert, Box } from 'native-base'; </s> remove return <Code colorScheme="success">Hello World!</Code>;
</s> add return <Code>Hello World!</Code>; </s> remove size="sm"
colorScheme="emerald"
variant={'solid'}
</s> add </s> remove bg: mode('blueGray.200', 'blueGray.600')(props),
</s> add bg: mode(`${colorScheme}.200`, `${colorScheme}.700`)(props),
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/79f4cb2f53dfdcb9160633860b47692492119bde
|
example/storybook/stories/components/composites/AppBar/AppBarExamples.tsx
|
return <Code>Hello World!</Code>;
|
<mask> import React from 'react';
<mask> import { Code } from 'native-base';
<mask> export default function () {
<mask> return <Code colorScheme="success">Hello World!</Code>;
<mask> }
</s> feat: primary colorscheme and update component themes to use primary as default colorscheme </s> remove import { Alert, CloseButton, Box } from 'native-base';
</s> add import { Alert, Box } from 'native-base'; </s> remove <Alert status="error">
</s> add <Alert> </s> remove colorScheme: 'default',
size: 'md',
rounded: 50,
</s> add colorScheme: 'primary',
size: 'sm', </s> remove <AppBar shadow={1} colorScheme="lightBlue">
</s> add <AppBar shadow={1}> </s> remove bg: mode('blueGray.200', 'blueGray.600')(props),
</s> add bg: mode(`${colorScheme}.200`, `${colorScheme}.700`)(props),
|
[
"keep",
"keep",
"keep",
"replace",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/79f4cb2f53dfdcb9160633860b47692492119bde
|
example/storybook/stories/components/composites/Code/Basic.tsx
|
<mask>
<mask> export default function () {
<mask> return (
<mask> <Button
<mask> size="sm"
<mask> colorScheme="emerald"
<mask> variant={'solid'}
<mask> onPress={() => console.log('hello world')}
<mask> _text={{ fontWeight: 700 }}
<mask> >
<mask> Button
<mask> </Button>
</s> feat: primary colorscheme and update component themes to use primary as default colorscheme </s> remove <Alert status="error">
</s> add <Alert> </s> remove import { Alert, CloseButton, Box } from 'native-base';
</s> add import { Alert, Box } from 'native-base'; </s> remove return <Code colorScheme="success">Hello World!</Code>;
</s> add return <Code>Hello World!</Code>; </s> remove borderTopColor={colorProp ? colorProp : 'blue.700'}
borderRightColor={colorProp ? colorProp : 'blue.700'}
</s> add borderTopColor={colorProp ? colorProp : 'primary.700'}
borderRightColor={colorProp ? colorProp : 'primary.700'} </s> remove <AppBar shadow={1} colorScheme="lightBlue">
</s> add <AppBar shadow={1}>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/79f4cb2f53dfdcb9160633860b47692492119bde
|
example/storybook/stories/components/primitives/Button/basic.tsx
|
|
borderTopColor={colorProp ? colorProp : 'primary.700'}
borderRightColor={colorProp ? colorProp : 'primary.700'}
|
<mask> const renderThirdLayer = (percent: number) => {
<mask> if (percent > halfSide) {
<mask> return (
<mask> <Box
<mask> borderTopColor={colorProp ? colorProp : 'blue.700'}
<mask> borderRightColor={colorProp ? colorProp : 'blue.700'}
<mask> style={[
<mask> styles.secondProgressLayer,
<mask> propStyle(percent - halfSide, 45),
<mask> ]}
<mask> />
</s> feat: primary colorscheme and update component themes to use primary as default colorscheme </s> remove borderTopColor={colorProp ? colorProp : 'blue.700'}
borderRightColor={colorProp ? colorProp : 'blue.700'}
</s> add borderTopColor={colorProp ? colorProp : 'primary.700'}
borderRightColor={colorProp ? colorProp : 'primary.700'} </s> remove borderTopColor={colorProp ? colorProp : 'blue.700'}
borderRightColor={colorProp ? colorProp : 'blue.700'}
</s> add borderTopColor={colorProp ? colorProp : 'primary.700'}
borderRightColor={colorProp ? colorProp : 'primary.700'} </s> remove hoverBorderColor: 'default.500',
focusBorderColor: mode('default.600', 'default.400')(props),
</s> add hoverBorderColor: 'primary.500',
focusBorderColor: mode('primary.600', 'primary.400')(props), </s> remove size="sm"
colorScheme="emerald"
variant={'solid'}
</s> add </s> remove <Alert status="error">
</s> add <Alert>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/79f4cb2f53dfdcb9160633860b47692492119bde
|
src/components/composites/CircularProgress/CircularProgress.tsx
|
borderTopColor={colorProp ? colorProp : 'primary.700'}
borderRightColor={colorProp ? colorProp : 'primary.700'}
|
<mask> {!isIndeterminate ? (
<mask> <>
<mask> <Box
<mask> onLayout={layout}
<mask> borderTopColor={colorProp ? colorProp : 'blue.700'}
<mask> borderRightColor={colorProp ? colorProp : 'blue.700'}
<mask> style={[styles.firstProgressLayer, firstProgressLayerStyle]}
<mask> />
<mask> {renderThirdLayer(value)}
<mask> <Box fontSize={sizeProps.height / 4} _text={_text}>
<mask> {props.children}
</s> feat: primary colorscheme and update component themes to use primary as default colorscheme </s> remove borderTopColor={colorProp ? colorProp : 'blue.700'}
borderRightColor={colorProp ? colorProp : 'blue.700'}
</s> add borderTopColor={colorProp ? colorProp : 'primary.700'}
borderRightColor={colorProp ? colorProp : 'primary.700'} </s> remove borderTopColor={colorProp ? colorProp : 'blue.700'}
borderRightColor={colorProp ? colorProp : 'blue.700'}
</s> add borderTopColor={colorProp ? colorProp : 'primary.700'}
borderRightColor={colorProp ? colorProp : 'primary.700'} </s> remove hoverBorderColor: 'default.500',
focusBorderColor: mode('default.600', 'default.400')(props),
</s> add hoverBorderColor: 'primary.500',
focusBorderColor: mode('primary.600', 'primary.400')(props), </s> remove <Alert status="error">
</s> add <Alert> </s> remove import { Alert, CloseButton, Box } from 'native-base';
</s> add import { Alert, Box } from 'native-base';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/79f4cb2f53dfdcb9160633860b47692492119bde
|
src/components/composites/CircularProgress/CircularProgress.tsx
|
borderTopColor={colorProp ? colorProp : 'primary.700'}
borderRightColor={colorProp ? colorProp : 'primary.700'}
|
<mask> </>
<mask> ) : (
<mask> <StyleAnimatedView
<mask> onLayout={layout}
<mask> borderTopColor={colorProp ? colorProp : 'blue.700'}
<mask> borderRightColor={colorProp ? colorProp : 'blue.700'}
<mask> style={styles.animateStyle}
<mask> />
<mask> )}
<mask> </Box>
<mask> );
</s> feat: primary colorscheme and update component themes to use primary as default colorscheme </s> remove borderTopColor={colorProp ? colorProp : 'blue.700'}
borderRightColor={colorProp ? colorProp : 'blue.700'}
</s> add borderTopColor={colorProp ? colorProp : 'primary.700'}
borderRightColor={colorProp ? colorProp : 'primary.700'} </s> remove borderTopColor={colorProp ? colorProp : 'blue.700'}
borderRightColor={colorProp ? colorProp : 'blue.700'}
</s> add borderTopColor={colorProp ? colorProp : 'primary.700'}
borderRightColor={colorProp ? colorProp : 'primary.700'} </s> remove hoverBorderColor: 'default.500',
focusBorderColor: mode('default.600', 'default.400')(props),
</s> add hoverBorderColor: 'primary.500',
focusBorderColor: mode('primary.600', 'primary.400')(props), </s> remove <CloseButton />
</s> add </s> remove <AppBar shadow={1} colorScheme="lightBlue">
</s> add <AppBar shadow={1}>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/79f4cb2f53dfdcb9160633860b47692492119bde
|
src/components/composites/CircularProgress/CircularProgress.tsx
|
primary: {},
|
<mask> error: {},
<mask> success: {},
<mask> warning: {},
<mask> muted: {},
<mask> default: {},
<mask> info: {},
<mask> secondary: {},
<mask> light: {},
<mask> };
<mask>
</s> feat: primary colorscheme and update component themes to use primary as default colorscheme </s> remove borderColor: 'default.500',
</s> add borderColor: 'primary.500', </s> remove bg: mode('default.600', 'default.200')(props),
</s> add bg: mode('primary.600', 'primary.200')(props), </s> remove const defaultProps = {};
</s> add const defaultProps = {
colorScheme: 'primary',
}; </s> remove borderColor: 'default.500',
</s> add borderColor: 'primary.500', </s> remove colorScheme: 'gray',
</s> add colorScheme: 'primary',
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/79f4cb2f53dfdcb9160633860b47692492119bde
|
src/theme/base/colors.ts
|
colors.primary = colors.blue;
|
<mask> colors.error = colors.red;
<mask> colors.success = colors.green;
<mask> colors.warning = colors.orange;
<mask> colors.muted = colors.trueGray;
<mask> colors.default = colors.blue;
<mask> colors.info = colors.lightBlue;
<mask> colors.secondary = colors.coolGray;
<mask> colors.light = colors.warmGray;
<mask>
<mask> export default colors;
</s> feat: primary colorscheme and update component themes to use primary as default colorscheme </s> remove const defaultProps = {};
</s> add const defaultProps = {
colorScheme: 'primary',
}; </s> remove bg: mode('blueGray.200', 'blueGray.600')(props),
</s> add bg: mode(`${colorScheme}.200`, `${colorScheme}.700`)(props), </s> remove colorScheme: 'gray',
</s> add colorScheme: 'primary', </s> remove colorScheme: 'default',
</s> add colorScheme: 'primary', </s> remove colorScheme: 'default',
</s> add colorScheme: 'primary',
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/79f4cb2f53dfdcb9160633860b47692492119bde
|
src/theme/base/colors.ts
|
bg: mode('primary.200', 'primary.300')(props),
|
<mask> borderColor: 'transparent',
<mask> borderTopColor: mode('gray.300', 'gray.600')(props),
<mask> p: 3,
<mask> _hover: {
<mask> bg: mode('default.200', 'default.300')(props),
<mask> },
<mask> _expanded: {
<mask> bg: 'default.600',
<mask> borderBottomColor: mode('gray.300', 'gray.600')(props),
<mask> _text: { color: 'white' },
</s> feat: primary colorscheme and update component themes to use primary as default colorscheme </s> remove bg: 'default.600',
</s> add bg: 'primary.600', </s> remove borderColor: 'default.500',
</s> add borderColor: 'primary.500', </s> remove borderColor: 'default.500',
</s> add borderColor: 'primary.500', </s> remove hoverBorderColor: 'default.500',
focusBorderColor: mode('default.600', 'default.400')(props),
</s> add hoverBorderColor: 'primary.500',
focusBorderColor: mode('primary.600', 'primary.400')(props), </s> remove borderColor: 'default.500',
</s> add borderColor: 'primary.500',
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/79f4cb2f53dfdcb9160633860b47692492119bde
|
src/theme/components/accordion.ts
|
bg: 'primary.600',
|
<mask> _hover: {
<mask> bg: mode('default.200', 'default.300')(props),
<mask> },
<mask> _expanded: {
<mask> bg: 'default.600',
<mask> borderBottomColor: mode('gray.300', 'gray.600')(props),
<mask> _text: { color: 'white' },
<mask> },
<mask> _disabled: {
<mask> bg: mode('gray.200', 'gray.700')(props),
</s> feat: primary colorscheme and update component themes to use primary as default colorscheme </s> remove bg: mode('default.200', 'default.300')(props),
</s> add bg: mode('primary.200', 'primary.300')(props), </s> remove borderColor: 'default.500',
</s> add borderColor: 'primary.500', </s> remove bg: mode('default.600', 'default.200')(props),
</s> add bg: mode('primary.600', 'primary.200')(props), </s> remove color: 'default.200',
</s> add color: 'primary.200', </s> remove backgroundColor: mode('default.300', 'default.700')(props),
</s> add backgroundColor: mode('primary.300', 'primary.700')(props),
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/79f4cb2f53dfdcb9160633860b47692492119bde
|
src/theme/components/accordion.ts
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.