docstring_tokens
stringlengths
0
76.5k
code_tokens
stringlengths
75
1.81M
label_window
listlengths
4
2.12k
html_url
stringlengths
74
116
file_name
stringlengths
3
311
<mask> top:null, <mask> left:null, <mask> right:null, <mask> paddingTop:5, <mask> paddingLeft:10, <mask> alignSelf:'flex-start', <mask> fontSize:variables.inputFontSize-2}, <mask> <mask> 'NativeBase.Input':{ <mask> alignSelf:_reactNative.Platform.OS==='ios'?'stretch':'flex-start', </s> items fix, tabs text color fix,picker fix </s> remove paddingLeft:10, </s> add </s> remove paddingLeft:10, </s> add </s> remove paddingTop:10, paddingLeft:10, </s> add </s> remove marginLeft:platform==='ios'?undefined:-5}, </s> add marginLeft:_reactNative.Platform.OS==='ios'?undefined:-5}, </s> remove 'NativeBase.Input':{ marginLeft:-5}}, </s> add 'NativeBase.Input':{}},
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
dist/src/theme/Item.js
<mask> 'NativeBase.Input':{ <mask> alignSelf:_reactNative.Platform.OS==='ios'?'stretch':'flex-start', <mask> flex:1, <mask> width:_reactNative.Platform.OS==='ios'?null:variables.deviceWidth-25, <mask> paddingTop:10, <mask> paddingLeft:10, <mask> fontSize:variables.inputFontSize}, <mask> <mask> flexDirection:null}, <mask> <mask> '.inlineLabel':{ </s> items fix, tabs text color fix,picker fix </s> remove paddingLeft:10, </s> add </s> remove paddingLeft:10, </s> add </s> remove paddingLeft:10, </s> add </s> remove paddingRight:5, paddingLeft:5, </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
dist/src/theme/Item.js
<mask> position:null, <mask> top:null, <mask> left:null, <mask> right:null, <mask> paddingLeft:10, <mask> paddingRight:20, <mask> height:null, <mask> width:null, <mask> fontSize:variables.inputFontSize}, <mask> </s> items fix, tabs text color fix,picker fix </s> remove paddingLeft:10, </s> add </s> remove paddingLeft:10, </s> add </s> remove paddingTop:10, paddingLeft:10, </s> add </s> remove height:55, top:10}}, </s> add height:60, top:8}, 'NativeBase.Label':{ top:8}}, </s> remove color: variables.topTabBarTextColor, </s> add color: variables.topTabBarActiveTextColor,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
dist/src/theme/Item.js
<mask> <mask> flexDirection:'row'}, <mask> <mask> 'NativeBase.Label':{ <mask> position:'absolute', <mask> top:10, <mask> left:15, <mask> right:0, <mask> fontSize:variables.inputFontSize, <mask> color:variables.inputColorPlaceholder}, <mask> <mask> 'NativeBase.Icon':{ <mask> fontSize:24, </s> items fix, tabs text color fix,picker fix </s> remove color:variables.inputColorPlaceholder}, </s> add color:variables.inputColorPlaceholder, paddingRight:5}, </s> remove paddingRight:5, paddingLeft:5, </s> add </s> remove height:55, top:10}}, </s> add height:60, top:8}, 'NativeBase.Label':{ top:8}},
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
dist/src/theme/Item.js
color:variables.inputColorPlaceholder, paddingRight:5},
<mask> top:10, <mask> left:15, <mask> right:0, <mask> fontSize:variables.inputFontSize, <mask> color:variables.inputColorPlaceholder}, <mask> <mask> 'NativeBase.Icon':{ <mask> fontSize:24, <mask> paddingRight:8}, <mask> </s> items fix, tabs text color fix,picker fix </s> remove position:'absolute', top:10, left:15, right:0, </s> add </s> remove paddingRight:5, paddingLeft:5, </s> add </s> remove color:variables.topTabBarTextColor}, </s> add color:variables.topTabBarActiveTextColor}, </s> remove color:variables.topTabBarTextColor}, </s> add color:variables.topTabBarActiveTextColor},
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
dist/src/theme/Item.js
<mask> <mask> 'NativeBase.Input':{ <mask> height:variables.inputHeightBase, <mask> color:variables.inputColor, <mask> paddingRight:5, <mask> paddingLeft:5, <mask> flex:1, <mask> fontSize:variables.inputFontSize, <mask> lineHeight:variables.inputLineHeight}, <mask> <mask> '.underline':{ </s> items fix, tabs text color fix,picker fix </s> remove paddingTop:10, paddingLeft:10, </s> add </s> remove paddingLeft:10, </s> add </s> remove color:variables.inputColorPlaceholder}, </s> add color:variables.inputColorPlaceholder, paddingRight:5}, </s> remove position:'absolute', top:10, left:15, right:0, </s> add
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
dist/src/theme/Item.js
top:1.5,
<mask> height:variables.inputHeightBase, <mask> color:variables.inputColor, <mask> flex:1, <mask> fontSize:variables.inputFontSize, <mask> lineHeight:variables.inputLineHeight}, <mask> <mask> '.underline':{ <mask> 'NativeBase.Input':{ </s> items fix, tabs text color fix,picker fix </s> remove paddingRight:5, paddingLeft:5, </s> add </s> remove paddingTop:10, paddingLeft:10, </s> add </s> remove paddingLeft:10, </s> add </s> remove color:variables.inputColorPlaceholder}, </s> add color:variables.inputColorPlaceholder, paddingRight:5}, </s> remove position:'absolute', top:10, left:15, right:0, </s> add
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
dist/src/theme/Item.js
paddingLeft:5}, 'NativeBase.Icon':{ paddingLeft:10},
<mask> borderColor:variables.inputBorderColor}, <mask> <mask> '.regular':{ <mask> 'NativeBase.Input':{ <mask> paddingLeft:15}, <mask> <mask> '.success':{ <mask> borderColor:variables.inputSuccessBorderColor}, <mask> <mask> '.error':{ </s> items fix, tabs text color fix,picker fix </s> remove paddingLeft:15}, </s> add paddingLeft:5}, 'NativeBase.Icon':{ paddingLeft:10}, </s> remove marginLeft:platform==='ios'?undefined:-5}, </s> add marginLeft:_reactNative.Platform.OS==='ios'?undefined:-5}, </s> remove 'NativeBase.Input':{ marginLeft:-5}}, </s> add 'NativeBase.Input':{}},
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
dist/src/theme/Item.js
paddingLeft:5}, 'NativeBase.Icon':{ paddingLeft:10},
<mask> borderColor:variables.inputBorderColor}, <mask> <mask> '.rounded':{ <mask> 'NativeBase.Input':{ <mask> paddingLeft:15}, <mask> <mask> '.success':{ <mask> borderColor:variables.inputSuccessBorderColor}, <mask> <mask> '.error':{ </s> items fix, tabs text color fix,picker fix </s> remove paddingLeft:15}, </s> add paddingLeft:5}, 'NativeBase.Icon':{ paddingLeft:10}, </s> remove marginLeft:platform==='ios'?undefined:-5}, </s> add marginLeft:_reactNative.Platform.OS==='ios'?undefined:-5}, </s> remove 'NativeBase.Input':{ marginLeft:-5}}, </s> add 'NativeBase.Input':{}},
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
dist/src/theme/Item.js
color:variables.topTabBarActiveTextColor},
<mask> padding:1.7, <mask> paddingHorizontal:3}, <mask> <mask> 'NativeBase.Icon':{ <mask> color:variables.topTabBarTextColor}, <mask> <mask> 'NativeBase.IconNB':{ <mask> color:variables.topTabBarTextColor}, <mask> <mask> 'NativeBase.Text':{ </s> items fix, tabs text color fix,picker fix </s> remove color:variables.topTabBarTextColor}, </s> add color:variables.topTabBarActiveTextColor}, </s> remove color:variables.topTabBarTextColor, </s> add color:variables.topTabBarActiveTextColor, </s> remove paddingLeft:15}, </s> add paddingLeft:5}, 'NativeBase.Icon':{ paddingLeft:10}, </s> remove color:variables.inputColorPlaceholder}, </s> add color:variables.inputColorPlaceholder, paddingRight:5}, </s> remove position:'absolute', top:10, left:15, right:0, </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
dist/src/theme/Tab.js
color:variables.topTabBarActiveTextColor},
<mask> 'NativeBase.Icon':{ <mask> color:variables.topTabBarTextColor}, <mask> <mask> 'NativeBase.IconNB':{ <mask> color:variables.topTabBarTextColor}, <mask> <mask> 'NativeBase.Text':{ <mask> color:variables.topTabBarTextColor, <mask> fontSize:variables.tabBarTextSize, <mask> lineHeight:16, </s> items fix, tabs text color fix,picker fix </s> remove color:variables.topTabBarTextColor, </s> add color:variables.topTabBarActiveTextColor, </s> remove color:variables.topTabBarTextColor}, </s> add color:variables.topTabBarActiveTextColor}, </s> remove paddingLeft:15}, </s> add paddingLeft:5}, 'NativeBase.Icon':{ paddingLeft:10}, </s> remove color:variables.inputColorPlaceholder}, </s> add color:variables.inputColorPlaceholder, paddingRight:5}, </s> remove position:'absolute', top:10, left:15, right:0, </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
dist/src/theme/Tab.js
color:variables.topTabBarActiveTextColor,
<mask> 'NativeBase.IconNB':{ <mask> color:variables.topTabBarTextColor}, <mask> <mask> 'NativeBase.Text':{ <mask> color:variables.topTabBarTextColor, <mask> fontSize:variables.tabBarTextSize, <mask> lineHeight:16, <mask> paddingVertical:3}, <mask> <mask> '.vertical':{ </s> items fix, tabs text color fix,picker fix </s> remove color:variables.topTabBarTextColor}, </s> add color:variables.topTabBarActiveTextColor}, </s> remove color:variables.topTabBarTextColor}, </s> add color:variables.topTabBarActiveTextColor}, </s> remove paddingLeft:15}, </s> add paddingLeft:5}, 'NativeBase.Icon':{ paddingLeft:10},
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
dist/src/theme/Tab.js
<mask> import { connectStyle } from '@shoutem/theme'; <mask> import variables from '../theme/variables'; <mask> import computeProps from '../Utils/computeProps'; <mask> import mapPropsToStyleNames from '../Utils/mapPropsToStyleNames'; <mask> import _ from 'lodash'; <mask> <mask> class Item extends Component { <mask> constructor(props) { <mask> super(props); <mask> this.state = { </s> items fix, tabs text color fix,picker fix </s> remove import { Picker, Modal, View } from 'react-native'; </s> add import { Picker, Modal, View, ListView } from 'react-native'; </s> remove const platformStyle = variables.platformStyle; const platform = variables.platform; </s> add </s> remove const ds = new List.DataSource({ rowHasChanged: (r1, r2) => r1 !== r2 }); </s> add const ds = new ListView.DataSource({ rowHasChanged: (r1, r2) => r1 !== r2 }); </s> remove onTextChange(text, inputProps) { this.setState({ text: text }); inputProps.onChangeText(); } </s> add </s> remove height: 55, top: 10, </s> add height: 60, top: 8, }, 'NativeBase.Label': { top: 8,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/basic/Item.js
<mask> )); <mask> } <mask> return newLabel; <mask> } <mask> onTextChange(text, inputProps) { <mask> this.setState({ text: text }); <mask> inputProps.onChangeText(); <mask> } <mask> <mask> renderChildren() { <mask> const newChildren = []; <mask> const childrenArray = React.Children.toArray(this.props.children); <mask> </s> items fix, tabs text color fix,picker fix </s> remove }},{key:'onTextChange',value:function onTextChange( text,inputProps){ this.setState({text:text}); inputProps.onChangeText(); </s> add </s> remove const platformStyle = variables.platformStyle; const platform = variables.platform; </s> add </s> remove const ds = new List.DataSource({ rowHasChanged: (r1, r2) => r1 !== r2 }); </s> add const ds = new ListView.DataSource({ rowHasChanged: (r1, r2) => r1 !== r2 }); </s> remove height: 55, top: 10, </s> add height: 60, top: 8, }, 'NativeBase.Label': { top: 8, </s> remove icon=_lodash2.default.remove(childrenArray,function(item){ </s> add icon=_.remove(childrenArray,function(item){
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/basic/Item.js
newChildren.push(<Input key="l2" {...inputProps} onChangeText={text => this.setState({ text })} />);
<mask> }); <mask> if(this.props.floatingLabel && icon.length) { <mask> newChildren.push(<Icon key="i1" {...iconProps} style={{ top: 6 }} />); <mask> newChildren.push(<Animated.View key="float" style={{ position: 'absolute', left: (this.props.last) ? 22 : 22, right: 0, top: this.state.topAnim, opacity: this.state.opacAnim, paddingTop: (Platform.OS === 'ios') ? undefined : 30, }}><Label style={{fontSize: (this.state.text) ? 13 : undefined}}>{this.renderLabel(label, labelProps)}</Label></Animated.View>); <mask> newChildren.push(<Input key="l2" {...inputProps} onChangeText={(text) => this.onTextChange(text,inputProps)} />); <mask> } <mask> else if (this.props.floatingLabel) { <mask> newChildren.push((this.props.floatingLabel) ? <Animated.View key="float" style={{ position: 'absolute', left: (this.props.last) ? 15 : 0, right: 0, top: this.state.topAnim, opacity: this.state.opacAnim, paddingTop: (Platform.OS === 'ios') ? undefined : 30, }}><Label style={{fontSize: (this.state.text) ? 13 : undefined}}>{this.renderLabel(label, labelProps)}</Label></Animated.View> : <Label style={{width: (this.state.text) ? 0 : undefined, marginLeft: (this.props.last) ? null : 15}}>{this.renderLabel(label, labelProps)}</Label>); <mask> newChildren.push(<Input key="l2" {...inputProps} onChangeText={(text) => this.onTextChange(text, inputProps)} />); <mask> } </s> items fix, tabs text color fix,picker fix </s> remove newChildren.push(<Input key="l2" {...inputProps} onChangeText={(text) => this.onTextChange(text, inputProps)} />); </s> add newChildren.push(<Input key="l2" {...inputProps} onChangeText={text => this.setState({ text })} />); </s> remove newChildren.push(<View key="s" style={{ flexDirection: 'row', flex: 1, width: variables.deviceWidth - 15 }}><Icon key="s1" {...iconProps} style={{ marginTop: 36 }} /><View style={{ flexDirection: 'column' }}><Label key="s2" {...labelProps}></Label><Input key="s3" {...inputProps} style={{ width: variables.deviceWidth - 40 }} /></View></View>); </s> add newChildren.push(<View key="s" style={{ flexDirection: 'row', flex: 1, width: variables.deviceWidth - 15 }}><Icon key="s1" {...iconProps} style={{ marginTop: 36 }} /><View style={{ flexDirection: 'column' }}><Label key="s2" {...labelProps}></Label><Input key="s3" {...inputProps} onChangeText={text => this.setState({ text })} style={{ width: variables.deviceWidth - 40 }} /></View></View>); </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add top: 8, marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove paddingTop: 10, paddingLeft: 10, </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/basic/Item.js
newChildren.push(<Input key="l2" {...inputProps} onChangeText={text => this.setState({ text })} />);
<mask> newChildren.push(<Input key="l2" {...inputProps} onChangeText={(text) => this.onTextChange(text,inputProps)} />); <mask> } <mask> else if (this.props.floatingLabel) { <mask> newChildren.push((this.props.floatingLabel) ? <Animated.View key="float" style={{ position: 'absolute', left: (this.props.last) ? 15 : 0, right: 0, top: this.state.topAnim, opacity: this.state.opacAnim, paddingTop: (Platform.OS === 'ios') ? undefined : 30, }}><Label style={{fontSize: (this.state.text) ? 13 : undefined}}>{this.renderLabel(label, labelProps)}</Label></Animated.View> : <Label style={{width: (this.state.text) ? 0 : undefined, marginLeft: (this.props.last) ? null : 15}}>{this.renderLabel(label, labelProps)}</Label>); <mask> newChildren.push(<Input key="l2" {...inputProps} onChangeText={(text) => this.onTextChange(text, inputProps)} />); <mask> } <mask> else if (this.props.stackedLabel && icon.length) { <mask> newChildren.push(<View key="s" style={{ flexDirection: 'row', flex: 1, width: variables.deviceWidth - 15 }}><Icon key="s1" {...iconProps} style={{ marginTop: 36 }} /><View style={{ flexDirection: 'column' }}><Label key="s2" {...labelProps}></Label><Input key="s3" {...inputProps} style={{ width: variables.deviceWidth - 40 }} /></View></View>); <mask> <mask> } </s> items fix, tabs text color fix,picker fix </s> remove newChildren.push(<View key="s" style={{ flexDirection: 'row', flex: 1, width: variables.deviceWidth - 15 }}><Icon key="s1" {...iconProps} style={{ marginTop: 36 }} /><View style={{ flexDirection: 'column' }}><Label key="s2" {...labelProps}></Label><Input key="s3" {...inputProps} style={{ width: variables.deviceWidth - 40 }} /></View></View>); </s> add newChildren.push(<View key="s" style={{ flexDirection: 'row', flex: 1, width: variables.deviceWidth - 15 }}><Icon key="s1" {...iconProps} style={{ marginTop: 36 }} /><View style={{ flexDirection: 'column' }}><Label key="s2" {...labelProps}></Label><Input key="s3" {...inputProps} onChangeText={text => this.setState({ text })} style={{ width: variables.deviceWidth - 40 }} /></View></View>); </s> remove newChildren.push(<Input key="l2" {...inputProps} onChangeText={(text) => this.onTextChange(text,inputProps)} />); </s> add newChildren.push(<Input key="l2" {...inputProps} onChangeText={text => this.setState({ text })} />); </s> remove paddingTop: 10, paddingLeft: 10, </s> add </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add top: 8, marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add marginLeft: (Platform.OS === 'ios') ? undefined : -5,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/basic/Item.js
newChildren.push(<View key="s" style={{ flexDirection: 'row', flex: 1, width: variables.deviceWidth - 15 }}><Icon key="s1" {...iconProps} style={{ marginTop: 36 }} /><View style={{ flexDirection: 'column' }}><Label key="s2" {...labelProps}></Label><Input key="s3" {...inputProps} onChangeText={text => this.setState({ text })} style={{ width: variables.deviceWidth - 40 }} /></View></View>);
<mask> newChildren.push((this.props.floatingLabel) ? <Animated.View key="float" style={{ position: 'absolute', left: (this.props.last) ? 15 : 0, right: 0, top: this.state.topAnim, opacity: this.state.opacAnim, paddingTop: (Platform.OS === 'ios') ? undefined : 30, }}><Label style={{fontSize: (this.state.text) ? 13 : undefined}}>{this.renderLabel(label, labelProps)}</Label></Animated.View> : <Label style={{width: (this.state.text) ? 0 : undefined, marginLeft: (this.props.last) ? null : 15}}>{this.renderLabel(label, labelProps)}</Label>); <mask> newChildren.push(<Input key="l2" {...inputProps} onChangeText={(text) => this.onTextChange(text, inputProps)} />); <mask> } <mask> else if (this.props.stackedLabel && icon.length) { <mask> newChildren.push(<View key="s" style={{ flexDirection: 'row', flex: 1, width: variables.deviceWidth - 15 }}><Icon key="s1" {...iconProps} style={{ marginTop: 36 }} /><View style={{ flexDirection: 'column' }}><Label key="s2" {...labelProps}></Label><Input key="s3" {...inputProps} style={{ width: variables.deviceWidth - 40 }} /></View></View>); <mask> <mask> } <mask> else { <mask> return this.props.children; <mask> } </s> items fix, tabs text color fix,picker fix </s> remove newChildren.push(<Input key="l2" {...inputProps} onChangeText={(text) => this.onTextChange(text, inputProps)} />); </s> add newChildren.push(<Input key="l2" {...inputProps} onChangeText={text => this.setState({ text })} />); </s> remove newChildren.push(<Input key="l2" {...inputProps} onChangeText={(text) => this.onTextChange(text,inputProps)} />); </s> add newChildren.push(<Input key="l2" {...inputProps} onChangeText={text => this.setState({ text })} />); </s> remove paddingTop: 10, paddingLeft: 10, </s> add </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add top: 8, marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add marginLeft: (Platform.OS === 'ios') ? undefined : -5,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/basic/Item.js
import { Picker, Modal, View, ListView } from 'react-native';
<mask> /* @flow */ <mask> <mask> import React, { Component } from 'react'; <mask> import { Picker, Modal, View } from 'react-native'; <mask> import _ from 'lodash'; <mask> import { Text } from './Text'; <mask> import { List } from './List'; <mask> import { IconNB as Icon } from './IconNB'; <mask> import { Radio } from './Radio'; </s> items fix, tabs text color fix,picker fix </s> remove import _ from 'lodash'; </s> add </s> remove const platformStyle = variables.platformStyle; const platform = variables.platform; </s> add </s> remove onTextChange(text, inputProps) { this.setState({ text: text }); inputProps.onChangeText(); } </s> add </s> remove newChildren.push(_react2.default.createElement(_reactNative.View,{key:'s',style:{flexDirection:'row',flex:1,width:_variables2.default.deviceWidth-15}},_react2.default.createElement(_Icon.Icon,_extends({key:'s1'},iconProps,{style:{marginTop:36}})),_react2.default.createElement(_reactNative.View,{style:{flexDirection:'column'}},_react2.default.createElement(_Label.Label,_extends({key:'s2'},labelProps)),_react2.default.createElement(_Input.Input,_extends({key:'s3'},inputProps,{style:{width:_variables2.default.deviceWidth-40}}))))); </s> add newChildren.push(_react2.default.createElement(_reactNative.View,{key:'s',style:{flexDirection:'row',flex:1,width:_variables2.default.deviceWidth-15}},_react2.default.createElement(_Icon.Icon,_extends({key:'s1'},iconProps,{style:{marginTop:36}})),_react2.default.createElement(_reactNative.View,{style:{flexDirection:'column'}},_react2.default.createElement(_Label.Label,_extends({key:'s2'},labelProps)),_react2.default.createElement(_Input.Input,_extends({key:'s3'},inputProps,{onChangeText:function onChangeText(text){return _this2.setState({text:text});},style:{width:_variables2.default.deviceWidth-40}}))))); </s> remove input=_lodash2.default.remove(childrenArray,function(item){ </s> add input=_.remove(childrenArray,function(item){
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/basic/Picker.ios.js
const ds = new ListView.DataSource({ rowHasChanged: (r1, r2) => r1 !== r2 });
<mask> class PickerNB extends Component { <mask> <mask> constructor(props) { <mask> super(props); <mask> const ds = new List.DataSource({ rowHasChanged: (r1, r2) => r1 !== r2 }); <mask> this.state = { <mask> modalVisible: false, <mask> currentLabel: this.getLabel(props), <mask> dataSource: ds.cloneWithRows(this.props.children), <mask> }; </s> items fix, tabs text color fix,picker fix </s> remove import _ from 'lodash'; </s> add </s> remove const platformStyle = variables.platformStyle; const platform = variables.platform; </s> add </s> remove onTextChange(text, inputProps) { this.setState({ text: text }); inputProps.onChangeText(); } </s> add </s> remove height: 55, top: 10, </s> add height: 60, top: 8, }, 'NativeBase.Label': { top: 8, </s> remove var _mapPropsToStyleNames=require('../Utils/mapPropsToStyleNames');var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames); var _lodash=require('lodash');var _lodash2=_interopRequireDefault(_lodash);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var </s> add var _mapPropsToStyleNames=require('../Utils/mapPropsToStyleNames');var _mapPropsToStyleNames2=_interopRequireDefault(_mapPropsToStyleNames);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/basic/Picker.ios.js
<ListView
<mask> > <mask> <Container> <mask> {this.renderHeader()} <mask> <Content> <mask> <List <mask> dataSource={this.state.dataSource} <mask> renderRow={child => <mask> <ListItem <mask> selected={(child.props.value === this.props.selectedValue) ? true : false} <mask> button </s> items fix, tabs text color fix,picker fix </s> remove newChildren.push(<Input key="l2" {...inputProps} onChangeText={(text) => this.onTextChange(text,inputProps)} />); </s> add newChildren.push(<Input key="l2" {...inputProps} onChangeText={text => this.setState({ text })} />); </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add top: 8, marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove paddingTop: 10, paddingLeft: 10, </s> add </s> remove newChildren.push(<Input key="l2" {...inputProps} onChangeText={(text) => this.onTextChange(text, inputProps)} />); </s> add newChildren.push(<Input key="l2" {...inputProps} onChangeText={text => this.setState({ text })} />);
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/basic/Picker.ios.js
<mask> <mask> import variable from './variables'; <mask> <mask> export default (variables = variable) => { <mask> const platformStyle = variables.platformStyle; <mask> const platform = variables.platform; <mask> <mask> const theme = { <mask> 'NativeBase.Item':{ <mask> '.fixedLabel': { <mask> 'NativeBase.Label': { <mask> paddingLeft: null, </s> items fix, tabs text color fix,picker fix </s> remove height: 55, top: 10, </s> add height: 60, top: 8, }, 'NativeBase.Label': { top: 8, </s> remove onTextChange(text, inputProps) { this.setState({ text: text }); inputProps.onChangeText(); } </s> add </s> remove const ds = new List.DataSource({ rowHasChanged: (r1, r2) => r1 !== r2 }); </s> add const ds = new ListView.DataSource({ rowHasChanged: (r1, r2) => r1 !== r2 }); </s> remove import _ from 'lodash'; </s> add </s> remove import { Picker, Modal, View } from 'react-native'; </s> add import { Picker, Modal, View, ListView } from 'react-native';
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Form.js
<mask> marginLeft: 15, <mask> }, <mask> '.placeholderLabel': { <mask> 'NativeBase.Input': { <mask> marginLeft: -5, <mask> }, <mask> }, <mask> '.stackedLabel': { <mask> 'NativeBase.Label': { <mask> paddingLeft: null, </s> items fix, tabs text color fix,picker fix </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add top: 8, marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove paddingLeft: 15, </s> add paddingLeft: 5, }, 'NativeBase.Icon': { paddingLeft: 10, </s> remove paddingLeft: 15, </s> add paddingLeft: 5, }, 'NativeBase.Icon': { paddingLeft: 10,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Form.js
marginLeft: (Platform.OS === 'ios') ? undefined : -5,
<mask> paddingLeft: null, <mask> }, <mask> 'NativeBase.Input': { <mask> paddingLeft: null, <mask> marginLeft: (platform === 'ios') ? undefined : -5, <mask> }, <mask> marginLeft: 15, <mask> }, <mask> '.floatingLabel': { <mask> 'NativeBase.Input': { </s> items fix, tabs text color fix,picker fix </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add top: 8, marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove marginLeft: -5, </s> add </s> remove paddingTop: 10, paddingLeft: 10, </s> add </s> remove paddingLeft: 10, </s> add </s> remove paddingLeft: 15, </s> add paddingLeft: 5, }, 'NativeBase.Icon': { paddingLeft: 10,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Form.js
top: 8, marginLeft: (Platform.OS === 'ios') ? undefined : -5,
<mask> }, <mask> '.floatingLabel': { <mask> 'NativeBase.Input': { <mask> paddingLeft: null, <mask> marginLeft: (platform === 'ios') ? undefined : -5, <mask> }, <mask> 'NativeBase.Label': { <mask> left: 0, <mask> }, <mask> marginLeft: 15, </s> items fix, tabs text color fix,picker fix </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove marginLeft: -5, </s> add </s> remove paddingLeft: 10, </s> add </s> remove paddingTop: 10, paddingLeft: 10, </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Form.js
'NativeBase.Label': { paddingRight: 5, },
<mask> '.last': { <mask> marginLeft:0, <mask> paddingLeft:15, <mask> }, <mask> marginLeft: 15, <mask> }, <mask> }; <mask> <mask> return theme; </s> items fix, tabs text color fix,picker fix </s> remove marginLeft: -5, </s> add </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add top: 8, marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove paddingLeft: 15, </s> add paddingLeft: 5, }, 'NativeBase.Icon': { paddingLeft: 10,
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Form.js
height: 60, top: 8, }, 'NativeBase.Label': { top: 8,
<mask> export default (variables = variable) => { <mask> const itemTheme = { <mask> '.floatingLabel': { <mask> 'NativeBase.Input': { <mask> height: 55, <mask> top: 10, <mask> }, <mask> }, <mask> '.fixedLabel': { <mask> 'NativeBase.Label': { <mask> position: null, </s> items fix, tabs text color fix,picker fix </s> remove const platformStyle = variables.platformStyle; const platform = variables.platform; </s> add </s> remove paddingLeft: 10, </s> add </s> remove paddingLeft: 10, </s> add </s> remove const ds = new List.DataSource({ rowHasChanged: (r1, r2) => r1 !== r2 }); </s> add const ds = new ListView.DataSource({ rowHasChanged: (r1, r2) => r1 !== r2 }); </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add top: 8, marginLeft: (Platform.OS === 'ios') ? undefined : -5,
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Item.js
<mask> position: null, <mask> top: null, <mask> left: null, <mask> right: null, <mask> paddingLeft: 10, <mask> flex: 1, <mask> height: null, <mask> width: null, <mask> fontSize: variables.inputFontSize, <mask> }, </s> items fix, tabs text color fix,picker fix </s> remove paddingLeft: 10, </s> add </s> remove paddingLeft: 10, </s> add </s> remove paddingTop: 10, paddingLeft: 10, </s> add </s> remove height: 55, top: 10, </s> add height: 60, top: 8, }, 'NativeBase.Label': { top: 8, </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add marginLeft: (Platform.OS === 'ios') ? undefined : -5,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Item.js
<mask> top: null, <mask> left: null, <mask> right: null, <mask> paddingTop: 5, <mask> paddingLeft: 10, <mask> alignSelf: 'flex-start', <mask> fontSize: variables.inputFontSize - 2, <mask> }, <mask> 'NativeBase.Input': { <mask> alignSelf: (Platform.OS === 'ios') ? 'stretch' : 'flex-start', </s> items fix, tabs text color fix,picker fix </s> remove paddingTop: 10, paddingLeft: 10, </s> add </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add top: 8, marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove paddingLeft: 10, </s> add </s> remove paddingLeft: 10, </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Item.js
<mask> 'NativeBase.Input': { <mask> alignSelf: (Platform.OS === 'ios') ? 'stretch' : 'flex-start', <mask> flex: 1, <mask> width: (Platform.OS === 'ios') ? null : variables.deviceWidth - 25, <mask> paddingTop: 10, <mask> paddingLeft: 10, <mask> fontSize: variables.inputFontSize, <mask> }, <mask> flexDirection: null, <mask> }, <mask> '.inlineLabel': { </s> items fix, tabs text color fix,picker fix </s> remove paddingLeft: 10, </s> add </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add top: 8, marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove newChildren.push(<View key="s" style={{ flexDirection: 'row', flex: 1, width: variables.deviceWidth - 15 }}><Icon key="s1" {...iconProps} style={{ marginTop: 36 }} /><View style={{ flexDirection: 'column' }}><Label key="s2" {...labelProps}></Label><Input key="s3" {...inputProps} style={{ width: variables.deviceWidth - 40 }} /></View></View>); </s> add newChildren.push(<View key="s" style={{ flexDirection: 'row', flex: 1, width: variables.deviceWidth - 15 }}><Icon key="s1" {...iconProps} style={{ marginTop: 36 }} /><View style={{ flexDirection: 'column' }}><Label key="s2" {...labelProps}></Label><Input key="s3" {...inputProps} onChangeText={text => this.setState({ text })} style={{ width: variables.deviceWidth - 40 }} /></View></View>); </s> remove newChildren.push(<Input key="l2" {...inputProps} onChangeText={(text) => this.onTextChange(text, inputProps)} />); </s> add newChildren.push(<Input key="l2" {...inputProps} onChangeText={text => this.setState({ text })} />);
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Item.js
<mask> position: null, <mask> top: null, <mask> left: null, <mask> right: null, <mask> paddingLeft: 10, <mask> paddingRight: 20, <mask> height: null, <mask> width: null, <mask> fontSize: variables.inputFontSize, <mask> }, </s> items fix, tabs text color fix,picker fix </s> remove paddingLeft: 10, </s> add </s> remove paddingLeft: 10, </s> add </s> remove paddingTop: 10, paddingLeft: 10, </s> add </s> remove height: 55, top: 10, </s> add height: 60, top: 8, }, 'NativeBase.Label': { top: 8, </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add marginLeft: (Platform.OS === 'ios') ? undefined : -5,
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Item.js
<mask> }, <mask> flexDirection: 'row', <mask> }, <mask> 'NativeBase.Label': { <mask> position: 'absolute', <mask> top: 10, <mask> left: 15, <mask> right: 0, <mask> fontSize: variables.inputFontSize, <mask> color: variables.inputColorPlaceholder, <mask> }, <mask> 'NativeBase.Icon': { <mask> fontSize: 24, </s> items fix, tabs text color fix,picker fix </s> remove paddingLeft: 10, </s> add </s> remove paddingLeft: 10, </s> add </s> remove color: variables.topTabBarTextColor, </s> add color: variables.topTabBarActiveTextColor,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Item.js
paddingRight: 5,
<mask> 'NativeBase.Label': { <mask> fontSize: variables.inputFontSize, <mask> color: variables.inputColorPlaceholder, <mask> }, <mask> 'NativeBase.Icon': { <mask> fontSize: 24, <mask> paddingRight: 8, <mask> }, <mask> 'NativeBase.IconNB': { </s> items fix, tabs text color fix,picker fix </s> remove position: 'absolute', top: 10, left: 15, right: 0, </s> add </s> remove color: variables.topTabBarTextColor, </s> add color: variables.topTabBarActiveTextColor, </s> remove paddingRight: 5, paddingLeft: 5, </s> add </s> remove color: variables.topTabBarTextColor, </s> add color: variables.topTabBarActiveTextColor, </s> remove color: variables.topTabBarTextColor, </s> add color: variables.topTabBarActiveTextColor,
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Item.js
<mask> }, <mask> 'NativeBase.Input': { <mask> height: variables.inputHeightBase, <mask> color: variables.inputColor, <mask> paddingRight: 5, <mask> paddingLeft: 5, <mask> flex: 1, <mask> fontSize: variables.inputFontSize, <mask> lineHeight: variables.inputLineHeight, <mask> }, <mask> '.underline': { </s> items fix, tabs text color fix,picker fix </s> remove paddingLeft: 10, </s> add </s> remove paddingLeft: 10, </s> add </s> remove paddingLeft: 15, </s> add paddingLeft: 5, }, 'NativeBase.Icon': { paddingLeft: 10,
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Item.js
top: 1.5,
<mask> height: variables.inputHeightBase, <mask> color: variables.inputColor, <mask> flex: 1, <mask> fontSize: variables.inputFontSize, <mask> lineHeight: variables.inputLineHeight, <mask> }, <mask> '.underline': { <mask> 'NativeBase.Input': { </s> items fix, tabs text color fix,picker fix </s> remove paddingRight: 5, paddingLeft: 5, </s> add </s> remove paddingLeft: 10, </s> add </s> remove color: variables.topTabBarTextColor, </s> add color: variables.topTabBarActiveTextColor, </s> remove color: variables.topTabBarTextColor, </s> add color: variables.topTabBarActiveTextColor, </s> remove paddingTop: 10, paddingLeft: 10, </s> add
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Item.js
paddingLeft: 5, }, 'NativeBase.Icon': { paddingLeft: 10,
<mask> borderColor: variables.inputBorderColor, <mask> }, <mask> '.regular': { <mask> 'NativeBase.Input': { <mask> paddingLeft: 15, <mask> }, <mask> '.success': { <mask> borderColor: variables.inputSuccessBorderColor, <mask> }, <mask> '.error': { </s> items fix, tabs text color fix,picker fix </s> remove paddingLeft: 15, </s> add paddingLeft: 5, }, 'NativeBase.Icon': { paddingLeft: 10, </s> remove marginLeft: -5, </s> add </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add top: 8, marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove paddingRight: 5, paddingLeft: 5, </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Item.js
paddingLeft: 5, }, 'NativeBase.Icon': { paddingLeft: 10,
<mask> borderColor: variables.inputBorderColor, <mask> }, <mask> '.rounded': { <mask> 'NativeBase.Input': { <mask> paddingLeft: 15, <mask> }, <mask> '.success': { <mask> borderColor: variables.inputSuccessBorderColor, <mask> }, <mask> '.error': { </s> items fix, tabs text color fix,picker fix </s> remove paddingLeft: 15, </s> add paddingLeft: 5, }, 'NativeBase.Icon': { paddingLeft: 10, </s> remove marginLeft: -5, </s> add </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove marginLeft: (platform === 'ios') ? undefined : -5, </s> add top: 8, marginLeft: (Platform.OS === 'ios') ? undefined : -5, </s> remove paddingRight: 5, paddingLeft: 5, </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Item.js
color: variables.topTabBarActiveTextColor,
<mask> padding: 1.7, <mask> paddingHorizontal: 3, <mask> }, <mask> 'NativeBase.Icon': { <mask> color: variables.topTabBarTextColor, <mask> }, <mask> 'NativeBase.IconNB': { <mask> color: variables.topTabBarTextColor, <mask> }, <mask> 'NativeBase.Text': { </s> items fix, tabs text color fix,picker fix </s> remove color: variables.topTabBarTextColor, </s> add color: variables.topTabBarActiveTextColor, </s> remove color: variables.topTabBarTextColor, </s> add color: variables.topTabBarActiveTextColor, </s> remove position: 'absolute', top: 10, left: 15, right: 0, </s> add </s> remove paddingRight: 5, paddingLeft: 5, </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Tab.js
color: variables.topTabBarActiveTextColor,
<mask> 'NativeBase.Icon': { <mask> color: variables.topTabBarTextColor, <mask> }, <mask> 'NativeBase.IconNB': { <mask> color: variables.topTabBarTextColor, <mask> }, <mask> 'NativeBase.Text': { <mask> color: variables.topTabBarTextColor, <mask> fontSize: variables.tabBarTextSize, <mask> lineHeight: 16, </s> items fix, tabs text color fix,picker fix </s> remove color: variables.topTabBarTextColor, </s> add color: variables.topTabBarActiveTextColor, </s> remove color: variables.topTabBarTextColor, </s> add color: variables.topTabBarActiveTextColor, </s> remove paddingRight: 5, paddingLeft: 5, </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Tab.js
color: variables.topTabBarActiveTextColor,
<mask> 'NativeBase.IconNB': { <mask> color: variables.topTabBarTextColor, <mask> }, <mask> 'NativeBase.Text': { <mask> color: variables.topTabBarTextColor, <mask> fontSize: variables.tabBarTextSize, <mask> lineHeight: 16, <mask> paddingVertical: 3, <mask> }, <mask> '.vertical': { </s> items fix, tabs text color fix,picker fix </s> remove color: variables.topTabBarTextColor, </s> add color: variables.topTabBarActiveTextColor, </s> remove color: variables.topTabBarTextColor, </s> add color: variables.topTabBarActiveTextColor, </s> remove paddingRight: 5, paddingLeft: 5, </s> add
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7c8f40051192533e065a963551a2f580b355cd90
src/theme/Tab.js
lineHeight: 21, defaultSpinnerColor: "#45D56E", inverseSpinnerColor: "#1A191B", defaultProgressColor: "#E4202D", inverseProgressColor: "#1A191B"
<mask> <mask> badgeColor: "#fff", <mask> badgeBg: "#ED1727", <mask> <mask> lineHeight: 21 <mask> } </s> inverse colors added for spinner and progress bar </s> remove <ActivityIndicatorIOS {...this.prepareRootProps()} color={this.props.color ? this.props.color : '#A6A4A2'} </s> add <ActivityIndicatorIOS {...this.prepareRootProps()} color={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseSpinnerColor : this.getTheme().defaultSpinnerColor} </s> remove color={this.props.color ? this.props.color : '#41B367'} /> </s> add color={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseSpinnerColor : this.getTheme().defaultSpinnerColor} /> </s> remove progressTintColor={this.props.color ? this.props.color : '#FD2E1F'} /> </s> add progressTintColor={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseProgressColor : this.getTheme().defaultProgressColor} /> </s> remove color={this.props.color ? this.props.color : '#41B367'} /> </s> add color={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseProgressColor : this.getTheme().defaultProgressColor} />
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d32ff6466fb333b2420741d68a240c16104f3d6
Components/Themes/light.js
color={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseProgressColor : this.getTheme().defaultProgressColor} />
<mask> render() { <mask> return( <mask> <ProgressBar {...this.prepareRootProps()} styleAttr = "Horizontal" <mask> indeterminate = {false} progress={this.props.progress ? this.props.progress/100 : 0.5} <mask> color={this.props.color ? this.props.color : '#41B367'} /> <mask> ); <mask> } <mask> <mask> } <mask> </s> inverse colors added for spinner and progress bar </s> remove color={this.props.color ? this.props.color : '#41B367'} /> </s> add color={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseSpinnerColor : this.getTheme().defaultSpinnerColor} /> </s> remove progressTintColor={this.props.color ? this.props.color : '#FD2E1F'} /> </s> add progressTintColor={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseProgressColor : this.getTheme().defaultProgressColor} /> </s> remove <ActivityIndicatorIOS {...this.prepareRootProps()} color={this.props.color ? this.props.color : '#A6A4A2'} </s> add <ActivityIndicatorIOS {...this.prepareRootProps()} color={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseSpinnerColor : this.getTheme().defaultSpinnerColor} </s> remove lineHeight: 21 </s> add lineHeight: 21, defaultSpinnerColor: "#45D56E", inverseSpinnerColor: "#1A191B", defaultProgressColor: "#E4202D", inverseProgressColor: "#1A191B"
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d32ff6466fb333b2420741d68a240c16104f3d6
Components/Widgets/ProgressBar.android.js
progressTintColor={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseProgressColor : this.getTheme().defaultProgressColor} />
<mask> <mask> render() { <mask> return( <mask> <ProgressViewIOS progress={this.props.progress ? this.props.progress/100 : 0.5} <mask> progressTintColor={this.props.color ? this.props.color : '#FD2E1F'} /> <mask> ); <mask> } <mask> <mask> } <mask> </s> inverse colors added for spinner and progress bar </s> remove color={this.props.color ? this.props.color : '#41B367'} /> </s> add color={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseProgressColor : this.getTheme().defaultProgressColor} /> </s> remove color={this.props.color ? this.props.color : '#41B367'} /> </s> add color={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseSpinnerColor : this.getTheme().defaultSpinnerColor} /> </s> remove <ActivityIndicatorIOS {...this.prepareRootProps()} color={this.props.color ? this.props.color : '#A6A4A2'} </s> add <ActivityIndicatorIOS {...this.prepareRootProps()} color={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseSpinnerColor : this.getTheme().defaultSpinnerColor} </s> remove lineHeight: 21 </s> add lineHeight: 21, defaultSpinnerColor: "#45D56E", inverseSpinnerColor: "#1A191B", defaultProgressColor: "#E4202D", inverseProgressColor: "#1A191B"
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d32ff6466fb333b2420741d68a240c16104f3d6
Components/Widgets/ProgressBar.ios.js
color={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseSpinnerColor : this.getTheme().defaultSpinnerColor} />
<mask> <mask> render() { <mask> return( <mask> <ProgressBar {...this.prepareRootProps()} styleAttr = {this.props.size ? this.props.size : "Large" } <mask> color={this.props.color ? this.props.color : '#41B367'} /> <mask> ); <mask> } <mask> <mask> } <mask> </s> inverse colors added for spinner and progress bar </s> remove color={this.props.color ? this.props.color : '#41B367'} /> </s> add color={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseProgressColor : this.getTheme().defaultProgressColor} /> </s> remove <ActivityIndicatorIOS {...this.prepareRootProps()} color={this.props.color ? this.props.color : '#A6A4A2'} </s> add <ActivityIndicatorIOS {...this.prepareRootProps()} color={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseSpinnerColor : this.getTheme().defaultSpinnerColor} </s> remove progressTintColor={this.props.color ? this.props.color : '#FD2E1F'} /> </s> add progressTintColor={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseProgressColor : this.getTheme().defaultProgressColor} /> </s> remove lineHeight: 21 </s> add lineHeight: 21, defaultSpinnerColor: "#45D56E", inverseSpinnerColor: "#1A191B", defaultProgressColor: "#E4202D", inverseProgressColor: "#1A191B"
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d32ff6466fb333b2420741d68a240c16104f3d6
Components/Widgets/Spinner.android.js
<ActivityIndicatorIOS {...this.prepareRootProps()} color={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseSpinnerColor : this.getTheme().defaultSpinnerColor}
<mask> <mask> <mask> render() { <mask> return( <mask> <ActivityIndicatorIOS {...this.prepareRootProps()} color={this.props.color ? this.props.color : '#A6A4A2'} <mask> size={this.props.size ? this.props.size : "large" } /> <mask> ); <mask> } <mask> <mask> } </s> inverse colors added for spinner and progress bar </s> remove color={this.props.color ? this.props.color : '#41B367'} /> </s> add color={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseSpinnerColor : this.getTheme().defaultSpinnerColor} /> </s> remove color={this.props.color ? this.props.color : '#41B367'} /> </s> add color={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseProgressColor : this.getTheme().defaultProgressColor} /> </s> remove progressTintColor={this.props.color ? this.props.color : '#FD2E1F'} /> </s> add progressTintColor={this.props.color ? this.props.color : this.props.inverse ? this.getTheme().inverseProgressColor : this.getTheme().defaultProgressColor} /> </s> remove lineHeight: 21 </s> add lineHeight: 21, defaultSpinnerColor: "#45D56E", inverseSpinnerColor: "#1A191B", defaultProgressColor: "#E4202D", inverseProgressColor: "#1A191B"
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d32ff6466fb333b2420741d68a240c16104f3d6
Components/Widgets/Spinner.ios.js
backgroundColor: "rgba(255, 255, 255, 0.7)",
<mask> left: 0, <mask> right: 0, <mask> [this.props.tabBarPosition === "overlayTop" ? "top" : "bottom"]: 0, <mask> }; <mask> } <mask> <mask> return ( <mask> <View style={[styles.container, this.props.style]} onLayout={this._handleLayout}> <mask> {(this.props.tabBarPosition === "top" || this.props.tabBarPosition==="overlayTop")&& this.renderTabBar(tabBarProps)} </s> Fix for issue #1330. Issue - Why does my `overlayTop` tab bar appear at bottom </s> remove {(this.props.tabBarPosition === "bottom" || overlayTabs) && this.renderTabBar(tabBarProps)} </s> add {(this.props.tabBarPosition === "bottom" || this.props.tabBarPosition==="overlayBottom") && this.renderTabBar(tabBarProps)} </s> remove {this.props.tabBarPosition === "top" && this.renderTabBar(tabBarProps)} </s> add {(this.props.tabBarPosition === "top" || this.props.tabBarPosition==="overlayTop")&& this.renderTabBar(tabBarProps)}
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d6a0660a1b0511c531585920e53c21d428bd15e
src/basic/Tabs/index.js
{(this.props.tabBarPosition === "top" || this.props.tabBarPosition==="overlayTop")&& this.renderTabBar(tabBarProps)}
<mask> } <mask> <mask> return ( <mask> <View style={[styles.container, this.props.style]} onLayout={this._handleLayout}> <mask> {this.props.tabBarPosition === "top" && this.renderTabBar(tabBarProps)} <mask> {this.renderScrollableContent()} <mask> {(this.props.tabBarPosition === "bottom" || overlayTabs) && this.renderTabBar(tabBarProps)} <mask> </View> <mask> ); <mask> }, </s> Fix for issue #1330. Issue - Why does my `overlayTop` tab bar appear at bottom </s> remove {(this.props.tabBarPosition === "bottom" || overlayTabs) && this.renderTabBar(tabBarProps)} </s> add {(this.props.tabBarPosition === "bottom" || this.props.tabBarPosition==="overlayBottom") && this.renderTabBar(tabBarProps)}
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d6a0660a1b0511c531585920e53c21d428bd15e
src/basic/Tabs/index.js
{(this.props.tabBarPosition === "bottom" || this.props.tabBarPosition==="overlayBottom") && this.renderTabBar(tabBarProps)}
<mask> return ( <mask> <View style={[styles.container, this.props.style]} onLayout={this._handleLayout}> <mask> {this.props.tabBarPosition === "top" && this.renderTabBar(tabBarProps)} <mask> {this.renderScrollableContent()} <mask> {(this.props.tabBarPosition === "bottom" || overlayTabs) && this.renderTabBar(tabBarProps)} <mask> </View> <mask> ); <mask> }, <mask> }); <mask> </s> Fix for issue #1330. Issue - Why does my `overlayTop` tab bar appear at bottom </s> remove {this.props.tabBarPosition === "top" && this.renderTabBar(tabBarProps)} </s> add {(this.props.tabBarPosition === "top" || this.props.tabBarPosition==="overlayTop")&& this.renderTabBar(tabBarProps)}
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d6a0660a1b0511c531585920e53c21d428bd15e
src/basic/Tabs/index.js
<mask> onOpen?: () => void; <mask> onClose?: () => void; <mask> offsetSpace?: number; <mask> closeOnSelect?: boolean; <mask> testID?: string; <mask> style?: ViewStyle; <mask> shadowOffset?: any; <mask> shadowOpacity?: number; <mask> shadowColor?: string; <mask> elevation?: number; </s> WIP: Renamed some props files to types </s> remove import type { IsetToastProps } from './props'; </s> add import type { IsetToastProps } from './types'; </s> remove import type { ITagProps } from './props'; </s> add import type { ITagProps } from './types'; </s> remove import type { INumberInputProps } from './props'; </s> add import type { INumberInputProps } from './types'; </s> remove import type { IToastProps } from './props'; </s> add import type { IToastProps } from './types'; </s> remove import type { INumberInputSteppersProps } from './props'; </s> add import type { INumberInputSteppersProps } from './types';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/composites/Menu/types.ts
import type { INumberInputContext, INumberInputStepperProps } from './types';
<mask> import React from 'react'; <mask> import type { INumberInputContext, INumberInputStepperProps } from './props'; <mask> import { NBStepper } from './NumberInputStepper'; <mask> import { NumberInputContext } from './Context'; <mask> <mask> const NumberDecrementStepper = ({ <mask> children, </s> WIP: Renamed some props files to types </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types'; </s> remove import type { INumberInputContext, INumberInputFieldProps } from './props'; </s> add import type { INumberInputContext, INumberInputFieldProps } from './types'; </s> remove import type { INumberInputProps } from './props'; </s> add import type { INumberInputProps } from './types'; </s> remove import type { INumberInputSteppersProps } from './props'; </s> add import type { INumberInputSteppersProps } from './types'; </s> remove import type { IsetToastProps } from './props'; </s> add import type { IsetToastProps } from './types';
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/composites/NumberInput/NumberDecrementStepper.tsx
import type { INumberInputContext, INumberInputStepperProps } from './types';
<mask> import React from 'react'; <mask> import type { INumberInputContext, INumberInputStepperProps } from './props'; <mask> import { NBStepper } from './NumberInputStepper'; <mask> import { NumberInputContext } from './Context'; <mask> <mask> const NumberIncrementStepper = ({ <mask> children, </s> WIP: Renamed some props files to types </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types'; </s> remove import type { INumberInputContext, INumberInputFieldProps } from './props'; </s> add import type { INumberInputContext, INumberInputFieldProps } from './types'; </s> remove import type { INumberInputProps } from './props'; </s> add import type { INumberInputProps } from './types'; </s> remove import type { INumberInputSteppersProps } from './props'; </s> add import type { INumberInputSteppersProps } from './types'; </s> remove import type { IsetToastProps } from './props'; </s> add import type { IsetToastProps } from './types';
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/composites/NumberInput/NumberIncrementStepper.tsx
import type { INumberInputProps } from './types';
<mask> import React from 'react'; <mask> import { useThemeProps } from '../../../hooks'; <mask> import { FormControlContext, IFormControlContext } from '../FormControl'; <mask> import type { INumberInputProps } from './props'; <mask> import { NumberInputContext } from './Context'; <mask> <mask> const NumberInput = ({ children, ...props }: INumberInputProps) => { <mask> const { <mask> defaultValue, </s> WIP: Renamed some props files to types </s> remove import type { INumberInputSteppersProps } from './props'; </s> add import type { INumberInputSteppersProps } from './types'; </s> remove } from './props'; </s> add } from './types'; </s> remove import type { IToastProps } from './props'; </s> add import type { IToastProps } from './types'; </s> remove import type { INumberInputContext, INumberInputFieldProps } from './props'; </s> add import type { INumberInputContext, INumberInputFieldProps } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types';
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/composites/NumberInput/NumberInput.tsx
import type { INumberInputContext, INumberInputFieldProps } from './types';
<mask> import React from 'react'; <mask> import Input from '../../primitives/Input'; <mask> import type { INumberInputContext, INumberInputFieldProps } from './props'; <mask> import { NumberInputContext } from './Context'; <mask> import type { TextInput } from 'react-native'; <mask> <mask> const NumberInputFiled = ( <mask> { isDisabled, ...props }: INumberInputFieldProps, </s> WIP: Renamed some props files to types </s> remove import type { IPinInputFieldProps, IPinInputContext } from './props'; </s> add import type { IPinInputFieldProps, IPinInputContext } from './types'; </s> remove import type { INumberInputProps } from './props'; </s> add import type { INumberInputProps } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types'; </s> remove import type { INumberInputSteppersProps } from './props'; </s> add import type { INumberInputSteppersProps } from './types';
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/composites/NumberInput/NumberInputField.tsx
import type { INumberInputSteppersProps } from './types';
<mask> import React from 'react'; <mask> import { TouchableOpacity, Platform } from 'react-native'; <mask> import { VStack, Box, Icon } from '../../primitives'; <mask> import { useThemeProps } from '../../../hooks'; <mask> import type { INumberInputSteppersProps } from './props'; <mask> <mask> export const NBStepper = ({ children, ...props }: any) => { <mask> const { <mask> style, <mask> isIncrement, </s> WIP: Renamed some props files to types </s> remove import type { INumberInputProps } from './props'; </s> add import type { INumberInputProps } from './types'; </s> remove import type { ITagProps } from './props'; </s> add import type { ITagProps } from './types'; </s> remove import type { IToastProps } from './props'; </s> add import type { IToastProps } from './types'; </s> remove import type { INumberInputContext, INumberInputFieldProps } from './props'; </s> add import type { INumberInputContext, INumberInputFieldProps } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/composites/NumberInput/NumberInputStepper.tsx
export { default as NumberInputStepper } from './NumberInputStepper';
<mask> export { default as NumberInput } from './NumberInput'; <mask> export { NumberInputContext } from './Context'; <mask> export { default as NumberInputField } from './NumberInputField'; <mask> export { default as NumberInputStepper, NBStepper } from './NumberInputStepper'; <mask> export { default as NumberIncrementStepper } from './NumberIncrementStepper'; <mask> export { default as NumberDecrementStepper } from './NumberDecrementStepper'; <mask> export type { <mask> INumberInputProps, <mask> INumberInputFieldProps, </s> WIP: Renamed some props files to types </s> remove import type { ISelectProps, ISelectItemProps } from './props'; </s> add import type { ISelectProps, ISelectItemProps } from './types'; </s> remove import type { INumberInputSteppersProps } from './props'; </s> add import type { INumberInputSteppersProps } from './types'; </s> remove import type { IsetToastProps } from './props'; </s> add import type { IsetToastProps } from './types'; </s> remove import type { ITagProps } from './props'; </s> add import type { ITagProps } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types';
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/composites/NumberInput/index.tsx
} from './types';
<mask> INumberInputFieldProps, <mask> INumberInputContext, <mask> INumberInputSteppersProps, <mask> INumberInputStepperProps, <mask> } from './props'; </s> WIP: Renamed some props files to types </s> remove import type { INumberInputContext, INumberInputFieldProps } from './props'; </s> add import type { INumberInputContext, INumberInputFieldProps } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types'; </s> remove export { default as NumberInputStepper, NBStepper } from './NumberInputStepper'; </s> add export { default as NumberInputStepper } from './NumberInputStepper'; </s> remove } from './props'; </s> add } from './types';
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/composites/NumberInput/index.tsx
import type { IPinInputFieldProps, IPinInputContext } from './types';
<mask> import React from 'react'; <mask> import Input from '../../primitives/Input'; <mask> import type { IPinInputFieldProps, IPinInputContext } from './props'; <mask> import { PinInputContext } from './Context'; <mask> <mask> const PinInputFiled = ({ <mask> fieldIndex = 0, <mask> defaultValue: pDefaultValue, </s> WIP: Renamed some props files to types </s> remove import type { INumberInputContext, INumberInputFieldProps } from './props'; </s> add import type { INumberInputContext, INumberInputFieldProps } from './types'; </s> remove } from './props'; </s> add } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types'; </s> remove import type { IsetToastProps } from './props'; </s> add import type { IsetToastProps } from './types';
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/composites/PinInput/PinInputField.tsx
} from './types';
<mask> import type { <mask> IPinInputProps, <mask> IPinInputFieldProps, <mask> IPinInputContext, <mask> } from './props'; <mask> import { FormControlContext, IFormControlContext } from '../FormControl'; <mask> import { Platform } from 'react-native'; <mask> import { PinInputContext } from './Context'; <mask> import { themeTools } from '../../../theme'; <mask> </s> WIP: Renamed some props files to types </s> remove import type { INumberInputProps } from './props'; </s> add import type { INumberInputProps } from './types'; </s> remove import type { IPinInputFieldProps, IPinInputContext } from './props'; </s> add import type { IPinInputFieldProps, IPinInputContext } from './types'; </s> remove import type { ISelectItemProps } from './props'; </s> add import type { ISelectItemProps } from './types'; </s> remove import type { INumberInputSteppersProps } from './props'; </s> add import type { INumberInputSteppersProps } from './types'; </s> remove import type { IToastProps } from './props'; </s> add import type { IToastProps } from './types';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/composites/PinInput/index.tsx
import type { ITagProps } from './types';
<mask> import styled from 'styled-components/native'; <mask> import { Box, IIconProps, Icon, Text, ITextProps } from '../../primitives'; <mask> import { useThemeProps } from '../../../hooks'; <mask> <mask> import type { ITagProps } from './props'; <mask> <mask> const StyledTag = styled(Box)<ITagProps>({}); <mask> <mask> export const TagLabel = React.memo((props: ITextProps) => { <mask> return <Text {...props} />; </s> WIP: Renamed some props files to types </s> remove import type { INumberInputSteppersProps } from './props'; </s> add import type { INumberInputSteppersProps } from './types'; </s> remove import type { INumberInputProps } from './props'; </s> add import type { INumberInputProps } from './types'; </s> remove import type { IsetToastProps } from './props'; </s> add import type { IsetToastProps } from './types'; </s> remove import type { IToastProps } from './props'; </s> add import type { IToastProps } from './types'; </s> remove import type { ITextProps } from './props'; </s> add import type { ITextProps } from './types';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/composites/Tag/index.tsx
import type { IToastProps } from './types';
<mask> import React from 'react'; <mask> import Box from '../../primitives/Box'; <mask> import Text from '../../primitives/Text'; <mask> import type { IToastProps } from './props'; <mask> import { themeTools } from '../../../theme'; <mask> import { useThemeProps } from '../../../hooks'; <mask> <mask> const ToastItem = ({ title, offset, ...props }: IToastProps) => { <mask> let newProps = useThemeProps('Toast', props); </s> WIP: Renamed some props files to types </s> remove import type { INumberInputProps } from './props'; </s> add import type { INumberInputProps } from './types'; </s> remove import type { INumberInputSteppersProps } from './props'; </s> add import type { INumberInputSteppersProps } from './types'; </s> remove import type { ISelectItemProps } from './props'; </s> add import type { ISelectItemProps } from './types'; </s> remove import type { IsetToastProps } from './props'; </s> add import type { IsetToastProps } from './types'; </s> remove import type { INumberInputContext, INumberInputFieldProps } from './props'; </s> add import type { INumberInputContext, INumberInputFieldProps } from './types';
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/composites/Toast/ToastItem.tsx
import type { IsetToastProps } from './types';
<mask> import React from 'react'; <mask> import { useOverlay } from '../../../core/Overlay'; <mask> import ToastItem from './ToastItem'; <mask> import type { IsetToastProps } from './props'; <mask> <mask> export const useToast = () => { <mask> const { closeOverlay, setOverlay } = useOverlay(); <mask> <mask> const setToast = ({ </s> WIP: Renamed some props files to types </s> remove import type { IToastProps } from './props'; </s> add import type { IToastProps } from './types'; </s> remove import type { INumberInputSteppersProps } from './props'; </s> add import type { INumberInputSteppersProps } from './types'; </s> remove import type { INumberInputProps } from './props'; </s> add import type { INumberInputProps } from './types'; </s> remove import type { ITagProps } from './props'; </s> add import type { ITagProps } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types';
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/composites/Toast/hooks.tsx
import type { ISelectItemProps } from './types';
<mask> import React from 'react'; <mask> import type { ISelectItemProps } from './props'; <mask> import { usePopover } from '../../../core'; <mask> import { themeTools } from '../../../theme'; <mask> import Button from '../Button'; <mask> import Text from '../Text'; <mask> </s> WIP: Renamed some props files to types </s> remove import type { ISelectProps, ISelectItemProps } from './props'; </s> add import type { ISelectProps, ISelectItemProps } from './types'; </s> remove import type { IToastProps } from './props'; </s> add import type { IToastProps } from './types'; </s> remove } from './props'; </s> add } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types';
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/primitives/Select/Item.tsx
import type { ISelectProps, ISelectItemProps } from './types';
<mask> import React from 'react'; <mask> import Text from '../Text'; <mask> import { Item as SelectItem } from './Item'; <mask> import type { ISelectProps, ISelectItemProps } from './props'; <mask> import { usePopover } from '../../../core'; <mask> import Button from '../Button'; <mask> import { ScrollView } from 'react-native'; <mask> <mask> const Select = React.memo( </s> WIP: Renamed some props files to types </s> remove import type { ISelectItemProps } from './props'; </s> add import type { ISelectItemProps } from './types'; </s> remove import type { INumberInputContext, INumberInputFieldProps } from './props'; </s> add import type { INumberInputContext, INumberInputFieldProps } from './types'; </s> remove import type { IToastProps } from './props'; </s> add import type { IToastProps } from './types'; </s> remove import type { INumberInputSteppersProps } from './props'; </s> add import type { INumberInputSteppersProps } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types';
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/primitives/Select/index.tsx
import type { ISwitchProps } from './types';
<mask> customExtra, <mask> customShadow, <mask> customPosition, <mask> } from '../../../utils/customProps'; <mask> import type { ISwitchProps } from './props'; <mask> import { useSwitch, AriaInputWrapper } from 'react-native-aria'; <mask> <mask> const StyledNBSwitch = styled(RNSwitch)<ISwitchProps>( <mask> color, <mask> space, </s> WIP: Renamed some props files to types </s> remove import type { ITextProps } from './props'; </s> add import type { ITextProps } from './types'; </s> remove import type { IsetToastProps } from './props'; </s> add import type { IsetToastProps } from './types'; </s> remove import type { INumberInputProps } from './props'; </s> add import type { INumberInputProps } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/primitives/Switch/index.tsx
import type { ITextProps } from './types';
<mask> customShadow, <mask> customTypography, <mask> customPosition, <mask> } from '../../../utils/customProps'; <mask> import type { ITextProps } from './props'; <mask> <mask> const StyledText = styled(NativeText)<ITextProps>( <mask> color, <mask> space, <mask> position, </s> WIP: Renamed some props files to types </s> remove import type { ISwitchProps } from './props'; </s> add import type { ISwitchProps } from './types'; </s> remove import type { ITagProps } from './props'; </s> add import type { ITagProps } from './types'; </s> remove import type { IsetToastProps } from './props'; </s> add import type { IsetToastProps } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types'; </s> remove import type { INumberInputContext, INumberInputStepperProps } from './props'; </s> add import type { INumberInputContext, INumberInputStepperProps } from './types';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7d969c792ff5e9b0d0cef226c54a10e4cecd72c8
src/components/primitives/Text/index.tsx
return multiply(this.fontSizeBase, 1.1);
<mask> get fontSizeH3 () { <mask> return multiply(this.fontSizeBase, 1.4); <mask> }, <mask> get btnTextSize () { <mask> return multiply(this.fontSizeBase, 1.2); <mask> }, <mask> get btnTextSizeLarge () { <mask> return multiply(this.fontSizeBase, 1.5); <mask> }, <mask> get btnTextSizeSmall () { </s> buttons fixed and hyphen-case updated </s> remove padding: 10, </s> add padding: 15, </s> remove if(this.props.itemDivider) </s> add if(this.props['item-divider']) </s> remove if (this.props.itemDivider) { </s> add if (this.props['item-divider']) { </s> remove var StyleSheetRegistry = require('react-native/Libraries/ReactNative/ReactNativePropRegistry'); </s> add var StyleSheetRegistry = require('react-native/Libraries/StyleSheet/StyleSheetRegistry');
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfc02c092821b4630df0aeafb84a30cb9d08610
Components/Themes/light.js
padding: 15,
<mask> <mask> getInitialStyle() { <mask> return { <mask> button: { <mask> padding: 10, <mask> justifyContent: 'space-around', <mask> flexDirection: 'row', <mask> alignSelf: 'center', <mask> backgroundColor: this.getTheme().btnPrimaryBg <mask> } </s> buttons fixed and hyphen-case updated </s> remove if(this.props.itemDivider) </s> add if(this.props['item-divider']) </s> remove return multiply(this.fontSizeBase, 1.2); </s> add return multiply(this.fontSizeBase, 1.1); </s> remove if (this.props.itemDivider) { </s> add if (this.props['item-divider']) { </s> remove color: ((this.props.bordered) && (this.props.primary)) ? this.getTheme().btnPrimaryBg : ((this.props.bordered) && (this.props.success)) ? this.getTheme().btnSuccessBg : ((this.props.bordered) && (this.props.danger)) ? this.getTheme().btnDangerBg : ((this.props.bordered) && (this.props.warning)) ? this.getTheme().btnWarningBg : ((this.props.bordered) && (this.props.info)) ? this.getTheme().btnInfoBg : </s> add color: (((this.props.bordered) && (this.props.primary)) || ((this.props.transparent) && (this.props.primary))) ? this.getTheme().btnPrimaryBg : (((this.props.bordered) && (this.props.success)) || ((this.props.transparent) && (this.props.success))) ? this.getTheme().btnSuccessBg : (((this.props.bordered) && (this.props.danger)) || ((this.props.transparent) && (this.props.danger))) ? this.getTheme().btnDangerBg : (((this.props.bordered) && (this.props.warning)) || ((this.props.transparent) && (this.props.warning))) ? this.getTheme().btnWarningBg : (((this.props.bordered) && (this.props.info)) || ((this.props.transparent) && (this.props.info))) ? this.getTheme().btnInfoBg : ((this.props.bordered) || (this.props.transparent)) ? this.getTheme().btnPrimaryBg :
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfc02c092821b4630df0aeafb84a30cb9d08610
Components/Widgets/Button.js
alignItems: 'center',
<mask> padding: 15, <mask> justifyContent: 'space-around', <mask> flexDirection: 'row', <mask> alignSelf: 'center', <mask> backgroundColor: this.getTheme().btnPrimaryBg <mask> } <mask> } <mask> } <mask> prepareRootProps() { <mask> </s> buttons fixed and hyphen-case updated </s> remove padding: 10, </s> add padding: 15, </s> remove if(this.props.itemDivider) </s> add if(this.props['item-divider']) </s> remove if (this.props.itemDivider) { </s> add if (this.props['item-divider']) { </s> remove color: ((this.props.bordered) && (this.props.primary)) ? this.getTheme().btnPrimaryBg : ((this.props.bordered) && (this.props.success)) ? this.getTheme().btnSuccessBg : ((this.props.bordered) && (this.props.danger)) ? this.getTheme().btnDangerBg : ((this.props.bordered) && (this.props.warning)) ? this.getTheme().btnWarningBg : ((this.props.bordered) && (this.props.info)) ? this.getTheme().btnInfoBg : </s> add color: (((this.props.bordered) && (this.props.primary)) || ((this.props.transparent) && (this.props.primary))) ? this.getTheme().btnPrimaryBg : (((this.props.bordered) && (this.props.success)) || ((this.props.transparent) && (this.props.success))) ? this.getTheme().btnSuccessBg : (((this.props.bordered) && (this.props.danger)) || ((this.props.transparent) && (this.props.danger))) ? this.getTheme().btnDangerBg : (((this.props.bordered) && (this.props.warning)) || ((this.props.transparent) && (this.props.warning))) ? this.getTheme().btnWarningBg : (((this.props.bordered) && (this.props.info)) || ((this.props.transparent) && (this.props.info))) ? this.getTheme().btnInfoBg : ((this.props.bordered) || (this.props.transparent)) ? this.getTheme().btnPrimaryBg : </s> remove color: ((this.props.bordered) && (this.props.primary)) ? this.getTheme().btnPrimaryBg : ((this.props.bordered) && (this.props.success)) ? this.getTheme().btnSuccessBg : ((this.props.bordered) && (this.props.danger)) ? this.getTheme().btnDangerBg : ((this.props.bordered) && (this.props.warning)) ? this.getTheme().btnWarningBg : ((this.props.bordered) && (this.props.info)) ? this.getTheme().btnInfoBg : </s> add paddingLeft: 3, color: (((this.props.bordered) && (this.props.primary)) || ((this.props.transparent) && (this.props.primary))) ? this.getTheme().btnPrimaryBg : (((this.props.bordered) && (this.props.success)) || ((this.props.transparent) && (this.props.success))) ? this.getTheme().btnSuccessBg : (((this.props.bordered) && (this.props.danger)) || ((this.props.transparent) && (this.props.danger))) ? this.getTheme().btnDangerBg : (((this.props.bordered) && (this.props.warning)) || ((this.props.transparent) && (this.props.warning))) ? this.getTheme().btnWarningBg : (((this.props.bordered) && (this.props.info)) || ((this.props.transparent) && (this.props.info))) ? this.getTheme().btnInfoBg : ((this.props.bordered) || (this.props.transparent)) ? this.getTheme().btnPrimaryBg :
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfc02c092821b4630df0aeafb84a30cb9d08610
Components/Widgets/Button.js
paddingLeft: 3, color: (((this.props.bordered) && (this.props.primary)) || ((this.props.transparent) && (this.props.primary))) ? this.getTheme().btnPrimaryBg : (((this.props.bordered) && (this.props.success)) || ((this.props.transparent) && (this.props.success))) ? this.getTheme().btnSuccessBg : (((this.props.bordered) && (this.props.danger)) || ((this.props.transparent) && (this.props.danger))) ? this.getTheme().btnDangerBg : (((this.props.bordered) && (this.props.warning)) || ((this.props.transparent) && (this.props.warning))) ? this.getTheme().btnWarningBg : (((this.props.bordered) && (this.props.info)) || ((this.props.transparent) && (this.props.info))) ? this.getTheme().btnInfoBg : ((this.props.bordered) || (this.props.transparent)) ? this.getTheme().btnPrimaryBg :
<mask> getTextStyle() { <mask> var mergedStyle = {}; <mask> <mask> var btnType = { <mask> color: ((this.props.bordered) && (this.props.primary)) ? this.getTheme().btnPrimaryBg : <mask> ((this.props.bordered) && (this.props.success)) ? this.getTheme().btnSuccessBg : <mask> ((this.props.bordered) && (this.props.danger)) ? this.getTheme().btnDangerBg : <mask> ((this.props.bordered) && (this.props.warning)) ? this.getTheme().btnWarningBg : <mask> ((this.props.bordered) && (this.props.info)) ? this.getTheme().btnInfoBg : <mask> this.getTheme().inverseTextColor, <mask> fontSize: (this.props.large) ? this.getTheme().btnTextSizeLarge : (this.props.small) ? this.getTheme().btnTextSizeSmall : this.getTheme().btnTextSize, <mask> lineHeight: (this.props.large) ? 32 : (this.props.small) ? 15 : 22 <mask> } <mask> </s> buttons fixed and hyphen-case updated </s> remove color: ((this.props.bordered) && (this.props.primary)) ? this.getTheme().btnPrimaryBg : ((this.props.bordered) && (this.props.success)) ? this.getTheme().btnSuccessBg : ((this.props.bordered) && (this.props.danger)) ? this.getTheme().btnDangerBg : ((this.props.bordered) && (this.props.warning)) ? this.getTheme().btnWarningBg : ((this.props.bordered) && (this.props.info)) ? this.getTheme().btnInfoBg : </s> add color: (((this.props.bordered) && (this.props.primary)) || ((this.props.transparent) && (this.props.primary))) ? this.getTheme().btnPrimaryBg : (((this.props.bordered) && (this.props.success)) || ((this.props.transparent) && (this.props.success))) ? this.getTheme().btnSuccessBg : (((this.props.bordered) && (this.props.danger)) || ((this.props.transparent) && (this.props.danger))) ? this.getTheme().btnDangerBg : (((this.props.bordered) && (this.props.warning)) || ((this.props.transparent) && (this.props.warning))) ? this.getTheme().btnWarningBg : (((this.props.bordered) && (this.props.info)) || ((this.props.transparent) && (this.props.info))) ? this.getTheme().btnInfoBg : ((this.props.bordered) || (this.props.transparent)) ? this.getTheme().btnPrimaryBg : </s> remove if (this.props.itemDivider) { </s> add if (this.props['item-divider']) { </s> remove if(this.props.itemDivider) </s> add if(this.props['item-divider']) </s> remove var StyleSheetRegistry = require('react-native/Libraries/ReactNative/ReactNativePropRegistry'); </s> add var StyleSheetRegistry = require('react-native/Libraries/StyleSheet/StyleSheetRegistry'); </s> remove padding: 10, </s> add padding: 15,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfc02c092821b4630df0aeafb84a30cb9d08610
Components/Widgets/Button.js
color: (((this.props.bordered) && (this.props.primary)) || ((this.props.transparent) && (this.props.primary))) ? this.getTheme().btnPrimaryBg : (((this.props.bordered) && (this.props.success)) || ((this.props.transparent) && (this.props.success))) ? this.getTheme().btnSuccessBg : (((this.props.bordered) && (this.props.danger)) || ((this.props.transparent) && (this.props.danger))) ? this.getTheme().btnDangerBg : (((this.props.bordered) && (this.props.warning)) || ((this.props.transparent) && (this.props.warning))) ? this.getTheme().btnWarningBg : (((this.props.bordered) && (this.props.info)) || ((this.props.transparent) && (this.props.info))) ? this.getTheme().btnInfoBg : ((this.props.bordered) || (this.props.transparent)) ? this.getTheme().btnPrimaryBg :
<mask> } <mask> <mask> getIconProps(icon) { <mask> var defaultStyle = { <mask> color: ((this.props.bordered) && (this.props.primary)) ? this.getTheme().btnPrimaryBg : <mask> ((this.props.bordered) && (this.props.success)) ? this.getTheme().btnSuccessBg : <mask> ((this.props.bordered) && (this.props.danger)) ? this.getTheme().btnDangerBg : <mask> ((this.props.bordered) && (this.props.warning)) ? this.getTheme().btnWarningBg : <mask> ((this.props.bordered) && (this.props.info)) ? this.getTheme().btnInfoBg : <mask> this.getTheme().inverseTextColor, <mask> fontSize: (this.props.large) ? this.getTheme().iconSizeLarge : (this.props.small) ? this.getTheme().iconSizeSmall : this.getTheme().iconFontSize, <mask> } <mask> <mask> console.log(this.props.small); </s> buttons fixed and hyphen-case updated </s> remove color: ((this.props.bordered) && (this.props.primary)) ? this.getTheme().btnPrimaryBg : ((this.props.bordered) && (this.props.success)) ? this.getTheme().btnSuccessBg : ((this.props.bordered) && (this.props.danger)) ? this.getTheme().btnDangerBg : ((this.props.bordered) && (this.props.warning)) ? this.getTheme().btnWarningBg : ((this.props.bordered) && (this.props.info)) ? this.getTheme().btnInfoBg : </s> add paddingLeft: 3, color: (((this.props.bordered) && (this.props.primary)) || ((this.props.transparent) && (this.props.primary))) ? this.getTheme().btnPrimaryBg : (((this.props.bordered) && (this.props.success)) || ((this.props.transparent) && (this.props.success))) ? this.getTheme().btnSuccessBg : (((this.props.bordered) && (this.props.danger)) || ((this.props.transparent) && (this.props.danger))) ? this.getTheme().btnDangerBg : (((this.props.bordered) && (this.props.warning)) || ((this.props.transparent) && (this.props.warning))) ? this.getTheme().btnWarningBg : (((this.props.bordered) && (this.props.info)) || ((this.props.transparent) && (this.props.info))) ? this.getTheme().btnInfoBg : ((this.props.bordered) || (this.props.transparent)) ? this.getTheme().btnPrimaryBg : </s> remove if (this.props.itemDivider) { </s> add if (this.props['item-divider']) { </s> remove if(this.props.itemDivider) </s> add if(this.props['item-divider']) </s> remove padding: 10, </s> add padding: 15,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfc02c092821b4630df0aeafb84a30cb9d08610
Components/Widgets/Button.js
if (this.props['item-divider']) {
<mask> style: this.getInitialStyle().itemButton <mask> } <mask> } <mask> else if(child.type == Text) { <mask> if (this.props.itemDivider) { <mask> defaultProps = { <mask> style: this.getInitialStyle().dividerItemText <mask> } <mask> } else { <mask> if(child.props.note && this.thumbnailPresent()) { </s> buttons fixed and hyphen-case updated </s> remove if(this.props.itemDivider) </s> add if(this.props['item-divider']) </s> remove padding: 10, </s> add padding: 15, </s> remove color: ((this.props.bordered) && (this.props.primary)) ? this.getTheme().btnPrimaryBg : ((this.props.bordered) && (this.props.success)) ? this.getTheme().btnSuccessBg : ((this.props.bordered) && (this.props.danger)) ? this.getTheme().btnDangerBg : ((this.props.bordered) && (this.props.warning)) ? this.getTheme().btnWarningBg : ((this.props.bordered) && (this.props.info)) ? this.getTheme().btnInfoBg : </s> add color: (((this.props.bordered) && (this.props.primary)) || ((this.props.transparent) && (this.props.primary))) ? this.getTheme().btnPrimaryBg : (((this.props.bordered) && (this.props.success)) || ((this.props.transparent) && (this.props.success))) ? this.getTheme().btnSuccessBg : (((this.props.bordered) && (this.props.danger)) || ((this.props.transparent) && (this.props.danger))) ? this.getTheme().btnDangerBg : (((this.props.bordered) && (this.props.warning)) || ((this.props.transparent) && (this.props.warning))) ? this.getTheme().btnWarningBg : (((this.props.bordered) && (this.props.info)) || ((this.props.transparent) && (this.props.info))) ? this.getTheme().btnInfoBg : ((this.props.bordered) || (this.props.transparent)) ? this.getTheme().btnPrimaryBg : </s> remove color: ((this.props.bordered) && (this.props.primary)) ? this.getTheme().btnPrimaryBg : ((this.props.bordered) && (this.props.success)) ? this.getTheme().btnSuccessBg : ((this.props.bordered) && (this.props.danger)) ? this.getTheme().btnDangerBg : ((this.props.bordered) && (this.props.warning)) ? this.getTheme().btnWarningBg : ((this.props.bordered) && (this.props.info)) ? this.getTheme().btnInfoBg : </s> add paddingLeft: 3, color: (((this.props.bordered) && (this.props.primary)) || ((this.props.transparent) && (this.props.primary))) ? this.getTheme().btnPrimaryBg : (((this.props.bordered) && (this.props.success)) || ((this.props.transparent) && (this.props.success))) ? this.getTheme().btnSuccessBg : (((this.props.bordered) && (this.props.danger)) || ((this.props.transparent) && (this.props.danger))) ? this.getTheme().btnDangerBg : (((this.props.bordered) && (this.props.warning)) || ((this.props.transparent) && (this.props.warning))) ? this.getTheme().btnWarningBg : (((this.props.bordered) && (this.props.info)) || ((this.props.transparent) && (this.props.info))) ? this.getTheme().btnInfoBg : ((this.props.bordered) || (this.props.transparent)) ? this.getTheme().btnPrimaryBg :
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfc02c092821b4630df0aeafb84a30cb9d08610
Components/Widgets/ListItem.js
if(this.props['item-divider'])
<mask> return computeProps(child.props, defaultProps); <mask> } <mask> <mask> prepareRootProps() { <mask> if(this.props.itemDivider) <mask> var defaultProps = { <mask> style: this.getInitialStyle().listItemDivider <mask> }; <mask> <mask> </s> buttons fixed and hyphen-case updated </s> remove if (this.props.itemDivider) { </s> add if (this.props['item-divider']) { </s> remove padding: 10, </s> add padding: 15, </s> remove return multiply(this.fontSizeBase, 1.2); </s> add return multiply(this.fontSizeBase, 1.1); </s> remove var StyleSheetRegistry = require('react-native/Libraries/ReactNative/ReactNativePropRegistry'); </s> add var StyleSheetRegistry = require('react-native/Libraries/StyleSheet/StyleSheetRegistry');
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfc02c092821b4630df0aeafb84a30cb9d08610
Components/Widgets/ListItem.js
var StyleSheetRegistry = require('react-native/Libraries/StyleSheet/StyleSheetRegistry');
<mask> var React = require('react-native'); <mask> <mask> var StyleSheetRegistry = require('react-native/Libraries/ReactNative/ReactNativePropRegistry'); <mask> <mask> module.exports = function(incomingProps, defaultProps) { <mask> <mask> <mask> // External props has a higher precedence </s> buttons fixed and hyphen-case updated </s> remove if(this.props.itemDivider) </s> add if(this.props['item-divider']) </s> remove if (this.props.itemDivider) { </s> add if (this.props['item-divider']) { </s> remove color: ((this.props.bordered) && (this.props.primary)) ? this.getTheme().btnPrimaryBg : ((this.props.bordered) && (this.props.success)) ? this.getTheme().btnSuccessBg : ((this.props.bordered) && (this.props.danger)) ? this.getTheme().btnDangerBg : ((this.props.bordered) && (this.props.warning)) ? this.getTheme().btnWarningBg : ((this.props.bordered) && (this.props.info)) ? this.getTheme().btnInfoBg : </s> add paddingLeft: 3, color: (((this.props.bordered) && (this.props.primary)) || ((this.props.transparent) && (this.props.primary))) ? this.getTheme().btnPrimaryBg : (((this.props.bordered) && (this.props.success)) || ((this.props.transparent) && (this.props.success))) ? this.getTheme().btnSuccessBg : (((this.props.bordered) && (this.props.danger)) || ((this.props.transparent) && (this.props.danger))) ? this.getTheme().btnDangerBg : (((this.props.bordered) && (this.props.warning)) || ((this.props.transparent) && (this.props.warning))) ? this.getTheme().btnWarningBg : (((this.props.bordered) && (this.props.info)) || ((this.props.transparent) && (this.props.info))) ? this.getTheme().btnInfoBg : ((this.props.bordered) || (this.props.transparent)) ? this.getTheme().btnPrimaryBg : </s> remove color: ((this.props.bordered) && (this.props.primary)) ? this.getTheme().btnPrimaryBg : ((this.props.bordered) && (this.props.success)) ? this.getTheme().btnSuccessBg : ((this.props.bordered) && (this.props.danger)) ? this.getTheme().btnDangerBg : ((this.props.bordered) && (this.props.warning)) ? this.getTheme().btnWarningBg : ((this.props.bordered) && (this.props.info)) ? this.getTheme().btnInfoBg : </s> add color: (((this.props.bordered) && (this.props.primary)) || ((this.props.transparent) && (this.props.primary))) ? this.getTheme().btnPrimaryBg : (((this.props.bordered) && (this.props.success)) || ((this.props.transparent) && (this.props.success))) ? this.getTheme().btnSuccessBg : (((this.props.bordered) && (this.props.danger)) || ((this.props.transparent) && (this.props.danger))) ? this.getTheme().btnDangerBg : (((this.props.bordered) && (this.props.warning)) || ((this.props.transparent) && (this.props.warning))) ? this.getTheme().btnWarningBg : (((this.props.bordered) && (this.props.info)) || ((this.props.transparent) && (this.props.info))) ? this.getTheme().btnInfoBg : ((this.props.bordered) || (this.props.transparent)) ? this.getTheme().btnPrimaryBg : </s> remove padding: 10, </s> add padding: 15,
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfc02c092821b4630df0aeafb84a30cb9d08610
Utils/computeProps.js
import _ from 'lodash'; import { Icon } from './Icon'; import { IconNB, Button, Badge } from 'native-base';
<mask> <mask> import React from 'react'; <mask> import { Platform, View } from 'react-native'; <mask> import { connectStyle } from '@shoutem/theme'; <mask> import { Icon, Icon as IconNB, Button, Badge } from 'native-base'; <mask> import mapPropsToStyleNames from '../../Utils/mapPropsToStyleNames'; <mask> import NativeBaseComponent from '../Base/NativeBaseComponent'; <mask> import { Text } from './Text'; <mask> <mask> class FooterTab extends NativeBaseComponent { </s> Footer and Fab fixes for 2.0 and /backward </s> remove import { IconNB as Icon, Button } from 'native-base'; </s> add import { IconNB, Icon, Button } from 'native-base'; </s> remove if ((typeof child !== 'string') && (child.type.displayName !== 'Styled(Icon)') && (child.type.displayName !== 'Styled(Text)')) { </s> add console.log(child); if ((typeof child !== 'string') && (child.type.displayName !== 'Styled(Icon)') && (child.type.displayName !== 'Styled(Text)') && (child.type.displayName !== 'Styled(AnimatedComponent)')) { </s> remove if (item.type === Badge) { </s> add if (item.type.displayName === "Styled(Badge)") { </s> remove if (item.type === IconNB) { </s> add if (item.type.displayName === "Styled(Icon)") {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
backward/Widgets/FooterTab.js
if (item.type.displayName === "Styled(Icon)") {
<mask> key: i })); <mask> } else { <mask> let iconElement = []; <mask> iconElement = _.remove(children, (item) => { <mask> if (item.type === IconNB) { <mask> return true; <mask> } <mask> }); <mask> let badgeElement = []; <mask> badgeElement = _.remove(children, (item) => { </s> Footer and Fab fixes for 2.0 and /backward </s> remove if (item.type === Badge) { </s> add if (item.type.displayName === "Styled(Badge)") { </s> remove if (item.type === Icon) { </s> add if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { </s> remove if ((typeof child !== 'string') && (child.type.displayName !== 'Styled(Icon)') && (child.type.displayName !== 'Styled(Text)')) { </s> add console.log(child); if ((typeof child !== 'string') && (child.type.displayName !== 'Styled(Icon)') && (child.type.displayName !== 'Styled(Text)') && (child.type.displayName !== 'Styled(AnimatedComponent)')) { </s> remove bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), </s> add bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65),
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
backward/Widgets/FooterTab.js
console.log(iconElement);
<mask> } <mask> }); <mask> let badgeElement = []; <mask> badgeElement = _.remove(children, (item) => { <mask> if (item.type.displayName === "Styled(Badge)") { <mask> return true; <mask> } <mask> }); </s> Footer and Fab fixes for 2.0 and /backward </s> remove if (item.type === Badge) { </s> add if (item.type.displayName === "Styled(Badge)") { </s> remove if (item.type === IconNB) { </s> add if (item.type.displayName === "Styled(Icon)") { </s> remove if (item.type === Icon) { </s> add if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { </s> remove if ((typeof child !== 'string') && (child.type.displayName !== 'Styled(Icon)') && (child.type.displayName !== 'Styled(Text)')) { </s> add console.log(child); if ((typeof child !== 'string') && (child.type.displayName !== 'Styled(Icon)') && (child.type.displayName !== 'Styled(Text)') && (child.type.displayName !== 'Styled(AnimatedComponent)')) { </s> remove bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), </s> add bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65),
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
backward/Widgets/FooterTab.js
if (item.type.displayName === "Styled(Badge)") {
<mask> } <mask> }); <mask> let badgeElement = []; <mask> badgeElement = _.remove(children, (item) => { <mask> if (item.type === Badge) { <mask> return true; <mask> } <mask> }); <mask> if (iconElement.length > 0) { <mask> if (badgeElement.length > 0) { </s> Footer and Fab fixes for 2.0 and /backward </s> remove if (item.type === IconNB) { </s> add if (item.type.displayName === "Styled(Icon)") { </s> remove if (item.type === Icon) { </s> add if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { </s> remove if ((typeof child !== 'string') && (child.type.displayName !== 'Styled(Icon)') && (child.type.displayName !== 'Styled(Text)')) { </s> add console.log(child); if ((typeof child !== 'string') && (child.type.displayName !== 'Styled(Icon)') && (child.type.displayName !== 'Styled(Text)') && (child.type.displayName !== 'Styled(AnimatedComponent)')) { </s> remove bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), </s> add bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65),
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
backward/Widgets/FooterTab.js
console.log(child); if ((typeof child !== 'string') && (child.type.displayName !== 'Styled(Icon)') && (child.type.displayName !== 'Styled(Text)') && (child.type.displayName !== 'Styled(AnimatedComponent)')) {
<mask> const childrenType = function childrenType(props, propName, component) { <mask> let error; <mask> const prop = props[propName]; <mask> React.Children.forEach(prop, (child) => { <mask> if ((typeof child !== 'string') && (child.type.displayName !== 'Styled(Icon)') && (child.type.displayName !== 'Styled(Text)')) { <mask> error = new Error(`${component} can have only Text or Icon components`); <mask> } <mask> }); <mask> return error; <mask> }; </s> Footer and Fab fixes for 2.0 and /backward </s> remove if (item.type === Icon) { </s> add if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") { </s> remove if (item.type === IconNB) { </s> add if (item.type.displayName === "Styled(Icon)") { </s> remove if (item.type === Badge) { </s> add if (item.type.displayName === "Styled(Badge)") { </s> remove import { Icon, Icon as IconNB, Button, Badge } from 'native-base'; </s> add import _ from 'lodash'; import { Icon } from './Icon'; import { IconNB, Button, Badge } from 'native-base';
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
basic/Badge.js
import { IconNB, Icon, Button } from 'native-base';
<mask> <mask> <mask> import React, { Component } from 'react'; <mask> // import Button from './Button'; <mask> import { IconNB as Icon, Button } from 'native-base'; <mask> import { Platform, Animated, TouchableOpacity } from 'react-native'; <mask> // import View from './View'; <mask> // import Icon from './Icon'; <mask> // import Badge from './Badge'; <mask> // import IconNB from './Icon'; </s> Footer and Fab fixes for 2.0 and /backward </s> remove import { Icon, Icon as IconNB, Button, Badge } from 'native-base'; </s> add import _ from 'lodash'; import { Icon } from './Icon'; import { IconNB, Button, Badge } from 'native-base'; </s> remove if (item.type === Badge) { </s> add if (item.type.displayName === "Styled(Badge)") { </s> remove if (item.type === IconNB) { </s> add if (item.type.displayName === "Styled(Icon)") { </s> remove if ((typeof child !== 'string') && (child.type.displayName !== 'Styled(Icon)') && (child.type.displayName !== 'Styled(Text)')) { </s> add console.log(child); if ((typeof child !== 'string') && (child.type.displayName !== 'Styled(Icon)') && (child.type.displayName !== 'Styled(Text)') && (child.type.displayName !== 'Styled(AnimatedComponent)')) {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
basic/Fab.js
bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65),
<mask> fabOtherBtns(direction, i) { <mask> if (direction === 'up') { <mask> return { <mask> top: undefined, <mask> bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), <mask> left: 8, <mask> right: 0, <mask> }; <mask> } else if (direction === 'left') { <mask> return { </s> Footer and Fab fixes for 2.0 and /backward </s> remove left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : -((i * 50)), </s> add left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : -((i * 50) + 50), </s> remove top: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), </s> add top: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65), </s> remove left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), </s> add left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65), </s> remove if (item.type === IconNB) { </s> add if (item.type.displayName === "Styled(Icon)") { </s> remove if (item.type === Badge) { </s> add if (item.type.displayName === "Styled(Badge)") {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
basic/Fab.js
left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : -((i * 50) + 50),
<mask> } else if (direction === 'left') { <mask> return { <mask> top: 8, <mask> bottom: 0, <mask> left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : -((i * 50)), <mask> right: 0, <mask> }; <mask> } else if (direction === 'down') { <mask> return { <mask> top: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), </s> Footer and Fab fixes for 2.0 and /backward </s> remove top: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), </s> add top: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65), </s> remove bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), </s> add bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65), </s> remove left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), </s> add left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65), </s> remove if (item.type === IconNB) { </s> add if (item.type.displayName === "Styled(Icon)") { </s> remove if (item.type === Badge) { </s> add if (item.type.displayName === "Styled(Badge)") {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
basic/Fab.js
top: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65),
<mask> right: 0, <mask> }; <mask> } else if (direction === 'down') { <mask> return { <mask> top: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), <mask> bottom: 0, <mask> left: 8, <mask> right: 0, <mask> }; <mask> } else if (direction === 'right') { </s> Footer and Fab fixes for 2.0 and /backward </s> remove left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : -((i * 50)), </s> add left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : -((i * 50) + 50), </s> remove left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), </s> add left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65), </s> remove bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), </s> add bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65), </s> remove if (item.type === IconNB) { </s> add if (item.type.displayName === "Styled(Icon)") { </s> remove if (item.type === Badge) { </s> add if (item.type.displayName === "Styled(Badge)") {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
basic/Fab.js
left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65),
<mask> } else if (direction === 'right') { <mask> return { <mask> top: 10, <mask> bottom: 0, <mask> left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), <mask> right: 0, <mask> }; <mask> } <mask> } <mask> </s> Footer and Fab fixes for 2.0 and /backward </s> remove top: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), </s> add top: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65), </s> remove left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : -((i * 50)), </s> add left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : -((i * 50) + 50), </s> remove bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), </s> add bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65), </s> remove if (item.type === IconNB) { </s> add if (item.type.displayName === "Styled(Icon)") { </s> remove if (item.type === Badge) { </s> add if (item.type.displayName === "Styled(Badge)") {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
basic/Fab.js
if (item.type.displayName === "Styled(Icon)" || item.type.displayName === "Styled(IconNB)") {
<mask> <mask> renderButtons() { <mask> const childrenArray = React.Children.toArray(this.props.children); <mask> const icon = _.remove(childrenArray, (item) => { <mask> if (item.type === Icon) { <mask> return true; <mask> } <mask> }); <mask> <mask> const newChildren = []; </s> Footer and Fab fixes for 2.0 and /backward </s> remove if (item.type === IconNB) { </s> add if (item.type.displayName === "Styled(Icon)") { </s> remove if (item.type === Badge) { </s> add if (item.type.displayName === "Styled(Badge)") { </s> remove if ((typeof child !== 'string') && (child.type.displayName !== 'Styled(Icon)') && (child.type.displayName !== 'Styled(Text)')) { </s> add console.log(child); if ((typeof child !== 'string') && (child.type.displayName !== 'Styled(Icon)') && (child.type.displayName !== 'Styled(Text)') && (child.type.displayName !== 'Styled(AnimatedComponent)')) { </s> remove bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), </s> add bottom: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65),
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
basic/Fab.js
"_resolved": "git+https://github.com/GeekyAnts/NativeBase.git#4601289ce558b9b398394232985d7853fdff796c", "_shasum": "62518c8afce391a31a460481e7c5aa632c245e1a",
<mask> }, <mask> "_requiredBy": [ <mask> "/" <mask> ], <mask> "_resolved": "git+https://github.com/GeekyAnts/NativeBase.git#c9a94bb306844b52377afa265070dbe8d36fdc36", <mask> "_shasum": "ab587463e63750a79bbc23c875b0ab0ff29f30b7", <mask> "_shrinkwrap": null, <mask> "_spec": "native-base@git+https://github.com/GeekyAnts/NativeBase.git#v2.0-alpha1", <mask> "_where": "/Users/sahusoft/Sites/projects/Try", <mask> "bugs": { <mask> "url": "https://github.com/GeekyAnts/NativeBase/issues" </s> Footer and Fab fixes for 2.0 and /backward </s> remove "_where": "/Users/sahusoft/Sites/projects/Try", </s> add "_where": "/Users/sahusoft/Sites/projects/NBKS", </s> remove ...cardItemTheme(variables), </s> add ...cardItemTheme(variables), '.cardBody': { padding: -5, 'NativeBase.Text': { marginTop: 5, }, }, 'NativeBase.Icon': { paddingRight: 10, }, 'NativeBase.IconNB': { paddingRight: 10, }, </s> remove flexDirection: 'column', </s> add </s> remove if (item.type === Badge) { </s> add if (item.type.displayName === "Styled(Badge)") {
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
package.json
"_where": "/Users/sahusoft/Sites/projects/NBKS",
<mask> "_resolved": "git+https://github.com/GeekyAnts/NativeBase.git#c9a94bb306844b52377afa265070dbe8d36fdc36", <mask> "_shasum": "ab587463e63750a79bbc23c875b0ab0ff29f30b7", <mask> "_shrinkwrap": null, <mask> "_spec": "native-base@git+https://github.com/GeekyAnts/NativeBase.git#v2.0-alpha1", <mask> "_where": "/Users/sahusoft/Sites/projects/Try", <mask> "bugs": { <mask> "url": "https://github.com/GeekyAnts/NativeBase/issues" <mask> }, <mask> "dependencies": { <mask> "@shoutem/animation": "^0.8.9", </s> Footer and Fab fixes for 2.0 and /backward </s> remove "_resolved": "git+https://github.com/GeekyAnts/NativeBase.git#c9a94bb306844b52377afa265070dbe8d36fdc36", "_shasum": "ab587463e63750a79bbc23c875b0ab0ff29f30b7", </s> add "_resolved": "git+https://github.com/GeekyAnts/NativeBase.git#4601289ce558b9b398394232985d7853fdff796c", "_shasum": "62518c8afce391a31a460481e7c5aa632c245e1a", </s> remove ...cardItemTheme(variables), </s> add ...cardItemTheme(variables), '.cardBody': { padding: -5, 'NativeBase.Text': { marginTop: 5, }, }, 'NativeBase.Icon': { paddingRight: 10, }, 'NativeBase.IconNB': { paddingRight: 10, }, </s> remove flexDirection: 'column', </s> add </s> remove if (item.type === Badge) { </s> add if (item.type.displayName === "Styled(Badge)") {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
package.json
<mask> flexDirection: 'row', <mask> alignItems: 'center', <mask> }, <mask> '.cardBody': { <mask> flexDirection: 'column', <mask> 'NativeBase.Text': { <mask> marginTop: 5, <mask> }, <mask> }, <mask> 'NativeBase.Body': { </s> Footer and Fab fixes for 2.0 and /backward </s> remove ...cardItemTheme(variables), </s> add ...cardItemTheme(variables), '.cardBody': { padding: -5, 'NativeBase.Text': { marginTop: 5, }, }, 'NativeBase.Icon': { paddingRight: 10, }, 'NativeBase.IconNB': { paddingRight: 10, }, </s> remove "_where": "/Users/sahusoft/Sites/projects/Try", </s> add "_where": "/Users/sahusoft/Sites/projects/NBKS", </s> remove "_resolved": "git+https://github.com/GeekyAnts/NativeBase.git#c9a94bb306844b52377afa265070dbe8d36fdc36", "_shasum": "ab587463e63750a79bbc23c875b0ab0ff29f30b7", </s> add "_resolved": "git+https://github.com/GeekyAnts/NativeBase.git#4601289ce558b9b398394232985d7853fdff796c", "_shasum": "62518c8afce391a31a460481e7c5aa632c245e1a", </s> remove if (item.type === Badge) { </s> add if (item.type.displayName === "Styled(Badge)") {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
theme/CardItem.js
...cardItemTheme(variables), '.cardBody': { padding: -5, 'NativeBase.Text': { marginTop: 5, }, }, 'NativeBase.Icon': { paddingRight: 10, }, 'NativeBase.IconNB': { paddingRight: 10, },
<mask> ...cardTheme(), <mask> }, <mask> <mask> 'NativeBase.CardItem': { <mask> ...cardItemTheme(variables), <mask> flexDirection: 'row', <mask> alignItems: 'center', <mask> }, <mask> <mask> 'NativeBase.CardItem1': { </s> Footer and Fab fixes for 2.0 and /backward </s> remove flexDirection: 'column', </s> add </s> remove "_where": "/Users/sahusoft/Sites/projects/Try", </s> add "_where": "/Users/sahusoft/Sites/projects/NBKS", </s> remove "_resolved": "git+https://github.com/GeekyAnts/NativeBase.git#c9a94bb306844b52377afa265070dbe8d36fdc36", "_shasum": "ab587463e63750a79bbc23c875b0ab0ff29f30b7", </s> add "_resolved": "git+https://github.com/GeekyAnts/NativeBase.git#4601289ce558b9b398394232985d7853fdff796c", "_shasum": "62518c8afce391a31a460481e7c5aa632c245e1a", </s> remove if (item.type === Badge) { </s> add if (item.type.displayName === "Styled(Badge)") {
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
theme/index.js
'NativeBase.Text': { '.note': { color: variables.listNoteColor, fontWeight: '200', }, alignSelf: 'center', },
<mask> 'NativeBase.CheckBox': { <mask> marginLeft: -10, <mask> marginRight: 10, <mask> }, <mask> }, <mask> <mask> 'NativeBase.ListItem1': { <mask> ...listItemTheme(variables), <mask> }, <mask> </s> Footer and Fab fixes for 2.0 and /backward </s> remove ...cardItemTheme(variables), </s> add ...cardItemTheme(variables), '.cardBody': { padding: -5, 'NativeBase.Text': { marginTop: 5, }, }, 'NativeBase.Icon': { paddingRight: 10, }, 'NativeBase.IconNB': { paddingRight: 10, }, </s> remove flexDirection: 'column', </s> add </s> remove "_where": "/Users/sahusoft/Sites/projects/Try", </s> add "_where": "/Users/sahusoft/Sites/projects/NBKS", </s> remove "_resolved": "git+https://github.com/GeekyAnts/NativeBase.git#c9a94bb306844b52377afa265070dbe8d36fdc36", "_shasum": "ab587463e63750a79bbc23c875b0ab0ff29f30b7", </s> add "_resolved": "git+https://github.com/GeekyAnts/NativeBase.git#4601289ce558b9b398394232985d7853fdff796c", "_shasum": "62518c8afce391a31a460481e7c5aa632c245e1a", </s> remove left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 15), </s> add left: (this.props.active === false) ? ((Platform.OS === 'ios') ? 8 : 8) : ((i * 50) + 65),
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7dfe3435bf54e2121b51a29c0c9449ce90a45207
theme/index.js
...transparentBtnCommon,
<mask> alignSelf: 'center', <mask> }, <mask> 'NativeBase.Button': { <mask> '.transparent': { <mask> 'NativeBase.Text': { <mask> fontSize: variables.DefaultFontSize - 4, <mask> color: variables.sTabBarActiveTextColor, <mask> }, <mask> 'NativeBase.Icon': { <mask> fontSize: variables.iconFontSize - 10, <mask> color: variables.sTabBarActiveTextColor, <mask> marginHorizontal: null, <mask> }, <mask> 'NativeBase.IconNB': { <mask> fontSize: variables.iconFontSize - 10, <mask> color: variables.sTabBarActiveTextColor, <mask> }, <mask> paddingVertical: null, <mask> paddingHorizontal: null, <mask> paddingRight: variables.listItemPadding + 5, <mask> }, <mask> }, <mask> flex: 1, <mask> flexDirection: 'row', </s> Attempt to improve code quality in file CardItem.js </s> remove 'NativeBase.Text': { fontSize: variables.DefaultFontSize - 4, color: variables.sTabBarActiveTextColor, }, 'NativeBase.Icon': { fontSize: variables.iconFontSize - 10, color: variables.sTabBarActiveTextColor, marginHorizontal: null, }, 'NativeBase.IconNB': { fontSize: variables.iconFontSize - 10, color: variables.sTabBarActiveTextColor, }, paddingVertical: null, paddingHorizontal: null, </s> add ...transparentBtnCommon </s> remove 'NativeBase.Text': { fontSize: variables.DefaultFontSize - 4, color: variables.sTabBarActiveTextColor, }, 'NativeBase.Icon': { fontSize: variables.iconFontSize - 10, color: variables.sTabBarActiveTextColor, marginHorizontal: null, }, 'NativeBase.IconNB': { fontSize: variables.iconFontSize - 10, color: variables.sTabBarActiveTextColor, }, paddingVertical: null, paddingHorizontal: null, </s> add ...transparentBtnCommon,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7e10c597562ad6139327a65d05dbf52fcb2b3857
src/theme/components/CardItem.js
...transparentBtnCommon,
<mask> }, <mask> }, <mask> 'NativeBase.Button': { <mask> '.transparent': { <mask> 'NativeBase.Text': { <mask> fontSize: variables.DefaultFontSize - 4, <mask> color: variables.sTabBarActiveTextColor, <mask> }, <mask> 'NativeBase.Icon': { <mask> fontSize: variables.iconFontSize - 10, <mask> color: variables.sTabBarActiveTextColor, <mask> marginHorizontal: null, <mask> }, <mask> 'NativeBase.IconNB': { <mask> fontSize: variables.iconFontSize - 10, <mask> color: variables.sTabBarActiveTextColor, <mask> }, <mask> paddingVertical: null, <mask> paddingHorizontal: null, <mask> paddingRight: variables.listItemPadding + 5, <mask> alignSelf: 'stretch', <mask> }, <mask> }, <mask> flex: 1, </s> Attempt to improve code quality in file CardItem.js </s> remove 'NativeBase.Text': { fontSize: variables.DefaultFontSize - 4, color: variables.sTabBarActiveTextColor, }, 'NativeBase.Icon': { fontSize: variables.iconFontSize - 10, color: variables.sTabBarActiveTextColor, marginHorizontal: null, }, 'NativeBase.IconNB': { fontSize: variables.iconFontSize - 10, color: variables.sTabBarActiveTextColor, }, paddingVertical: null, paddingHorizontal: null, </s> add ...transparentBtnCommon </s> remove 'NativeBase.Text': { fontSize: variables.DefaultFontSize - 4, color: variables.sTabBarActiveTextColor, }, 'NativeBase.Icon': { fontSize: variables.iconFontSize - 10, color: variables.sTabBarActiveTextColor, marginHorizontal: null, }, 'NativeBase.IconNB': { fontSize: variables.iconFontSize - 10, color: variables.sTabBarActiveTextColor, }, paddingVertical: null, paddingHorizontal: null, </s> add ...transparentBtnCommon,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7e10c597562ad6139327a65d05dbf52fcb2b3857
src/theme/components/CardItem.js
...transparentBtnCommon
<mask> alignSelf: null, <mask> }, <mask> 'NativeBase.Button': { <mask> '.transparent': { <mask> 'NativeBase.Text': { <mask> fontSize: variables.DefaultFontSize - 4, <mask> color: variables.sTabBarActiveTextColor, <mask> }, <mask> 'NativeBase.Icon': { <mask> fontSize: variables.iconFontSize - 10, <mask> color: variables.sTabBarActiveTextColor, <mask> marginHorizontal: null, <mask> }, <mask> 'NativeBase.IconNB': { <mask> fontSize: variables.iconFontSize - 10, <mask> color: variables.sTabBarActiveTextColor, <mask> }, <mask> paddingVertical: null, <mask> paddingHorizontal: null, <mask> }, <mask> alignSelf: null, <mask> }, <mask> 'NativeBase.Icon': { <mask> alignSelf: null, </s> Attempt to improve code quality in file CardItem.js </s> remove 'NativeBase.Text': { fontSize: variables.DefaultFontSize - 4, color: variables.sTabBarActiveTextColor, }, 'NativeBase.Icon': { fontSize: variables.iconFontSize - 10, color: variables.sTabBarActiveTextColor, marginHorizontal: null, }, 'NativeBase.IconNB': { fontSize: variables.iconFontSize - 10, color: variables.sTabBarActiveTextColor, }, paddingVertical: null, paddingHorizontal: null, </s> add ...transparentBtnCommon, </s> remove 'NativeBase.Text': { fontSize: variables.DefaultFontSize - 4, color: variables.sTabBarActiveTextColor, }, 'NativeBase.Icon': { fontSize: variables.iconFontSize - 10, color: variables.sTabBarActiveTextColor, marginHorizontal: null, }, 'NativeBase.IconNB': { fontSize: variables.iconFontSize - 10, color: variables.sTabBarActiveTextColor, }, paddingVertical: null, paddingHorizontal: null, </s> add ...transparentBtnCommon,
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7e10c597562ad6139327a65d05dbf52fcb2b3857
src/theme/components/CardItem.js
import { NativeBaseProvider, extendTheme, themeTools } from 'native-base'; import { Content } from './Content';
<mask> import React from 'react'; <mask> import { <mask> Heading, <mask> useColorMode, <mask> Button, <mask> HStack, <mask> Avatar, <mask> Center, <mask> useColorModeValue, <mask> } from 'native-base'; <mask> <mask> const LocalWrapper = ({ children }: any) => { <mask> return ( <mask> <Center <mask> height="100%" <mask> width="100%" <mask> bg={useColorModeValue('gray.200', 'gray.800')} <mask> > <mask> {children} <mask> </Center> <mask> ); <mask> }; <mask> <mask> export default function () { <mask> const { colorMode, toggleColorMode } = useColorMode(); <mask> return ( <mask> <LocalWrapper> </s> Added default dark mode example </s> remove const { colorMode, toggleColorMode } = useColorMode(); </s> add </s> remove <LocalWrapper> <Heading> I'm a Heading</Heading> <Button colorScheme={colorMode === 'light' ? 'blue' : 'red'} onPress={() => { toggleColorMode(); }} > Change mode </Button> <HStack space={2} mt={3}> <Avatar name="Sanket Sahu" borderWidth={2} source={{ uri: 'https://pbs.twimg.com/profile_images/1188747996843761665/8CiUdKZW_400x400.jpg', }} /> <Avatar name="Gaurav Guha" borderWidth={2} source={{ uri: 'https://pbs.twimg.com/profile_images/1177303899243343872/B0sUJIH0_400x400.jpg', }} /> </HStack> </LocalWrapper> </s> add <NativeBaseProvider theme={customTheme}> <Content /> </NativeBaseProvider> </s> remove import Wrapper from './../../components/Wrapper'; </s> add import { View, StyleSheet } from 'react-native'; </s> remove .add('Basic', () => <Basic />); </s> add .add('Basic', () => <Basic />) .add('DefaultMode', () => <DefaultMode />); const styles = StyleSheet.create({ wrapper: { position: 'absolute', top: 0, bottom: 0, left: 0, right: 0 }, });
[ "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7f355abd89758726f526b03cb10da92c854c9aaf
example/storybook/stories/theme/Mode/Basic.tsx
const customTheme = extendTheme({ components: { Heading: { baseStyle: (props: any) => { return { color: themeTools.mode('red.300', 'blue.300')(props), fontWeight: 'bold', }; }, }, }, });
<mask> import { NativeBaseProvider, extendTheme, themeTools } from 'native-base'; <mask> import { Content } from './Content'; <mask> <mask> export default function () { <mask> return ( <mask> <NativeBaseProvider theme={customTheme}> <mask> <Content /> <mask> </NativeBaseProvider> <mask> ); </s> Added default dark mode example </s> remove <LocalWrapper> <Heading> I'm a Heading</Heading> <Button colorScheme={colorMode === 'light' ? 'blue' : 'red'} onPress={() => { toggleColorMode(); }} > Change mode </Button> <HStack space={2} mt={3}> <Avatar name="Sanket Sahu" borderWidth={2} source={{ uri: 'https://pbs.twimg.com/profile_images/1188747996843761665/8CiUdKZW_400x400.jpg', }} /> <Avatar name="Gaurav Guha" borderWidth={2} source={{ uri: 'https://pbs.twimg.com/profile_images/1177303899243343872/B0sUJIH0_400x400.jpg', }} /> </HStack> </LocalWrapper> </s> add <NativeBaseProvider theme={customTheme}> <Content /> </NativeBaseProvider> </s> remove import { Heading, useColorMode, Button, HStack, Avatar, Center, useColorModeValue, } from 'native-base'; const LocalWrapper = ({ children }: any) => { return ( <Center height="100%" width="100%" bg={useColorModeValue('gray.200', 'gray.800')} > {children} </Center> ); }; </s> add import { NativeBaseProvider, extendTheme, themeTools } from 'native-base'; import { Content } from './Content'; </s> remove const { colorMode, toggleColorMode } = useColorMode(); </s> add </s> remove import Wrapper from './../../components/Wrapper'; </s> add import { View, StyleSheet } from 'react-native'; </s> remove .add('Basic', () => <Basic />); </s> add .add('Basic', () => <Basic />) .add('DefaultMode', () => <DefaultMode />); const styles = StyleSheet.create({ wrapper: { position: 'absolute', top: 0, bottom: 0, left: 0, right: 0 }, });
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7f355abd89758726f526b03cb10da92c854c9aaf
example/storybook/stories/theme/Mode/Basic.tsx
<mask> ); <mask> }; <mask> <mask> export default function () { <mask> const { colorMode, toggleColorMode } = useColorMode(); <mask> return ( <mask> <LocalWrapper> <mask> <Heading> I'm a Heading</Heading> <mask> <Button <mask> colorScheme={colorMode === 'light' ? 'blue' : 'red'} </s> Added default dark mode example </s> remove <LocalWrapper> <Heading> I'm a Heading</Heading> <Button colorScheme={colorMode === 'light' ? 'blue' : 'red'} onPress={() => { toggleColorMode(); }} > Change mode </Button> <HStack space={2} mt={3}> <Avatar name="Sanket Sahu" borderWidth={2} source={{ uri: 'https://pbs.twimg.com/profile_images/1188747996843761665/8CiUdKZW_400x400.jpg', }} /> <Avatar name="Gaurav Guha" borderWidth={2} source={{ uri: 'https://pbs.twimg.com/profile_images/1177303899243343872/B0sUJIH0_400x400.jpg', }} /> </HStack> </LocalWrapper> </s> add <NativeBaseProvider theme={customTheme}> <Content /> </NativeBaseProvider> </s> remove import { Heading, useColorMode, Button, HStack, Avatar, Center, useColorModeValue, } from 'native-base'; const LocalWrapper = ({ children }: any) => { return ( <Center height="100%" width="100%" bg={useColorModeValue('gray.200', 'gray.800')} > {children} </Center> ); }; </s> add import { NativeBaseProvider, extendTheme, themeTools } from 'native-base'; import { Content } from './Content'; </s> remove import Wrapper from './../../components/Wrapper'; </s> add import { View, StyleSheet } from 'react-native'; </s> remove .add('Basic', () => <Basic />); </s> add .add('Basic', () => <Basic />) .add('DefaultMode', () => <DefaultMode />); const styles = StyleSheet.create({ wrapper: { position: 'absolute', top: 0, bottom: 0, left: 0, right: 0 }, });
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7f355abd89758726f526b03cb10da92c854c9aaf
example/storybook/stories/theme/Mode/Basic.tsx
<NativeBaseProvider theme={customTheme}> <Content /> </NativeBaseProvider>
<mask> <mask> export default function () { <mask> const { colorMode, toggleColorMode } = useColorMode(); <mask> return ( <mask> <LocalWrapper> <mask> <Heading> I'm a Heading</Heading> <mask> <Button <mask> colorScheme={colorMode === 'light' ? 'blue' : 'red'} <mask> onPress={() => { <mask> toggleColorMode(); <mask> }} <mask> > <mask> Change mode <mask> </Button> <mask> <HStack space={2} mt={3}> <mask> <Avatar <mask> name="Sanket Sahu" <mask> borderWidth={2} <mask> source={{ <mask> uri: <mask> 'https://pbs.twimg.com/profile_images/1188747996843761665/8CiUdKZW_400x400.jpg', <mask> }} <mask> /> <mask> <Avatar <mask> name="Gaurav Guha" <mask> borderWidth={2} <mask> source={{ <mask> uri: <mask> 'https://pbs.twimg.com/profile_images/1177303899243343872/B0sUJIH0_400x400.jpg', <mask> }} <mask> /> <mask> </HStack> <mask> </LocalWrapper> <mask> ); <mask> } </s> Added default dark mode example </s> remove const { colorMode, toggleColorMode } = useColorMode(); </s> add </s> remove import { Heading, useColorMode, Button, HStack, Avatar, Center, useColorModeValue, } from 'native-base'; const LocalWrapper = ({ children }: any) => { return ( <Center height="100%" width="100%" bg={useColorModeValue('gray.200', 'gray.800')} > {children} </Center> ); }; </s> add import { NativeBaseProvider, extendTheme, themeTools } from 'native-base'; import { Content } from './Content'; </s> remove import Wrapper from './../../components/Wrapper'; </s> add import { View, StyleSheet } from 'react-native'; </s> remove .add('Basic', () => <Basic />); </s> add .add('Basic', () => <Basic />) .add('DefaultMode', () => <DefaultMode />); const styles = StyleSheet.create({ wrapper: { position: 'absolute', top: 0, bottom: 0, left: 0, right: 0 }, });
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7f355abd89758726f526b03cb10da92c854c9aaf
example/storybook/stories/theme/Mode/Basic.tsx
import { View, StyleSheet } from 'react-native';
<mask> import React from 'react'; <mask> import { storiesOf } from '@storybook/react-native'; <mask> import { withKnobs } from '@storybook/addon-knobs'; <mask> import Wrapper from './../../components/Wrapper'; <mask> import { extendTheme, themeTools } from 'native-base'; <mask> import Basic from './Basic'; <mask> <mask> const customTheme = extendTheme({ <mask> components: { </s> Added default dark mode example </s> remove import { Heading, useColorMode, Button, HStack, Avatar, Center, useColorModeValue, } from 'native-base'; const LocalWrapper = ({ children }: any) => { return ( <Center height="100%" width="100%" bg={useColorModeValue('gray.200', 'gray.800')} > {children} </Center> ); }; </s> add import { NativeBaseProvider, extendTheme, themeTools } from 'native-base'; import { Content } from './Content'; </s> remove const { colorMode, toggleColorMode } = useColorMode(); </s> add </s> remove <LocalWrapper> <Heading> I'm a Heading</Heading> <Button colorScheme={colorMode === 'light' ? 'blue' : 'red'} onPress={() => { toggleColorMode(); }} > Change mode </Button> <HStack space={2} mt={3}> <Avatar name="Sanket Sahu" borderWidth={2} source={{ uri: 'https://pbs.twimg.com/profile_images/1188747996843761665/8CiUdKZW_400x400.jpg', }} /> <Avatar name="Gaurav Guha" borderWidth={2} source={{ uri: 'https://pbs.twimg.com/profile_images/1177303899243343872/B0sUJIH0_400x400.jpg', }} /> </HStack> </LocalWrapper> </s> add <NativeBaseProvider theme={customTheme}> <Content /> </NativeBaseProvider> </s> remove .add('Basic', () => <Basic />); </s> add .add('Basic', () => <Basic />) .add('DefaultMode', () => <DefaultMode />); const styles = StyleSheet.create({ wrapper: { position: 'absolute', top: 0, bottom: 0, left: 0, right: 0 }, });
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7f355abd89758726f526b03cb10da92c854c9aaf
example/storybook/stories/theme/Mode/index.tsx
.add('Basic', () => <Basic />) .add('DefaultMode', () => <DefaultMode />); const styles = StyleSheet.create({ wrapper: { position: 'absolute', top: 0, bottom: 0, left: 0, right: 0 }, });
<mask> .addDecorator(withKnobs) <mask> .addDecorator((getStory: any) => ( <mask> <Wrapper theme={customTheme}>{getStory()}</Wrapper> <mask> )) <mask> .add('Basic', () => <Basic />); </s> Added default dark mode example </s> remove import { Heading, useColorMode, Button, HStack, Avatar, Center, useColorModeValue, } from 'native-base'; const LocalWrapper = ({ children }: any) => { return ( <Center height="100%" width="100%" bg={useColorModeValue('gray.200', 'gray.800')} > {children} </Center> ); }; </s> add import { NativeBaseProvider, extendTheme, themeTools } from 'native-base'; import { Content } from './Content'; </s> remove <LocalWrapper> <Heading> I'm a Heading</Heading> <Button colorScheme={colorMode === 'light' ? 'blue' : 'red'} onPress={() => { toggleColorMode(); }} > Change mode </Button> <HStack space={2} mt={3}> <Avatar name="Sanket Sahu" borderWidth={2} source={{ uri: 'https://pbs.twimg.com/profile_images/1188747996843761665/8CiUdKZW_400x400.jpg', }} /> <Avatar name="Gaurav Guha" borderWidth={2} source={{ uri: 'https://pbs.twimg.com/profile_images/1177303899243343872/B0sUJIH0_400x400.jpg', }} /> </HStack> </LocalWrapper> </s> add <NativeBaseProvider theme={customTheme}> <Content /> </NativeBaseProvider> </s> remove const { colorMode, toggleColorMode } = useColorMode(); </s> add </s> remove import Wrapper from './../../components/Wrapper'; </s> add import { View, StyleSheet } from 'react-native';
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/GeekyAnts/NativeBase/commit/7f355abd89758726f526b03cb10da92c854c9aaf
example/storybook/stories/theme/Mode/index.tsx
duration: 150
<mask> <mask> floatBack() { <mask> Animated.timing(this.state.topAnim, { <mask> toValue: 18, <mask> duration: 150, <mask> useNativeDriver: true <mask> }).start(); <mask> Animated.timing(this.state.opacAnim, { <mask> toValue: 1, <mask> duration: 150, <mask> useNativeDriver: true </s> Fixes crash of prop floatingLabel in Item (#2794) </s> remove duration: 150, useNativeDriver: true </s> add duration: 150 </s> remove duration: 150, useNativeDriver: true </s> add duration: 150 </s> remove duration: 150, useNativeDriver: true </s> add duration: 150
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7fc84b73bc8c66ec5542437ff7449bb0b3f73334
src/basic/Item.js
duration: 150
<mask> useNativeDriver: true <mask> }).start(); <mask> Animated.timing(this.state.opacAnim, { <mask> toValue: 1, <mask> duration: 150, <mask> useNativeDriver: true <mask> }).start(); <mask> } <mask> <mask> floatUp(e) { <mask> Animated.timing(this.state.topAnim, { </s> Fixes crash of prop floatingLabel in Item (#2794) </s> remove duration: 150, useNativeDriver: true </s> add duration: 150 </s> remove duration: 150, useNativeDriver: true </s> add duration: 150 </s> remove duration: 150, useNativeDriver: true </s> add duration: 150
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7fc84b73bc8c66ec5542437ff7449bb0b3f73334
src/basic/Item.js
duration: 150
<mask> <mask> floatUp(e) { <mask> Animated.timing(this.state.topAnim, { <mask> toValue: e || -22, <mask> duration: 150, <mask> useNativeDriver: true <mask> }).start(); <mask> Animated.timing(this.state.opacAnim, { <mask> toValue: 0.7, <mask> duration: 150, <mask> useNativeDriver: true </s> Fixes crash of prop floatingLabel in Item (#2794) </s> remove duration: 150, useNativeDriver: true </s> add duration: 150 </s> remove duration: 150, useNativeDriver: true </s> add duration: 150 </s> remove duration: 150, useNativeDriver: true </s> add duration: 150
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/GeekyAnts/NativeBase/commit/7fc84b73bc8c66ec5542437ff7449bb0b3f73334
src/basic/Item.js