docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
style: this.getInitialStyle().listItem
| <mask> };
<mask>
<mask> else
<mask> defaultProps = {
<mask> style: this.getInitialStyle().listItem,
<mask> key: keyIndex++
<mask> };
<mask>
<mask> return computeProps(this.props, defaultProps);
<mask> }
<mask>
</s> fix issues arising from component keys </s> remove style: this.getInitialStyle().listItem,
key: keyIndex++
</s> add style: this.getInitialStyle().listItem </s> remove style: this.getInitialStyle().listItemDivider,
key: keyIndex++
</s> add style: this.getInitialStyle().listItemDivider
</s> remove style: this.getInitialStyle().listItemDivider,
key: keyIndex++
</s> add style: this.getInitialStyle().listItemDivider </s> remove key: keyIndex++
</s> add key: 'inpGroup' </s> remove foregroundColor: this.getContextForegroundColor(),
key: keyIndex++
</s> add foregroundColor: this.getContextForegroundColor() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
<View key='listItem' style={{alignSelf: 'stretch', flex:1}}>
| <mask>
<mask> var newChildren = [];
<mask> if(!Array.isArray(this.props.children) && !this.inlinePresent() && !this.stackedPresent() && !this.insetPresent()) {
<mask> newChildren.push(
<mask> <View key={keyIndex++} style={{alignSelf: 'stretch', flex:1}}>
<mask> {React.cloneElement(this.props.children, this.getChildProps(this.props.children))}
<mask> </View>
<mask> );
<mask> }
<mask>
</s> fix issues arising from component keys </s> remove <View key={keyIndex++} style={{justifyContent: 'flex-start'}}>
</s> add <View key='cardItem' style={{justifyContent: 'flex-start'}}> </s> remove newChildren = React.Children.map(this.props.children, (child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren = React.Children.map(this.props.children, (child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i}); </s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove <View key={keyIndex++} style={ this.notePresent() ? this.getRightStyle().right : this.squareThumbs() ? this.getRightStyle().right3 : this.getRightStyle().right2 }>
{childrenArray.slice(1).map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add <View key='cardItem' style={ this.notePresent() ? this.getRightStyle().right : this.squareThumbs() ? this.getRightStyle().right3 : this.getRightStyle().right2 }>
{childrenArray.slice(1).map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i}); </s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'row', justifyContent: 'space-between', flex: 1}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| <mask> if(item.type == Icon) {
<mask> return true;
<mask> }
<mask> });
<mask> newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
<mask> newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'space-between', flex: 1}} >
<mask> {childrenArray.map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
<mask> })}
<mask> </View>);
<mask> }
<mask> else if (this.props.iconRight && !this.props.iconLeft) {
<mask>
</s> fix issues arising from component keys </s> remove newChildren.push(<View key={keyIndex++} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between'}} >
{childrenArray.slice(0,2).map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between'}} >
{childrenArray.slice(0,2).map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(React.cloneElement(badgeElement[0], this.getChildProps(badgeElement[0])));
</s> add newChildren.push(React.cloneElement(badgeElement[0], {...this.getChildProps(badgeElement[0]), key: 'listItem1'}));
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
newChildren.push(<View key='listItem0' >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| <mask> return true;
<mask> }
<mask> });
<mask>
<mask> newChildren.push(<View key={keyIndex++} >
<mask> {childrenArray.map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
<mask> })}
<mask> </View>);
<mask> newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
<mask> }
<mask> else if (this.badgePresent()) {
</s> fix issues arising from component keys </s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'space-between', flex: 1}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'row', justifyContent: 'space-between', flex: 1}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem1'}));
</s> remove newChildren.push(<View key={keyIndex++} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between'}} >
{childrenArray.slice(0,2).map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between'}} >
{childrenArray.slice(0,2).map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem1'}));
| <mask> {childrenArray.map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
<mask> })}
<mask> </View>);
<mask> newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
<mask> }
<mask> else if (this.badgePresent()) {
<mask>
<mask> var badgeElement = _.remove(childrenArray, function(item) {
<mask> if(item.type == Badge) {
</s> fix issues arising from component keys </s> remove newChildren.push(<View key={keyIndex++} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(React.cloneElement(badgeElement[0], this.getChildProps(badgeElement[0])));
</s> add newChildren.push(React.cloneElement(badgeElement[0], {...this.getChildProps(badgeElement[0]), key: 'listItem1'}));
</s> remove newChildren.push(React.cloneElement(iconElement[1], this.getChildProps(iconElement[1])));
</s> add newChildren.push(React.cloneElement(iconElement[1], {...this.getChildProps(iconElement[1]), key: 'listItem1'}));
</s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'space-between', flex: 1}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'row', justifyContent: 'space-between', flex: 1}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
newChildren.push(<View key='listItem0' >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| <mask> return true;
<mask> }
<mask> });
<mask>
<mask> newChildren.push(<View key={keyIndex++} >
<mask> {childrenArray.map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
<mask> })}
<mask> </View>);
<mask> newChildren.push(React.cloneElement(badgeElement[0], this.getChildProps(badgeElement[0])));
<mask> }
<mask> else if (this.props.iconRight && this.props.iconLeft) {
</s> fix issues arising from component keys </s> remove newChildren.push(React.cloneElement(badgeElement[0], this.getChildProps(badgeElement[0])));
</s> add newChildren.push(React.cloneElement(badgeElement[0], {...this.getChildProps(badgeElement[0]), key: 'listItem1'}));
</s> remove newChildren.push(<View key={keyIndex++} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'space-between', flex: 1}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'row', justifyContent: 'space-between', flex: 1}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between'}} >
{childrenArray.slice(0,2).map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between'}} >
{childrenArray.slice(0,2).map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
newChildren.push(React.cloneElement(badgeElement[0], {...this.getChildProps(badgeElement[0]), key: 'listItem1'}));
| <mask> {childrenArray.map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
<mask> })}
<mask> </View>);
<mask> newChildren.push(React.cloneElement(badgeElement[0], this.getChildProps(badgeElement[0])));
<mask> }
<mask> else if (this.props.iconRight && this.props.iconLeft) {
<mask>
<mask> iconElement = _.filter(childrenArray, function(item) {
<mask> if(item.type == Icon) {
</s> fix issues arising from component keys </s> remove newChildren.push(<View key={keyIndex++} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem1'}));
</s> remove newChildren.push(React.cloneElement(iconElement[1], this.getChildProps(iconElement[1])));
</s> add newChildren.push(React.cloneElement(iconElement[1], {...this.getChildProps(iconElement[1]), key: 'listItem1'}));
</s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'space-between', flex: 1}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'row', justifyContent: 'space-between', flex: 1}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
newChildren.push(<View key='listItem0' style={{flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between'}} >
{childrenArray.slice(0,2).map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| <mask> return true;
<mask> }
<mask> });
<mask>
<mask> newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between'}} >
<mask> {childrenArray.slice(0,2).map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
<mask> })}
<mask> </View>);
<mask> newChildren.push(React.cloneElement(iconElement[1], this.getChildProps(iconElement[1])));
<mask> }
<mask>
</s> fix issues arising from component keys </s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'space-between', flex: 1}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'row', justifyContent: 'space-between', flex: 1}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'center', flex: 1, borderBottomWidth: 1, borderColor: this.getTheme().listBorderColor, alignItems: 'center', height: this.getTheme().inputHeightBase+5 }} >
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', justifyContent: 'center', flex: 1, borderBottomWidth: 1, borderColor: this.getTheme().listBorderColor, alignItems: 'center', height: this.getTheme().inputHeightBase+5 }} >
</s> remove newChildren.push(React.cloneElement(iconElement[1], this.getChildProps(iconElement[1])));
</s> add newChildren.push(React.cloneElement(iconElement[1], {...this.getChildProps(iconElement[1]), key: 'listItem1'}));
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'flex-start', flex: 1, alignSelf: 'stretch', alignItems: 'center', height: this.getTheme().inputHeightBase, paddingLeft: 10 }} >
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', justifyContent: 'flex-start', flex: 1, alignSelf: 'stretch', alignItems: 'center', height: this.getTheme().inputHeightBase, paddingLeft: 10 }} >
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
newChildren.push(React.cloneElement(iconElement[1], {...this.getChildProps(iconElement[1]), key: 'listItem1'}));
| <mask> {childrenArray.slice(0,2).map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
<mask> })}
<mask> </View>);
<mask> newChildren.push(React.cloneElement(iconElement[1], this.getChildProps(iconElement[1])));
<mask> }
<mask>
<mask> else if (this.thumbnailPresent()) {
<mask>
<mask> iconElement = _.remove(childrenArray, function(item) {
</s> fix issues arising from component keys </s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem1'}));
</s> remove newChildren.push(React.cloneElement(badgeElement[0], this.getChildProps(badgeElement[0])));
</s> add newChildren.push(React.cloneElement(badgeElement[0], {...this.getChildProps(badgeElement[0]), key: 'listItem1'}));
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between'}} >
{childrenArray.slice(0,2).map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', alignItems: 'center', justifyContent: 'space-between'}} >
{childrenArray.slice(0,2).map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| <mask> if(item.type == Thumbnail) {
<mask> return true;
<mask> }
<mask> });
<mask> newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
<mask> newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
<mask> {childrenArray.map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
<mask> })}
<mask> </View>);
<mask> }
<mask> else if (this.inputPresent() && !this.inlinePresent() && !this.stackedPresent() && !this.insetPresent()) {
<mask>
</s> fix issues arising from component keys </s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'space-between', flex: 1}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'row', justifyContent: 'space-between', flex: 1}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'center', flex: 1, borderBottomWidth: 1, borderColor: this.getTheme().listBorderColor, alignItems: 'center', height: this.getTheme().inputHeightBase+5 }} >
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', justifyContent: 'center', flex: 1, borderBottomWidth: 1, borderColor: this.getTheme().listBorderColor, alignItems: 'center', height: this.getTheme().inputHeightBase+5 }} >
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
newChildren.push(<View key='listItem0' style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| <mask> }
<mask> else if (this.inputPresent() && !this.inlinePresent() && !this.stackedPresent() && !this.insetPresent()) {
<mask>
<mask>
<mask> newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
<mask> {childrenArray.map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
<mask> })}
<mask> </View>);
<mask> }
<mask> else if (this.inlinePresent()) {
<mask>
</s> fix issues arising from component keys </s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'center', flex: 1, borderBottomWidth: 1, borderColor: this.getTheme().listBorderColor, alignItems: 'center', height: this.getTheme().inputHeightBase+5 }} >
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', justifyContent: 'center', flex: 1, borderBottomWidth: 1, borderColor: this.getTheme().listBorderColor, alignItems: 'center', height: this.getTheme().inputHeightBase+5 }} >
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
newChildren.push(<View key='listItem0' style={{flexDirection: 'row', justifyContent: 'center', flex: 1, borderBottomWidth: 1, borderColor: this.getTheme().listBorderColor, alignItems: 'center', height: this.getTheme().inputHeightBase+5 }} >
| <mask> </View>);
<mask> }
<mask> else if (this.inlinePresent()) {
<mask>
<mask> newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'center', flex: 1, borderBottomWidth: 1, borderColor: this.getTheme().listBorderColor, alignItems: 'center', height: this.getTheme().inputHeightBase+5 }} >
<mask> <Text style={{color: this.getContextForegroundColor() ? this.getContextForegroundColor() : this.getTheme().inputColorPlaceholder }}>{this.props.children.props.children.props.label}</Text>
<mask> </View>);
<mask> newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
<mask> {childrenArray.map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
</s> fix issues arising from component keys </s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'flex-start', flex: 1, alignSelf: 'stretch', alignItems: 'center', height: this.getTheme().inputHeightBase, paddingLeft: 10 }} >
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', justifyContent: 'flex-start', flex: 1, alignSelf: 'stretch', alignItems: 'center', height: this.getTheme().inputHeightBase, paddingLeft: 10 }} >
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 2 , padding: 0}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 2 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
newChildren.push(<View key='listItem1' style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| <mask>
<mask> newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'center', flex: 1, borderBottomWidth: 1, borderColor: this.getTheme().listBorderColor, alignItems: 'center', height: this.getTheme().inputHeightBase+5 }} >
<mask> <Text style={{color: this.getContextForegroundColor() ? this.getContextForegroundColor() : this.getTheme().inputColorPlaceholder }}>{this.props.children.props.children.props.label}</Text>
<mask> </View>);
<mask> newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
<mask> {childrenArray.map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
<mask> })}
<mask> </View>);
<mask> }
<mask> else if (this.stackedPresent()) {
<mask>
</s> fix issues arising from component keys </s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'center', flex: 1, borderBottomWidth: 1, borderColor: this.getTheme().listBorderColor, alignItems: 'center', height: this.getTheme().inputHeightBase+5 }} >
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', justifyContent: 'center', flex: 1, borderBottomWidth: 1, borderColor: this.getTheme().listBorderColor, alignItems: 'center', height: this.getTheme().inputHeightBase+5 }} >
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'flex-start', flex: 1, alignSelf: 'stretch', alignItems: 'center', height: this.getTheme().inputHeightBase, paddingLeft: 10 }} >
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', justifyContent: 'flex-start', flex: 1, alignSelf: 'stretch', alignItems: 'center', height: this.getTheme().inputHeightBase, paddingLeft: 10 }} >
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 2 , padding: 0}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 2 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(React.cloneElement(iconElement[0], this.getChildProps(iconElement[0])));
newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(React.cloneElement(iconElement[0], {...this.getChildProps(iconElement[0]), key: 'listItem0'}));
newChildren.push(<View key='listItem1' style={{flexDirection: 'column', paddingLeft: 15, alignSelf: (this.squareThumbs()) ? 'flex-start' : 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
newChildren.push(<View key='listItem0' style={{flexDirection: 'row', justifyContent: 'flex-start', flex: 1, alignSelf: 'stretch', alignItems: 'center', height: this.getTheme().inputHeightBase, paddingLeft: 10 }} >
| <mask> </View>);
<mask> }
<mask> else if (this.stackedPresent()) {
<mask>
<mask> newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'flex-start', flex: 1, alignSelf: 'stretch', alignItems: 'center', height: this.getTheme().inputHeightBase, paddingLeft: 10 }} >
<mask> <Text style={{color: this.getContextForegroundColor() ? this.getContextForegroundColor() : this.getTheme().inputColorPlaceholder, textAlign: 'left', fontSize: 17 }}>{this.props.children.props.children.props.label}</Text>
<mask> </View>);
<mask> newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 2 , padding: 0}} >
<mask> {childrenArray.map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
</s> fix issues arising from component keys </s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 2 , padding: 0}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 2 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'center', flex: 1, borderBottomWidth: 1, borderColor: this.getTheme().listBorderColor, alignItems: 'center', height: this.getTheme().inputHeightBase+5 }} >
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', justifyContent: 'center', flex: 1, borderBottomWidth: 1, borderColor: this.getTheme().listBorderColor, alignItems: 'center', height: this.getTheme().inputHeightBase+5 }} >
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
newChildren.push(<View key='listItem1' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 2 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| <mask>
<mask> newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'flex-start', flex: 1, alignSelf: 'stretch', alignItems: 'center', height: this.getTheme().inputHeightBase, paddingLeft: 10 }} >
<mask> <Text style={{color: this.getContextForegroundColor() ? this.getContextForegroundColor() : this.getTheme().inputColorPlaceholder, textAlign: 'left', fontSize: 17 }}>{this.props.children.props.children.props.label}</Text>
<mask> </View>);
<mask> newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 2 , padding: 0}} >
<mask> {childrenArray.map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
<mask> })}
<mask> </View>);
<mask> }
<mask> else if (this.insetPresent()) {
<mask>
</s> fix issues arising from component keys </s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'flex-start', flex: 1, alignSelf: 'stretch', alignItems: 'center', height: this.getTheme().inputHeightBase, paddingLeft: 10 }} >
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', justifyContent: 'flex-start', flex: 1, alignSelf: 'stretch', alignItems: 'center', height: this.getTheme().inputHeightBase, paddingLeft: 10 }} >
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'center', flex: 1, borderBottomWidth: 1, borderColor: this.getTheme().listBorderColor, alignItems: 'center', height: this.getTheme().inputHeightBase+5 }} >
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', justifyContent: 'center', flex: 1, borderBottomWidth: 1, borderColor: this.getTheme().listBorderColor, alignItems: 'center', height: this.getTheme().inputHeightBase+5 }} >
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
newChildren.push(<View key='listItem0' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| <mask> }
<mask> else if (this.insetPresent()) {
<mask>
<mask>
<mask> newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
<mask> {childrenArray.map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
<mask> })}
<mask> </View>);
<mask> newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
<mask> {childrenArray.map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
</s> fix issues arising from component keys </s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 2 , padding: 0}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 2 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'flex-start', flex: 1, alignSelf: 'stretch', alignItems: 'center', height: this.getTheme().inputHeightBase, paddingLeft: 10 }} >
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', justifyContent: 'flex-start', flex: 1, alignSelf: 'stretch', alignItems: 'center', height: this.getTheme().inputHeightBase, paddingLeft: 10 }} >
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
newChildren.push(<View key='listItem1' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| <mask> {childrenArray.map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
<mask> })}
<mask> </View>);
<mask> newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
<mask> {childrenArray.map((child) => {
<mask> return React.cloneElement(child, this.getChildProps(child));
<mask> })}
<mask> </View>);
<mask> }
<mask> }
<mask>
</s> fix issues arising from component keys </s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 1 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', alignSelf: 'stretch', flex: 2 , padding: 0}} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'row', alignSelf: 'stretch', flex: 2 , padding: 0}} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'row', justifyContent: 'flex-start', flex: 1, alignSelf: 'stretch', alignItems: 'center', height: this.getTheme().inputHeightBase, paddingLeft: 10 }} >
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'row', justifyContent: 'flex-start', flex: 1, alignSelf: 'stretch', alignItems: 'center', height: this.getTheme().inputHeightBase, paddingLeft: 10 }} >
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem0' style={{flexDirection: 'column', alignSelf: 'center', flex: 1 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
</s> remove newChildren.push(<View key={keyIndex++} style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child) => {
return React.cloneElement(child, this.getChildProps(child));
</s> add newChildren.push(<View key='listItem1' style={{flexDirection: 'column', alignSelf: 'center', flex: 2 }} >
{childrenArray.map((child, i) => {
return React.cloneElement(child, {...this.getChildProps(child), key: i});
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/995d5398aaeb4a1d39267a923c3393c74c65a1e3 | Components/Widgets/ListItem.js |
alignSelf: 'center', | <mask> button: {
<mask> padding: 10,
<mask> justifyContent: 'space-around',
<mask> flexDirection: 'row',
<mask> marginBottom: 10,
<mask> backgroundColor: this.getTheme().btnPrimaryBg,
<mask> }
<mask> }
<mask> }
<mask> prepareRootProps() {
</s> buttons props and lisitem border </s> remove getInitialStyle() {
return {
listItem: {
borderBottomWidth: 1,
padding: 8,
borderRadius: 1,
paddingRight: 10,
paddingLeft: 10,
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
alignItems: 'center',
borderColor: this.getTheme().listBorderColor
},
listItemDivider: {
borderBottomWidth: 1,
padding: 7,
backgroundColor: '#ddd',
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
borderColor: this.getTheme().listBorderColor
},
itemText: {
fontSize: 18,
},
itemIcon: {
fontSize: 27,
color: 'black'
},
itemButton: {
width: 50
},
itemNote: {
fontSize: 15,
color: '#58575C',
alignSelf: 'center',
fontWeight: '100',
flex: 1,
textAlign: 'right',
},
itemSubNote: {
fontSize: 15,
color: '#999'
},
thumbnail: {
alignSelf: 'center',
},
fullImage: {
width: 300,
height: 300
}
}
}
</s> add getInitialStyle() {
return {
listItem: {
borderBottomWidth: 1,
padding: 8,
borderRadius: 1,
paddingRight: 10,
paddingLeft: 10,
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
alignItems: 'center',
borderColor: this.getTheme().listBorderColor
},
listItemDivider: {
borderBottomWidth: 1,
padding: 7,
backgroundColor: '#ddd',
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
borderColor: this.getTheme().listBorderColor
},
itemText: {
fontSize: 18,
},
itemIcon: {
fontSize: 27,
color: 'black'
},
itemNote: {
fontSize: 15,
color: '#58575C',
alignSelf: 'center',
fontWeight: '100',
flex: 1,
textAlign: 'right',
},
itemSubNote: {
fontSize: 15,
color: '#999'
},
thumbnail: {
alignSelf: 'center',
},
fullImage: {
width: 300,
height: 300
}
}
} </s> remove style: this.getChildStyle(child)
</s> add style: this.getInitialStyle().itemButton
}
}
else if(child.type == Text) {
if(child.props.note && this.thumbnailPresent()) {
defaultProps = {
style: this.getInitialStyle().itemSubNote
}
}
else if(child.props.note) {
defaultProps = {
style: this.getInitialStyle().itemNote
}
}
else {
defaultProps = {
style: this.getInitialStyle().itemText
}
}
}
else if(child.type == Icon) {
defaultProps = {
style: this.getInitialStyle().itemIcon
}
}
else if(child.type == Thumbnail) {
defaultProps = {
style: this.getInitialStyle().thumbnail </s> remove style: this.getChildStyle(child)
</s> add style: {} </s> remove
getChildStyle(child) {
var mergedStyle = {};
if(child.type == Icon) {
return _.merge(mergedStyle, this.getInitialStyle().itemIcon, child.props.style);
}
else if(child.type == Text) {
if(child.props.note && this.thumbnailPresent())
return _.merge(mergedStyle, this.getInitialStyle().itemSubNote, child.props.style);
else if(child.props.note)
return _.merge(mergedStyle, this.getInitialStyle().itemNote, child.props.style);
else
return _.merge(mergedStyle, this.getInitialStyle().itemText, child.props.style);
}
else if(child.type == Button) {
return _.merge(mergedStyle, this.getInitialStyle().itemButton, child.props.style);
}
else if(child.type == Thumbnail) {
return _.merge(mergedStyle, this.getInitialStyle().thumbnail, child.props.style);
}
else if(child.type == Image && !Array.isArray(this.props.children))
return _.merge(mergedStyle, this.getInitialStyle().fullImage, child.props.style);
else
return child.props.style;
}
</s> add </s> remove style: this.getChildStyle(child)
</s> add style: this.getInitialStyle().fullImage | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/99b6bc6fb6ea5b13ab538da26a54b5965b228e59 | Components/Widgets/Button.js |
getInitialStyle() {
return {
listItem: {
borderBottomWidth: 1,
padding: 8,
borderRadius: 1,
paddingRight: 10,
paddingLeft: 10,
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
alignItems: 'center',
borderColor: this.getTheme().listBorderColor
},
listItemDivider: {
borderBottomWidth: 1,
padding: 7,
backgroundColor: '#ddd',
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
borderColor: this.getTheme().listBorderColor
},
itemText: {
fontSize: 18,
},
itemIcon: {
fontSize: 27,
color: 'black'
},
itemNote: {
fontSize: 15,
color: '#58575C',
alignSelf: 'center',
fontWeight: '100',
flex: 1,
textAlign: 'right',
},
itemSubNote: {
fontSize: 15,
color: '#999'
},
thumbnail: {
alignSelf: 'center',
},
fullImage: {
width: 300,
height: 300
}
}
} | <mask> import Thumbnail from './Thumbnail';
<mask>
<mask> export default class ListItemNB extends NativeBaseComponent {
<mask>
<mask> getInitialStyle() {
<mask> return {
<mask> listItem: {
<mask> borderBottomWidth: 1,
<mask> padding: 8,
<mask> borderRadius: 1,
<mask> paddingRight: 10,
<mask> paddingLeft: 10,
<mask> flex: 1,
<mask> justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
<mask> flexDirection: 'row',
<mask> alignItems: 'center',
<mask> borderColor: this.getTheme().listBorderColor
<mask> },
<mask> listItemDivider: {
<mask> borderBottomWidth: 1,
<mask> padding: 7,
<mask> backgroundColor: '#ddd',
<mask> flex: 1,
<mask> justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
<mask> flexDirection: 'row',
<mask> borderColor: this.getTheme().listBorderColor
<mask> },
<mask> itemText: {
<mask> fontSize: 18,
<mask> },
<mask> itemIcon: {
<mask> fontSize: 27,
<mask> color: 'black'
<mask> },
<mask> itemButton: {
<mask> width: 50
<mask> },
<mask> itemNote: {
<mask> fontSize: 15,
<mask> color: '#58575C',
<mask> alignSelf: 'center',
<mask> fontWeight: '100',
<mask> flex: 1,
<mask> textAlign: 'right',
<mask>
<mask> },
<mask> itemSubNote: {
<mask> fontSize: 15,
<mask> color: '#999'
<mask> },
<mask> thumbnail: {
<mask> alignSelf: 'center',
<mask> },
<mask> fullImage: {
<mask> width: 300,
<mask> height: 300
<mask> }
<mask> }
<mask> }
<mask> getRightStyle() {
<mask> return {
<mask> right : {
<mask> flex: 1,
<mask> paddingLeft: 10
</s> buttons props and lisitem border </s> remove marginBottom: 10,
</s> add alignSelf: 'center', </s> remove style: this.getChildStyle(child)
</s> add style: this.getInitialStyle().itemButton
}
}
else if(child.type == Text) {
if(child.props.note && this.thumbnailPresent()) {
defaultProps = {
style: this.getInitialStyle().itemSubNote
}
}
else if(child.props.note) {
defaultProps = {
style: this.getInitialStyle().itemNote
}
}
else {
defaultProps = {
style: this.getInitialStyle().itemText
}
}
}
else if(child.type == Icon) {
defaultProps = {
style: this.getInitialStyle().itemIcon
}
}
else if(child.type == Thumbnail) {
defaultProps = {
style: this.getInitialStyle().thumbnail </s> remove
getChildStyle(child) {
var mergedStyle = {};
if(child.type == Icon) {
return _.merge(mergedStyle, this.getInitialStyle().itemIcon, child.props.style);
}
else if(child.type == Text) {
if(child.props.note && this.thumbnailPresent())
return _.merge(mergedStyle, this.getInitialStyle().itemSubNote, child.props.style);
else if(child.props.note)
return _.merge(mergedStyle, this.getInitialStyle().itemNote, child.props.style);
else
return _.merge(mergedStyle, this.getInitialStyle().itemText, child.props.style);
}
else if(child.type == Button) {
return _.merge(mergedStyle, this.getInitialStyle().itemButton, child.props.style);
}
else if(child.type == Thumbnail) {
return _.merge(mergedStyle, this.getInitialStyle().thumbnail, child.props.style);
}
else if(child.type == Image && !Array.isArray(this.props.children))
return _.merge(mergedStyle, this.getInitialStyle().fullImage, child.props.style);
else
return child.props.style;
}
</s> add </s> remove style: this.getChildStyle(child)
</s> add style: this.getInitialStyle().fullImage </s> remove style: this.getChildStyle(child)
</s> add style: {} | [
"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",
"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",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/99b6bc6fb6ea5b13ab538da26a54b5965b228e59 | Components/Widgets/ListItem.js |
<mask>
<mask> return buttonComponentPresent;
<mask> }
<mask>
<mask>
<mask> getChildStyle(child) {
<mask> var mergedStyle = {};
<mask> if(child.type == Icon) {
<mask> return _.merge(mergedStyle, this.getInitialStyle().itemIcon, child.props.style);
<mask> }
<mask>
<mask> else if(child.type == Text) {
<mask> if(child.props.note && this.thumbnailPresent())
<mask> return _.merge(mergedStyle, this.getInitialStyle().itemSubNote, child.props.style);
<mask> else if(child.props.note)
<mask> return _.merge(mergedStyle, this.getInitialStyle().itemNote, child.props.style);
<mask> else
<mask> return _.merge(mergedStyle, this.getInitialStyle().itemText, child.props.style);
<mask> }
<mask>
<mask> else if(child.type == Button) {
<mask> return _.merge(mergedStyle, this.getInitialStyle().itemButton, child.props.style);
<mask> }
<mask>
<mask> else if(child.type == Thumbnail) {
<mask> return _.merge(mergedStyle, this.getInitialStyle().thumbnail, child.props.style);
<mask> }
<mask>
<mask> else if(child.type == Image && !Array.isArray(this.props.children))
<mask> return _.merge(mergedStyle, this.getInitialStyle().fullImage, child.props.style);
<mask> else
<mask> return child.props.style;
<mask> }
<mask>
<mask>
<mask> getChildProps(child) {
<mask> var defaultProps = {};
<mask> if(child.type == Image && !Array.isArray(this.props.children)) {
<mask> defaultProps = {
<mask> resizeMode: 'stretch',
</s> buttons props and lisitem border </s> remove style: this.getChildStyle(child)
</s> add style: this.getInitialStyle().fullImage </s> remove style: this.getChildStyle(child)
</s> add style: this.getInitialStyle().itemButton
}
}
else if(child.type == Text) {
if(child.props.note && this.thumbnailPresent()) {
defaultProps = {
style: this.getInitialStyle().itemSubNote
}
}
else if(child.props.note) {
defaultProps = {
style: this.getInitialStyle().itemNote
}
}
else {
defaultProps = {
style: this.getInitialStyle().itemText
}
}
}
else if(child.type == Icon) {
defaultProps = {
style: this.getInitialStyle().itemIcon
}
}
else if(child.type == Thumbnail) {
defaultProps = {
style: this.getInitialStyle().thumbnail </s> remove style: this.getChildStyle(child)
</s> add style: {} </s> remove marginBottom: 10,
</s> add alignSelf: 'center', </s> remove getInitialStyle() {
return {
listItem: {
borderBottomWidth: 1,
padding: 8,
borderRadius: 1,
paddingRight: 10,
paddingLeft: 10,
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
alignItems: 'center',
borderColor: this.getTheme().listBorderColor
},
listItemDivider: {
borderBottomWidth: 1,
padding: 7,
backgroundColor: '#ddd',
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
borderColor: this.getTheme().listBorderColor
},
itemText: {
fontSize: 18,
},
itemIcon: {
fontSize: 27,
color: 'black'
},
itemButton: {
width: 50
},
itemNote: {
fontSize: 15,
color: '#58575C',
alignSelf: 'center',
fontWeight: '100',
flex: 1,
textAlign: 'right',
},
itemSubNote: {
fontSize: 15,
color: '#999'
},
thumbnail: {
alignSelf: 'center',
},
fullImage: {
width: 300,
height: 300
}
}
}
</s> add getInitialStyle() {
return {
listItem: {
borderBottomWidth: 1,
padding: 8,
borderRadius: 1,
paddingRight: 10,
paddingLeft: 10,
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
alignItems: 'center',
borderColor: this.getTheme().listBorderColor
},
listItemDivider: {
borderBottomWidth: 1,
padding: 7,
backgroundColor: '#ddd',
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
borderColor: this.getTheme().listBorderColor
},
itemText: {
fontSize: 18,
},
itemIcon: {
fontSize: 27,
color: 'black'
},
itemNote: {
fontSize: 15,
color: '#58575C',
alignSelf: 'center',
fontWeight: '100',
flex: 1,
textAlign: 'right',
},
itemSubNote: {
fontSize: 15,
color: '#999'
},
thumbnail: {
alignSelf: 'center',
},
fullImage: {
width: 300,
height: 300
}
}
} | [
"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",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/99b6bc6fb6ea5b13ab538da26a54b5965b228e59 | Components/Widgets/ListItem.js |
|
style: this.getInitialStyle().fullImage | <mask> var defaultProps = {};
<mask> if(child.type == Image && !Array.isArray(this.props.children)) {
<mask> defaultProps = {
<mask> resizeMode: 'stretch',
<mask> style: this.getChildStyle(child)
<mask> }
<mask> }
<mask> else if(child.type == Button) {
<mask> defaultProps = {
<mask> small: true,
</s> buttons props and lisitem border </s> remove
getChildStyle(child) {
var mergedStyle = {};
if(child.type == Icon) {
return _.merge(mergedStyle, this.getInitialStyle().itemIcon, child.props.style);
}
else if(child.type == Text) {
if(child.props.note && this.thumbnailPresent())
return _.merge(mergedStyle, this.getInitialStyle().itemSubNote, child.props.style);
else if(child.props.note)
return _.merge(mergedStyle, this.getInitialStyle().itemNote, child.props.style);
else
return _.merge(mergedStyle, this.getInitialStyle().itemText, child.props.style);
}
else if(child.type == Button) {
return _.merge(mergedStyle, this.getInitialStyle().itemButton, child.props.style);
}
else if(child.type == Thumbnail) {
return _.merge(mergedStyle, this.getInitialStyle().thumbnail, child.props.style);
}
else if(child.type == Image && !Array.isArray(this.props.children))
return _.merge(mergedStyle, this.getInitialStyle().fullImage, child.props.style);
else
return child.props.style;
}
</s> add </s> remove style: this.getChildStyle(child)
</s> add style: this.getInitialStyle().itemButton
}
}
else if(child.type == Text) {
if(child.props.note && this.thumbnailPresent()) {
defaultProps = {
style: this.getInitialStyle().itemSubNote
}
}
else if(child.props.note) {
defaultProps = {
style: this.getInitialStyle().itemNote
}
}
else {
defaultProps = {
style: this.getInitialStyle().itemText
}
}
}
else if(child.type == Icon) {
defaultProps = {
style: this.getInitialStyle().itemIcon
}
}
else if(child.type == Thumbnail) {
defaultProps = {
style: this.getInitialStyle().thumbnail </s> remove style: this.getChildStyle(child)
</s> add style: {} </s> remove getInitialStyle() {
return {
listItem: {
borderBottomWidth: 1,
padding: 8,
borderRadius: 1,
paddingRight: 10,
paddingLeft: 10,
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
alignItems: 'center',
borderColor: this.getTheme().listBorderColor
},
listItemDivider: {
borderBottomWidth: 1,
padding: 7,
backgroundColor: '#ddd',
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
borderColor: this.getTheme().listBorderColor
},
itemText: {
fontSize: 18,
},
itemIcon: {
fontSize: 27,
color: 'black'
},
itemButton: {
width: 50
},
itemNote: {
fontSize: 15,
color: '#58575C',
alignSelf: 'center',
fontWeight: '100',
flex: 1,
textAlign: 'right',
},
itemSubNote: {
fontSize: 15,
color: '#999'
},
thumbnail: {
alignSelf: 'center',
},
fullImage: {
width: 300,
height: 300
}
}
}
</s> add getInitialStyle() {
return {
listItem: {
borderBottomWidth: 1,
padding: 8,
borderRadius: 1,
paddingRight: 10,
paddingLeft: 10,
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
alignItems: 'center',
borderColor: this.getTheme().listBorderColor
},
listItemDivider: {
borderBottomWidth: 1,
padding: 7,
backgroundColor: '#ddd',
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
borderColor: this.getTheme().listBorderColor
},
itemText: {
fontSize: 18,
},
itemIcon: {
fontSize: 27,
color: 'black'
},
itemNote: {
fontSize: 15,
color: '#58575C',
alignSelf: 'center',
fontWeight: '100',
flex: 1,
textAlign: 'right',
},
itemSubNote: {
fontSize: 15,
color: '#999'
},
thumbnail: {
alignSelf: 'center',
},
fullImage: {
width: 300,
height: 300
}
}
} </s> remove marginBottom: 10,
</s> add alignSelf: 'center', | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/99b6bc6fb6ea5b13ab538da26a54b5965b228e59 | Components/Widgets/ListItem.js |
style: this.getInitialStyle().itemButton
}
}
else if(child.type == Text) {
if(child.props.note && this.thumbnailPresent()) {
defaultProps = {
style: this.getInitialStyle().itemSubNote
}
}
else if(child.props.note) {
defaultProps = {
style: this.getInitialStyle().itemNote
}
}
else {
defaultProps = {
style: this.getInitialStyle().itemText
}
}
}
else if(child.type == Icon) {
defaultProps = {
style: this.getInitialStyle().itemIcon
}
}
else if(child.type == Thumbnail) {
defaultProps = {
style: this.getInitialStyle().thumbnail | <mask> }
<mask> else if(child.type == Button) {
<mask> defaultProps = {
<mask> small: true,
<mask> style: this.getChildStyle(child)
<mask> }
<mask> }
<mask> else {
<mask> defaultProps = {
<mask> style: this.getChildStyle(child)
</s> buttons props and lisitem border </s> remove style: this.getChildStyle(child)
</s> add style: this.getInitialStyle().fullImage </s> remove
getChildStyle(child) {
var mergedStyle = {};
if(child.type == Icon) {
return _.merge(mergedStyle, this.getInitialStyle().itemIcon, child.props.style);
}
else if(child.type == Text) {
if(child.props.note && this.thumbnailPresent())
return _.merge(mergedStyle, this.getInitialStyle().itemSubNote, child.props.style);
else if(child.props.note)
return _.merge(mergedStyle, this.getInitialStyle().itemNote, child.props.style);
else
return _.merge(mergedStyle, this.getInitialStyle().itemText, child.props.style);
}
else if(child.type == Button) {
return _.merge(mergedStyle, this.getInitialStyle().itemButton, child.props.style);
}
else if(child.type == Thumbnail) {
return _.merge(mergedStyle, this.getInitialStyle().thumbnail, child.props.style);
}
else if(child.type == Image && !Array.isArray(this.props.children))
return _.merge(mergedStyle, this.getInitialStyle().fullImage, child.props.style);
else
return child.props.style;
}
</s> add </s> remove style: this.getChildStyle(child)
</s> add style: {} </s> remove marginBottom: 10,
</s> add alignSelf: 'center', </s> remove getInitialStyle() {
return {
listItem: {
borderBottomWidth: 1,
padding: 8,
borderRadius: 1,
paddingRight: 10,
paddingLeft: 10,
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
alignItems: 'center',
borderColor: this.getTheme().listBorderColor
},
listItemDivider: {
borderBottomWidth: 1,
padding: 7,
backgroundColor: '#ddd',
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
borderColor: this.getTheme().listBorderColor
},
itemText: {
fontSize: 18,
},
itemIcon: {
fontSize: 27,
color: 'black'
},
itemButton: {
width: 50
},
itemNote: {
fontSize: 15,
color: '#58575C',
alignSelf: 'center',
fontWeight: '100',
flex: 1,
textAlign: 'right',
},
itemSubNote: {
fontSize: 15,
color: '#999'
},
thumbnail: {
alignSelf: 'center',
},
fullImage: {
width: 300,
height: 300
}
}
}
</s> add getInitialStyle() {
return {
listItem: {
borderBottomWidth: 1,
padding: 8,
borderRadius: 1,
paddingRight: 10,
paddingLeft: 10,
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
alignItems: 'center',
borderColor: this.getTheme().listBorderColor
},
listItemDivider: {
borderBottomWidth: 1,
padding: 7,
backgroundColor: '#ddd',
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
borderColor: this.getTheme().listBorderColor
},
itemText: {
fontSize: 18,
},
itemIcon: {
fontSize: 27,
color: 'black'
},
itemNote: {
fontSize: 15,
color: '#58575C',
alignSelf: 'center',
fontWeight: '100',
flex: 1,
textAlign: 'right',
},
itemSubNote: {
fontSize: 15,
color: '#999'
},
thumbnail: {
alignSelf: 'center',
},
fullImage: {
width: 300,
height: 300
}
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/99b6bc6fb6ea5b13ab538da26a54b5965b228e59 | Components/Widgets/ListItem.js |
style: {} | <mask> }
<mask> }
<mask> else {
<mask> defaultProps = {
<mask> style: this.getChildStyle(child)
<mask> }
<mask> }
<mask>
<mask> return computeProps(child.props, defaultProps);
<mask> }
</s> buttons props and lisitem border </s> remove style: this.getChildStyle(child)
</s> add style: this.getInitialStyle().itemButton
}
}
else if(child.type == Text) {
if(child.props.note && this.thumbnailPresent()) {
defaultProps = {
style: this.getInitialStyle().itemSubNote
}
}
else if(child.props.note) {
defaultProps = {
style: this.getInitialStyle().itemNote
}
}
else {
defaultProps = {
style: this.getInitialStyle().itemText
}
}
}
else if(child.type == Icon) {
defaultProps = {
style: this.getInitialStyle().itemIcon
}
}
else if(child.type == Thumbnail) {
defaultProps = {
style: this.getInitialStyle().thumbnail </s> remove
getChildStyle(child) {
var mergedStyle = {};
if(child.type == Icon) {
return _.merge(mergedStyle, this.getInitialStyle().itemIcon, child.props.style);
}
else if(child.type == Text) {
if(child.props.note && this.thumbnailPresent())
return _.merge(mergedStyle, this.getInitialStyle().itemSubNote, child.props.style);
else if(child.props.note)
return _.merge(mergedStyle, this.getInitialStyle().itemNote, child.props.style);
else
return _.merge(mergedStyle, this.getInitialStyle().itemText, child.props.style);
}
else if(child.type == Button) {
return _.merge(mergedStyle, this.getInitialStyle().itemButton, child.props.style);
}
else if(child.type == Thumbnail) {
return _.merge(mergedStyle, this.getInitialStyle().thumbnail, child.props.style);
}
else if(child.type == Image && !Array.isArray(this.props.children))
return _.merge(mergedStyle, this.getInitialStyle().fullImage, child.props.style);
else
return child.props.style;
}
</s> add </s> remove style: this.getChildStyle(child)
</s> add style: this.getInitialStyle().fullImage </s> remove marginBottom: 10,
</s> add alignSelf: 'center', </s> remove getInitialStyle() {
return {
listItem: {
borderBottomWidth: 1,
padding: 8,
borderRadius: 1,
paddingRight: 10,
paddingLeft: 10,
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
alignItems: 'center',
borderColor: this.getTheme().listBorderColor
},
listItemDivider: {
borderBottomWidth: 1,
padding: 7,
backgroundColor: '#ddd',
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
borderColor: this.getTheme().listBorderColor
},
itemText: {
fontSize: 18,
},
itemIcon: {
fontSize: 27,
color: 'black'
},
itemButton: {
width: 50
},
itemNote: {
fontSize: 15,
color: '#58575C',
alignSelf: 'center',
fontWeight: '100',
flex: 1,
textAlign: 'right',
},
itemSubNote: {
fontSize: 15,
color: '#999'
},
thumbnail: {
alignSelf: 'center',
},
fullImage: {
width: 300,
height: 300
}
}
}
</s> add getInitialStyle() {
return {
listItem: {
borderBottomWidth: 1,
padding: 8,
borderRadius: 1,
paddingRight: 10,
paddingLeft: 10,
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
alignItems: 'center',
borderColor: this.getTheme().listBorderColor
},
listItemDivider: {
borderBottomWidth: 1,
padding: 7,
backgroundColor: '#ddd',
flex: 1,
justifyContent: (this.buttonPresent()) ? 'space-between' : 'flex-start',
flexDirection: 'row',
borderColor: this.getTheme().listBorderColor
},
itemText: {
fontSize: 18,
},
itemIcon: {
fontSize: 27,
color: 'black'
},
itemNote: {
fontSize: 15,
color: '#58575C',
alignSelf: 'center',
fontWeight: '100',
flex: 1,
textAlign: 'right',
},
itemSubNote: {
fontSize: 15,
color: '#999'
},
thumbnail: {
alignSelf: 'center',
},
fullImage: {
width: 300,
height: 300
}
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/99b6bc6fb6ea5b13ab538da26a54b5965b228e59 | Components/Widgets/ListItem.js |
badgePadding: 0, | <mask>
<mask> // Badge
<mask> badgeBg: "#ED1727",
<mask> badgeColor: "#fff",
<mask> badgePadding: platform === "ios" ? 3 : 0,
<mask>
<mask> // Button
<mask> btnFontFamily: platform === "ios" ? "Roboto" : "Roboto_medium",
<mask> btnDisabledBg: "#b5b5b5",
<mask> buttonPadding: 6,
</s> Removed platform dependency in file
variables/material.js </s> remove btnFontFamily: platform === "ios" ? "Roboto" : "Roboto_medium",
</s> add btnFontFamily: "Roboto", </s> remove radioBtnLineHeight: platform === "ios" ? 29 : 24,
</s> add radioBtnLineHeight: 24, </s> remove titleFontfamily: platform === "ios" ? "Roboto" : "Roboto_medium",
</s> add titleFontfamily: "Roboto", </s> remove toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
toolbarHeight: platform === "ios" ? (isIphoneX ? 88 : 64) : 56,
toolbarSearchIconSize: platform === "ios" ? 20 : 23,
</s> add toolbarDefaultBg: "#3F51B5",
toolbarHeight: 56,
toolbarSearchIconSize: 23, </s> remove CheckboxPaddingBottom: platform === "ios" ? 0 : 5,
CheckboxIconSize: platform === "ios" ? 18 : 14,
CheckboxIconMarginTop: platform === "ios" ? undefined : 1,
CheckboxFontSize: platform === "ios" ? 21 : 18,
</s> add CheckboxPaddingBottom: 5,
CheckboxIconSize: 14,
CheckboxIconMarginTop: 1,
CheckboxFontSize: 18, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a7b2b7bbdcff3f2baccdf48c996c005434cf8b7 | src/theme/variables/material.js |
btnFontFamily: "Roboto", | <mask> badgeColor: "#fff",
<mask> badgePadding: platform === "ios" ? 3 : 0,
<mask>
<mask> // Button
<mask> btnFontFamily: platform === "ios" ? "Roboto" : "Roboto_medium",
<mask> btnDisabledBg: "#b5b5b5",
<mask> buttonPadding: 6,
<mask> get btnPrimaryBg() {
<mask> return this.brandPrimary;
<mask> },
</s> Removed platform dependency in file
variables/material.js </s> remove badgePadding: platform === "ios" ? 3 : 0,
</s> add badgePadding: 0, </s> remove return platform === "ios" ? this.fontSizeBase * 1.1 : this.fontSizeBase - 1;
</s> add return this.fontSizeBase - 1; </s> remove searchBarHeight: platform === "ios" ? 30 : 40,
searchBarInputHeight: platform === "ios" ? 30 : 50,
</s> add searchBarHeight: 40,
searchBarInputHeight: 50, </s> remove titleFontfamily: platform === "ios" ? "Roboto" : "Roboto_medium",
</s> add titleFontfamily: "Roboto", </s> remove toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
toolbarHeight: platform === "ios" ? (isIphoneX ? 88 : 64) : 56,
toolbarSearchIconSize: platform === "ios" ? 20 : 23,
</s> add toolbarDefaultBg: "#3F51B5",
toolbarHeight: 56,
toolbarSearchIconSize: 23, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a7b2b7bbdcff3f2baccdf48c996c005434cf8b7 | src/theme/variables/material.js |
return this.fontSizeBase - 1; | <mask> get btnWarningColor() {
<mask> return this.inverseTextColor;
<mask> },
<mask> get btnTextSize() {
<mask> return platform === "ios" ? this.fontSizeBase * 1.1 : this.fontSizeBase - 1;
<mask> },
<mask> get btnTextSizeLarge() {
<mask> return this.fontSizeBase * 1.5;
<mask> },
<mask> get btnTextSizeSmall() {
</s> Removed platform dependency in file
variables/material.js </s> remove btnFontFamily: platform === "ios" ? "Roboto" : "Roboto_medium",
</s> add btnFontFamily: "Roboto", </s> remove searchBarHeight: platform === "ios" ? 30 : 40,
searchBarInputHeight: platform === "ios" ? 30 : 50,
</s> add searchBarHeight: 40,
searchBarInputHeight: 50, </s> remove titleFontfamily: platform === "ios" ? "Roboto" : "Roboto_medium",
</s> add titleFontfamily: "Roboto", </s> remove iconFontSize: platform === "ios" ? 30 : 28,
iconHeaderSize: platform === "ios" ? 29 : 24,
</s> add iconFontSize: 28,
iconHeaderSize: 24, </s> remove toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
toolbarHeight: platform === "ios" ? (isIphoneX ? 88 : 64) : 56,
toolbarSearchIconSize: platform === "ios" ? 20 : 23,
</s> add toolbarDefaultBg: "#3F51B5",
toolbarHeight: 56,
toolbarSearchIconSize: 23, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a7b2b7bbdcff3f2baccdf48c996c005434cf8b7 | src/theme/variables/material.js |
CheckboxPaddingBottom: 5,
CheckboxIconSize: 14,
CheckboxIconMarginTop: 1,
CheckboxFontSize: 18, | <mask> // CheckBox
<mask> CheckboxRadius: 0,
<mask> CheckboxBorderWidth: 2,
<mask> CheckboxPaddingLeft: 2,
<mask> CheckboxPaddingBottom: platform === "ios" ? 0 : 5,
<mask> CheckboxIconSize: platform === "ios" ? 18 : 14,
<mask> CheckboxIconMarginTop: platform === "ios" ? undefined : 1,
<mask> CheckboxFontSize: platform === "ios" ? 21 : 18,
<mask> DefaultFontSize: 17,
<mask> checkboxBgColor: "#039BE5",
<mask> checkboxSize: 20,
<mask> checkboxTickColor: "#fff",
<mask>
</s> Removed platform dependency in file
variables/material.js </s> remove toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
toolbarHeight: platform === "ios" ? (isIphoneX ? 88 : 64) : 56,
toolbarSearchIconSize: platform === "ios" ? 20 : 23,
</s> add toolbarDefaultBg: "#3F51B5",
toolbarHeight: 56,
toolbarSearchIconSize: 23, </s> remove searchBarHeight: platform === "ios" ? 30 : 40,
searchBarInputHeight: platform === "ios" ? 30 : 50,
</s> add searchBarHeight: 40,
searchBarInputHeight: 50, </s> remove badgePadding: platform === "ios" ? 3 : 0,
</s> add badgePadding: 0, </s> remove iconFontSize: platform === "ios" ? 30 : 28,
iconHeaderSize: platform === "ios" ? 29 : 24,
</s> add iconFontSize: 28,
iconHeaderSize: 24, </s> remove btnFontFamily: platform === "ios" ? "Roboto" : "Roboto_medium",
</s> add btnFontFamily: "Roboto", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a7b2b7bbdcff3f2baccdf48c996c005434cf8b7 | src/theme/variables/material.js |
tabBarTextSize: 11, | <mask> footerPaddingBottom: isIphoneX ? 34 : 0,
<mask>
<mask> // FooterTab
<mask> tabBarTextColor: "#fff",
<mask> tabBarTextSize: platform === "ios" ? 14 : 11,
<mask> activeTab: "#fff",
<mask> sTabBarActiveTextColor: "#007aff",
<mask> tabBarActiveTextColor: "#fff",
<mask> tabActiveBgColor: "#3F51B5",
<mask>
</s> Removed platform dependency in file
variables/material.js </s> remove toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
toolbarHeight: platform === "ios" ? (isIphoneX ? 88 : 64) : 56,
toolbarSearchIconSize: platform === "ios" ? 20 : 23,
</s> add toolbarDefaultBg: "#3F51B5",
toolbarHeight: 56,
toolbarSearchIconSize: 23, </s> remove badgePadding: platform === "ios" ? 3 : 0,
</s> add badgePadding: 0, </s> remove searchBarHeight: platform === "ios" ? 30 : 40,
searchBarInputHeight: platform === "ios" ? 30 : 50,
</s> add searchBarHeight: 40,
searchBarInputHeight: 50, </s> remove radioBtnLineHeight: platform === "ios" ? 29 : 24,
</s> add radioBtnLineHeight: 24, </s> remove btnFontFamily: platform === "ios" ? "Roboto" : "Roboto_medium",
</s> add btnFontFamily: "Roboto", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a7b2b7bbdcff3f2baccdf48c996c005434cf8b7 | src/theme/variables/material.js |
toolbarDefaultBg: "#3F51B5",
toolbarHeight: 56,
toolbarSearchIconSize: 23, | <mask> tabActiveBgColor: "#3F51B5",
<mask>
<mask> // Header
<mask> toolbarBtnColor: "#fff",
<mask> toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
<mask> toolbarHeight: platform === "ios" ? (isIphoneX ? 88 : 64) : 56,
<mask> toolbarSearchIconSize: platform === "ios" ? 20 : 23,
<mask> toolbarInputColor: "#fff",
<mask> searchBarHeight: platform === "ios" ? 30 : 40,
<mask> searchBarInputHeight: platform === "ios" ? 30 : 50,
<mask> toolbarBtnTextColor: "#fff",
<mask> toolbarDefaultBorder: "#3F51B5",
</s> Removed platform dependency in file
variables/material.js </s> remove searchBarHeight: platform === "ios" ? 30 : 40,
searchBarInputHeight: platform === "ios" ? 30 : 50,
</s> add searchBarHeight: 40,
searchBarInputHeight: 50, </s> remove radioBtnLineHeight: platform === "ios" ? 29 : 24,
</s> add radioBtnLineHeight: 24, </s> remove tabBarTextSize: platform === "ios" ? 14 : 11,
</s> add tabBarTextSize: 11, </s> remove CheckboxPaddingBottom: platform === "ios" ? 0 : 5,
CheckboxIconSize: platform === "ios" ? 18 : 14,
CheckboxIconMarginTop: platform === "ios" ? undefined : 1,
CheckboxFontSize: platform === "ios" ? 21 : 18,
</s> add CheckboxPaddingBottom: 5,
CheckboxIconSize: 14,
CheckboxIconMarginTop: 1,
CheckboxFontSize: 18, </s> remove iconFontSize: platform === "ios" ? 30 : 28,
iconHeaderSize: platform === "ios" ? 29 : 24,
</s> add iconFontSize: 28,
iconHeaderSize: 24, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a7b2b7bbdcff3f2baccdf48c996c005434cf8b7 | src/theme/variables/material.js |
searchBarHeight: 40,
searchBarInputHeight: 50, | <mask> toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
<mask> toolbarHeight: platform === "ios" ? (isIphoneX ? 88 : 64) : 56,
<mask> toolbarSearchIconSize: platform === "ios" ? 20 : 23,
<mask> toolbarInputColor: "#fff",
<mask> searchBarHeight: platform === "ios" ? 30 : 40,
<mask> searchBarInputHeight: platform === "ios" ? 30 : 50,
<mask> toolbarBtnTextColor: "#fff",
<mask> toolbarDefaultBorder: "#3F51B5",
<mask> iosStatusbar: "light-content",
<mask> get statusBarColor() {
<mask> return color(this.toolbarDefaultBg)
</s> Removed platform dependency in file
variables/material.js </s> remove toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
toolbarHeight: platform === "ios" ? (isIphoneX ? 88 : 64) : 56,
toolbarSearchIconSize: platform === "ios" ? 20 : 23,
</s> add toolbarDefaultBg: "#3F51B5",
toolbarHeight: 56,
toolbarSearchIconSize: 23, </s> remove btnFontFamily: platform === "ios" ? "Roboto" : "Roboto_medium",
</s> add btnFontFamily: "Roboto", </s> remove radioBtnLineHeight: platform === "ios" ? 29 : 24,
</s> add radioBtnLineHeight: 24, </s> remove CheckboxPaddingBottom: platform === "ios" ? 0 : 5,
CheckboxIconSize: platform === "ios" ? 18 : 14,
CheckboxIconMarginTop: platform === "ios" ? undefined : 1,
CheckboxFontSize: platform === "ios" ? 21 : 18,
</s> add CheckboxPaddingBottom: 5,
CheckboxIconSize: 14,
CheckboxIconMarginTop: 1,
CheckboxFontSize: 18, </s> remove iconFontSize: platform === "ios" ? 30 : 28,
iconHeaderSize: platform === "ios" ? 29 : 24,
</s> add iconFontSize: 28,
iconHeaderSize: 24, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a7b2b7bbdcff3f2baccdf48c996c005434cf8b7 | src/theme/variables/material.js |
iconFontSize: 28,
iconHeaderSize: 24, | <mask> },
<mask>
<mask> // Icon
<mask> iconFamily: "Ionicons",
<mask> iconFontSize: platform === "ios" ? 30 : 28,
<mask> iconHeaderSize: platform === "ios" ? 29 : 24,
<mask>
<mask> // InputGroup
<mask> inputFontSize: 17,
<mask> inputBorderColor: "#D9D5DC",
<mask> inputSuccessBorderColor: "#2b8339",
</s> Removed platform dependency in file
variables/material.js </s> remove radioBtnLineHeight: platform === "ios" ? 29 : 24,
</s> add radioBtnLineHeight: 24, </s> remove radioBtnSize: platform === "ios" ? 25 : 23,
</s> add radioBtnSize: 23, </s> remove toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
toolbarHeight: platform === "ios" ? (isIphoneX ? 88 : 64) : 56,
toolbarSearchIconSize: platform === "ios" ? 20 : 23,
</s> add toolbarDefaultBg: "#3F51B5",
toolbarHeight: 56,
toolbarSearchIconSize: 23, </s> remove CheckboxPaddingBottom: platform === "ios" ? 0 : 5,
CheckboxIconSize: platform === "ios" ? 18 : 14,
CheckboxIconMarginTop: platform === "ios" ? undefined : 1,
CheckboxFontSize: platform === "ios" ? 21 : 18,
</s> add CheckboxPaddingBottom: 5,
CheckboxIconSize: 14,
CheckboxIconMarginTop: 1,
CheckboxFontSize: 18, </s> remove searchBarHeight: platform === "ios" ? 30 : 40,
searchBarInputHeight: platform === "ios" ? 30 : 50,
</s> add searchBarHeight: 40,
searchBarInputHeight: 50, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a7b2b7bbdcff3f2baccdf48c996c005434cf8b7 | src/theme/variables/material.js |
lineHeight: 24, | <mask> btnLineHeight: 19,
<mask> lineHeightH1: 32,
<mask> lineHeightH2: 27,
<mask> lineHeightH3: 22,
<mask> lineHeight: platform === "ios" ? 20 : 24,
<mask>
<mask> // List
<mask> listBg: "transparent",
<mask> listBorderColor: "#c9c9c9",
<mask> listDividerBg: "#f4f4f4",
</s> Removed platform dependency in file
variables/material.js </s> remove listItemPadding: platform === "ios" ? 10 : 12,
</s> add listItemPadding: 12, </s> remove radioBtnLineHeight: platform === "ios" ? 29 : 24,
</s> add radioBtnLineHeight: 24, </s> remove titleFontfamily: platform === "ios" ? "Roboto" : "Roboto_medium",
</s> add titleFontfamily: "Roboto", </s> remove toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
toolbarHeight: platform === "ios" ? (isIphoneX ? 88 : 64) : 56,
toolbarSearchIconSize: platform === "ios" ? 20 : 23,
</s> add toolbarDefaultBg: "#3F51B5",
toolbarHeight: 56,
toolbarSearchIconSize: 23, </s> remove iconFontSize: platform === "ios" ? 30 : 28,
iconHeaderSize: platform === "ios" ? 29 : 24,
</s> add iconFontSize: 28,
iconHeaderSize: 24, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a7b2b7bbdcff3f2baccdf48c996c005434cf8b7 | src/theme/variables/material.js |
listItemPadding: 12, | <mask> listBg: "transparent",
<mask> listBorderColor: "#c9c9c9",
<mask> listDividerBg: "#f4f4f4",
<mask> listBtnUnderlayColor: "#DDD",
<mask> listItemPadding: platform === "ios" ? 10 : 12,
<mask> listNoteColor: "#808080",
<mask> listNoteSize: 13,
<mask>
<mask> // Progress Bar
<mask> defaultProgressColor: "#E4202D",
</s> Removed platform dependency in file
variables/material.js </s> remove lineHeight: platform === "ios" ? 20 : 24,
</s> add lineHeight: 24, </s> remove radioBtnSize: platform === "ios" ? 25 : 23,
</s> add radioBtnSize: 23, </s> remove toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
toolbarHeight: platform === "ios" ? (isIphoneX ? 88 : 64) : 56,
toolbarSearchIconSize: platform === "ios" ? 20 : 23,
</s> add toolbarDefaultBg: "#3F51B5",
toolbarHeight: 56,
toolbarSearchIconSize: 23, </s> remove badgePadding: platform === "ios" ? 3 : 0,
</s> add badgePadding: 0, </s> remove radioBtnLineHeight: platform === "ios" ? 29 : 24,
</s> add radioBtnLineHeight: 24, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a7b2b7bbdcff3f2baccdf48c996c005434cf8b7 | src/theme/variables/material.js |
radioBtnSize: 23, | <mask> defaultProgressColor: "#E4202D",
<mask> inverseProgressColor: "#1A191B",
<mask>
<mask> // Radio Button
<mask> radioBtnSize: platform === "ios" ? 25 : 23,
<mask> radioSelectedColorAndroid: "#5067FF",
<mask> radioBtnLineHeight: platform === "ios" ? 29 : 24,
<mask> radioColor: this.brandPrimary,
<mask>
<mask> // Segment
</s> Removed platform dependency in file
variables/material.js </s> remove radioBtnLineHeight: platform === "ios" ? 29 : 24,
</s> add radioBtnLineHeight: 24, </s> remove iconFontSize: platform === "ios" ? 30 : 28,
iconHeaderSize: platform === "ios" ? 29 : 24,
</s> add iconFontSize: 28,
iconHeaderSize: 24, </s> remove listItemPadding: platform === "ios" ? 10 : 12,
</s> add listItemPadding: 12, </s> remove toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
toolbarHeight: platform === "ios" ? (isIphoneX ? 88 : 64) : 56,
toolbarSearchIconSize: platform === "ios" ? 20 : 23,
</s> add toolbarDefaultBg: "#3F51B5",
toolbarHeight: 56,
toolbarSearchIconSize: 23, </s> remove badgePadding: platform === "ios" ? 3 : 0,
</s> add badgePadding: 0, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a7b2b7bbdcff3f2baccdf48c996c005434cf8b7 | src/theme/variables/material.js |
radioBtnLineHeight: 24, | <mask>
<mask> // Radio Button
<mask> radioBtnSize: platform === "ios" ? 25 : 23,
<mask> radioSelectedColorAndroid: "#5067FF",
<mask> radioBtnLineHeight: platform === "ios" ? 29 : 24,
<mask> radioColor: this.brandPrimary,
<mask>
<mask> // Segment
<mask> segmentBackgroundColor: "#3F51B5",
<mask> segmentActiveBackgroundColor: "#fff",
</s> Removed platform dependency in file
variables/material.js </s> remove radioBtnSize: platform === "ios" ? 25 : 23,
</s> add radioBtnSize: 23, </s> remove toolbarDefaultBg: platform === "ios" ? "#F8F8F8" : "#3F51B5",
toolbarHeight: platform === "ios" ? (isIphoneX ? 88 : 64) : 56,
toolbarSearchIconSize: platform === "ios" ? 20 : 23,
</s> add toolbarDefaultBg: "#3F51B5",
toolbarHeight: 56,
toolbarSearchIconSize: 23, </s> remove iconFontSize: platform === "ios" ? 30 : 28,
iconHeaderSize: platform === "ios" ? 29 : 24,
</s> add iconFontSize: 28,
iconHeaderSize: 24, </s> remove searchBarHeight: platform === "ios" ? 30 : 40,
searchBarInputHeight: platform === "ios" ? 30 : 50,
</s> add searchBarHeight: 40,
searchBarInputHeight: 50, </s> remove badgePadding: platform === "ios" ? 3 : 0,
</s> add badgePadding: 0, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a7b2b7bbdcff3f2baccdf48c996c005434cf8b7 | src/theme/variables/material.js |
titleFontfamily: "Roboto", | <mask> return this.textColor;
<mask> },
<mask>
<mask> // Title
<mask> titleFontfamily: platform === "ios" ? "Roboto" : "Roboto_medium",
<mask> titleFontSize: 19,
<mask> subTitleFontSize: 14,
<mask> subtitleColor: "#FFF",
<mask> titleFontColor: "#FFF",
<mask>
</s> Removed platform dependency in file
variables/material.js </s> remove btnFontFamily: platform === "ios" ? "Roboto" : "Roboto_medium",
</s> add btnFontFamily: "Roboto", </s> remove badgePadding: platform === "ios" ? 3 : 0,
</s> add badgePadding: 0, </s> remove CheckboxPaddingBottom: platform === "ios" ? 0 : 5,
CheckboxIconSize: platform === "ios" ? 18 : 14,
CheckboxIconMarginTop: platform === "ios" ? undefined : 1,
CheckboxFontSize: platform === "ios" ? 21 : 18,
</s> add CheckboxPaddingBottom: 5,
CheckboxIconSize: 14,
CheckboxIconMarginTop: 1,
CheckboxFontSize: 18, </s> remove return platform === "ios" ? this.fontSizeBase * 1.1 : this.fontSizeBase - 1;
</s> add return this.fontSizeBase - 1; </s> remove lineHeight: platform === "ios" ? 20 : 24,
</s> add lineHeight: 24, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a7b2b7bbdcff3f2baccdf48c996c005434cf8b7 | src/theme/variables/material.js |
if(this.props.onSwiping) | <mask> }},{key:'swipeRight',value:function swipeRight()
<mask>
<mask>
<mask> {var _this3=this;
<mask> if(this.props.onSwiping){
<mask> this.props.onSwiping('right');
<mask> }
<mask> setTimeout(function(){
<mask> _reactNative.Animated.timing(
<mask> _this3.state.fadeAnim,
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove }
</s> add </s> remove }
</s> add </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) </s> remove }
</s> add </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/basic/DeckSwiper.js |
<mask>
<mask> {var _this3=this;
<mask> if(this.props.onSwiping){
<mask> this.props.onSwiping('right');
<mask> }
<mask> setTimeout(function(){
<mask> _reactNative.Animated.timing(
<mask> _this3.state.fadeAnim,
<mask> {toValue:1}).
<mask> start();
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) </s> remove }
</s> add </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) </s> remove }
</s> add </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/basic/DeckSwiper.js |
|
if(this.props.onSwiping) | <mask> },300);
<mask> }},{key:'swipeLeft',value:function swipeLeft()
<mask>
<mask> {var _this4=this;
<mask> if(this.props.onSwiping){
<mask> this.props.onSwiping('left');
<mask> }
<mask> setTimeout(function(){
<mask> _reactNative.Animated.timing(
<mask> _this4.state.fadeAnim,
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove }
</s> add </s> remove }
</s> add </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) </s> remove }
</s> add </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/basic/DeckSwiper.js |
<mask>
<mask> {var _this4=this;
<mask> if(this.props.onSwiping){
<mask> this.props.onSwiping('left');
<mask> }
<mask> setTimeout(function(){
<mask> _reactNative.Animated.timing(
<mask> _this4.state.fadeAnim,
<mask> {toValue:1}).
<mask> start();
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) </s> remove }
</s> add </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) </s> remove }
</s> add </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/basic/DeckSwiper.js |
|
onMoveShouldSetPanResponderCapture:function onMoveShouldSetPanResponderCapture(evt,gestureState){
return Math.abs(gestureState.dx)>5;
}, | <mask>
<mask> {var _this5=this;
<mask> this._panResponder=_reactNative.PanResponder.create({
<mask> onMoveShouldSetResponderCapture:function onMoveShouldSetResponderCapture(){return true;},
<mask> onMoveShouldSetPanResponderCapture:function onMoveShouldSetPanResponderCapture(evt,gestureState){return Math.abs(gestureState.dx)>5;},
<mask>
<mask> onPanResponderGrant:function onPanResponderGrant(e,gestureState){
<mask> _this5.state.pan.setOffset({x:_this5.state.pan.x._value,y:_this5.state.pan.y._value});
<mask> _this5.state.pan.setValue({x:0,y:0});
<mask> },
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove }
</s> add </s> remove }
</s> add </s> remove }
</s> add </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/basic/DeckSwiper.js |
if(_this5.props.onSwiping) | <mask>
<mask>
<mask> onPanResponderMove:function onPanResponderMove(e,gestureState){
<mask> if(gestureState.dx>20){
<mask> if(_this5.props.onSwiping){
<mask> _this5.props.onSwiping('right',gestureState.dx);
<mask> }
<mask> }else if(gestureState.dx<-20){
<mask> if(_this5.props.onSwiping){
<mask> _this5.props.onSwiping('left',gestureState.dx);
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove }
}else if(gestureState.dx<-20){
if(_this5.props.onSwiping){
</s> add }else
if(gestureState.dx<-20){
if(_this5.props.onSwiping) </s> remove }
var val=Math.abs(gestureState.dx*0.0013);
var opa=Math.abs(gestureState.dx*0.0022);
</s> add var val=Math.abs(gestureState.dx*.0013);
var opa=Math.abs(gestureState.dx*.0022); </s> remove }
var velocity=void 0;
</s> add var velocity; </s> remove if(_this5.props.onSwiping){
</s> add if(_this5.props.onSwiping) </s> remove </View>
);
}
</s> add </View>
);
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/basic/DeckSwiper.js |
}else
if(gestureState.dx<-20){
if(_this5.props.onSwiping) | <mask> onPanResponderMove:function onPanResponderMove(e,gestureState){
<mask> if(gestureState.dx>20){
<mask> if(_this5.props.onSwiping){
<mask> _this5.props.onSwiping('right',gestureState.dx);
<mask> }
<mask> }else if(gestureState.dx<-20){
<mask> if(_this5.props.onSwiping){
<mask> _this5.props.onSwiping('left',gestureState.dx);
<mask> }
<mask> }
<mask> var val=Math.abs(gestureState.dx*0.0013);
<mask> var opa=Math.abs(gestureState.dx*0.0022);
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove if(_this5.props.onSwiping){
</s> add if(_this5.props.onSwiping) </s> remove }
var val=Math.abs(gestureState.dx*0.0013);
var opa=Math.abs(gestureState.dx*0.0022);
</s> add var val=Math.abs(gestureState.dx*.0013);
var opa=Math.abs(gestureState.dx*.0022); </s> remove }
var velocity=void 0;
</s> add var velocity; </s> remove if(_this5.props.onSwiping){
</s> add if(_this5.props.onSwiping) </s> remove if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity > 0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: { x: velocity, y: vy },
deceleration: 0.98,
}).start(this._resetState.bind(this));
} else {
Animated.spring(this.state.pan, {
toValue: { x: 0, y: 0 },
friction: 4,
}).start();
}
},
});
}
_resetState() {
this.state.pan.setValue({ x: 0, y: 0 });
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top,
});
if (this.props.onSwiping) {
this.props.onSwiping(null);
</s> add componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => {
return Math.abs(gestureState.dx) > 5;
},
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({x: this.state.pan.x._value, y: this.state.pan.y._value});
this.state.pan.setValue({x: 0, y: 0});
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20){
if(this.props.onSwiping)
this.props.onSwiping('right',gestureState.dx);
}
else if (gestureState.dx < -20){
if(this.props.onSwiping)
this.props.onSwiping('left',gestureState.dx);
}
let val = Math.abs((gestureState.dx*.0013));
let opa = Math.abs((gestureState.dx*.0022));
if (val>0.2) {
val = 0.2;
}
Animated.timing(
this.state.fadeAnim,
{toValue: 0.8+val}
).start();
Animated.spring(
this.state.enter,
{ toValue: 0.8+val, friction: 7 }
).start();
Animated.event([
null, {dx: this.state.pan.x},
])(e, gestureState)
},
onPanResponderRelease: (e, {vx, vy}) => {
if(this.props.onSwiping)
this.props.onSwiping(null);
var velocity;
if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity>0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: {x: velocity, y: vy},
deceleration: 0.98
}).start(this._resetState.bind(this))
} else {
Animated.spring(this.state.pan, {
toValue: {x: 0, y: 0},
friction: 4
}).start()
}
}
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/basic/DeckSwiper.js |
var val=Math.abs(gestureState.dx*.0013);
var opa=Math.abs(gestureState.dx*.0022); | <mask> }else if(gestureState.dx<-20){
<mask> if(_this5.props.onSwiping){
<mask> _this5.props.onSwiping('left',gestureState.dx);
<mask> }
<mask> }
<mask> var val=Math.abs(gestureState.dx*0.0013);
<mask> var opa=Math.abs(gestureState.dx*0.0022);
<mask> if(val>0.2){
<mask> val=0.2;
<mask> }
<mask> _reactNative.Animated.timing(
<mask> _this5.state.fadeAnim,
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove }
}else if(gestureState.dx<-20){
if(_this5.props.onSwiping){
</s> add }else
if(gestureState.dx<-20){
if(_this5.props.onSwiping) </s> remove if(_this5.props.onSwiping){
</s> add if(_this5.props.onSwiping) </s> remove }
var velocity=void 0;
</s> add var velocity; </s> remove if(_this5.props.onSwiping){
</s> add if(_this5.props.onSwiping) </s> remove }
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/basic/DeckSwiper.js |
if(_this5.props.onSwiping) | <mask> e,gestureState);
<mask> },
<mask>
<mask> onPanResponderRelease:function onPanResponderRelease(e,_ref){var vx=_ref.vx,vy=_ref.vy;
<mask> if(_this5.props.onSwiping){
<mask> _this5.props.onSwiping(null);
<mask> }
<mask> var velocity=void 0;
<mask>
<mask> if(vx>=0){
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove }
var velocity=void 0;
</s> add var velocity; </s> remove }
}else if(gestureState.dx<-20){
if(_this5.props.onSwiping){
</s> add }else
if(gestureState.dx<-20){
if(_this5.props.onSwiping) </s> remove }
var val=Math.abs(gestureState.dx*0.0013);
var opa=Math.abs(gestureState.dx*0.0022);
</s> add var val=Math.abs(gestureState.dx*.0013);
var opa=Math.abs(gestureState.dx*.0022); </s> remove if(_this5.props.onSwiping){
</s> add if(_this5.props.onSwiping) </s> remove if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity > 0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: { x: velocity, y: vy },
deceleration: 0.98,
}).start(this._resetState.bind(this));
} else {
Animated.spring(this.state.pan, {
toValue: { x: 0, y: 0 },
friction: 4,
}).start();
}
},
});
}
_resetState() {
this.state.pan.setValue({ x: 0, y: 0 });
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top,
});
if (this.props.onSwiping) {
this.props.onSwiping(null);
</s> add componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => {
return Math.abs(gestureState.dx) > 5;
},
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({x: this.state.pan.x._value, y: this.state.pan.y._value});
this.state.pan.setValue({x: 0, y: 0});
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20){
if(this.props.onSwiping)
this.props.onSwiping('right',gestureState.dx);
}
else if (gestureState.dx < -20){
if(this.props.onSwiping)
this.props.onSwiping('left',gestureState.dx);
}
let val = Math.abs((gestureState.dx*.0013));
let opa = Math.abs((gestureState.dx*.0022));
if (val>0.2) {
val = 0.2;
}
Animated.timing(
this.state.fadeAnim,
{toValue: 0.8+val}
).start();
Animated.spring(
this.state.enter,
{ toValue: 0.8+val, friction: 7 }
).start();
Animated.event([
null, {dx: this.state.pan.x},
])(e, gestureState)
},
onPanResponderRelease: (e, {vx, vy}) => {
if(this.props.onSwiping)
this.props.onSwiping(null);
var velocity;
if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity>0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: {x: velocity, y: vy},
deceleration: 0.98
}).start(this._resetState.bind(this))
} else {
Animated.spring(this.state.pan, {
toValue: {x: 0, y: 0},
friction: 4
}).start()
}
}
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/basic/DeckSwiper.js |
var velocity; | <mask>
<mask> onPanResponderRelease:function onPanResponderRelease(e,_ref){var vx=_ref.vx,vy=_ref.vy;
<mask> if(_this5.props.onSwiping){
<mask> _this5.props.onSwiping(null);
<mask> }
<mask> var velocity=void 0;
<mask>
<mask> if(vx>=0){
<mask> velocity=(0,_clamp2.default)(vx,4.5,10);
<mask> }else if(vx<0){
<mask> velocity=(0,_clamp2.default)(vx*-1,4.5,10)*-1;
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove if(_this5.props.onSwiping){
</s> add if(_this5.props.onSwiping) </s> remove }
}else if(gestureState.dx<-20){
if(_this5.props.onSwiping){
</s> add }else
if(gestureState.dx<-20){
if(_this5.props.onSwiping) </s> remove }
var val=Math.abs(gestureState.dx*0.0013);
var opa=Math.abs(gestureState.dx*0.0022);
</s> add var val=Math.abs(gestureState.dx*.0013);
var opa=Math.abs(gestureState.dx*.0022); </s> remove if(_this5.props.onSwiping){
</s> add if(_this5.props.onSwiping) </s> remove if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity > 0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: { x: velocity, y: vy },
deceleration: 0.98,
}).start(this._resetState.bind(this));
} else {
Animated.spring(this.state.pan, {
toValue: { x: 0, y: 0 },
friction: 4,
}).start();
}
},
});
}
_resetState() {
this.state.pan.setValue({ x: 0, y: 0 });
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top,
});
if (this.props.onSwiping) {
this.props.onSwiping(null);
</s> add componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => {
return Math.abs(gestureState.dx) > 5;
},
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({x: this.state.pan.x._value, y: this.state.pan.y._value});
this.state.pan.setValue({x: 0, y: 0});
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20){
if(this.props.onSwiping)
this.props.onSwiping('right',gestureState.dx);
}
else if (gestureState.dx < -20){
if(this.props.onSwiping)
this.props.onSwiping('left',gestureState.dx);
}
let val = Math.abs((gestureState.dx*.0013));
let opa = Math.abs((gestureState.dx*.0022));
if (val>0.2) {
val = 0.2;
}
Animated.timing(
this.state.fadeAnim,
{toValue: 0.8+val}
).start();
Animated.spring(
this.state.enter,
{ toValue: 0.8+val, friction: 7 }
).start();
Animated.event([
null, {dx: this.state.pan.x},
])(e, gestureState)
},
onPanResponderRelease: (e, {vx, vy}) => {
if(this.props.onSwiping)
this.props.onSwiping(null);
var velocity;
if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity>0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: {x: velocity, y: vy},
deceleration: 0.98
}).start(this._resetState.bind(this))
} else {
Animated.spring(this.state.pan, {
toValue: {x: 0, y: 0},
friction: 4
}).start()
}
}
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/basic/DeckSwiper.js |
if(this.props.onSwiping) | <mask> this.setState({
<mask> card1Top:!this.state.card1Top,
<mask> card2Top:!this.state.card2Top});
<mask>
<mask> if(this.props.onSwiping){
<mask> this.props.onSwiping(null);
<mask> }
<mask> }},{key:'getCardStyles',value:function getCardStyles()
<mask>
<mask> {var _state=
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove }
</s> add </s> remove getCardStyles() {
const { pan, pan2, enter } = this.state;
</s> add _resetState() {
this.state.pan.setValue({x: 0, y: 0});
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top
});
if(this.props.onSwiping)
this.props.onSwiping(null); </s> remove }
</s> add </s> remove }
</s> add </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/basic/DeckSwiper.js |
<mask> card2Top:!this.state.card2Top});
<mask>
<mask> if(this.props.onSwiping){
<mask> this.props.onSwiping(null);
<mask> }
<mask> }},{key:'getCardStyles',value:function getCardStyles()
<mask>
<mask> {var _state=
<mask> this.state,pan=_state.pan,pan2=_state.pan2,enter=_state.enter;var _ref2=
<mask>
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) </s> remove }
</s> add </s> remove }
</s> add </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) </s> remove if(this.props.onSwiping){
</s> add if(this.props.onSwiping) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/basic/DeckSwiper.js |
|
_react2.default.createElement(_reactNative.View,{ref:function ref(c){return _this6._root=c;},style:{position:'relative',flexDirection:'column'}},this.state.selectedItem===undefined?_react2.default.createElement(_reactNative.View,null): | <mask> return[animatedCardStyles,animatedCardStyles2];
<mask> }},{key:'render',value:function render()
<mask> {var _this6=this;
<mask> return(
<mask> _react2.default.createElement(_reactNative.View,_extends({ref:function ref(c){return _this6._root=c;}},this.props,{style:{position:'relative',flexDirection:'column',flex:1}}),this.state.selectedItem===undefined?_react2.default.createElement(_reactNative.View,null):
<mask> _react2.default.createElement(_reactNative.View,null,
<mask> _react2.default.createElement(_reactNative.Animated.View,_extends({
<mask> style:[this.getCardStyles()[1],this.getInitialStyle().topCard,
<mask> {opacity:this.state.fadeAnim}]},
<mask> this._panResponder.panHandlers),
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove _react2.default.createElement(_reactNative.Animated.View,_extends({
style:[this.getCardStyles()[1],this.getInitialStyle().topCard,
{opacity:this.state.fadeAnim}]},
this._panResponder.panHandlers),
</s> add _react2.default.createElement(_reactNative.Animated.View,_extends({style:[this.getCardStyles()[1],this.getInitialStyle().topCard,{opacity:this.state.fadeAnim}]},this._panResponder.panHandlers), </s> remove _react2.default.createElement(_reactNative.Animated.View,_extends({
style:[this.getCardStyles()[0],this.getInitialStyle().topCard]},
this._panResponder.panHandlers),
</s> add _react2.default.createElement(_reactNative.Animated.View,_extends({style:[this.getCardStyles()[0],this.getInitialStyle().topCard]},this._panResponder.panHandlers), </s> remove return [animatedCardStyles, animatedCardStyles2];
}
render() {
return (
<View ref={c => this._root = c} {...this.props} style={{ position: 'relative', flexDirection: 'column', flex: 1 }}>{(this.state.selectedItem) === undefined ? (<View />) :
</s> add let rotate = pan.x.interpolate({inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg']});
let opacity = pan.x.interpolate({inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9]})
let scale = enter;
let animatedCardStyles = {transform: [{translateX}, {translateY}, {rotate}], opacity};
let animatedCardStyles2 = {transform: [{scale}]};
return [animatedCardStyles, animatedCardStyles2]
}
render() {
return(
<View ref={c => this._root = c} style={{position: 'relative', flexDirection: 'column'}}>{(this.state.selectedItem)===undefined ? (<View />) : </s> remove <Animated.View
style={[this.getCardStyles()[1], this.getInitialStyle().topCard,
{ opacity: this.state.fadeAnim }]}
{...this._panResponder.panHandlers}
>
{(this.props.renderBottom) ?
</s> add <Animated.View style={[this.getCardStyles()[1],this.getInitialStyle().topCard,{opacity: this.state.fadeAnim}]} {...this._panResponder.panHandlers}>
{(this.props.renderBottom) ? </s> remove }
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/basic/DeckSwiper.js |
_react2.default.createElement(_reactNative.Animated.View,_extends({style:[this.getCardStyles()[1],this.getInitialStyle().topCard,{opacity:this.state.fadeAnim}]},this._panResponder.panHandlers), | <mask> {var _this6=this;
<mask> return(
<mask> _react2.default.createElement(_reactNative.View,_extends({ref:function ref(c){return _this6._root=c;}},this.props,{style:{position:'relative',flexDirection:'column',flex:1}}),this.state.selectedItem===undefined?_react2.default.createElement(_reactNative.View,null):
<mask> _react2.default.createElement(_reactNative.View,null,
<mask> _react2.default.createElement(_reactNative.Animated.View,_extends({
<mask> style:[this.getCardStyles()[1],this.getInitialStyle().topCard,
<mask> {opacity:this.state.fadeAnim}]},
<mask> this._panResponder.panHandlers),
<mask>
<mask> this.props.renderBottom?
<mask> this.props.renderBottom(this.state.selectedItem2):
<mask>
<mask> this.props.renderItem(this.state.selectedItem2)),
<mask>
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove _react2.default.createElement(_reactNative.View,_extends({ref:function ref(c){return _this6._root=c;}},this.props,{style:{position:'relative',flexDirection:'column',flex:1}}),this.state.selectedItem===undefined?_react2.default.createElement(_reactNative.View,null):
</s> add _react2.default.createElement(_reactNative.View,{ref:function ref(c){return _this6._root=c;},style:{position:'relative',flexDirection:'column'}},this.state.selectedItem===undefined?_react2.default.createElement(_reactNative.View,null): </s> remove _react2.default.createElement(_reactNative.Animated.View,_extends({
style:[this.getCardStyles()[0],this.getInitialStyle().topCard]},
this._panResponder.panHandlers),
</s> add _react2.default.createElement(_reactNative.Animated.View,_extends({style:[this.getCardStyles()[0],this.getInitialStyle().topCard]},this._panResponder.panHandlers), </s> remove }
</s> add </s> remove }
</s> add </s> remove }
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/basic/DeckSwiper.js |
_react2.default.createElement(_reactNative.Animated.View,_extends({style:[this.getCardStyles()[0],this.getInitialStyle().topCard]},this._panResponder.panHandlers), | <mask>
<mask> this.props.renderItem(this.state.selectedItem2)),
<mask>
<mask>
<mask> _react2.default.createElement(_reactNative.Animated.View,_extends({
<mask> style:[this.getCardStyles()[0],this.getInitialStyle().topCard]},
<mask> this._panResponder.panHandlers),
<mask>
<mask> this.props.renderTop?
<mask> this.props.renderTop(this.state.selectedItem):
<mask>
<mask> this.props.renderItem(this.state.selectedItem)))));
<mask>
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove _react2.default.createElement(_reactNative.Animated.View,_extends({
style:[this.getCardStyles()[1],this.getInitialStyle().topCard,
{opacity:this.state.fadeAnim}]},
this._panResponder.panHandlers),
</s> add _react2.default.createElement(_reactNative.Animated.View,_extends({style:[this.getCardStyles()[1],this.getInitialStyle().topCard,{opacity:this.state.fadeAnim}]},this._panResponder.panHandlers), </s> remove _react2.default.createElement(_reactNative.View,_extends({ref:function ref(c){return _this6._root=c;}},this.props,{style:{position:'relative',flexDirection:'column',flex:1}}),this.state.selectedItem===undefined?_react2.default.createElement(_reactNative.View,null):
</s> add _react2.default.createElement(_reactNative.View,{ref:function ref(c){return _this6._root=c;},style:{position:'relative',flexDirection:'column'}},this.state.selectedItem===undefined?_react2.default.createElement(_reactNative.View,null): </s> remove 'NativeBase.InputGroup': {
</s> add 'NativeBase.Item': { </s> remove }
selectNext() {
const nextIndexes = this.findNextIndexes();
setTimeout(() => {
this.setState({
selectedItem: this.props.dataSource[nextIndexes[0]],
});
setTimeout(() => {
this.setState({
selectedItem2: this.props.dataSource[nextIndexes[1]],
});
}, 350);
}, 50);
}
</s> add </s> remove 'NativeBase.InputGroup':{
</s> add 'NativeBase.Item':{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/basic/DeckSwiper.js |
'NativeBase.Item':{ | <mask>
<mask> paddingHorizontal:15},
<mask>
<mask> '.searchBar':{
<mask> 'NativeBase.InputGroup':{
<mask> 'NativeBase.Icon':{
<mask> backgroundColor:'transparent',
<mask> color:variables.dropdownLinkColor,
<mask> fontSize:_reactNative.Platform.OS==='ios'?variables.iconFontSize-10:variables.iconFontSize-5,
<mask> alignItems:'center',
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove paddingRight:8},
</s> add paddingRight:10,
paddingLeft:10}, </s> remove 'NativeBase.InputGroup':{
</s> add 'NativeBase.Item':{ </s> remove 'NativeBase.InputGroup': {
</s> add 'NativeBase.Item': { </s> remove }
selectNext() {
const nextIndexes = this.findNextIndexes();
setTimeout(() => {
this.setState({
selectedItem: this.props.dataSource[nextIndexes[0]],
});
setTimeout(() => {
this.setState({
selectedItem2: this.props.dataSource[nextIndexes[1]],
});
}, 350);
}, 50);
}
</s> add </s> remove _react2.default.createElement(_reactNative.Animated.View,_extends({
style:[this.getCardStyles()[0],this.getInitialStyle().topCard]},
this._panResponder.panHandlers),
</s> add _react2.default.createElement(_reactNative.Animated.View,_extends({style:[this.getCardStyles()[0],this.getInitialStyle().topCard]},this._panResponder.panHandlers), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/theme/Header.js |
paddingRight:10,
paddingLeft:10}, | <mask> color:variables.dropdownLinkColor,
<mask> fontSize:_reactNative.Platform.OS==='ios'?variables.iconFontSize-10:variables.iconFontSize-5,
<mask> alignItems:'center',
<mask> marginTop:2,
<mask> paddingRight:8},
<mask>
<mask> 'NativeBase.IconNB':{
<mask> backgroundColor:'transparent',
<mask> color:null,
<mask> alignSelf:'center'},
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove 'NativeBase.InputGroup':{
</s> add 'NativeBase.Item':{ </s> remove 'NativeBase.InputGroup': {
</s> add 'NativeBase.Item': { </s> remove }
selectNext() {
const nextIndexes = this.findNextIndexes();
setTimeout(() => {
this.setState({
selectedItem: this.props.dataSource[nextIndexes[0]],
});
setTimeout(() => {
this.setState({
selectedItem2: this.props.dataSource[nextIndexes[1]],
});
}, 350);
}, 50);
}
</s> add </s> remove 'NativeBase.InputGroup':{
</s> add 'NativeBase.Item':{ </s> remove _react2.default.createElement(_reactNative.Animated.View,_extends({
style:[this.getCardStyles()[0],this.getInitialStyle().topCard]},
this._panResponder.panHandlers),
</s> add _react2.default.createElement(_reactNative.Animated.View,_extends({style:[this.getCardStyles()[0],this.getInitialStyle().topCard]},this._panResponder.panHandlers), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/theme/Header.js |
'NativeBase.Item':{ | <mask> height:_reactNative.Platform.OS==='ios'?undefined:0}},
<mask>
<mask>
<mask> '.rounded':{
<mask> 'NativeBase.InputGroup':{
<mask> borderRadius:_reactNative.Platform.OS==='ios'?25:0}},
<mask>
<mask>
<mask> 'NativeBase.Left':{
<mask> 'NativeBase.Button':{
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove 'NativeBase.InputGroup':{
</s> add 'NativeBase.Item':{ </s> remove 'NativeBase.InputGroup': {
</s> add 'NativeBase.Item': { </s> remove }
selectNext() {
const nextIndexes = this.findNextIndexes();
setTimeout(() => {
this.setState({
selectedItem: this.props.dataSource[nextIndexes[0]],
});
setTimeout(() => {
this.setState({
selectedItem2: this.props.dataSource[nextIndexes[1]],
});
}, 350);
}, 50);
}
</s> add </s> remove paddingRight:8},
</s> add paddingRight:10,
paddingLeft:10}, </s> remove _react2.default.createElement(_reactNative.Animated.View,_extends({
style:[this.getCardStyles()[0],this.getInitialStyle().topCard]},
this._panResponder.panHandlers),
</s> add _react2.default.createElement(_reactNative.Animated.View,_extends({style:[this.getCardStyles()[0],this.getInitialStyle().topCard]},this._panResponder.panHandlers), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | dist/src/theme/Header.js |
constructor(props) {
super(props);
this.state = {
pan: new Animated.ValueXY(),
pan2: new Animated.ValueXY(),
enter: new Animated.Value(0.8),
selectedItem : this.props.dataSource[0],
selectedItem2 : this.props.dataSource[1],
card1Top: true,
card2Top: false,
fadeAnim: new Animated.Value(0.8)
} | <mask>
<mask> const SWIPE_THRESHOLD = 120;
<mask>
<mask> class DeckSwiper extends Component {
<mask> constructor(props) {
<mask> super(props);
<mask> this.state = {
<mask> pan: new Animated.ValueXY(),
<mask> pan2: new Animated.ValueXY(),
<mask> enter: new Animated.Value(0.8),
<mask> selectedItem: this.props.dataSource[0],
<mask> selectedItem2: this.props.dataSource[1],
<mask> card1Top: true,
<mask> card2Top: false,
<mask> fadeAnim: new Animated.Value(0.8),
<mask> };
<mask> }
<mask>
<mask> getInitialStyle() {
<mask> return {
<mask> topCard: {
<mask> position: 'absolute',
<mask> top: 0,
<mask> right: 0,
<mask> left: 0,
<mask> },
<mask> };
<mask> }
<mask>
<mask>
<mask> findNextIndexes() {
<mask> const currentIndex = this.props.dataSource.indexOf(this.state.selectedItem);
<mask> const newIdx = currentIndex + 1;
<mask> const newIdx2 = currentIndex + 2;
<mask>
<mask> if (newIdx2 > this.props.dataSource.length - 1 && newIdx === this.props.dataSource.length - 1) {
<mask> return [newIdx, 0];
<mask> } else if (newIdx > this.props.dataSource.length - 1) {
<mask> return [0, 1];
<mask> } else {
<mask> return [newIdx, newIdx2];
<mask> }
<mask> }
<mask>
<mask> selectNext() {
<mask> const nextIndexes = this.findNextIndexes();
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove swipeRight() {
if (this.props.onSwiping) {
this.props.onSwiping('right');
</s> add if(newIdx2 > this.props.dataSource.length - 1 && newIdx === this.props.dataSource.length - 1) {
return [newIdx, 0];
} else if (newIdx > this.props.dataSource.length - 1) {
return [0, 1];
} else {
return [newIdx, newIdx2];
} </s> remove }
selectNext() {
const nextIndexes = this.findNextIndexes();
setTimeout(() => {
this.setState({
selectedItem: this.props.dataSource[nextIndexes[0]],
});
setTimeout(() => {
this.setState({
selectedItem2: this.props.dataSource[nextIndexes[1]],
});
}, 350);
}, 50);
}
</s> add </s> remove const animatedCardStyles = { transform: [{ translateX }, { translateY }, { rotate }], opacity };
const animatedCardStyles2 = { transform: [{ scale }] };
</s> add let [translateX, translateY] = [pan.x, pan.y];
// let [translateX, translateY] = [pan2.x, pan2.y]; </s> remove if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity > 0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: { x: velocity, y: vy },
deceleration: 0.98,
}).start(this._resetState.bind(this));
} else {
Animated.spring(this.state.pan, {
toValue: { x: 0, y: 0 },
friction: 4,
}).start();
}
},
});
}
_resetState() {
this.state.pan.setValue({ x: 0, y: 0 });
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top,
});
if (this.props.onSwiping) {
this.props.onSwiping(null);
</s> add componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => {
return Math.abs(gestureState.dx) > 5;
},
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({x: this.state.pan.x._value, y: this.state.pan.y._value});
this.state.pan.setValue({x: 0, y: 0});
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20){
if(this.props.onSwiping)
this.props.onSwiping('right',gestureState.dx);
}
else if (gestureState.dx < -20){
if(this.props.onSwiping)
this.props.onSwiping('left',gestureState.dx);
}
let val = Math.abs((gestureState.dx*.0013));
let opa = Math.abs((gestureState.dx*.0022));
if (val>0.2) {
val = 0.2;
}
Animated.timing(
this.state.fadeAnim,
{toValue: 0.8+val}
).start();
Animated.spring(
this.state.enter,
{ toValue: 0.8+val, friction: 7 }
).start();
Animated.event([
null, {dx: this.state.pan.x},
])(e, gestureState)
},
onPanResponderRelease: (e, {vx, vy}) => {
if(this.props.onSwiping)
this.props.onSwiping(null);
var velocity;
if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity>0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: {x: velocity, y: vy},
deceleration: 0.98
}).start(this._resetState.bind(this))
} else {
Animated.spring(this.state.pan, {
toValue: {x: 0, y: 0},
friction: 4
}).start()
}
}
}) </s> remove setTimeout(() => {
Animated.timing(
this.state.fadeAnim,
{ toValue: 1 }
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: { x: -8, y: 1 },
deceleration: 0.98,
}).start(this._resetState.bind(this));
}, 300);
}
componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => Math.abs(gestureState.dx) > 5,
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({ x: this.state.pan.x._value, y: this.state.pan.y._value });
this.state.pan.setValue({ x: 0, y: 0 });
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20) {
if (this.props.onSwiping) {
this.props.onSwiping('right', gestureState.dx);
}
} else if (gestureState.dx < -20) {
if (this.props.onSwiping) {
this.props.onSwiping('left', gestureState.dx);
}
}
let val = Math.abs((gestureState.dx * 0.0013));
const opa = Math.abs((gestureState.dx * 0.0022));
if (val > 0.2) {
val = 0.2;
}
</s> add swipeRight() {
if(this.props.onSwiping)
this.props.onSwiping('right');
setTimeout( () => { | [
"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",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
<mask> return [0, 1];
<mask> } else {
<mask> return [newIdx, newIdx2];
<mask> }
<mask> }
<mask>
<mask> selectNext() {
<mask> const nextIndexes = this.findNextIndexes();
<mask> setTimeout(() => {
<mask> this.setState({
<mask> selectedItem: this.props.dataSource[nextIndexes[0]],
<mask> });
<mask> setTimeout(() => {
<mask> this.setState({
<mask> selectedItem2: this.props.dataSource[nextIndexes[1]],
<mask> });
<mask> }, 350);
<mask> }, 50);
<mask> }
<mask>
<mask>
<mask> swipeRight() {
<mask> if (this.props.onSwiping) {
<mask> this.props.onSwiping('right');
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove setTimeout(() => {
Animated.timing(
this.state.fadeAnim,
{ toValue: 1 }
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: { x: 8, y: 1 },
deceleration: 0.98,
}).start(this._resetState.bind(this));
}, 300);
}
swipeLeft() {
if (this.props.onSwiping) {
this.props.onSwiping('left');
</s> add selectNext() {
let nextIndexes = this.findNextIndexes();
setTimeout( () => {
this.setState({
selectedItem: this.props.dataSource[nextIndexes[0]]
});
setTimeout( () => {
this.setState({
selectedItem2: this.props.dataSource[nextIndexes[1]]
});
}, 350);
}, 50); </s> remove swipeRight() {
if (this.props.onSwiping) {
this.props.onSwiping('right');
</s> add if(newIdx2 > this.props.dataSource.length - 1 && newIdx === this.props.dataSource.length - 1) {
return [newIdx, 0];
} else if (newIdx > this.props.dataSource.length - 1) {
return [0, 1];
} else {
return [newIdx, newIdx2];
} </s> remove constructor(props) {
super(props);
this.state = {
pan: new Animated.ValueXY(),
pan2: new Animated.ValueXY(),
enter: new Animated.Value(0.8),
selectedItem: this.props.dataSource[0],
selectedItem2: this.props.dataSource[1],
card1Top: true,
card2Top: false,
fadeAnim: new Animated.Value(0.8),
};
}
getInitialStyle() {
return {
topCard: {
position: 'absolute',
top: 0,
right: 0,
left: 0,
},
};
}
findNextIndexes() {
const currentIndex = this.props.dataSource.indexOf(this.state.selectedItem);
const newIdx = currentIndex + 1;
const newIdx2 = currentIndex + 2;
if (newIdx2 > this.props.dataSource.length - 1 && newIdx === this.props.dataSource.length - 1) {
return [newIdx, 0];
} else if (newIdx > this.props.dataSource.length - 1) {
return [0, 1];
} else {
return [newIdx, newIdx2];
</s> add constructor(props) {
super(props);
this.state = {
pan: new Animated.ValueXY(),
pan2: new Animated.ValueXY(),
enter: new Animated.Value(0.8),
selectedItem : this.props.dataSource[0],
selectedItem2 : this.props.dataSource[1],
card1Top: true,
card2Top: false,
fadeAnim: new Animated.Value(0.8)
} </s> remove setTimeout(() => {
Animated.timing(
this.state.fadeAnim,
{ toValue: 1 }
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: { x: -8, y: 1 },
deceleration: 0.98,
}).start(this._resetState.bind(this));
}, 300);
}
componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => Math.abs(gestureState.dx) > 5,
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({ x: this.state.pan.x._value, y: this.state.pan.y._value });
this.state.pan.setValue({ x: 0, y: 0 });
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20) {
if (this.props.onSwiping) {
this.props.onSwiping('right', gestureState.dx);
}
} else if (gestureState.dx < -20) {
if (this.props.onSwiping) {
this.props.onSwiping('left', gestureState.dx);
}
}
let val = Math.abs((gestureState.dx * 0.0013));
const opa = Math.abs((gestureState.dx * 0.0022));
if (val > 0.2) {
val = 0.2;
}
</s> add swipeRight() {
if(this.props.onSwiping)
this.props.onSwiping('right');
setTimeout( () => { </s> remove if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity > 0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: { x: velocity, y: vy },
deceleration: 0.98,
}).start(this._resetState.bind(this));
} else {
Animated.spring(this.state.pan, {
toValue: { x: 0, y: 0 },
friction: 4,
}).start();
}
},
});
}
_resetState() {
this.state.pan.setValue({ x: 0, y: 0 });
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top,
});
if (this.props.onSwiping) {
this.props.onSwiping(null);
</s> add componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => {
return Math.abs(gestureState.dx) > 5;
},
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({x: this.state.pan.x._value, y: this.state.pan.y._value});
this.state.pan.setValue({x: 0, y: 0});
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20){
if(this.props.onSwiping)
this.props.onSwiping('right',gestureState.dx);
}
else if (gestureState.dx < -20){
if(this.props.onSwiping)
this.props.onSwiping('left',gestureState.dx);
}
let val = Math.abs((gestureState.dx*.0013));
let opa = Math.abs((gestureState.dx*.0022));
if (val>0.2) {
val = 0.2;
}
Animated.timing(
this.state.fadeAnim,
{toValue: 0.8+val}
).start();
Animated.spring(
this.state.enter,
{ toValue: 0.8+val, friction: 7 }
).start();
Animated.event([
null, {dx: this.state.pan.x},
])(e, gestureState)
},
onPanResponderRelease: (e, {vx, vy}) => {
if(this.props.onSwiping)
this.props.onSwiping(null);
var velocity;
if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity>0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: {x: velocity, y: vy},
deceleration: 0.98
}).start(this._resetState.bind(this))
} else {
Animated.spring(this.state.pan, {
toValue: {x: 0, y: 0},
friction: 4
}).start()
}
}
}) | [
"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/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
|
if(newIdx2 > this.props.dataSource.length - 1 && newIdx === this.props.dataSource.length - 1) {
return [newIdx, 0];
} else if (newIdx > this.props.dataSource.length - 1) {
return [0, 1];
} else {
return [newIdx, newIdx2];
} | <mask> }, 50);
<mask> }
<mask>
<mask>
<mask> swipeRight() {
<mask> if (this.props.onSwiping) {
<mask> this.props.onSwiping('right');
<mask> }
<mask> setTimeout(() => {
<mask> Animated.timing(
<mask> this.state.fadeAnim,
<mask> { toValue: 1 }
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove setTimeout(() => {
Animated.timing(
this.state.fadeAnim,
{ toValue: 1 }
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: { x: 8, y: 1 },
deceleration: 0.98,
}).start(this._resetState.bind(this));
}, 300);
}
swipeLeft() {
if (this.props.onSwiping) {
this.props.onSwiping('left');
</s> add selectNext() {
let nextIndexes = this.findNextIndexes();
setTimeout( () => {
this.setState({
selectedItem: this.props.dataSource[nextIndexes[0]]
});
setTimeout( () => {
this.setState({
selectedItem2: this.props.dataSource[nextIndexes[1]]
});
}, 350);
}, 50); </s> remove }
selectNext() {
const nextIndexes = this.findNextIndexes();
setTimeout(() => {
this.setState({
selectedItem: this.props.dataSource[nextIndexes[0]],
});
setTimeout(() => {
this.setState({
selectedItem2: this.props.dataSource[nextIndexes[1]],
});
}, 350);
}, 50);
}
</s> add </s> remove setTimeout(() => {
Animated.timing(
this.state.fadeAnim,
{ toValue: 1 }
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: { x: -8, y: 1 },
deceleration: 0.98,
}).start(this._resetState.bind(this));
}, 300);
}
componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => Math.abs(gestureState.dx) > 5,
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({ x: this.state.pan.x._value, y: this.state.pan.y._value });
this.state.pan.setValue({ x: 0, y: 0 });
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20) {
if (this.props.onSwiping) {
this.props.onSwiping('right', gestureState.dx);
}
} else if (gestureState.dx < -20) {
if (this.props.onSwiping) {
this.props.onSwiping('left', gestureState.dx);
}
}
let val = Math.abs((gestureState.dx * 0.0013));
const opa = Math.abs((gestureState.dx * 0.0022));
if (val > 0.2) {
val = 0.2;
}
</s> add swipeRight() {
if(this.props.onSwiping)
this.props.onSwiping('right');
setTimeout( () => { </s> remove this.state.fadeAnim,
{ toValue: 0.8 + val }
).start();
</s> add this.state.fadeAnim,
{toValue: 1}
).start(); </s> remove this.state.enter,
{ toValue: 0.8 + val, friction: 7 }
).start();
Animated.event([
null, { dx: this.state.pan.x },
])(e, gestureState);
},
onPanResponderRelease: (e, { vx, vy }) => {
if (this.props.onSwiping) {
this.props.onSwiping(null);
}
let velocity;
</s> add this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: {x: 8, y: 1},
deceleration: 0.98
}).start(this._resetState.bind(this))
}, 300);
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
selectNext() {
let nextIndexes = this.findNextIndexes();
setTimeout( () => {
this.setState({
selectedItem: this.props.dataSource[nextIndexes[0]]
});
setTimeout( () => {
this.setState({
selectedItem2: this.props.dataSource[nextIndexes[1]]
});
}, 350);
}, 50); | <mask> swipeRight() {
<mask> if (this.props.onSwiping) {
<mask> this.props.onSwiping('right');
<mask> }
<mask> setTimeout(() => {
<mask> Animated.timing(
<mask> this.state.fadeAnim,
<mask> { toValue: 1 }
<mask> ).start();
<mask> Animated.spring(
<mask> this.state.enter,
<mask> { toValue: 1, friction: 7 }
<mask> ).start();
<mask> this.selectNext();
<mask> Animated.decay(this.state.pan, {
<mask> velocity: { x: 8, y: 1 },
<mask> deceleration: 0.98,
<mask> }).start(this._resetState.bind(this));
<mask> }, 300);
<mask> }
<mask>
<mask> swipeLeft() {
<mask> if (this.props.onSwiping) {
<mask> this.props.onSwiping('left');
<mask> }
<mask> setTimeout(() => {
<mask> Animated.timing(
<mask> this.state.fadeAnim,
<mask> { toValue: 1 }
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove setTimeout(() => {
Animated.timing(
this.state.fadeAnim,
{ toValue: 1 }
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: { x: -8, y: 1 },
deceleration: 0.98,
}).start(this._resetState.bind(this));
}, 300);
}
componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => Math.abs(gestureState.dx) > 5,
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({ x: this.state.pan.x._value, y: this.state.pan.y._value });
this.state.pan.setValue({ x: 0, y: 0 });
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20) {
if (this.props.onSwiping) {
this.props.onSwiping('right', gestureState.dx);
}
} else if (gestureState.dx < -20) {
if (this.props.onSwiping) {
this.props.onSwiping('left', gestureState.dx);
}
}
let val = Math.abs((gestureState.dx * 0.0013));
const opa = Math.abs((gestureState.dx * 0.0022));
if (val > 0.2) {
val = 0.2;
}
</s> add swipeRight() {
if(this.props.onSwiping)
this.props.onSwiping('right');
setTimeout( () => { </s> remove this.state.enter,
{ toValue: 0.8 + val, friction: 7 }
).start();
Animated.event([
null, { dx: this.state.pan.x },
])(e, gestureState);
},
onPanResponderRelease: (e, { vx, vy }) => {
if (this.props.onSwiping) {
this.props.onSwiping(null);
}
let velocity;
</s> add this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: {x: 8, y: 1},
deceleration: 0.98
}).start(this._resetState.bind(this))
}, 300);
} </s> remove if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
</s> add swipeLeft() {
if(this.props.onSwiping)
this.props.onSwiping('left');
setTimeout( () => {
Animated.timing(
this.state.fadeAnim,
{toValue: 1}
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: {x: -8, y: 1},
deceleration: 0.98
}).start(this._resetState.bind(this))
}, 300);
} </s> remove swipeRight() {
if (this.props.onSwiping) {
this.props.onSwiping('right');
</s> add if(newIdx2 > this.props.dataSource.length - 1 && newIdx === this.props.dataSource.length - 1) {
return [newIdx, 0];
} else if (newIdx > this.props.dataSource.length - 1) {
return [0, 1];
} else {
return [newIdx, newIdx2];
} </s> remove this.state.fadeAnim,
{ toValue: 0.8 + val }
).start();
</s> add this.state.fadeAnim,
{toValue: 1}
).start(); | [
"keep",
"keep",
"keep",
"keep",
"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/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
swipeRight() {
if(this.props.onSwiping)
this.props.onSwiping('right');
setTimeout( () => { | <mask> swipeLeft() {
<mask> if (this.props.onSwiping) {
<mask> this.props.onSwiping('left');
<mask> }
<mask> setTimeout(() => {
<mask> Animated.timing(
<mask> this.state.fadeAnim,
<mask> { toValue: 1 }
<mask> ).start();
<mask> Animated.spring(
<mask> this.state.enter,
<mask> { toValue: 1, friction: 7 }
<mask> ).start();
<mask> this.selectNext();
<mask> Animated.decay(this.state.pan, {
<mask> velocity: { x: -8, y: 1 },
<mask> deceleration: 0.98,
<mask> }).start(this._resetState.bind(this));
<mask> }, 300);
<mask> }
<mask>
<mask> componentWillMount() {
<mask> this._panResponder = PanResponder.create({
<mask> onMoveShouldSetResponderCapture: () => true,
<mask> onMoveShouldSetPanResponderCapture: (evt, gestureState) => Math.abs(gestureState.dx) > 5,
<mask>
<mask> onPanResponderGrant: (e, gestureState) => {
<mask> this.state.pan.setOffset({ x: this.state.pan.x._value, y: this.state.pan.y._value });
<mask> this.state.pan.setValue({ x: 0, y: 0 });
<mask> },
<mask>
<mask>
<mask> onPanResponderMove: (e, gestureState) => {
<mask> if (gestureState.dx > 20) {
<mask> if (this.props.onSwiping) {
<mask> this.props.onSwiping('right', gestureState.dx);
<mask> }
<mask> } else if (gestureState.dx < -20) {
<mask> if (this.props.onSwiping) {
<mask> this.props.onSwiping('left', gestureState.dx);
<mask> }
<mask> }
<mask> let val = Math.abs((gestureState.dx * 0.0013));
<mask> const opa = Math.abs((gestureState.dx * 0.0022));
<mask> if (val > 0.2) {
<mask> val = 0.2;
<mask> }
<mask> Animated.timing(
<mask> this.state.fadeAnim,
<mask> { toValue: 0.8 + val }
<mask> ).start();
<mask> Animated.spring(
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity > 0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: { x: velocity, y: vy },
deceleration: 0.98,
}).start(this._resetState.bind(this));
} else {
Animated.spring(this.state.pan, {
toValue: { x: 0, y: 0 },
friction: 4,
}).start();
}
},
});
}
_resetState() {
this.state.pan.setValue({ x: 0, y: 0 });
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top,
});
if (this.props.onSwiping) {
this.props.onSwiping(null);
</s> add componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => {
return Math.abs(gestureState.dx) > 5;
},
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({x: this.state.pan.x._value, y: this.state.pan.y._value});
this.state.pan.setValue({x: 0, y: 0});
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20){
if(this.props.onSwiping)
this.props.onSwiping('right',gestureState.dx);
}
else if (gestureState.dx < -20){
if(this.props.onSwiping)
this.props.onSwiping('left',gestureState.dx);
}
let val = Math.abs((gestureState.dx*.0013));
let opa = Math.abs((gestureState.dx*.0022));
if (val>0.2) {
val = 0.2;
}
Animated.timing(
this.state.fadeAnim,
{toValue: 0.8+val}
).start();
Animated.spring(
this.state.enter,
{ toValue: 0.8+val, friction: 7 }
).start();
Animated.event([
null, {dx: this.state.pan.x},
])(e, gestureState)
},
onPanResponderRelease: (e, {vx, vy}) => {
if(this.props.onSwiping)
this.props.onSwiping(null);
var velocity;
if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity>0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: {x: velocity, y: vy},
deceleration: 0.98
}).start(this._resetState.bind(this))
} else {
Animated.spring(this.state.pan, {
toValue: {x: 0, y: 0},
friction: 4
}).start()
}
}
}) </s> remove setTimeout(() => {
Animated.timing(
this.state.fadeAnim,
{ toValue: 1 }
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: { x: 8, y: 1 },
deceleration: 0.98,
}).start(this._resetState.bind(this));
}, 300);
}
swipeLeft() {
if (this.props.onSwiping) {
this.props.onSwiping('left');
</s> add selectNext() {
let nextIndexes = this.findNextIndexes();
setTimeout( () => {
this.setState({
selectedItem: this.props.dataSource[nextIndexes[0]]
});
setTimeout( () => {
this.setState({
selectedItem2: this.props.dataSource[nextIndexes[1]]
});
}, 350);
}, 50); </s> remove this.state.enter,
{ toValue: 0.8 + val, friction: 7 }
).start();
Animated.event([
null, { dx: this.state.pan.x },
])(e, gestureState);
},
onPanResponderRelease: (e, { vx, vy }) => {
if (this.props.onSwiping) {
this.props.onSwiping(null);
}
let velocity;
</s> add this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: {x: 8, y: 1},
deceleration: 0.98
}).start(this._resetState.bind(this))
}, 300);
} </s> remove this.state.fadeAnim,
{ toValue: 0.8 + val }
).start();
</s> add this.state.fadeAnim,
{toValue: 1}
).start(); </s> remove if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
</s> add swipeLeft() {
if(this.props.onSwiping)
this.props.onSwiping('left');
setTimeout( () => {
Animated.timing(
this.state.fadeAnim,
{toValue: 1}
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: {x: -8, y: 1},
deceleration: 0.98
}).start(this._resetState.bind(this))
}, 300);
} | [
"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",
"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/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
this.state.fadeAnim,
{toValue: 1}
).start(); | <mask> if (val > 0.2) {
<mask> val = 0.2;
<mask> }
<mask> Animated.timing(
<mask> this.state.fadeAnim,
<mask> { toValue: 0.8 + val }
<mask> ).start();
<mask> Animated.spring(
<mask> this.state.enter,
<mask> { toValue: 0.8 + val, friction: 7 }
<mask> ).start();
<mask> Animated.event([
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove this.state.enter,
{ toValue: 0.8 + val, friction: 7 }
).start();
Animated.event([
null, { dx: this.state.pan.x },
])(e, gestureState);
},
onPanResponderRelease: (e, { vx, vy }) => {
if (this.props.onSwiping) {
this.props.onSwiping(null);
}
let velocity;
</s> add this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: {x: 8, y: 1},
deceleration: 0.98
}).start(this._resetState.bind(this))
}, 300);
} </s> remove setTimeout(() => {
Animated.timing(
this.state.fadeAnim,
{ toValue: 1 }
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: { x: -8, y: 1 },
deceleration: 0.98,
}).start(this._resetState.bind(this));
}, 300);
}
componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => Math.abs(gestureState.dx) > 5,
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({ x: this.state.pan.x._value, y: this.state.pan.y._value });
this.state.pan.setValue({ x: 0, y: 0 });
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20) {
if (this.props.onSwiping) {
this.props.onSwiping('right', gestureState.dx);
}
} else if (gestureState.dx < -20) {
if (this.props.onSwiping) {
this.props.onSwiping('left', gestureState.dx);
}
}
let val = Math.abs((gestureState.dx * 0.0013));
const opa = Math.abs((gestureState.dx * 0.0022));
if (val > 0.2) {
val = 0.2;
}
</s> add swipeRight() {
if(this.props.onSwiping)
this.props.onSwiping('right');
setTimeout( () => { </s> remove setTimeout(() => {
Animated.timing(
this.state.fadeAnim,
{ toValue: 1 }
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: { x: 8, y: 1 },
deceleration: 0.98,
}).start(this._resetState.bind(this));
}, 300);
}
swipeLeft() {
if (this.props.onSwiping) {
this.props.onSwiping('left');
</s> add selectNext() {
let nextIndexes = this.findNextIndexes();
setTimeout( () => {
this.setState({
selectedItem: this.props.dataSource[nextIndexes[0]]
});
setTimeout( () => {
this.setState({
selectedItem2: this.props.dataSource[nextIndexes[1]]
});
}, 350);
}, 50); </s> remove if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
</s> add swipeLeft() {
if(this.props.onSwiping)
this.props.onSwiping('left');
setTimeout( () => {
Animated.timing(
this.state.fadeAnim,
{toValue: 1}
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: {x: -8, y: 1},
deceleration: 0.98
}).start(this._resetState.bind(this))
}, 300);
} </s> remove if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity > 0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: { x: velocity, y: vy },
deceleration: 0.98,
}).start(this._resetState.bind(this));
} else {
Animated.spring(this.state.pan, {
toValue: { x: 0, y: 0 },
friction: 4,
}).start();
}
},
});
}
_resetState() {
this.state.pan.setValue({ x: 0, y: 0 });
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top,
});
if (this.props.onSwiping) {
this.props.onSwiping(null);
</s> add componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => {
return Math.abs(gestureState.dx) > 5;
},
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({x: this.state.pan.x._value, y: this.state.pan.y._value});
this.state.pan.setValue({x: 0, y: 0});
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20){
if(this.props.onSwiping)
this.props.onSwiping('right',gestureState.dx);
}
else if (gestureState.dx < -20){
if(this.props.onSwiping)
this.props.onSwiping('left',gestureState.dx);
}
let val = Math.abs((gestureState.dx*.0013));
let opa = Math.abs((gestureState.dx*.0022));
if (val>0.2) {
val = 0.2;
}
Animated.timing(
this.state.fadeAnim,
{toValue: 0.8+val}
).start();
Animated.spring(
this.state.enter,
{ toValue: 0.8+val, friction: 7 }
).start();
Animated.event([
null, {dx: this.state.pan.x},
])(e, gestureState)
},
onPanResponderRelease: (e, {vx, vy}) => {
if(this.props.onSwiping)
this.props.onSwiping(null);
var velocity;
if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity>0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: {x: velocity, y: vy},
deceleration: 0.98
}).start(this._resetState.bind(this))
} else {
Animated.spring(this.state.pan, {
toValue: {x: 0, y: 0},
friction: 4
}).start()
}
}
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: {x: 8, y: 1},
deceleration: 0.98
}).start(this._resetState.bind(this))
}, 300);
} | <mask> this.state.fadeAnim,
<mask> { toValue: 0.8 + val }
<mask> ).start();
<mask> Animated.spring(
<mask> this.state.enter,
<mask> { toValue: 0.8 + val, friction: 7 }
<mask> ).start();
<mask> Animated.event([
<mask> null, { dx: this.state.pan.x },
<mask> ])(e, gestureState);
<mask> },
<mask>
<mask> onPanResponderRelease: (e, { vx, vy }) => {
<mask> if (this.props.onSwiping) {
<mask> this.props.onSwiping(null);
<mask> }
<mask> let velocity;
<mask>
<mask> if (vx >= 0) {
<mask> velocity = clamp(vx, 4.5, 10);
<mask> } else if (vx < 0) {
<mask> velocity = clamp(vx * -1, 4.5, 10) * -1;
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
</s> add swipeLeft() {
if(this.props.onSwiping)
this.props.onSwiping('left');
setTimeout( () => {
Animated.timing(
this.state.fadeAnim,
{toValue: 1}
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: {x: -8, y: 1},
deceleration: 0.98
}).start(this._resetState.bind(this))
}, 300);
} </s> remove if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity > 0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: { x: velocity, y: vy },
deceleration: 0.98,
}).start(this._resetState.bind(this));
} else {
Animated.spring(this.state.pan, {
toValue: { x: 0, y: 0 },
friction: 4,
}).start();
}
},
});
}
_resetState() {
this.state.pan.setValue({ x: 0, y: 0 });
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top,
});
if (this.props.onSwiping) {
this.props.onSwiping(null);
</s> add componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => {
return Math.abs(gestureState.dx) > 5;
},
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({x: this.state.pan.x._value, y: this.state.pan.y._value});
this.state.pan.setValue({x: 0, y: 0});
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20){
if(this.props.onSwiping)
this.props.onSwiping('right',gestureState.dx);
}
else if (gestureState.dx < -20){
if(this.props.onSwiping)
this.props.onSwiping('left',gestureState.dx);
}
let val = Math.abs((gestureState.dx*.0013));
let opa = Math.abs((gestureState.dx*.0022));
if (val>0.2) {
val = 0.2;
}
Animated.timing(
this.state.fadeAnim,
{toValue: 0.8+val}
).start();
Animated.spring(
this.state.enter,
{ toValue: 0.8+val, friction: 7 }
).start();
Animated.event([
null, {dx: this.state.pan.x},
])(e, gestureState)
},
onPanResponderRelease: (e, {vx, vy}) => {
if(this.props.onSwiping)
this.props.onSwiping(null);
var velocity;
if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity>0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: {x: velocity, y: vy},
deceleration: 0.98
}).start(this._resetState.bind(this))
} else {
Animated.spring(this.state.pan, {
toValue: {x: 0, y: 0},
friction: 4
}).start()
}
}
}) </s> remove this.state.fadeAnim,
{ toValue: 0.8 + val }
).start();
</s> add this.state.fadeAnim,
{toValue: 1}
).start(); </s> remove setTimeout(() => {
Animated.timing(
this.state.fadeAnim,
{ toValue: 1 }
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: { x: -8, y: 1 },
deceleration: 0.98,
}).start(this._resetState.bind(this));
}, 300);
}
componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => Math.abs(gestureState.dx) > 5,
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({ x: this.state.pan.x._value, y: this.state.pan.y._value });
this.state.pan.setValue({ x: 0, y: 0 });
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20) {
if (this.props.onSwiping) {
this.props.onSwiping('right', gestureState.dx);
}
} else if (gestureState.dx < -20) {
if (this.props.onSwiping) {
this.props.onSwiping('left', gestureState.dx);
}
}
let val = Math.abs((gestureState.dx * 0.0013));
const opa = Math.abs((gestureState.dx * 0.0022));
if (val > 0.2) {
val = 0.2;
}
</s> add swipeRight() {
if(this.props.onSwiping)
this.props.onSwiping('right');
setTimeout( () => { </s> remove setTimeout(() => {
Animated.timing(
this.state.fadeAnim,
{ toValue: 1 }
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: { x: 8, y: 1 },
deceleration: 0.98,
}).start(this._resetState.bind(this));
}, 300);
}
swipeLeft() {
if (this.props.onSwiping) {
this.props.onSwiping('left');
</s> add selectNext() {
let nextIndexes = this.findNextIndexes();
setTimeout( () => {
this.setState({
selectedItem: this.props.dataSource[nextIndexes[0]]
});
setTimeout( () => {
this.setState({
selectedItem2: this.props.dataSource[nextIndexes[1]]
});
}, 350);
}, 50); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
swipeLeft() {
if(this.props.onSwiping)
this.props.onSwiping('left');
setTimeout( () => {
Animated.timing(
this.state.fadeAnim,
{toValue: 1}
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: {x: -8, y: 1},
deceleration: 0.98
}).start(this._resetState.bind(this))
}, 300);
} | <mask> this.props.onSwiping(null);
<mask> }
<mask> let velocity;
<mask>
<mask> if (vx >= 0) {
<mask> velocity = clamp(vx, 4.5, 10);
<mask> } else if (vx < 0) {
<mask> velocity = clamp(vx * -1, 4.5, 10) * -1;
<mask> }
<mask>
<mask> if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
<mask> if (velocity > 0) {
<mask> (this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
<mask> this.selectNext();
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity > 0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: { x: velocity, y: vy },
deceleration: 0.98,
}).start(this._resetState.bind(this));
} else {
Animated.spring(this.state.pan, {
toValue: { x: 0, y: 0 },
friction: 4,
}).start();
}
},
});
}
_resetState() {
this.state.pan.setValue({ x: 0, y: 0 });
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top,
});
if (this.props.onSwiping) {
this.props.onSwiping(null);
</s> add componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => {
return Math.abs(gestureState.dx) > 5;
},
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({x: this.state.pan.x._value, y: this.state.pan.y._value});
this.state.pan.setValue({x: 0, y: 0});
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20){
if(this.props.onSwiping)
this.props.onSwiping('right',gestureState.dx);
}
else if (gestureState.dx < -20){
if(this.props.onSwiping)
this.props.onSwiping('left',gestureState.dx);
}
let val = Math.abs((gestureState.dx*.0013));
let opa = Math.abs((gestureState.dx*.0022));
if (val>0.2) {
val = 0.2;
}
Animated.timing(
this.state.fadeAnim,
{toValue: 0.8+val}
).start();
Animated.spring(
this.state.enter,
{ toValue: 0.8+val, friction: 7 }
).start();
Animated.event([
null, {dx: this.state.pan.x},
])(e, gestureState)
},
onPanResponderRelease: (e, {vx, vy}) => {
if(this.props.onSwiping)
this.props.onSwiping(null);
var velocity;
if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity>0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: {x: velocity, y: vy},
deceleration: 0.98
}).start(this._resetState.bind(this))
} else {
Animated.spring(this.state.pan, {
toValue: {x: 0, y: 0},
friction: 4
}).start()
}
}
}) </s> remove this.state.enter,
{ toValue: 0.8 + val, friction: 7 }
).start();
Animated.event([
null, { dx: this.state.pan.x },
])(e, gestureState);
},
onPanResponderRelease: (e, { vx, vy }) => {
if (this.props.onSwiping) {
this.props.onSwiping(null);
}
let velocity;
</s> add this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: {x: 8, y: 1},
deceleration: 0.98
}).start(this._resetState.bind(this))
}, 300);
} </s> remove setTimeout(() => {
Animated.timing(
this.state.fadeAnim,
{ toValue: 1 }
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: { x: -8, y: 1 },
deceleration: 0.98,
}).start(this._resetState.bind(this));
}, 300);
}
componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => Math.abs(gestureState.dx) > 5,
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({ x: this.state.pan.x._value, y: this.state.pan.y._value });
this.state.pan.setValue({ x: 0, y: 0 });
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20) {
if (this.props.onSwiping) {
this.props.onSwiping('right', gestureState.dx);
}
} else if (gestureState.dx < -20) {
if (this.props.onSwiping) {
this.props.onSwiping('left', gestureState.dx);
}
}
let val = Math.abs((gestureState.dx * 0.0013));
const opa = Math.abs((gestureState.dx * 0.0022));
if (val > 0.2) {
val = 0.2;
}
</s> add swipeRight() {
if(this.props.onSwiping)
this.props.onSwiping('right');
setTimeout( () => { </s> remove swipeRight() {
if (this.props.onSwiping) {
this.props.onSwiping('right');
</s> add if(newIdx2 > this.props.dataSource.length - 1 && newIdx === this.props.dataSource.length - 1) {
return [newIdx, 0];
} else if (newIdx > this.props.dataSource.length - 1) {
return [0, 1];
} else {
return [newIdx, newIdx2];
} </s> remove }
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => {
return Math.abs(gestureState.dx) > 5;
},
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({x: this.state.pan.x._value, y: this.state.pan.y._value});
this.state.pan.setValue({x: 0, y: 0});
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20){
if(this.props.onSwiping)
this.props.onSwiping('right',gestureState.dx);
}
else if (gestureState.dx < -20){
if(this.props.onSwiping)
this.props.onSwiping('left',gestureState.dx);
}
let val = Math.abs((gestureState.dx*.0013));
let opa = Math.abs((gestureState.dx*.0022));
if (val>0.2) {
val = 0.2;
}
Animated.timing(
this.state.fadeAnim,
{toValue: 0.8+val}
).start();
Animated.spring(
this.state.enter,
{ toValue: 0.8+val, friction: 7 }
).start();
Animated.event([
null, {dx: this.state.pan.x},
])(e, gestureState)
},
onPanResponderRelease: (e, {vx, vy}) => {
if(this.props.onSwiping)
this.props.onSwiping(null);
var velocity;
if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity>0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: {x: velocity, y: vy},
deceleration: 0.98
}).start(this._resetState.bind(this))
} else {
Animated.spring(this.state.pan, {
toValue: {x: 0, y: 0},
friction: 4
}).start()
}
}
}) | <mask> } else if (vx < 0) {
<mask> velocity = clamp(vx * -1, 4.5, 10) * -1;
<mask> }
<mask>
<mask> if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
<mask> if (velocity > 0) {
<mask> (this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
<mask> this.selectNext();
<mask> } else {
<mask> (this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
<mask> this.selectNext();
<mask> }
<mask>
<mask> Animated.decay(this.state.pan, {
<mask> velocity: { x: velocity, y: vy },
<mask> deceleration: 0.98,
<mask> }).start(this._resetState.bind(this));
<mask> } else {
<mask> Animated.spring(this.state.pan, {
<mask> toValue: { x: 0, y: 0 },
<mask> friction: 4,
<mask> }).start();
<mask> }
<mask> },
<mask> });
<mask> }
<mask>
<mask> _resetState() {
<mask> this.state.pan.setValue({ x: 0, y: 0 });
<mask> this.state.enter.setValue(0.8);
<mask> this.state.fadeAnim.setValue(0.8);
<mask> this.setState({
<mask> card1Top: !this.state.card1Top,
<mask> card2Top: !this.state.card2Top,
<mask> });
<mask> if (this.props.onSwiping) {
<mask> this.props.onSwiping(null);
<mask> }
<mask> }
<mask>
<mask> getCardStyles() {
<mask> const { pan, pan2, enter } = this.state;
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
</s> add swipeLeft() {
if(this.props.onSwiping)
this.props.onSwiping('left');
setTimeout( () => {
Animated.timing(
this.state.fadeAnim,
{toValue: 1}
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: {x: -8, y: 1},
deceleration: 0.98
}).start(this._resetState.bind(this))
}, 300);
} </s> remove this.state.enter,
{ toValue: 0.8 + val, friction: 7 }
).start();
Animated.event([
null, { dx: this.state.pan.x },
])(e, gestureState);
},
onPanResponderRelease: (e, { vx, vy }) => {
if (this.props.onSwiping) {
this.props.onSwiping(null);
}
let velocity;
</s> add this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: {x: 8, y: 1},
deceleration: 0.98
}).start(this._resetState.bind(this))
}, 300);
} </s> remove setTimeout(() => {
Animated.timing(
this.state.fadeAnim,
{ toValue: 1 }
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: { x: -8, y: 1 },
deceleration: 0.98,
}).start(this._resetState.bind(this));
}, 300);
}
componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => Math.abs(gestureState.dx) > 5,
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({ x: this.state.pan.x._value, y: this.state.pan.y._value });
this.state.pan.setValue({ x: 0, y: 0 });
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20) {
if (this.props.onSwiping) {
this.props.onSwiping('right', gestureState.dx);
}
} else if (gestureState.dx < -20) {
if (this.props.onSwiping) {
this.props.onSwiping('left', gestureState.dx);
}
}
let val = Math.abs((gestureState.dx * 0.0013));
const opa = Math.abs((gestureState.dx * 0.0022));
if (val > 0.2) {
val = 0.2;
}
</s> add swipeRight() {
if(this.props.onSwiping)
this.props.onSwiping('right');
setTimeout( () => { </s> remove setTimeout(() => {
Animated.timing(
this.state.fadeAnim,
{ toValue: 1 }
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: { x: 8, y: 1 },
deceleration: 0.98,
}).start(this._resetState.bind(this));
}, 300);
}
swipeLeft() {
if (this.props.onSwiping) {
this.props.onSwiping('left');
</s> add selectNext() {
let nextIndexes = this.findNextIndexes();
setTimeout( () => {
this.setState({
selectedItem: this.props.dataSource[nextIndexes[0]]
});
setTimeout( () => {
this.setState({
selectedItem2: this.props.dataSource[nextIndexes[1]]
});
}, 350);
}, 50); </s> remove getCardStyles() {
const { pan, pan2, enter } = this.state;
</s> add _resetState() {
this.state.pan.setValue({x: 0, y: 0});
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top
});
if(this.props.onSwiping)
this.props.onSwiping(null); | [
"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",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
<mask> });
<mask> if (this.props.onSwiping) {
<mask> this.props.onSwiping(null);
<mask> }
<mask> }
<mask>
<mask> getCardStyles() {
<mask> const { pan, pan2, enter } = this.state;
<mask>
<mask> const [translateX, translateY] = [pan.x, pan.y];
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove getCardStyles() {
const { pan, pan2, enter } = this.state;
</s> add _resetState() {
this.state.pan.setValue({x: 0, y: 0});
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top
});
if(this.props.onSwiping)
this.props.onSwiping(null); </s> remove const [translateX, translateY] = [pan.x, pan.y];
// let [translateX, translateY] = [pan2.x, pan2.y];
</s> add } </s> remove const opacity = pan.x.interpolate({ inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9] });
const scale = enter;
</s> add let { pan, pan2, enter } = this.state; </s> remove const rotate = pan.x.interpolate({ inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg'] });
</s> add getCardStyles() { </s> remove const animatedCardStyles = { transform: [{ translateX }, { translateY }, { rotate }], opacity };
const animatedCardStyles2 = { transform: [{ scale }] };
</s> add let [translateX, translateY] = [pan.x, pan.y];
// let [translateX, translateY] = [pan2.x, pan2.y]; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
|
_resetState() {
this.state.pan.setValue({x: 0, y: 0});
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top
});
if(this.props.onSwiping)
this.props.onSwiping(null); | <mask> this.props.onSwiping(null);
<mask> }
<mask> }
<mask>
<mask> getCardStyles() {
<mask> const { pan, pan2, enter } = this.state;
<mask>
<mask> const [translateX, translateY] = [pan.x, pan.y];
<mask> // let [translateX, translateY] = [pan2.x, pan2.y];
<mask>
<mask> const rotate = pan.x.interpolate({ inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg'] });
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove const [translateX, translateY] = [pan.x, pan.y];
// let [translateX, translateY] = [pan2.x, pan2.y];
</s> add } </s> remove const rotate = pan.x.interpolate({ inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg'] });
</s> add getCardStyles() { </s> remove const opacity = pan.x.interpolate({ inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9] });
const scale = enter;
</s> add let { pan, pan2, enter } = this.state; </s> remove }
</s> add </s> remove const animatedCardStyles = { transform: [{ translateX }, { translateY }, { rotate }], opacity };
const animatedCardStyles2 = { transform: [{ scale }] };
</s> add let [translateX, translateY] = [pan.x, pan.y];
// let [translateX, translateY] = [pan2.x, pan2.y]; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
} | <mask>
<mask> getCardStyles() {
<mask> const { pan, pan2, enter } = this.state;
<mask>
<mask> const [translateX, translateY] = [pan.x, pan.y];
<mask> // let [translateX, translateY] = [pan2.x, pan2.y];
<mask>
<mask> const rotate = pan.x.interpolate({ inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg'] });
<mask>
<mask> const opacity = pan.x.interpolate({ inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9] });
<mask> const scale = enter;
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove const rotate = pan.x.interpolate({ inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg'] });
</s> add getCardStyles() { </s> remove const opacity = pan.x.interpolate({ inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9] });
const scale = enter;
</s> add let { pan, pan2, enter } = this.state; </s> remove getCardStyles() {
const { pan, pan2, enter } = this.state;
</s> add _resetState() {
this.state.pan.setValue({x: 0, y: 0});
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top
});
if(this.props.onSwiping)
this.props.onSwiping(null); </s> remove const animatedCardStyles = { transform: [{ translateX }, { translateY }, { rotate }], opacity };
const animatedCardStyles2 = { transform: [{ scale }] };
</s> add let [translateX, translateY] = [pan.x, pan.y];
// let [translateX, translateY] = [pan2.x, pan2.y]; </s> remove }
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
getCardStyles() { | <mask>
<mask> const [translateX, translateY] = [pan.x, pan.y];
<mask> // let [translateX, translateY] = [pan2.x, pan2.y];
<mask>
<mask> const rotate = pan.x.interpolate({ inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg'] });
<mask>
<mask> const opacity = pan.x.interpolate({ inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9] });
<mask> const scale = enter;
<mask>
<mask> const animatedCardStyles = { transform: [{ translateX }, { translateY }, { rotate }], opacity };
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove const opacity = pan.x.interpolate({ inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9] });
const scale = enter;
</s> add let { pan, pan2, enter } = this.state; </s> remove const [translateX, translateY] = [pan.x, pan.y];
// let [translateX, translateY] = [pan2.x, pan2.y];
</s> add } </s> remove const animatedCardStyles = { transform: [{ translateX }, { translateY }, { rotate }], opacity };
const animatedCardStyles2 = { transform: [{ scale }] };
</s> add let [translateX, translateY] = [pan.x, pan.y];
// let [translateX, translateY] = [pan2.x, pan2.y]; </s> remove getCardStyles() {
const { pan, pan2, enter } = this.state;
</s> add _resetState() {
this.state.pan.setValue({x: 0, y: 0});
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top
});
if(this.props.onSwiping)
this.props.onSwiping(null); </s> remove return [animatedCardStyles, animatedCardStyles2];
}
render() {
return (
<View ref={c => this._root = c} {...this.props} style={{ position: 'relative', flexDirection: 'column', flex: 1 }}>{(this.state.selectedItem) === undefined ? (<View />) :
</s> add let rotate = pan.x.interpolate({inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg']});
let opacity = pan.x.interpolate({inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9]})
let scale = enter;
let animatedCardStyles = {transform: [{translateX}, {translateY}, {rotate}], opacity};
let animatedCardStyles2 = {transform: [{scale}]};
return [animatedCardStyles, animatedCardStyles2]
}
render() {
return(
<View ref={c => this._root = c} style={{position: 'relative', flexDirection: 'column'}}>{(this.state.selectedItem)===undefined ? (<View />) : | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
let { pan, pan2, enter } = this.state; | <mask> // let [translateX, translateY] = [pan2.x, pan2.y];
<mask>
<mask> const rotate = pan.x.interpolate({ inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg'] });
<mask>
<mask> const opacity = pan.x.interpolate({ inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9] });
<mask> const scale = enter;
<mask>
<mask> const animatedCardStyles = { transform: [{ translateX }, { translateY }, { rotate }], opacity };
<mask> const animatedCardStyles2 = { transform: [{ scale }] };
<mask>
<mask> return [animatedCardStyles, animatedCardStyles2];
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove const rotate = pan.x.interpolate({ inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg'] });
</s> add getCardStyles() { </s> remove const animatedCardStyles = { transform: [{ translateX }, { translateY }, { rotate }], opacity };
const animatedCardStyles2 = { transform: [{ scale }] };
</s> add let [translateX, translateY] = [pan.x, pan.y];
// let [translateX, translateY] = [pan2.x, pan2.y]; </s> remove const [translateX, translateY] = [pan.x, pan.y];
// let [translateX, translateY] = [pan2.x, pan2.y];
</s> add } </s> remove return [animatedCardStyles, animatedCardStyles2];
}
render() {
return (
<View ref={c => this._root = c} {...this.props} style={{ position: 'relative', flexDirection: 'column', flex: 1 }}>{(this.state.selectedItem) === undefined ? (<View />) :
</s> add let rotate = pan.x.interpolate({inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg']});
let opacity = pan.x.interpolate({inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9]})
let scale = enter;
let animatedCardStyles = {transform: [{translateX}, {translateY}, {rotate}], opacity};
let animatedCardStyles2 = {transform: [{scale}]};
return [animatedCardStyles, animatedCardStyles2]
}
render() {
return(
<View ref={c => this._root = c} style={{position: 'relative', flexDirection: 'column'}}>{(this.state.selectedItem)===undefined ? (<View />) : </s> remove getCardStyles() {
const { pan, pan2, enter } = this.state;
</s> add _resetState() {
this.state.pan.setValue({x: 0, y: 0});
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top
});
if(this.props.onSwiping)
this.props.onSwiping(null); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
let [translateX, translateY] = [pan.x, pan.y];
// let [translateX, translateY] = [pan2.x, pan2.y]; | <mask>
<mask> const opacity = pan.x.interpolate({ inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9] });
<mask> const scale = enter;
<mask>
<mask> const animatedCardStyles = { transform: [{ translateX }, { translateY }, { rotate }], opacity };
<mask> const animatedCardStyles2 = { transform: [{ scale }] };
<mask>
<mask> return [animatedCardStyles, animatedCardStyles2];
<mask> }
<mask> render() {
<mask> return (
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove const opacity = pan.x.interpolate({ inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9] });
const scale = enter;
</s> add let { pan, pan2, enter } = this.state; </s> remove const rotate = pan.x.interpolate({ inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg'] });
</s> add getCardStyles() { </s> remove return [animatedCardStyles, animatedCardStyles2];
}
render() {
return (
<View ref={c => this._root = c} {...this.props} style={{ position: 'relative', flexDirection: 'column', flex: 1 }}>{(this.state.selectedItem) === undefined ? (<View />) :
</s> add let rotate = pan.x.interpolate({inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg']});
let opacity = pan.x.interpolate({inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9]})
let scale = enter;
let animatedCardStyles = {transform: [{translateX}, {translateY}, {rotate}], opacity};
let animatedCardStyles2 = {transform: [{scale}]};
return [animatedCardStyles, animatedCardStyles2]
}
render() {
return(
<View ref={c => this._root = c} style={{position: 'relative', flexDirection: 'column'}}>{(this.state.selectedItem)===undefined ? (<View />) : </s> remove const [translateX, translateY] = [pan.x, pan.y];
// let [translateX, translateY] = [pan2.x, pan2.y];
</s> add } </s> remove getCardStyles() {
const { pan, pan2, enter } = this.state;
</s> add _resetState() {
this.state.pan.setValue({x: 0, y: 0});
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top
});
if(this.props.onSwiping)
this.props.onSwiping(null); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
let rotate = pan.x.interpolate({inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg']});
let opacity = pan.x.interpolate({inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9]})
let scale = enter;
let animatedCardStyles = {transform: [{translateX}, {translateY}, {rotate}], opacity};
let animatedCardStyles2 = {transform: [{scale}]};
return [animatedCardStyles, animatedCardStyles2]
}
render() {
return(
<View ref={c => this._root = c} style={{position: 'relative', flexDirection: 'column'}}>{(this.state.selectedItem)===undefined ? (<View />) : | <mask>
<mask> const animatedCardStyles = { transform: [{ translateX }, { translateY }, { rotate }], opacity };
<mask> const animatedCardStyles2 = { transform: [{ scale }] };
<mask>
<mask> return [animatedCardStyles, animatedCardStyles2];
<mask> }
<mask> render() {
<mask> return (
<mask> <View ref={c => this._root = c} {...this.props} style={{ position: 'relative', flexDirection: 'column', flex: 1 }}>{(this.state.selectedItem) === undefined ? (<View />) :
<mask> (<View>
<mask> <Animated.View
<mask> style={[this.getCardStyles()[1], this.getInitialStyle().topCard,
<mask> { opacity: this.state.fadeAnim }]}
<mask> {...this._panResponder.panHandlers}
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove <Animated.View
style={[this.getCardStyles()[1], this.getInitialStyle().topCard,
{ opacity: this.state.fadeAnim }]}
{...this._panResponder.panHandlers}
>
{(this.props.renderBottom) ?
</s> add <Animated.View style={[this.getCardStyles()[1],this.getInitialStyle().topCard,{opacity: this.state.fadeAnim}]} {...this._panResponder.panHandlers}>
{(this.props.renderBottom) ? </s> remove const animatedCardStyles = { transform: [{ translateX }, { translateY }, { rotate }], opacity };
const animatedCardStyles2 = { transform: [{ scale }] };
</s> add let [translateX, translateY] = [pan.x, pan.y];
// let [translateX, translateY] = [pan2.x, pan2.y]; </s> remove const opacity = pan.x.interpolate({ inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9] });
const scale = enter;
</s> add let { pan, pan2, enter } = this.state; </s> remove const rotate = pan.x.interpolate({ inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg'] });
</s> add getCardStyles() { </s> remove constructor(props) {
super(props);
this.state = {
pan: new Animated.ValueXY(),
pan2: new Animated.ValueXY(),
enter: new Animated.Value(0.8),
selectedItem: this.props.dataSource[0],
selectedItem2: this.props.dataSource[1],
card1Top: true,
card2Top: false,
fadeAnim: new Animated.Value(0.8),
};
}
getInitialStyle() {
return {
topCard: {
position: 'absolute',
top: 0,
right: 0,
left: 0,
},
};
}
findNextIndexes() {
const currentIndex = this.props.dataSource.indexOf(this.state.selectedItem);
const newIdx = currentIndex + 1;
const newIdx2 = currentIndex + 2;
if (newIdx2 > this.props.dataSource.length - 1 && newIdx === this.props.dataSource.length - 1) {
return [newIdx, 0];
} else if (newIdx > this.props.dataSource.length - 1) {
return [0, 1];
} else {
return [newIdx, newIdx2];
</s> add constructor(props) {
super(props);
this.state = {
pan: new Animated.ValueXY(),
pan2: new Animated.ValueXY(),
enter: new Animated.Value(0.8),
selectedItem : this.props.dataSource[0],
selectedItem2 : this.props.dataSource[1],
card1Top: true,
card2Top: false,
fadeAnim: new Animated.Value(0.8)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
<Animated.View style={[this.getCardStyles()[1],this.getInitialStyle().topCard,{opacity: this.state.fadeAnim}]} {...this._panResponder.panHandlers}>
{(this.props.renderBottom) ? | <mask> render() {
<mask> return (
<mask> <View ref={c => this._root = c} {...this.props} style={{ position: 'relative', flexDirection: 'column', flex: 1 }}>{(this.state.selectedItem) === undefined ? (<View />) :
<mask> (<View>
<mask> <Animated.View
<mask> style={[this.getCardStyles()[1], this.getInitialStyle().topCard,
<mask> { opacity: this.state.fadeAnim }]}
<mask> {...this._panResponder.panHandlers}
<mask> >
<mask> {(this.props.renderBottom) ?
<mask> this.props.renderBottom(this.state.selectedItem2)
<mask> :
<mask> this.props.renderItem(this.state.selectedItem2)
<mask> }
<mask> </Animated.View>
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove return [animatedCardStyles, animatedCardStyles2];
}
render() {
return (
<View ref={c => this._root = c} {...this.props} style={{ position: 'relative', flexDirection: 'column', flex: 1 }}>{(this.state.selectedItem) === undefined ? (<View />) :
</s> add let rotate = pan.x.interpolate({inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg']});
let opacity = pan.x.interpolate({inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9]})
let scale = enter;
let animatedCardStyles = {transform: [{translateX}, {translateY}, {rotate}], opacity};
let animatedCardStyles2 = {transform: [{scale}]};
return [animatedCardStyles, animatedCardStyles2]
}
render() {
return(
<View ref={c => this._root = c} style={{position: 'relative', flexDirection: 'column'}}>{(this.state.selectedItem)===undefined ? (<View />) : </s> remove </Animated.View>
<Animated.View
style={[this.getCardStyles()[0], this.getInitialStyle().topCard]}
{...this._panResponder.panHandlers}
>
{(this.props.renderTop) ?
</s> add </Animated.View>
<Animated.View style={[ this.getCardStyles()[0], this.getInitialStyle().topCard] } {...this._panResponder.panHandlers} >
{(this.props.renderTop) ? </s> remove 'NativeBase.InputGroup': {
</s> add 'NativeBase.Item': { </s> remove swipeRight() {
if (this.props.onSwiping) {
this.props.onSwiping('right');
</s> add if(newIdx2 > this.props.dataSource.length - 1 && newIdx === this.props.dataSource.length - 1) {
return [newIdx, 0];
} else if (newIdx > this.props.dataSource.length - 1) {
return [0, 1];
} else {
return [newIdx, newIdx2];
} </s> remove if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity > 0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: { x: velocity, y: vy },
deceleration: 0.98,
}).start(this._resetState.bind(this));
} else {
Animated.spring(this.state.pan, {
toValue: { x: 0, y: 0 },
friction: 4,
}).start();
}
},
});
}
_resetState() {
this.state.pan.setValue({ x: 0, y: 0 });
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top,
});
if (this.props.onSwiping) {
this.props.onSwiping(null);
</s> add componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => {
return Math.abs(gestureState.dx) > 5;
},
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({x: this.state.pan.x._value, y: this.state.pan.y._value});
this.state.pan.setValue({x: 0, y: 0});
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20){
if(this.props.onSwiping)
this.props.onSwiping('right',gestureState.dx);
}
else if (gestureState.dx < -20){
if(this.props.onSwiping)
this.props.onSwiping('left',gestureState.dx);
}
let val = Math.abs((gestureState.dx*.0013));
let opa = Math.abs((gestureState.dx*.0022));
if (val>0.2) {
val = 0.2;
}
Animated.timing(
this.state.fadeAnim,
{toValue: 0.8+val}
).start();
Animated.spring(
this.state.enter,
{ toValue: 0.8+val, friction: 7 }
).start();
Animated.event([
null, {dx: this.state.pan.x},
])(e, gestureState)
},
onPanResponderRelease: (e, {vx, vy}) => {
if(this.props.onSwiping)
this.props.onSwiping(null);
var velocity;
if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity>0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: {x: velocity, y: vy},
deceleration: 0.98
}).start(this._resetState.bind(this))
} else {
Animated.spring(this.state.pan, {
toValue: {x: 0, y: 0},
friction: 4
}).start()
}
}
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
</Animated.View>
<Animated.View style={[ this.getCardStyles()[0], this.getInitialStyle().topCard] } {...this._panResponder.panHandlers} >
{(this.props.renderTop) ? | <mask> this.props.renderBottom(this.state.selectedItem2)
<mask> :
<mask> this.props.renderItem(this.state.selectedItem2)
<mask> }
<mask> </Animated.View>
<mask> <Animated.View
<mask> style={[this.getCardStyles()[0], this.getInitialStyle().topCard]}
<mask> {...this._panResponder.panHandlers}
<mask> >
<mask> {(this.props.renderTop) ?
<mask> this.props.renderTop(this.state.selectedItem)
<mask> :
<mask> this.props.renderItem(this.state.selectedItem)
<mask> }
<mask> </Animated.View>
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove <Animated.View
style={[this.getCardStyles()[1], this.getInitialStyle().topCard,
{ opacity: this.state.fadeAnim }]}
{...this._panResponder.panHandlers}
>
{(this.props.renderBottom) ?
</s> add <Animated.View style={[this.getCardStyles()[1],this.getInitialStyle().topCard,{opacity: this.state.fadeAnim}]} {...this._panResponder.panHandlers}>
{(this.props.renderBottom) ? </s> remove </Animated.View>
</View>
</s> add </Animated.View>
</View> </s> remove </View>
);
}
</s> add </View>
);
}
</s> remove return [animatedCardStyles, animatedCardStyles2];
}
render() {
return (
<View ref={c => this._root = c} {...this.props} style={{ position: 'relative', flexDirection: 'column', flex: 1 }}>{(this.state.selectedItem) === undefined ? (<View />) :
</s> add let rotate = pan.x.interpolate({inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg']});
let opacity = pan.x.interpolate({inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9]})
let scale = enter;
let animatedCardStyles = {transform: [{translateX}, {translateY}, {rotate}], opacity};
let animatedCardStyles2 = {transform: [{scale}]};
return [animatedCardStyles, animatedCardStyles2]
}
render() {
return(
<View ref={c => this._root = c} style={{position: 'relative', flexDirection: 'column'}}>{(this.state.selectedItem)===undefined ? (<View />) : </s> remove if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity > 0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: { x: velocity, y: vy },
deceleration: 0.98,
}).start(this._resetState.bind(this));
} else {
Animated.spring(this.state.pan, {
toValue: { x: 0, y: 0 },
friction: 4,
}).start();
}
},
});
}
_resetState() {
this.state.pan.setValue({ x: 0, y: 0 });
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top,
});
if (this.props.onSwiping) {
this.props.onSwiping(null);
</s> add componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => {
return Math.abs(gestureState.dx) > 5;
},
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({x: this.state.pan.x._value, y: this.state.pan.y._value});
this.state.pan.setValue({x: 0, y: 0});
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20){
if(this.props.onSwiping)
this.props.onSwiping('right',gestureState.dx);
}
else if (gestureState.dx < -20){
if(this.props.onSwiping)
this.props.onSwiping('left',gestureState.dx);
}
let val = Math.abs((gestureState.dx*.0013));
let opa = Math.abs((gestureState.dx*.0022));
if (val>0.2) {
val = 0.2;
}
Animated.timing(
this.state.fadeAnim,
{toValue: 0.8+val}
).start();
Animated.spring(
this.state.enter,
{ toValue: 0.8+val, friction: 7 }
).start();
Animated.event([
null, {dx: this.state.pan.x},
])(e, gestureState)
},
onPanResponderRelease: (e, {vx, vy}) => {
if(this.props.onSwiping)
this.props.onSwiping(null);
var velocity;
if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity>0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: {x: velocity, y: vy},
deceleration: 0.98
}).start(this._resetState.bind(this))
} else {
Animated.spring(this.state.pan, {
toValue: {x: 0, y: 0},
friction: 4
}).start()
}
}
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
</Animated.View>
</View> | <mask> this.props.renderTop(this.state.selectedItem)
<mask> :
<mask> this.props.renderItem(this.state.selectedItem)
<mask> }
<mask> </Animated.View>
<mask> </View>
<mask> )
<mask> }
<mask> </View>
<mask> );
<mask> }
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove </View>
);
}
</s> add </View>
);
}
</s> remove </Animated.View>
<Animated.View
style={[this.getCardStyles()[0], this.getInitialStyle().topCard]}
{...this._panResponder.panHandlers}
>
{(this.props.renderTop) ?
</s> add </Animated.View>
<Animated.View style={[ this.getCardStyles()[0], this.getInitialStyle().topCard] } {...this._panResponder.panHandlers} >
{(this.props.renderTop) ? </s> remove <Animated.View
style={[this.getCardStyles()[1], this.getInitialStyle().topCard,
{ opacity: this.state.fadeAnim }]}
{...this._panResponder.panHandlers}
>
{(this.props.renderBottom) ?
</s> add <Animated.View style={[this.getCardStyles()[1],this.getInitialStyle().topCard,{opacity: this.state.fadeAnim}]} {...this._panResponder.panHandlers}>
{(this.props.renderBottom) ? </s> remove if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity > 0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: { x: velocity, y: vy },
deceleration: 0.98,
}).start(this._resetState.bind(this));
} else {
Animated.spring(this.state.pan, {
toValue: { x: 0, y: 0 },
friction: 4,
}).start();
}
},
});
}
_resetState() {
this.state.pan.setValue({ x: 0, y: 0 });
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top,
});
if (this.props.onSwiping) {
this.props.onSwiping(null);
</s> add componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => {
return Math.abs(gestureState.dx) > 5;
},
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({x: this.state.pan.x._value, y: this.state.pan.y._value});
this.state.pan.setValue({x: 0, y: 0});
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20){
if(this.props.onSwiping)
this.props.onSwiping('right',gestureState.dx);
}
else if (gestureState.dx < -20){
if(this.props.onSwiping)
this.props.onSwiping('left',gestureState.dx);
}
let val = Math.abs((gestureState.dx*.0013));
let opa = Math.abs((gestureState.dx*.0022));
if (val>0.2) {
val = 0.2;
}
Animated.timing(
this.state.fadeAnim,
{toValue: 0.8+val}
).start();
Animated.spring(
this.state.enter,
{ toValue: 0.8+val, friction: 7 }
).start();
Animated.event([
null, {dx: this.state.pan.x},
])(e, gestureState)
},
onPanResponderRelease: (e, {vx, vy}) => {
if(this.props.onSwiping)
this.props.onSwiping(null);
var velocity;
if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity>0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: {x: velocity, y: vy},
deceleration: 0.98
}).start(this._resetState.bind(this))
} else {
Animated.spring(this.state.pan, {
toValue: {x: 0, y: 0},
friction: 4
}).start()
}
}
}) </s> remove if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
</s> add swipeLeft() {
if(this.props.onSwiping)
this.props.onSwiping('left');
setTimeout( () => {
Animated.timing(
this.state.fadeAnim,
{toValue: 1}
).start();
Animated.spring(
this.state.enter,
{ toValue: 1, friction: 7 }
).start();
this.selectNext();
Animated.decay(this.state.pan, {
velocity: {x: -8, y: 1},
deceleration: 0.98
}).start(this._resetState.bind(this))
}, 300);
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
</View>
);
}
| <mask> </Animated.View>
<mask> </View>
<mask> )
<mask> }
<mask> </View>
<mask> );
<mask> }
<mask> }
<mask>
<mask> DeckSwiper.propTypes = {
<mask> ...View.propTypes,
<mask> style: React.PropTypes.object,
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove </Animated.View>
</View>
</s> add </Animated.View>
</View> </s> remove </Animated.View>
<Animated.View
style={[this.getCardStyles()[0], this.getInitialStyle().topCard]}
{...this._panResponder.panHandlers}
>
{(this.props.renderTop) ?
</s> add </Animated.View>
<Animated.View style={[ this.getCardStyles()[0], this.getInitialStyle().topCard] } {...this._panResponder.panHandlers} >
{(this.props.renderTop) ? </s> remove }
</s> add </s> remove if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity > 0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: { x: velocity, y: vy },
deceleration: 0.98,
}).start(this._resetState.bind(this));
} else {
Animated.spring(this.state.pan, {
toValue: { x: 0, y: 0 },
friction: 4,
}).start();
}
},
});
}
_resetState() {
this.state.pan.setValue({ x: 0, y: 0 });
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top,
});
if (this.props.onSwiping) {
this.props.onSwiping(null);
</s> add componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => {
return Math.abs(gestureState.dx) > 5;
},
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({x: this.state.pan.x._value, y: this.state.pan.y._value});
this.state.pan.setValue({x: 0, y: 0});
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20){
if(this.props.onSwiping)
this.props.onSwiping('right',gestureState.dx);
}
else if (gestureState.dx < -20){
if(this.props.onSwiping)
this.props.onSwiping('left',gestureState.dx);
}
let val = Math.abs((gestureState.dx*.0013));
let opa = Math.abs((gestureState.dx*.0022));
if (val>0.2) {
val = 0.2;
}
Animated.timing(
this.state.fadeAnim,
{toValue: 0.8+val}
).start();
Animated.spring(
this.state.enter,
{ toValue: 0.8+val, friction: 7 }
).start();
Animated.event([
null, {dx: this.state.pan.x},
])(e, gestureState)
},
onPanResponderRelease: (e, {vx, vy}) => {
if(this.props.onSwiping)
this.props.onSwiping(null);
var velocity;
if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity>0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: {x: velocity, y: vy},
deceleration: 0.98
}).start(this._resetState.bind(this))
} else {
Animated.spring(this.state.pan, {
toValue: {x: 0, y: 0},
friction: 4
}).start()
}
}
}) </s> remove }
selectNext() {
const nextIndexes = this.findNextIndexes();
setTimeout(() => {
this.setState({
selectedItem: this.props.dataSource[nextIndexes[0]],
});
setTimeout(() => {
this.setState({
selectedItem2: this.props.dataSource[nextIndexes[1]],
});
}, 350);
}, 50);
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/basic/DeckSwiper.js |
'NativeBase.Item': { | <mask> },
<mask> paddingHorizontal: 15,
<mask> },
<mask> '.searchBar': {
<mask> 'NativeBase.InputGroup': {
<mask> 'NativeBase.Icon': {
<mask> backgroundColor: 'transparent',
<mask> color: variables.dropdownLinkColor,
<mask> fontSize: (Platform.OS === 'ios') ? variables.iconFontSize - 10 : variables.iconFontSize - 5,
<mask> alignItems: 'center',
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove paddingRight: 8,
</s> add paddingRight: 10,
paddingLeft: 10, </s> remove 'NativeBase.InputGroup': {
</s> add 'NativeBase.Item': { </s> remove swipeRight() {
if (this.props.onSwiping) {
this.props.onSwiping('right');
</s> add if(newIdx2 > this.props.dataSource.length - 1 && newIdx === this.props.dataSource.length - 1) {
return [newIdx, 0];
} else if (newIdx > this.props.dataSource.length - 1) {
return [0, 1];
} else {
return [newIdx, newIdx2];
} </s> remove constructor(props) {
super(props);
this.state = {
pan: new Animated.ValueXY(),
pan2: new Animated.ValueXY(),
enter: new Animated.Value(0.8),
selectedItem: this.props.dataSource[0],
selectedItem2: this.props.dataSource[1],
card1Top: true,
card2Top: false,
fadeAnim: new Animated.Value(0.8),
};
}
getInitialStyle() {
return {
topCard: {
position: 'absolute',
top: 0,
right: 0,
left: 0,
},
};
}
findNextIndexes() {
const currentIndex = this.props.dataSource.indexOf(this.state.selectedItem);
const newIdx = currentIndex + 1;
const newIdx2 = currentIndex + 2;
if (newIdx2 > this.props.dataSource.length - 1 && newIdx === this.props.dataSource.length - 1) {
return [newIdx, 0];
} else if (newIdx > this.props.dataSource.length - 1) {
return [0, 1];
} else {
return [newIdx, newIdx2];
</s> add constructor(props) {
super(props);
this.state = {
pan: new Animated.ValueXY(),
pan2: new Animated.ValueXY(),
enter: new Animated.Value(0.8),
selectedItem : this.props.dataSource[0],
selectedItem2 : this.props.dataSource[1],
card1Top: true,
card2Top: false,
fadeAnim: new Animated.Value(0.8)
} </s> remove <Animated.View
style={[this.getCardStyles()[1], this.getInitialStyle().topCard,
{ opacity: this.state.fadeAnim }]}
{...this._panResponder.panHandlers}
>
{(this.props.renderBottom) ?
</s> add <Animated.View style={[this.getCardStyles()[1],this.getInitialStyle().topCard,{opacity: this.state.fadeAnim}]} {...this._panResponder.panHandlers}>
{(this.props.renderBottom) ? | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/theme/Header.js |
paddingRight: 10,
paddingLeft: 10, | <mask> color: variables.dropdownLinkColor,
<mask> fontSize: (Platform.OS === 'ios') ? variables.iconFontSize - 10 : variables.iconFontSize - 5,
<mask> alignItems: 'center',
<mask> marginTop: 2,
<mask> paddingRight: 8,
<mask> },
<mask> 'NativeBase.IconNB': {
<mask> backgroundColor: 'transparent',
<mask> color: null,
<mask> alignSelf: 'center',
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove 'NativeBase.InputGroup': {
</s> add 'NativeBase.Item': { </s> remove 'NativeBase.InputGroup': {
</s> add 'NativeBase.Item': { </s> remove swipeRight() {
if (this.props.onSwiping) {
this.props.onSwiping('right');
</s> add if(newIdx2 > this.props.dataSource.length - 1 && newIdx === this.props.dataSource.length - 1) {
return [newIdx, 0];
} else if (newIdx > this.props.dataSource.length - 1) {
return [0, 1];
} else {
return [newIdx, newIdx2];
} </s> remove constructor(props) {
super(props);
this.state = {
pan: new Animated.ValueXY(),
pan2: new Animated.ValueXY(),
enter: new Animated.Value(0.8),
selectedItem: this.props.dataSource[0],
selectedItem2: this.props.dataSource[1],
card1Top: true,
card2Top: false,
fadeAnim: new Animated.Value(0.8),
};
}
getInitialStyle() {
return {
topCard: {
position: 'absolute',
top: 0,
right: 0,
left: 0,
},
};
}
findNextIndexes() {
const currentIndex = this.props.dataSource.indexOf(this.state.selectedItem);
const newIdx = currentIndex + 1;
const newIdx2 = currentIndex + 2;
if (newIdx2 > this.props.dataSource.length - 1 && newIdx === this.props.dataSource.length - 1) {
return [newIdx, 0];
} else if (newIdx > this.props.dataSource.length - 1) {
return [0, 1];
} else {
return [newIdx, newIdx2];
</s> add constructor(props) {
super(props);
this.state = {
pan: new Animated.ValueXY(),
pan2: new Animated.ValueXY(),
enter: new Animated.Value(0.8),
selectedItem : this.props.dataSource[0],
selectedItem2 : this.props.dataSource[1],
card1Top: true,
card2Top: false,
fadeAnim: new Animated.Value(0.8)
} </s> remove <Animated.View
style={[this.getCardStyles()[1], this.getInitialStyle().topCard,
{ opacity: this.state.fadeAnim }]}
{...this._panResponder.panHandlers}
>
{(this.props.renderBottom) ?
</s> add <Animated.View style={[this.getCardStyles()[1],this.getInitialStyle().topCard,{opacity: this.state.fadeAnim}]} {...this._panResponder.panHandlers}>
{(this.props.renderBottom) ? | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/theme/Header.js |
'NativeBase.Item': { | <mask> height: (Platform.OS === 'ios') ? undefined : 0,
<mask> },
<mask> },
<mask> '.rounded': {
<mask> 'NativeBase.InputGroup': {
<mask> borderRadius: (Platform.OS === 'ios') ? 25 : 0,
<mask> },
<mask> },
<mask> 'NativeBase.Left': {
<mask> 'NativeBase.Button': {
</s> DeckSwiper updated with swipeleft and swiperight prop </s> remove 'NativeBase.InputGroup': {
</s> add 'NativeBase.Item': { </s> remove paddingRight: 8,
</s> add paddingRight: 10,
paddingLeft: 10, </s> remove <Animated.View
style={[this.getCardStyles()[1], this.getInitialStyle().topCard,
{ opacity: this.state.fadeAnim }]}
{...this._panResponder.panHandlers}
>
{(this.props.renderBottom) ?
</s> add <Animated.View style={[this.getCardStyles()[1],this.getInitialStyle().topCard,{opacity: this.state.fadeAnim}]} {...this._panResponder.panHandlers}>
{(this.props.renderBottom) ? </s> remove return [animatedCardStyles, animatedCardStyles2];
}
render() {
return (
<View ref={c => this._root = c} {...this.props} style={{ position: 'relative', flexDirection: 'column', flex: 1 }}>{(this.state.selectedItem) === undefined ? (<View />) :
</s> add let rotate = pan.x.interpolate({inputRange: [-700, 0, 700], outputRange: ['-10deg', '0deg', '10deg']});
let opacity = pan.x.interpolate({inputRange: [-320, 0, 320], outputRange: [0.9, 1, 0.9]})
let scale = enter;
let animatedCardStyles = {transform: [{translateX}, {translateY}, {rotate}], opacity};
let animatedCardStyles2 = {transform: [{scale}]};
return [animatedCardStyles, animatedCardStyles2]
}
render() {
return(
<View ref={c => this._root = c} style={{position: 'relative', flexDirection: 'column'}}>{(this.state.selectedItem)===undefined ? (<View />) : </s> remove if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity > 0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: { x: velocity, y: vy },
deceleration: 0.98,
}).start(this._resetState.bind(this));
} else {
Animated.spring(this.state.pan, {
toValue: { x: 0, y: 0 },
friction: 4,
}).start();
}
},
});
}
_resetState() {
this.state.pan.setValue({ x: 0, y: 0 });
this.state.enter.setValue(0.8);
this.state.fadeAnim.setValue(0.8);
this.setState({
card1Top: !this.state.card1Top,
card2Top: !this.state.card2Top,
});
if (this.props.onSwiping) {
this.props.onSwiping(null);
</s> add componentWillMount() {
this._panResponder = PanResponder.create({
onMoveShouldSetResponderCapture: () => true,
onMoveShouldSetPanResponderCapture: (evt, gestureState) => {
return Math.abs(gestureState.dx) > 5;
},
onPanResponderGrant: (e, gestureState) => {
this.state.pan.setOffset({x: this.state.pan.x._value, y: this.state.pan.y._value});
this.state.pan.setValue({x: 0, y: 0});
},
onPanResponderMove: (e, gestureState) => {
if (gestureState.dx > 20){
if(this.props.onSwiping)
this.props.onSwiping('right',gestureState.dx);
}
else if (gestureState.dx < -20){
if(this.props.onSwiping)
this.props.onSwiping('left',gestureState.dx);
}
let val = Math.abs((gestureState.dx*.0013));
let opa = Math.abs((gestureState.dx*.0022));
if (val>0.2) {
val = 0.2;
}
Animated.timing(
this.state.fadeAnim,
{toValue: 0.8+val}
).start();
Animated.spring(
this.state.enter,
{ toValue: 0.8+val, friction: 7 }
).start();
Animated.event([
null, {dx: this.state.pan.x},
])(e, gestureState)
},
onPanResponderRelease: (e, {vx, vy}) => {
if(this.props.onSwiping)
this.props.onSwiping(null);
var velocity;
if (vx >= 0) {
velocity = clamp(vx, 4.5, 10);
} else if (vx < 0) {
velocity = clamp(vx * -1, 4.5, 10) * -1;
}
if (Math.abs(this.state.pan.x._value) > SWIPE_THRESHOLD) {
if (velocity>0) {
(this.props.onSwipeRight) ? this.props.onSwipeRight() : undefined;
this.selectNext();
} else {
(this.props.onSwipeLeft) ? this.props.onSwipeLeft() : undefined;
this.selectNext();
}
Animated.decay(this.state.pan, {
velocity: {x: velocity, y: vy},
deceleration: 0.98
}).start(this._resetState.bind(this))
} else {
Animated.spring(this.state.pan, {
toValue: {x: 0, y: 0},
friction: 4
}).start()
}
}
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9a9134788869b588ad39979b83fbfa5dd7e0f348 | src/theme/Header.js |
Stack, | <mask> Center,
<mask> HStack,
<mask> Switch,
<mask> Text,
<mask> } from 'native-base';
<mask>
<mask> const ButtonTemplate = ({ shade }: any) => {
<mask> const colorContrast = useContrastText(`emerald.${shade}`);
</s> fix: use accessible color responsive </s> remove let [, , toggleAccessibleColors] = useAccessibleColors();
</s> add const [, , toggleAccessibleColors] = useAccessibleColors(); </s> remove <HStack space="3">
</s> add <Stack space="3" direction={['column', 'row']}> </s> remove </HStack>
</s> add </Stack> | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9c202f201c090a929ffa069774d91ce0bcc64e84 | example/storybook/stories/hooks/useAccessibleColors/Basic.tsx |
const [, , toggleAccessibleColors] = useAccessibleColors(); | <mask> );
<mask> };
<mask>
<mask> export const Example = () => {
<mask> let [, , toggleAccessibleColors] = useAccessibleColors();
<mask> const { colors } = useTheme();
<mask> return (
<mask> <Center>
<mask> <HStack space="3">
<mask> {Object.keys(colors.yellow).map((key, index) => {
</s> fix: use accessible color responsive </s> remove <HStack space="3">
</s> add <Stack space="3" direction={['column', 'row']}> </s> remove </HStack>
</s> add </Stack> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9c202f201c090a929ffa069774d91ce0bcc64e84 | example/storybook/stories/hooks/useAccessibleColors/Basic.tsx |
<Stack space="3" direction={['column', 'row']}> | <mask> let [, , toggleAccessibleColors] = useAccessibleColors();
<mask> const { colors } = useTheme();
<mask> return (
<mask> <Center>
<mask> <HStack space="3">
<mask> {Object.keys(colors.yellow).map((key, index) => {
<mask> if (index > 2 && index < 9) return <ButtonTemplate shade={key} />;
<mask> })}
<mask> </HStack>
<mask> <HStack mt="6" space="3">
</s> fix: use accessible color responsive </s> remove let [, , toggleAccessibleColors] = useAccessibleColors();
</s> add const [, , toggleAccessibleColors] = useAccessibleColors(); </s> remove </HStack>
</s> add </Stack> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9c202f201c090a929ffa069774d91ce0bcc64e84 | example/storybook/stories/hooks/useAccessibleColors/Basic.tsx |
</Stack> | <mask> <HStack space="3">
<mask> {Object.keys(colors.yellow).map((key, index) => {
<mask> if (index > 2 && index < 9) return <ButtonTemplate shade={key} />;
<mask> })}
<mask> </HStack>
<mask> <HStack mt="6" space="3">
<mask> <Text>Toggle Accessible Colors</Text>
<mask> <Switch onToggle={toggleAccessibleColors} colorScheme="coolGray" />
<mask> </HStack>
<mask> </Center>
</s> fix: use accessible color responsive </s> remove <HStack space="3">
</s> add <Stack space="3" direction={['column', 'row']}> </s> remove let [, , toggleAccessibleColors] = useAccessibleColors();
</s> add const [, , toggleAccessibleColors] = useAccessibleColors(); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9c202f201c090a929ffa069774d91ce0bcc64e84 | example/storybook/stories/hooks/useAccessibleColors/Basic.tsx |
if(incomingProps) {
try {
_.merge(computedProps, defaultProps, incomingProps);
} catch (exception) {
console.log('Warning: Call stack size exceeded when merging props, falling back to shallow merge.');
_.assign(computedProps, defaultProps, incomingProps);
}
} else | <mask> var incomingPropsStyle = incomingProps.style;
<mask> delete incomingProps.style;
<mask>
<mask> // console.log(defaultProps, incomingProps);
<mask> if(incomingProps)
<mask> _.merge(computedProps, defaultProps, incomingProps);
<mask> else
<mask> computedProps = defaultProps;
<mask> // Pass the merged Style Object instead
<mask> if(incomingPropsStyle) {
<mask>
<mask> var computedPropsStyle = {};
</s> Fix 'call stack size exceeded' error when parsing props with React components as values </s> remove } </s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9cb1a1e2c2125c6789142f1ec0bf07cb0a33f11f | Utils/computeProps.js |
<mask>
<mask> }
<mask> // console.log("computedProps ", computedProps);
<mask> return computedProps;
<mask> } </s> Fix 'call stack size exceeded' error when parsing props with React components as values </s> remove if(incomingProps)
_.merge(computedProps, defaultProps, incomingProps);
else
</s> add if(incomingProps) {
try {
_.merge(computedProps, defaultProps, incomingProps);
} catch (exception) {
console.log('Warning: Call stack size exceeded when merging props, falling back to shallow merge.');
_.assign(computedProps, defaultProps, incomingProps);
}
} else | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/GeekyAnts/NativeBase/commit/9cb1a1e2c2125c6789142f1ec0bf07cb0a33f11f | Utils/computeProps.js |
|
} | <mask> }
<mask> // console.log("computedProps ", computedProps);
<mask> return computedProps;
<mask> }
</s> Fix 'call stack size exceeded' error when parsing props with React components as values </s> remove } </s> add </s> remove if(incomingProps)
_.merge(computedProps, defaultProps, incomingProps);
else
</s> add if(incomingProps) {
try {
_.merge(computedProps, defaultProps, incomingProps);
} catch (exception) {
console.log('Warning: Call stack size exceeded when merging props, falling back to shallow merge.');
_.assign(computedProps, defaultProps, incomingProps);
}
} else | [
"keep",
"keep",
"keep",
"add"
] | https://github.com/GeekyAnts/NativeBase/commit/9cb1a1e2c2125c6789142f1ec0bf07cb0a33f11f | Utils/computeProps.js |
export type { ITooltipProps } from './Tooltip';
| <mask> export { Popover } from './Popover';
<mask> export { Tooltip } from './Tooltip';
<mask> export type { IPopoverProps } from './Popover';
<mask>
<mask> export { AlertDialog } from './AlertDialog';
<mask> export type { IAlertDialogProps } from './AlertDialog';
</s> fix: type-export Export the type of Tooltip component | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9cfec7732941302d226a3c39306348bc0244b588 | src/components/composites/index.ts |
ITooltipProps, | <mask> Toast,
<mask> IToastProps,
<mask> Backdrop,
<mask> Drawer,
<mask> Tooltip,
<mask> } from './components/composites';
<mask> import type { IScrollViewProps } from './components/basic';
</s> fix: type-export Export the type of Tooltip component | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9cfec7732941302d226a3c39306348bc0244b588 | src/index.tsx |
ITooltipProps, | <mask> // ITabsContextProps,
<mask> IToastProps,
<mask> IActionsheetProps,
<mask> IActionsheetContentProps,
<mask> IActionsheetItemProps,
<mask> IFabProps,
</s> fix: type-export Export the type of Tooltip component | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9cfec7732941302d226a3c39306348bc0244b588 | src/index.tsx |
platform === "ios" && (deviceHeight === 812 || deviceHeight === 896); | <mask> const deviceWidth = Dimensions.get("window").width;
<mask> const platform = Platform.OS;
<mask> const platformStyle = undefined;
<mask> const isIphoneX =
<mask> platform === "ios" && (deviceHeight === 812 || deviceWidth === 812);
<mask>
<mask> export default {
<mask> platformStyle,
<mask> platform,
<mask>
</s> iPhoneX family height issue fixed </s> remove platform === "ios" && (deviceHeight === 812 || deviceWidth === 812);
</s> add platform === "ios" && (deviceHeight === 812 || deviceHeight === 896); </s> remove platform === "ios" && (deviceHeight === 812 || deviceWidth === 812);
</s> add platform === "ios" && (deviceHeight === 812 || deviceHeight === 896); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9e324204be9699c51d14957ec55835c7a2f97487 | src/theme/variables/commonColor.js |
platform === "ios" && (deviceHeight === 812 || deviceHeight === 896); | <mask> const deviceWidth = Dimensions.get("window").width;
<mask> const platform = Platform.OS;
<mask> const platformStyle = "material";
<mask> const isIphoneX =
<mask> platform === "ios" && (deviceHeight === 812 || deviceWidth === 812);
<mask>
<mask> export default {
<mask> platformStyle,
<mask> platform,
<mask>
</s> iPhoneX family height issue fixed </s> remove platform === "ios" && (deviceHeight === 812 || deviceWidth === 812);
</s> add platform === "ios" && (deviceHeight === 812 || deviceHeight === 896); </s> remove platform === "ios" && (deviceHeight === 812 || deviceWidth === 812);
</s> add platform === "ios" && (deviceHeight === 812 || deviceHeight === 896); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9e324204be9699c51d14957ec55835c7a2f97487 | src/theme/variables/material.js |
platform === "ios" && (deviceHeight === 812 || deviceHeight === 896); | <mask> const deviceWidth = Dimensions.get("window").width;
<mask> const platform = Platform.OS;
<mask> const platformStyle = undefined;
<mask> const isIphoneX =
<mask> platform === "ios" && (deviceHeight === 812 || deviceWidth === 812);
<mask>
<mask> export default {
<mask> platformStyle,
<mask> platform,
<mask>
</s> iPhoneX family height issue fixed | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9e324204be9699c51d14957ec55835c7a2f97487 | src/theme/variables/platform.js |
"react": "17.0.1", | <mask> "expo-linear-gradient": "^9.1.0",
<mask> "expo-splash-screen": "^0.8.1",
<mask> "expo-status-bar": "~1.0.3",
<mask> "formik": "^2.2.6",
<mask> "react": "16.13.1",
<mask> "react-hook-form": "^6.14.0",
<mask> "react-native": "https://github.com/expo/react-native/archive/sdk-40.0.1.tar.gz",
<mask> "react-native-keyboard-aware-scroll-view": "^0.9.4",
<mask> "react-native-safe-area-context": "^3.1.9",
<mask> "react-native-svg": "^12.1.0",
</s> chore: upgrade expo version to 44.0.0 </s> remove "react-native": "https://github.com/expo/react-native/archive/sdk-40.0.1.tar.gz",
</s> add "react-native": "https://github.com/expo/react-native/archive/sdk-44.0.0.tar.gz", </s> remove "react-native-safe-area-context": "^3.1.9",
"react-native-svg": "^12.1.0",
"react-native-web": "^0.16.5"
</s> add "react-native-safe-area-context": "3.3.2",
"react-native-svg": "12.1.1",
"react-native-web": "0.17.1" </s> remove "@babel/core": "~7.9.0",
</s> add "@babel/core": "^7.12.9", </s> remove "typescript": "4.2.4"
</s> add "typescript": "~4.3.5" </s> remove "react-dom": "^17.0.2",
</s> add "react-dom": "17.0.1", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9ef46b0f4cc2c00a78ee5df1794cf9d3fd234f5c | example/package.json |
"react-native": "https://github.com/expo/react-native/archive/sdk-44.0.0.tar.gz", | <mask> "expo-status-bar": "~1.0.3",
<mask> "formik": "^2.2.6",
<mask> "react": "16.13.1",
<mask> "react-hook-form": "^6.14.0",
<mask> "react-native": "https://github.com/expo/react-native/archive/sdk-40.0.1.tar.gz",
<mask> "react-native-keyboard-aware-scroll-view": "^0.9.4",
<mask> "react-native-safe-area-context": "^3.1.9",
<mask> "react-native-svg": "^12.1.0",
<mask> "react-native-web": "^0.16.5"
<mask> },
</s> chore: upgrade expo version to 44.0.0 </s> remove "react": "16.13.1",
</s> add "react": "17.0.1", </s> remove "react-native-safe-area-context": "^3.1.9",
"react-native-svg": "^12.1.0",
"react-native-web": "^0.16.5"
</s> add "react-native-safe-area-context": "3.3.2",
"react-native-svg": "12.1.1",
"react-native-web": "0.17.1" </s> remove "@babel/core": "~7.9.0",
</s> add "@babel/core": "^7.12.9", </s> remove "typescript": "4.2.4"
</s> add "typescript": "~4.3.5" </s> remove "react-dom": "^17.0.2",
</s> add "react-dom": "17.0.1", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9ef46b0f4cc2c00a78ee5df1794cf9d3fd234f5c | example/package.json |
"react-native-safe-area-context": "3.3.2",
"react-native-svg": "12.1.1",
"react-native-web": "0.17.1" | <mask> "react": "16.13.1",
<mask> "react-hook-form": "^6.14.0",
<mask> "react-native": "https://github.com/expo/react-native/archive/sdk-40.0.1.tar.gz",
<mask> "react-native-keyboard-aware-scroll-view": "^0.9.4",
<mask> "react-native-safe-area-context": "^3.1.9",
<mask> "react-native-svg": "^12.1.0",
<mask> "react-native-web": "^0.16.5"
<mask> },
<mask> "devDependencies": {
<mask> "@babel/core": "~7.9.0",
<mask> "@babel/runtime": "^7.12.5",
<mask> "@expo/webpack-config": "^0.12.51",
</s> chore: upgrade expo version to 44.0.0 </s> remove "react-native": "https://github.com/expo/react-native/archive/sdk-40.0.1.tar.gz",
</s> add "react-native": "https://github.com/expo/react-native/archive/sdk-44.0.0.tar.gz", </s> remove "@babel/core": "~7.9.0",
</s> add "@babel/core": "^7.12.9", </s> remove "react": "16.13.1",
</s> add "react": "17.0.1", </s> remove "@expo/webpack-config": "^0.12.51",
</s> add "@expo/webpack-config": "~0.16.2", </s> remove "typescript": "4.2.4"
</s> add "typescript": "~4.3.5" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9ef46b0f4cc2c00a78ee5df1794cf9d3fd234f5c | example/package.json |
"@babel/core": "^7.12.9", | <mask> "react-native-svg": "^12.1.0",
<mask> "react-native-web": "^0.16.5"
<mask> },
<mask> "devDependencies": {
<mask> "@babel/core": "~7.9.0",
<mask> "@babel/runtime": "^7.12.5",
<mask> "@expo/webpack-config": "^0.12.51",
<mask> "@storybook/addon-actions": "^5.3",
<mask> "@storybook/addon-knobs": "^5.3",
<mask> "@storybook/addon-links": "^5.3",
</s> chore: upgrade expo version to 44.0.0 </s> remove "@expo/webpack-config": "^0.12.51",
</s> add "@expo/webpack-config": "~0.16.2", </s> remove "react-native-safe-area-context": "^3.1.9",
"react-native-svg": "^12.1.0",
"react-native-web": "^0.16.5"
</s> add "react-native-safe-area-context": "3.3.2",
"react-native-svg": "12.1.1",
"react-native-web": "0.17.1" </s> remove "react-native": "https://github.com/expo/react-native/archive/sdk-40.0.1.tar.gz",
</s> add "react-native": "https://github.com/expo/react-native/archive/sdk-44.0.0.tar.gz", </s> remove "react": "16.13.1",
</s> add "react": "17.0.1", </s> remove "typescript": "4.2.4"
</s> add "typescript": "~4.3.5" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9ef46b0f4cc2c00a78ee5df1794cf9d3fd234f5c | example/package.json |
"@expo/webpack-config": "~0.16.2", | <mask> },
<mask> "devDependencies": {
<mask> "@babel/core": "~7.9.0",
<mask> "@babel/runtime": "^7.12.5",
<mask> "@expo/webpack-config": "^0.12.51",
<mask> "@storybook/addon-actions": "^5.3",
<mask> "@storybook/addon-knobs": "^5.3",
<mask> "@storybook/addon-links": "^5.3",
<mask> "@storybook/addon-ondevice-actions": "^5.3.23",
<mask> "@storybook/addon-ondevice-knobs": "^5.3.23",
</s> chore: upgrade expo version to 44.0.0 </s> remove "@babel/core": "~7.9.0",
</s> add "@babel/core": "^7.12.9", </s> remove "react-native-safe-area-context": "^3.1.9",
"react-native-svg": "^12.1.0",
"react-native-web": "^0.16.5"
</s> add "react-native-safe-area-context": "3.3.2",
"react-native-svg": "12.1.1",
"react-native-web": "0.17.1" </s> remove "@types/react": "~16.9.35",
"@types/react-dom": "~16.9.8",
"@types/react-native": "~0.63.2",
</s> add "@types/react": "~17.0.21",
"@types/react-dom": "~17.0.9",
"@types/react-native": "~0.64.12", </s> remove "typescript": "4.2.4"
</s> add "typescript": "~4.3.5" </s> remove "react-dom": "^17.0.2",
</s> add "react-dom": "17.0.1", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9ef46b0f4cc2c00a78ee5df1794cf9d3fd234f5c | example/package.json |
"@types/react": "~17.0.21",
"@types/react-dom": "~17.0.9",
"@types/react-native": "~0.64.12", | <mask> "@storybook/addon-ondevice-knobs": "^5.3.23",
<mask> "@storybook/addon-storyshots": "^6.3.4",
<mask> "@storybook/react-native": "^5.3.23",
<mask> "@storybook/react-native-server": "^5.3.23",
<mask> "@types/react": "~16.9.35",
<mask> "@types/react-dom": "~16.9.8",
<mask> "@types/react-native": "~0.63.2",
<mask> "babel-loader": "^8.2.2",
<mask> "babel-plugin-module-resolver": "^4.0.0",
<mask> "core-js": "3.6.5",
<mask> "jest": "^27.0.6",
<mask> "jest-expo": "^42.0.1",
</s> chore: upgrade expo version to 44.0.0 </s> remove "jest": "^27.0.6",
"jest-expo": "^42.0.1",
</s> add "jest": "^26.6.3",
"jest-expo": "^44.0.0", </s> remove "@expo/webpack-config": "^0.12.51",
</s> add "@expo/webpack-config": "~0.16.2", </s> remove "react-dom": "^17.0.2",
</s> add "react-dom": "17.0.1", </s> remove "typescript": "4.2.4"
</s> add "typescript": "~4.3.5" </s> remove "@babel/core": "~7.9.0",
</s> add "@babel/core": "^7.12.9", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9ef46b0f4cc2c00a78ee5df1794cf9d3fd234f5c | example/package.json |
"jest": "^26.6.3",
"jest-expo": "^44.0.0", | <mask> "@types/react-native": "~0.63.2",
<mask> "babel-loader": "^8.2.2",
<mask> "babel-plugin-module-resolver": "^4.0.0",
<mask> "core-js": "3.6.5",
<mask> "jest": "^27.0.6",
<mask> "jest-expo": "^42.0.1",
<mask> "metro-react-native-babel-preset": "^0.64.0",
<mask> "patch-package": "^6.2.2",
<mask> "postinstall-postinstall": "^2.1.0",
<mask> "react-dom": "^17.0.2",
<mask> "react-test-renderer": "^17.0.2",
</s> chore: upgrade expo version to 44.0.0 </s> remove "@types/react": "~16.9.35",
"@types/react-dom": "~16.9.8",
"@types/react-native": "~0.63.2",
</s> add "@types/react": "~17.0.21",
"@types/react-dom": "~17.0.9",
"@types/react-native": "~0.64.12", </s> remove "react-dom": "^17.0.2",
</s> add "react-dom": "17.0.1", </s> remove "typescript": "4.2.4"
</s> add "typescript": "~4.3.5" </s> remove "@expo/webpack-config": "^0.12.51",
</s> add "@expo/webpack-config": "~0.16.2", </s> remove "@babel/core": "~7.9.0",
</s> add "@babel/core": "^7.12.9", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9ef46b0f4cc2c00a78ee5df1794cf9d3fd234f5c | example/package.json |
"react-dom": "17.0.1", | <mask> "jest-expo": "^42.0.1",
<mask> "metro-react-native-babel-preset": "^0.64.0",
<mask> "patch-package": "^6.2.2",
<mask> "postinstall-postinstall": "^2.1.0",
<mask> "react-dom": "^17.0.2",
<mask> "react-test-renderer": "^17.0.2",
<mask> "typescript": "4.2.4"
<mask> },
<mask> "private": false
<mask> }
</s> chore: upgrade expo version to 44.0.0 </s> remove "typescript": "4.2.4"
</s> add "typescript": "~4.3.5" </s> remove "jest": "^27.0.6",
"jest-expo": "^42.0.1",
</s> add "jest": "^26.6.3",
"jest-expo": "^44.0.0", </s> remove "@types/react": "~16.9.35",
"@types/react-dom": "~16.9.8",
"@types/react-native": "~0.63.2",
</s> add "@types/react": "~17.0.21",
"@types/react-dom": "~17.0.9",
"@types/react-native": "~0.64.12", </s> remove "@expo/webpack-config": "^0.12.51",
</s> add "@expo/webpack-config": "~0.16.2", </s> remove "@babel/core": "~7.9.0",
</s> add "@babel/core": "^7.12.9", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9ef46b0f4cc2c00a78ee5df1794cf9d3fd234f5c | example/package.json |
"typescript": "~4.3.5" | <mask> "patch-package": "^6.2.2",
<mask> "postinstall-postinstall": "^2.1.0",
<mask> "react-dom": "^17.0.2",
<mask> "react-test-renderer": "^17.0.2",
<mask> "typescript": "4.2.4"
<mask> },
<mask> "private": false
<mask> }
</s> chore: upgrade expo version to 44.0.0 </s> remove "react-dom": "^17.0.2",
</s> add "react-dom": "17.0.1", </s> remove "jest": "^27.0.6",
"jest-expo": "^42.0.1",
</s> add "jest": "^26.6.3",
"jest-expo": "^44.0.0", </s> remove "@expo/webpack-config": "^0.12.51",
</s> add "@expo/webpack-config": "~0.16.2", </s> remove "@babel/core": "~7.9.0",
</s> add "@babel/core": "^7.12.9", </s> remove "react-native": "https://github.com/expo/react-native/archive/sdk-40.0.1.tar.gz",
</s> add "react-native": "https://github.com/expo/react-native/archive/sdk-44.0.0.tar.gz", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9ef46b0f4cc2c00a78ee5df1794cf9d3fd234f5c | example/package.json |
import type { ResponsiveValue } from '../../types';
import type { ISizes } from '../../../theme/base/sizes'; | <mask> import type { InterfaceBoxProps } from '../Box';
<mask> import type { ColorSchemeType } from '../../../components/types';
<mask>
<mask> export interface InterfaceSliderProps extends InterfaceBoxProps<ISliderProps> {
<mask> /** The current value of the Slider */
<mask> value?: number;
<mask> /** The default value (uncontrolled). */
</s> feat: sliderTrackHeight, thumbSize, interactionBox types | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/GeekyAnts/NativeBase/commit/9f1cc307b06d9529796b12756bfdd94728226de7 | src/components/primitives/Slider/types.tsx |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.