docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
listlengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
contentStyle: "#f5f4f5",
|
<mask>
<mask> //Accordion
<mask> headerStyle: "#d8d3d8",
<mask> iconStyle: "#000",
<mask> contentStyle: "#F4F3F4",
<mask> expandedIconStyle: "#000",
<mask>
<mask> // Android
<mask> androidRipple: true,
<mask> androidRippleColor: "rgba(256, 256, 256, 0.3)",
</s> changed theme colors for Accordion
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/864942330cb5b78d2c3c48feac2883be063900f6
|
src/theme/variables/platform.js
|
"fontSize": 34,
"lineHeight": 36,
|
<mask> "fontSize": 12,
<mask> },
<mask> Object {
<mask> "color": "#007aff",
<mask> "fontSize": 25,
<mask> "lineHeight": 28,
<mask> },
<mask> Object {
<mask> "fontFamily": "Ionicons",
<mask> "fontStyle": "normal",
<mask> "fontWeight": "normal",
</s> header prop added to icon </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36, </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36, </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36, </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36, </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/870e2733803d5240c1b55156467ae2be65c3ac8f
|
Components/Widgets/Header/__snapshots__/Header.ios.spec.js.snap
|
"fontSize": 34,
"lineHeight": 36,
|
<mask> "fontSize": 12,
<mask> },
<mask> Object {
<mask> "color": "#007aff",
<mask> "fontSize": 25,
<mask> "lineHeight": 28,
<mask> },
<mask> Object {
<mask> "fontFamily": "Ionicons",
<mask> "fontStyle": "normal",
<mask> "fontWeight": "normal",
</s> header prop added to icon
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/870e2733803d5240c1b55156467ae2be65c3ac8f
|
Components/Widgets/Header/__snapshots__/Header.ios.spec.js.snap
|
"fontSize": 34,
"lineHeight": 36,
|
<mask> "fontSize": 12,
<mask> },
<mask> Object {
<mask> "color": "#007aff",
<mask> "fontSize": 25,
<mask> "lineHeight": 28,
<mask> },
<mask> Object {
<mask> "fontFamily": "Ionicons",
<mask> "fontStyle": "normal",
<mask> "fontWeight": "normal",
</s> header prop added to icon
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/870e2733803d5240c1b55156467ae2be65c3ac8f
|
Components/Widgets/Header/__snapshots__/Header.ios.spec.js.snap
|
"fontSize": 34,
"lineHeight": 36,
|
<mask> "fontSize": 12,
<mask> },
<mask> Object {
<mask> "color": "#007aff",
<mask> "fontSize": 25,
<mask> "lineHeight": 28,
<mask> },
<mask> Object {
<mask> "fontFamily": "Ionicons",
<mask> "fontStyle": "normal",
<mask> "fontWeight": "normal",
</s> header prop added to icon
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/870e2733803d5240c1b55156467ae2be65c3ac8f
|
Components/Widgets/Header/__snapshots__/Header.ios.spec.js.snap
|
"fontSize": 34,
"lineHeight": 36,
|
<mask> "fontSize": 12,
<mask> },
<mask> Object {
<mask> "color": "#007aff",
<mask> "fontSize": 25,
<mask> "lineHeight": 28,
<mask> },
<mask> Object {
<mask> "fontFamily": "Ionicons",
<mask> "fontStyle": "normal",
<mask> "fontWeight": "normal",
</s> header prop added to icon
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/870e2733803d5240c1b55156467ae2be65c3ac8f
|
Components/Widgets/Header/__snapshots__/Header.ios.spec.js.snap
|
"fontSize": 34,
"lineHeight": 36,
|
<mask> "fontSize": 12,
<mask> },
<mask> Object {
<mask> "color": "#007aff",
<mask> "fontSize": 25,
<mask> "lineHeight": 28,
<mask> },
<mask> Object {
<mask> "fontFamily": "Ionicons",
<mask> "fontStyle": "normal",
<mask> "fontWeight": "normal",
</s> header prop added to icon
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/870e2733803d5240c1b55156467ae2be65c3ac8f
|
Components/Widgets/Header/__snapshots__/Header.ios.spec.js.snap
|
"fontSize": 34,
"lineHeight": 36,
|
<mask> "fontSize": 12,
<mask> },
<mask> Object {
<mask> "color": "#007aff",
<mask> "fontSize": 25,
<mask> "lineHeight": 28,
<mask> },
<mask> Object {
<mask> "fontFamily": "Ionicons",
<mask> "fontStyle": "normal",
<mask> "fontWeight": "normal",
</s> header prop added to icon
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/870e2733803d5240c1b55156467ae2be65c3ac8f
|
Components/Widgets/Header/__snapshots__/Header.ios.spec.js.snap
|
"fontSize": 34,
"lineHeight": 36,
|
<mask> "fontSize": 12,
<mask> },
<mask> Object {
<mask> "color": "#007aff",
<mask> "fontSize": 25,
<mask> "lineHeight": 28,
<mask> },
<mask> Object {
<mask> "fontFamily": "Ionicons",
<mask> "fontStyle": "normal",
<mask> "fontWeight": "normal",
</s> header prop added to icon
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/870e2733803d5240c1b55156467ae2be65c3ac8f
|
Components/Widgets/Header/__snapshots__/Header.ios.spec.js.snap
|
{React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, header : true, style: this.getInitialStyle().toolbarButton})}
|
<mask> {[title[0],subtitle[0]]}
<mask> </View>)
<mask> newChildren.push(<View key='title2' style={{flex: 3, alignSelf: 'stretch'}} />)
<mask> newChildren.push(<View key='btn1' style={{alignItems: 'center', justifyContent: 'flex-start', flexDirection: 'row', marginRight: -14}}>
<mask> {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
<mask> </View>)
<mask> }
<mask> else {
<mask> newChildren.push(<View key='title' style={{flex: 3, alignSelf: 'stretch', justifyContent: 'center'}}>
<mask> {[title[0]]}
</s> header prop added to icon </s> remove {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
</s> add {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, header : true, style: this.getInitialStyle().toolbarButton})} </s> remove {React.cloneElement(buttons[i], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
</s> add {React.cloneElement(buttons[i], {color: this.getTheme().iosToolbarBtnColor, header : true, style: this.getInitialStyle().toolbarButton})} </s> remove _react2.default.cloneElement(buttons[i],{color:this.getTheme().iosToolbarBtnColor,style:this.getInitialStyle().toolbarButton})));
</s> add _react2.default.cloneElement(buttons[i],{color:this.getTheme().iosToolbarBtnColor,header:true,style:this.getInitialStyle().toolbarButton}))); </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36, </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/870e2733803d5240c1b55156467ae2be65c3ac8f
|
Components/Widgets/Header/index.js
|
{React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, header : true, style: this.getInitialStyle().toolbarButton})}
|
<mask> newChildren.push(<View key='title' style={{position: 'absolute', left: 0, right: 0, top: 13, bottom: 0, alignSelf: 'center', justifyContent: 'center'}}>
<mask> {[title[0],subtitle[0]]}
<mask> </View>)
<mask> newChildren.push(<View key='btn1' style={{alignItems: 'center', justifyContent: 'flex-start', flexDirection: 'row', marginLeft: -14}}>
<mask> {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
<mask> </View>)
<mask> newChildren.push(<View key='title2' style={{flex: 3, alignSelf: 'stretch'}} />)
<mask> if (buttons.length>1) {
<mask> for (let i = 1; i < buttons.length; i++) {
<mask> newChildren.push(<View key={'btn' + (i+1)} style={{alignItems: 'center', justifyContent: 'flex-start', flexDirection: 'row', marginRight: -14}}>
</s> header prop added to icon </s> remove {React.cloneElement(buttons[i], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
</s> add {React.cloneElement(buttons[i], {color: this.getTheme().iosToolbarBtnColor, header : true, style: this.getInitialStyle().toolbarButton})} </s> remove {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
</s> add {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, header : true, style: this.getInitialStyle().toolbarButton})} </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36, </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36, </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/870e2733803d5240c1b55156467ae2be65c3ac8f
|
Components/Widgets/Header/index.js
|
{React.cloneElement(buttons[i], {color: this.getTheme().iosToolbarBtnColor, header : true, style: this.getInitialStyle().toolbarButton})}
|
<mask> newChildren.push(<View key='title2' style={{flex: 3, alignSelf: 'stretch'}} />)
<mask> if (buttons.length>1) {
<mask> for (let i = 1; i < buttons.length; i++) {
<mask> newChildren.push(<View key={'btn' + (i+1)} style={{alignItems: 'center', justifyContent: 'flex-start', flexDirection: 'row', marginRight: -14}}>
<mask> {React.cloneElement(buttons[i], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
<mask> </View>)
<mask> }
<mask> }
<mask> }
<mask> else {
</s> header prop added to icon </s> remove {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
</s> add {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, header : true, style: this.getInitialStyle().toolbarButton})} </s> remove {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
</s> add {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, header : true, style: this.getInitialStyle().toolbarButton})} </s> remove _react2.default.cloneElement(buttons[i],{color:this.getTheme().iosToolbarBtnColor,style:this.getInitialStyle().toolbarButton})));
</s> add _react2.default.cloneElement(buttons[i],{color:this.getTheme().iosToolbarBtnColor,header:true,style:this.getInitialStyle().toolbarButton}))); </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36, </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/870e2733803d5240c1b55156467ae2be65c3ac8f
|
Components/Widgets/Header/index.js
|
_react2.default.cloneElement(buttons[0],{color:this.getTheme().iosToolbarBtnColor,header:true,style:this.getInitialStyle().toolbarButton})));
|
<mask> [title[0],subtitle[0]]));
<mask>
<mask> newChildren.push(_react2.default.createElement(_View2.default,{key:'title2',style:{flex:3,alignSelf:'stretch'}}));
<mask> newChildren.push(_react2.default.createElement(_View2.default,{key:'btn1',style:{alignItems:'center',justifyContent:'flex-start',flexDirection:'row',marginRight:-14}},
<mask> _react2.default.cloneElement(buttons[0],{color:this.getTheme().iosToolbarBtnColor,style:this.getInitialStyle().toolbarButton})));
<mask>
<mask> }else
<mask> {
<mask> newChildren.push(_react2.default.createElement(_View2.default,{key:'title',style:{flex:3,alignSelf:'stretch',justifyContent:'center'}},
<mask> [title[0]]));
</s> header prop added to icon </s> remove _react2.default.cloneElement(buttons[0],{color:this.getTheme().iosToolbarBtnColor,style:this.getInitialStyle().toolbarButton})));
</s> add _react2.default.cloneElement(buttons[0],{color:this.getTheme().iosToolbarBtnColor,header:true,style:this.getInitialStyle().toolbarButton}))); </s> remove _react2.default.cloneElement(buttons[i],{color:this.getTheme().iosToolbarBtnColor,style:this.getInitialStyle().toolbarButton})));
</s> add _react2.default.cloneElement(buttons[i],{color:this.getTheme().iosToolbarBtnColor,header:true,style:this.getInitialStyle().toolbarButton}))); </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36, </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36, </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/870e2733803d5240c1b55156467ae2be65c3ac8f
|
dist/Components/Widgets/Header/index.js
|
_react2.default.cloneElement(buttons[0],{color:this.getTheme().iosToolbarBtnColor,header:true,style:this.getInitialStyle().toolbarButton})));
|
<mask> newChildren.push(_react2.default.createElement(_View2.default,{key:'title',style:{position:'absolute',left:0,right:0,top:13,bottom:0,alignSelf:'center',justifyContent:'center'}},
<mask> [title[0],subtitle[0]]));
<mask>
<mask> newChildren.push(_react2.default.createElement(_View2.default,{key:'btn1',style:{alignItems:'center',justifyContent:'flex-start',flexDirection:'row',marginLeft:-14}},
<mask> _react2.default.cloneElement(buttons[0],{color:this.getTheme().iosToolbarBtnColor,style:this.getInitialStyle().toolbarButton})));
<mask>
<mask> newChildren.push(_react2.default.createElement(_View2.default,{key:'title2',style:{flex:3,alignSelf:'stretch'}}));
<mask> if(buttons.length>1){
<mask> for(var i=1;i<buttons.length;i++){
<mask> newChildren.push(_react2.default.createElement(_View2.default,{key:'btn'+(i+1),style:{alignItems:'center',justifyContent:'flex-start',flexDirection:'row',marginRight:-14}},
</s> header prop added to icon </s> remove _react2.default.cloneElement(buttons[i],{color:this.getTheme().iosToolbarBtnColor,style:this.getInitialStyle().toolbarButton})));
</s> add _react2.default.cloneElement(buttons[i],{color:this.getTheme().iosToolbarBtnColor,header:true,style:this.getInitialStyle().toolbarButton}))); </s> remove _react2.default.cloneElement(buttons[0],{color:this.getTheme().iosToolbarBtnColor,style:this.getInitialStyle().toolbarButton})));
</s> add _react2.default.cloneElement(buttons[0],{color:this.getTheme().iosToolbarBtnColor,header:true,style:this.getInitialStyle().toolbarButton}))); </s> remove {React.cloneElement(buttons[i], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
</s> add {React.cloneElement(buttons[i], {color: this.getTheme().iosToolbarBtnColor, header : true, style: this.getInitialStyle().toolbarButton})} </s> remove {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
</s> add {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, header : true, style: this.getInitialStyle().toolbarButton})} </s> remove {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
</s> add {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, header : true, style: this.getInitialStyle().toolbarButton})}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/870e2733803d5240c1b55156467ae2be65c3ac8f
|
dist/Components/Widgets/Header/index.js
|
_react2.default.cloneElement(buttons[i],{color:this.getTheme().iosToolbarBtnColor,header:true,style:this.getInitialStyle().toolbarButton})));
|
<mask> newChildren.push(_react2.default.createElement(_View2.default,{key:'title2',style:{flex:3,alignSelf:'stretch'}}));
<mask> if(buttons.length>1){
<mask> for(var i=1;i<buttons.length;i++){
<mask> newChildren.push(_react2.default.createElement(_View2.default,{key:'btn'+(i+1),style:{alignItems:'center',justifyContent:'flex-start',flexDirection:'row',marginRight:-14}},
<mask> _react2.default.cloneElement(buttons[i],{color:this.getTheme().iosToolbarBtnColor,style:this.getInitialStyle().toolbarButton})));
<mask>
<mask> }
<mask> }
<mask> }else
<mask> {
</s> header prop added to icon </s> remove _react2.default.cloneElement(buttons[0],{color:this.getTheme().iosToolbarBtnColor,style:this.getInitialStyle().toolbarButton})));
</s> add _react2.default.cloneElement(buttons[0],{color:this.getTheme().iosToolbarBtnColor,header:true,style:this.getInitialStyle().toolbarButton}))); </s> remove _react2.default.cloneElement(buttons[0],{color:this.getTheme().iosToolbarBtnColor,style:this.getInitialStyle().toolbarButton})));
</s> add _react2.default.cloneElement(buttons[0],{color:this.getTheme().iosToolbarBtnColor,header:true,style:this.getInitialStyle().toolbarButton}))); </s> remove {React.cloneElement(buttons[i], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
</s> add {React.cloneElement(buttons[i], {color: this.getTheme().iosToolbarBtnColor, header : true, style: this.getInitialStyle().toolbarButton})} </s> remove {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
</s> add {React.cloneElement(buttons[0], {color: this.getTheme().iosToolbarBtnColor, header : true, style: this.getInitialStyle().toolbarButton})} </s> remove "fontSize": 25,
"lineHeight": 28,
</s> add "fontSize": 34,
"lineHeight": 36,
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/870e2733803d5240c1b55156467ae2be65c3ac8f
|
dist/Components/Widgets/Header/index.js
|
import { transparentize } from './tools';
const isNumber = (n: any) => typeof n === 'number' && !isNaN(n);
const getColor = (rawValue: any, scale: any, theme: any) => {
let alphaMatched = rawValue?.match(/:alpha\.\d\d?\d?/);
if (alphaMatched) {
let colorMatched = rawValue?.match(/^.*?(?=:alpha)/);
let color = colorMatched ? colorMatched[0] : colorMatched;
const alphaValue = alphaMatched[0].split('.')[1];
const alphaFromToken = get(theme['opacity'], alphaValue, alphaValue);
let alpha = alphaFromToken ? parseFloat(alphaFromToken) : 1;
const newColor = transparentize(color, alpha)(theme);
return newColor;
} else {
return get(scale, rawValue, rawValue);
}
};
// To handle negative margins
const getMargin = (n: any, scale: any) => {
if (!isNumber(n)) {
return get(scale, n, n);
}
const isNegative = n < 0;
const absolute = Math.abs(n);
const value = get(scale, absolute, absolute);
if (!isNumber(value)) {
return isNegative ? '-' + value : value;
}
return value * (isNegative ? -1 : 1);
};
|
<mask> import { StyleSheet } from 'react-native';
<mask> import { get } from 'lodash';
<mask> import { resolveValueWithBreakpoint } from '../hooks/useThemeProps/utils';
<mask> import tinycolor from 'tinycolor2';
<mask>
<mask> export const layout = {
<mask> width: {
<mask> property: 'width',
<mask> scale: 'sizes',
</s> fix: add negative margin resolution (#3866) </s> remove const originalRawValue = value;
if (scale === 'colors') {
if (value?.match(/^.*?(?=:alpha)/)) {
value = value?.match(/^.*?(?=:alpha)/)[0];
}
}
let val = get(theme[scale], value, value);
if (scale === 'colors') {
}
if (scale === 'colors') {
const alpha: string = originalRawValue?.match(/:alpha\.\d\d?\d?/)
? originalRawValue?.match(/:alpha\.\d\d?\d?/)[0].split('.')[1]
: '1';
const resolvedAlpha = get(theme['opacity'], alpha, alpha);
let color = tinycolor(val);
val =
resolvedAlpha === '1'
? val
: color.setAlpha(resolvedAlpha).toString();
}
</s> add let val = value; </s> remove val = transformer(val);
</s> add val = transformer(val, theme[scale], theme);
} else {
val = get(theme[scale], value, value); </s> remove let value = resolveValueWithBreakpoint(rawValue, currentBreakpoint, key);
</s> add const value = resolveValueWithBreakpoint(
rawValue,
currentBreakpoint,
key
); </s> remove export let shouldEnableNewStyledSystemImplementation = false;
</s> add export let shouldEnableNewStyledSystemImplementation = true;
|
[
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getColor,
|
<mask> color: {
<mask> property: 'color',
<mask> scale: 'colors',
<mask> },
<mask> backgroundColor: {
<mask> property: 'backgroundColor',
<mask> scale: 'colors',
<mask> transformer: getColor,
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getColor,
|
<mask> },
<mask> backgroundColor: {
<mask> property: 'backgroundColor',
<mask> scale: 'colors',
<mask> },
<mask> opacity: true,
<mask> bg: {
<mask> property: 'backgroundColor',
<mask> scale: 'colors',
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getColor,
|
<mask> property: 'backgroundColor',
<mask> scale: 'colors',
<mask> },
<mask> bgColor: {
<mask> property: 'backgroundColor',
<mask> scale: 'colors',
<mask> transformer: getColor,
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getColor,
|
<mask> },
<mask> bgColor: {
<mask> property: 'backgroundColor',
<mask> scale: 'colors',
<mask> },
<mask> };
<mask>
<mask> export const border = {
<mask> border: {
</s> fix: add negative margin resolution (#3866) </s> remove import tinycolor from 'tinycolor2';
</s> add import { transparentize } from './tools';
const isNumber = (n: any) => typeof n === 'number' && !isNaN(n);
const getColor = (rawValue: any, scale: any, theme: any) => {
let alphaMatched = rawValue?.match(/:alpha\.\d\d?\d?/);
if (alphaMatched) {
let colorMatched = rawValue?.match(/^.*?(?=:alpha)/);
let color = colorMatched ? colorMatched[0] : colorMatched;
const alphaValue = alphaMatched[0].split('.')[1];
const alphaFromToken = get(theme['opacity'], alphaValue, alphaValue);
let alpha = alphaFromToken ? parseFloat(alphaFromToken) : 1;
const newColor = transparentize(color, alpha)(theme);
return newColor;
} else {
return get(scale, rawValue, rawValue);
}
};
// To handle negative margins
const getMargin = (n: any, scale: any) => {
if (!isNumber(n)) {
return get(scale, n, n);
}
const isNegative = n < 0;
const absolute = Math.abs(n);
const value = get(scale, absolute, absolute);
if (!isNumber(value)) {
return isNegative ? '-' + value : value;
}
return value * (isNegative ? -1 : 1);
}; </s> remove export let shouldEnableNewStyledSystemImplementation = false;
</s> add export let shouldEnableNewStyledSystemImplementation = true;
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getColor,
|
<mask> borderColor: {
<mask> property: 'borderColor',
<mask> scale: 'colors',
<mask> },
<mask> borderRadius: {
<mask> property: 'borderRadius',
<mask> scale: 'radii',
<mask> },
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getColor,
|
<mask> property: 'borderTopColor',
<mask> scale: 'colors',
<mask> },
<mask> borderTopStyle: {
<mask> property: 'borderTopStyle',
<mask> scale: 'borderStyles',
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getColor,
|
<mask> borderBottomColor: {
<mask> property: 'borderBottomColor',
<mask> scale: 'colors',
<mask> },
<mask> borderBottomStyle: {
<mask> property: 'borderBottomStyle',
<mask> scale: 'borderStyles',
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getColor,
|
<mask> property: 'borderLeftColor',
<mask> scale: 'colors',
<mask> },
<mask> borderLeftStyle: {
<mask> property: 'borderLeftStyle',
<mask> scale: 'borderStyles',
<mask> },
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getColor,
|
<mask> },
<mask> borderRightColor: {
<mask> property: 'borderRightColor',
<mask> scale: 'colors',
<mask> },
<mask> borderRightStyle: {
<mask> property: 'borderRightStyle',
<mask> scale: 'borderStyles',
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getMargin,
|
<mask> property: 'margin',
<mask> scale: 'space',
<mask> },
<mask> m: {
<mask> property: 'margin',
<mask> scale: 'space',
<mask> transformer: getMargin,
<mask> },
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getMargin,
|
<mask> property: 'margin',
<mask> scale: 'space',
<mask> },
<mask> marginTop: {
<mask> property: 'marginTop',
<mask> scale: 'space',
<mask> transformer: getMargin,
<mask> },
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getMargin,
|
<mask> property: 'marginTop',
<mask> scale: 'space',
<mask> },
<mask> mt: {
<mask> property: 'marginTop',
<mask> scale: 'space',
<mask> transformer: getMargin,
<mask> },
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getMargin,
|
<mask> },
<mask> mt: {
<mask> property: 'marginTop',
<mask> scale: 'space',
<mask> },
<mask> marginRight: {
<mask> property: 'marginRight',
<mask> scale: 'space',
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getMargin,
|
<mask> marginRight: {
<mask> property: 'marginRight',
<mask> scale: 'space',
<mask> },
<mask> mr: {
<mask> property: 'marginRight',
<mask> scale: 'space',
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getMargin,
|
<mask> mr: {
<mask> property: 'marginRight',
<mask> scale: 'space',
<mask> },
<mask> marginBottom: {
<mask> property: 'marginBottom',
<mask> scale: 'space',
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getMargin,
|
<mask> },
<mask> marginBottom: {
<mask> property: 'marginBottom',
<mask> scale: 'space',
<mask> },
<mask> mb: {
<mask> property: 'marginBottom',
<mask> scale: 'space',
<mask> transformer: getMargin,
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getMargin,
|
<mask> },
<mask> mb: {
<mask> property: 'marginBottom',
<mask> scale: 'space',
<mask> },
<mask> marginLeft: {
<mask> property: 'marginLeft',
<mask> scale: 'space',
<mask> transformer: getMargin,
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getMargin,
|
<mask> },
<mask> marginLeft: {
<mask> property: 'marginLeft',
<mask> scale: 'space',
<mask> },
<mask> ml: {
<mask> property: 'marginLeft',
<mask> scale: 'space',
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getMargin,
|
<mask> ml: {
<mask> property: 'marginLeft',
<mask> scale: 'space',
<mask> },
<mask> marginX: {
<mask> properties: ['marginLeft', 'marginRight'],
<mask> scale: 'space',
<mask> transformer: getMargin,
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getMargin,
|
<mask> properties: ['marginLeft', 'marginRight'],
<mask> scale: 'space',
<mask> },
<mask> mx: {
<mask> properties: ['marginLeft', 'marginRight'],
<mask> scale: 'space',
<mask> transformer: getMargin,
<mask> },
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getMargin,
|
<mask> },
<mask> mx: {
<mask> properties: ['marginLeft', 'marginRight'],
<mask> scale: 'space',
<mask> },
<mask> marginY: {
<mask> properties: ['marginTop', 'marginBottom'],
<mask> scale: 'space',
<mask> transformer: getMargin,
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getMargin,
|
<mask> marginY: {
<mask> properties: ['marginTop', 'marginBottom'],
<mask> scale: 'space',
<mask> },
<mask> my: {
<mask> properties: ['marginTop', 'marginBottom'],
<mask> scale: 'space',
<mask> transformer: getMargin,
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: getMargin,
|
<mask> },
<mask> my: {
<mask> properties: ['marginTop', 'marginBottom'],
<mask> scale: 'space',
<mask> },
<mask>
<mask> padding: {
<mask> property: 'padding',
<mask> scale: 'space',
</s> fix: add negative margin resolution (#3866)
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
transformer: (val: any, scale: any) => {
return val ? get(scale, val, val).toString() : val;
|
<mask> },
<mask> fontWeight: {
<mask> property: 'fontWeight',
<mask> scale: 'fontWeights',
<mask> transformer: (val: any) => {
<mask> return val ? val.toString() : val;
<mask> },
<mask> },
<mask> lineHeight: {
<mask> property: 'lineHeight',
<mask> scale: 'lineHeights',
</s> fix: add negative margin resolution (#3866) </s> remove import tinycolor from 'tinycolor2';
</s> add import { transparentize } from './tools';
const isNumber = (n: any) => typeof n === 'number' && !isNaN(n);
const getColor = (rawValue: any, scale: any, theme: any) => {
let alphaMatched = rawValue?.match(/:alpha\.\d\d?\d?/);
if (alphaMatched) {
let colorMatched = rawValue?.match(/^.*?(?=:alpha)/);
let color = colorMatched ? colorMatched[0] : colorMatched;
const alphaValue = alphaMatched[0].split('.')[1];
const alphaFromToken = get(theme['opacity'], alphaValue, alphaValue);
let alpha = alphaFromToken ? parseFloat(alphaFromToken) : 1;
const newColor = transparentize(color, alpha)(theme);
return newColor;
} else {
return get(scale, rawValue, rawValue);
}
};
// To handle negative margins
const getMargin = (n: any, scale: any) => {
if (!isNumber(n)) {
return get(scale, n, n);
}
const isNegative = n < 0;
const absolute = Math.abs(n);
const value = get(scale, absolute, absolute);
if (!isNumber(value)) {
return isNegative ? '-' + value : value;
}
return value * (isNegative ? -1 : 1);
};
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
const rawValue = props[key];
|
<mask> }: any) => {
<mask> let styleFromProps: any = {};
<mask> let restProps: any = {};
<mask> for (let key in props) {
<mask> let rawValue = props[key];
<mask>
<mask> if (key in propConfig) {
<mask> let value = resolveValueWithBreakpoint(rawValue, currentBreakpoint, key);
<mask>
<mask> const config = propConfig[key as keyof typeof propConfig];
</s> fix: add negative margin resolution (#3866) </s> remove let value = resolveValueWithBreakpoint(rawValue, currentBreakpoint, key);
</s> add const value = resolveValueWithBreakpoint(
rawValue,
currentBreakpoint,
key
); </s> remove export let shouldEnableNewStyledSystemImplementation = false;
</s> add export let shouldEnableNewStyledSystemImplementation = true; </s> remove import tinycolor from 'tinycolor2';
</s> add import { transparentize } from './tools';
const isNumber = (n: any) => typeof n === 'number' && !isNaN(n);
const getColor = (rawValue: any, scale: any, theme: any) => {
let alphaMatched = rawValue?.match(/:alpha\.\d\d?\d?/);
if (alphaMatched) {
let colorMatched = rawValue?.match(/^.*?(?=:alpha)/);
let color = colorMatched ? colorMatched[0] : colorMatched;
const alphaValue = alphaMatched[0].split('.')[1];
const alphaFromToken = get(theme['opacity'], alphaValue, alphaValue);
let alpha = alphaFromToken ? parseFloat(alphaFromToken) : 1;
const newColor = transparentize(color, alpha)(theme);
return newColor;
} else {
return get(scale, rawValue, rawValue);
}
};
// To handle negative margins
const getMargin = (n: any, scale: any) => {
if (!isNumber(n)) {
return get(scale, n, n);
}
const isNegative = n < 0;
const absolute = Math.abs(n);
const value = get(scale, absolute, absolute);
if (!isNumber(value)) {
return isNegative ? '-' + value : value;
}
return value * (isNegative ? -1 : 1);
}; </s> remove const originalRawValue = value;
if (scale === 'colors') {
if (value?.match(/^.*?(?=:alpha)/)) {
value = value?.match(/^.*?(?=:alpha)/)[0];
}
}
let val = get(theme[scale], value, value);
if (scale === 'colors') {
}
if (scale === 'colors') {
const alpha: string = originalRawValue?.match(/:alpha\.\d\d?\d?/)
? originalRawValue?.match(/:alpha\.\d\d?\d?/)[0].split('.')[1]
: '1';
const resolvedAlpha = get(theme['opacity'], alpha, alpha);
let color = tinycolor(val);
val =
resolvedAlpha === '1'
? val
: color.setAlpha(resolvedAlpha).toString();
}
</s> add let val = value; </s> remove val = transformer(val);
</s> add val = transformer(val, theme[scale], theme);
} else {
val = get(theme[scale], value, value);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
const value = resolveValueWithBreakpoint(
rawValue,
currentBreakpoint,
key
);
|
<mask> for (let key in props) {
<mask> let rawValue = props[key];
<mask>
<mask> if (key in propConfig) {
<mask> let value = resolveValueWithBreakpoint(rawValue, currentBreakpoint, key);
<mask>
<mask> const config = propConfig[key as keyof typeof propConfig];
<mask> if (config === true) {
<mask> styleFromProps = { ...styleFromProps, [key]: value };
<mask> } else if (config) {
</s> fix: add negative margin resolution (#3866) </s> remove let rawValue = props[key];
</s> add const rawValue = props[key]; </s> remove const originalRawValue = value;
if (scale === 'colors') {
if (value?.match(/^.*?(?=:alpha)/)) {
value = value?.match(/^.*?(?=:alpha)/)[0];
}
}
let val = get(theme[scale], value, value);
if (scale === 'colors') {
}
if (scale === 'colors') {
const alpha: string = originalRawValue?.match(/:alpha\.\d\d?\d?/)
? originalRawValue?.match(/:alpha\.\d\d?\d?/)[0].split('.')[1]
: '1';
const resolvedAlpha = get(theme['opacity'], alpha, alpha);
let color = tinycolor(val);
val =
resolvedAlpha === '1'
? val
: color.setAlpha(resolvedAlpha).toString();
}
</s> add let val = value; </s> remove import tinycolor from 'tinycolor2';
</s> add import { transparentize } from './tools';
const isNumber = (n: any) => typeof n === 'number' && !isNaN(n);
const getColor = (rawValue: any, scale: any, theme: any) => {
let alphaMatched = rawValue?.match(/:alpha\.\d\d?\d?/);
if (alphaMatched) {
let colorMatched = rawValue?.match(/^.*?(?=:alpha)/);
let color = colorMatched ? colorMatched[0] : colorMatched;
const alphaValue = alphaMatched[0].split('.')[1];
const alphaFromToken = get(theme['opacity'], alphaValue, alphaValue);
let alpha = alphaFromToken ? parseFloat(alphaFromToken) : 1;
const newColor = transparentize(color, alpha)(theme);
return newColor;
} else {
return get(scale, rawValue, rawValue);
}
};
// To handle negative margins
const getMargin = (n: any, scale: any) => {
if (!isNumber(n)) {
return get(scale, n, n);
}
const isNegative = n < 0;
const absolute = Math.abs(n);
const value = get(scale, absolute, absolute);
if (!isNumber(value)) {
return isNegative ? '-' + value : value;
}
return value * (isNegative ? -1 : 1);
}; </s> remove val = transformer(val);
</s> add val = transformer(val, theme[scale], theme);
} else {
val = get(theme[scale], value, value); </s> remove export let shouldEnableNewStyledSystemImplementation = false;
</s> add export let shouldEnableNewStyledSystemImplementation = true;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
let val = value;
|
<mask> styleFromProps = { ...styleFromProps, [key]: value };
<mask> } else if (config) {
<mask> //@ts-ignore
<mask> const { property, scale, properties, transformer } = config;
<mask> const originalRawValue = value;
<mask> if (scale === 'colors') {
<mask> if (value?.match(/^.*?(?=:alpha)/)) {
<mask> value = value?.match(/^.*?(?=:alpha)/)[0];
<mask> }
<mask> }
<mask> let val = get(theme[scale], value, value);
<mask> if (scale === 'colors') {
<mask> }
<mask> if (scale === 'colors') {
<mask> const alpha: string = originalRawValue?.match(/:alpha\.\d\d?\d?/)
<mask> ? originalRawValue?.match(/:alpha\.\d\d?\d?/)[0].split('.')[1]
<mask> : '1';
<mask> const resolvedAlpha = get(theme['opacity'], alpha, alpha);
<mask> let color = tinycolor(val);
<mask> val =
<mask> resolvedAlpha === '1'
<mask> ? val
<mask> : color.setAlpha(resolvedAlpha).toString();
<mask> }
<mask> if (transformer) {
<mask> val = transformer(val);
<mask> }
<mask> if (typeof val === 'string' && val.endsWith('px')) {
<mask> val = parseInt(val, 10);
</s> fix: add negative margin resolution (#3866) </s> remove val = transformer(val);
</s> add val = transformer(val, theme[scale], theme);
} else {
val = get(theme[scale], value, value); </s> remove let value = resolveValueWithBreakpoint(rawValue, currentBreakpoint, key);
</s> add const value = resolveValueWithBreakpoint(
rawValue,
currentBreakpoint,
key
); </s> remove import tinycolor from 'tinycolor2';
</s> add import { transparentize } from './tools';
const isNumber = (n: any) => typeof n === 'number' && !isNaN(n);
const getColor = (rawValue: any, scale: any, theme: any) => {
let alphaMatched = rawValue?.match(/:alpha\.\d\d?\d?/);
if (alphaMatched) {
let colorMatched = rawValue?.match(/^.*?(?=:alpha)/);
let color = colorMatched ? colorMatched[0] : colorMatched;
const alphaValue = alphaMatched[0].split('.')[1];
const alphaFromToken = get(theme['opacity'], alphaValue, alphaValue);
let alpha = alphaFromToken ? parseFloat(alphaFromToken) : 1;
const newColor = transparentize(color, alpha)(theme);
return newColor;
} else {
return get(scale, rawValue, rawValue);
}
};
// To handle negative margins
const getMargin = (n: any, scale: any) => {
if (!isNumber(n)) {
return get(scale, n, n);
}
const isNegative = n < 0;
const absolute = Math.abs(n);
const value = get(scale, absolute, absolute);
if (!isNumber(value)) {
return isNegative ? '-' + value : value;
}
return value * (isNegative ? -1 : 1);
}; </s> remove let rawValue = props[key];
</s> add const rawValue = props[key]; </s> remove export let shouldEnableNewStyledSystemImplementation = false;
</s> add export let shouldEnableNewStyledSystemImplementation = true;
|
[
"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/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
val = transformer(val, theme[scale], theme);
} else {
val = get(theme[scale], value, value);
|
<mask> ? val
<mask> : color.setAlpha(resolvedAlpha).toString();
<mask> }
<mask> if (transformer) {
<mask> val = transformer(val);
<mask> }
<mask> if (typeof val === 'string' && val.endsWith('px')) {
<mask> val = parseInt(val, 10);
<mask> }
<mask> if (properties) {
</s> fix: add negative margin resolution (#3866) </s> remove const originalRawValue = value;
if (scale === 'colors') {
if (value?.match(/^.*?(?=:alpha)/)) {
value = value?.match(/^.*?(?=:alpha)/)[0];
}
}
let val = get(theme[scale], value, value);
if (scale === 'colors') {
}
if (scale === 'colors') {
const alpha: string = originalRawValue?.match(/:alpha\.\d\d?\d?/)
? originalRawValue?.match(/:alpha\.\d\d?\d?/)[0].split('.')[1]
: '1';
const resolvedAlpha = get(theme['opacity'], alpha, alpha);
let color = tinycolor(val);
val =
resolvedAlpha === '1'
? val
: color.setAlpha(resolvedAlpha).toString();
}
</s> add let val = value; </s> remove import tinycolor from 'tinycolor2';
</s> add import { transparentize } from './tools';
const isNumber = (n: any) => typeof n === 'number' && !isNaN(n);
const getColor = (rawValue: any, scale: any, theme: any) => {
let alphaMatched = rawValue?.match(/:alpha\.\d\d?\d?/);
if (alphaMatched) {
let colorMatched = rawValue?.match(/^.*?(?=:alpha)/);
let color = colorMatched ? colorMatched[0] : colorMatched;
const alphaValue = alphaMatched[0].split('.')[1];
const alphaFromToken = get(theme['opacity'], alphaValue, alphaValue);
let alpha = alphaFromToken ? parseFloat(alphaFromToken) : 1;
const newColor = transparentize(color, alpha)(theme);
return newColor;
} else {
return get(scale, rawValue, rawValue);
}
};
// To handle negative margins
const getMargin = (n: any, scale: any) => {
if (!isNumber(n)) {
return get(scale, n, n);
}
const isNegative = n < 0;
const absolute = Math.abs(n);
const value = get(scale, absolute, absolute);
if (!isNumber(value)) {
return isNegative ? '-' + value : value;
}
return value * (isNegative ? -1 : 1);
}; </s> remove transformer: (val: any) => {
return val ? val.toString() : val;
</s> add transformer: (val: any, scale: any) => {
return val ? get(scale, val, val).toString() : val; </s> remove let value = resolveValueWithBreakpoint(rawValue, currentBreakpoint, key);
</s> add const value = resolveValueWithBreakpoint(
rawValue,
currentBreakpoint,
key
); </s> remove let rawValue = props[key];
</s> add const rawValue = props[key];
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/theme/styled-system.ts
|
export let shouldEnableNewStyledSystemImplementation = true;
|
<mask> customTypography,
<mask> customLayout,
<mask> ];
<mask>
<mask> export let shouldEnableNewStyledSystemImplementation = false;
<mask>
<mask> export const makeStyledComponent = (Comp: any) => {
<mask> if (shouldEnableNewStyledSystemImplementation) {
<mask> return React.forwardRef(
<mask> ({ style: propStyle, children, debug, ...props }: any, ref: any) => {
</s> fix: add negative margin resolution (#3866) </s> remove import tinycolor from 'tinycolor2';
</s> add import { transparentize } from './tools';
const isNumber = (n: any) => typeof n === 'number' && !isNaN(n);
const getColor = (rawValue: any, scale: any, theme: any) => {
let alphaMatched = rawValue?.match(/:alpha\.\d\d?\d?/);
if (alphaMatched) {
let colorMatched = rawValue?.match(/^.*?(?=:alpha)/);
let color = colorMatched ? colorMatched[0] : colorMatched;
const alphaValue = alphaMatched[0].split('.')[1];
const alphaFromToken = get(theme['opacity'], alphaValue, alphaValue);
let alpha = alphaFromToken ? parseFloat(alphaFromToken) : 1;
const newColor = transparentize(color, alpha)(theme);
return newColor;
} else {
return get(scale, rawValue, rawValue);
}
};
// To handle negative margins
const getMargin = (n: any, scale: any) => {
if (!isNumber(n)) {
return get(scale, n, n);
}
const isNegative = n < 0;
const absolute = Math.abs(n);
const value = get(scale, absolute, absolute);
if (!isNumber(value)) {
return isNegative ? '-' + value : value;
}
return value * (isNegative ? -1 : 1);
}; </s> remove let rawValue = props[key];
</s> add const rawValue = props[key]; </s> remove transformer: (val: any) => {
return val ? val.toString() : val;
</s> add transformer: (val: any, scale: any) => {
return val ? get(scale, val, val).toString() : val; </s> remove const originalRawValue = value;
if (scale === 'colors') {
if (value?.match(/^.*?(?=:alpha)/)) {
value = value?.match(/^.*?(?=:alpha)/)[0];
}
}
let val = get(theme[scale], value, value);
if (scale === 'colors') {
}
if (scale === 'colors') {
const alpha: string = originalRawValue?.match(/:alpha\.\d\d?\d?/)
? originalRawValue?.match(/:alpha\.\d\d?\d?/)[0].split('.')[1]
: '1';
const resolvedAlpha = get(theme['opacity'], alpha, alpha);
let color = tinycolor(val);
val =
resolvedAlpha === '1'
? val
: color.setAlpha(resolvedAlpha).toString();
}
</s> add let val = value;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/890a7d20159ebd6cb6fd73abb95f670737854f96
|
src/utils/styled.tsx
|
if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Header) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Header) {
return this.props.children;
|
<mask>
<mask> export default class Container extends NativeBaseComponent {
<mask>
<mask> renderHeader() {
<mask> return _.find(this.props.children, function(item) {
<mask> if(item && item.type == Header) {
<mask> return true;
<mask> }
<mask> });
<mask> }
<mask> renderContent() {
<mask> return _.find(this.props.children, function(item) {
</s> fix header and footer rendering </s> remove });
</s> add } </s> remove });
</s> add } </s> remove return _.find(this.props.children, function(item) {
if(item && item.type == Footer) {
return true;
</s> add if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Footer) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Footer) {
return this.props.children; </s> remove });
</s> add } </s> remove return _.find(this.props.children, function(item) {
if(item && item.type == Content) {
return true;
</s> add if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Content) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Content) {
return this.props.children;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89658ad72e7a9f9e6d73b43e0c7ea82ab3ff1671
|
Components/Widgets/Container.js
|
}
|
<mask> return _.find(this.props.children, function(item) {
<mask> if(item && item.type == Header) {
<mask> return true;
<mask> }
<mask> });
<mask> }
<mask> renderContent() {
<mask> return _.find(this.props.children, function(item) {
<mask> if(item && item.type == Content) {
<mask> return true;
</s> fix header and footer rendering </s> remove return _.find(this.props.children, function(item) {
if(item && item.type == Header) {
return true;
</s> add if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Header) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Header) {
return this.props.children; </s> remove });
</s> add } </s> remove return _.find(this.props.children, function(item) {
if(item && item.type == Footer) {
return true;
</s> add if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Footer) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Footer) {
return this.props.children; </s> remove return _.find(this.props.children, function(item) {
if(item && item.type == Content) {
return true;
</s> add if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Content) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Content) {
return this.props.children; </s> remove });
</s> add }
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89658ad72e7a9f9e6d73b43e0c7ea82ab3ff1671
|
Components/Widgets/Container.js
|
if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Content) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Content) {
return this.props.children;
|
<mask> }
<mask> });
<mask> }
<mask> renderContent() {
<mask> return _.find(this.props.children, function(item) {
<mask> if(item && item.type == Content) {
<mask> return true;
<mask> }
<mask> });
<mask> }
<mask> renderFooter() {
<mask> return _.find(this.props.children, function(item) {
</s> fix header and footer rendering </s> remove });
</s> add } </s> remove return _.find(this.props.children, function(item) {
if(item && item.type == Header) {
return true;
</s> add if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Header) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Header) {
return this.props.children; </s> remove });
</s> add } </s> remove });
</s> add } </s> remove return _.find(this.props.children, function(item) {
if(item && item.type == Footer) {
return true;
</s> add if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Footer) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Footer) {
return this.props.children;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89658ad72e7a9f9e6d73b43e0c7ea82ab3ff1671
|
Components/Widgets/Container.js
|
}
|
<mask> return _.find(this.props.children, function(item) {
<mask> if(item && item.type == Content) {
<mask> return true;
<mask> }
<mask> });
<mask> }
<mask> renderFooter() {
<mask> return _.find(this.props.children, function(item) {
<mask> if(item && item.type == Footer) {
<mask> return true;
</s> fix header and footer rendering </s> remove });
</s> add } </s> remove return _.find(this.props.children, function(item) {
if(item && item.type == Header) {
return true;
</s> add if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Header) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Header) {
return this.props.children; </s> remove return _.find(this.props.children, function(item) {
if(item && item.type == Footer) {
return true;
</s> add if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Footer) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Footer) {
return this.props.children; </s> remove return _.find(this.props.children, function(item) {
if(item && item.type == Content) {
return true;
</s> add if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Content) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Content) {
return this.props.children; </s> remove });
</s> add }
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89658ad72e7a9f9e6d73b43e0c7ea82ab3ff1671
|
Components/Widgets/Container.js
|
if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Footer) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Footer) {
return this.props.children;
|
<mask> }
<mask> });
<mask> }
<mask> renderFooter() {
<mask> return _.find(this.props.children, function(item) {
<mask> if(item && item.type == Footer) {
<mask> return true;
<mask> }
<mask> });
<mask> }
<mask> render() {
<mask> return(
</s> fix header and footer rendering </s> remove });
</s> add } </s> remove return _.find(this.props.children, function(item) {
if(item && item.type == Header) {
return true;
</s> add if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Header) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Header) {
return this.props.children; </s> remove });
</s> add } </s> remove });
</s> add } </s> remove return _.find(this.props.children, function(item) {
if(item && item.type == Content) {
return true;
</s> add if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Content) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Content) {
return this.props.children;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89658ad72e7a9f9e6d73b43e0c7ea82ab3ff1671
|
Components/Widgets/Container.js
|
}
|
<mask> return _.find(this.props.children, function(item) {
<mask> if(item && item.type == Footer) {
<mask> return true;
<mask> }
<mask> });
<mask> }
<mask> render() {
<mask> return(
<mask> <View style={{flex:1}}>
<mask>
</s> fix header and footer rendering </s> remove return _.find(this.props.children, function(item) {
if(item && item.type == Footer) {
return true;
</s> add if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Footer) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Footer) {
return this.props.children; </s> remove return _.find(this.props.children, function(item) {
if(item && item.type == Header) {
return true;
</s> add if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Header) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Header) {
return this.props.children; </s> remove });
</s> add } </s> remove });
</s> add } </s> remove return _.find(this.props.children, function(item) {
if(item && item.type == Content) {
return true;
</s> add if(Array.isArray(this.props.children)) {
return _.find(this.props.children, function(item) {
if(item && item.type == Content) {
return true;
}
});
}
else {
if(this.props.children && this.props.children.type == Content) {
return this.props.children;
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89658ad72e7a9f9e6d73b43e0c7ea82ab3ff1671
|
Components/Widgets/Container.js
|
import React, { memo, forwardRef } from 'react';
|
<mask> import React from 'react';
<mask> import type { IMenuProps } from './types';
<mask> import Box from '../../primitives/Box';
<mask> import { usePropsResolution } from '../../../hooks/useThemeProps';
<mask> import { Popper } from '../Popper';
<mask> import { ScrollView, StyleSheet } from 'react-native';
</s> fix: menu examples and docs </s> remove import React, { forwardRef } from 'react';
</s> add import React, { forwardRef, memo } from 'react'; </s> remove import type { IBoxProps } from '../Box';
</s> add import type {
BorderProps,
ColorProps,
FlexboxProps,
LayoutProps,
PositionProps,
SpaceProps,
TypographyProps,
ExtraProps,
OutlineProps,
ShadowProps,
BackgroundProps,
SafeAreaProps,
TransformProps,
PlatformProps,
} from '../../types'; </s> remove export type IPressableProps = PressableProps &
IBoxProps & {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
};
</s> add export interface IPressableProps
extends PressableProps,
ColorProps,
SpaceProps,
LayoutProps,
FlexboxProps,
TypographyProps,
PositionProps,
BorderProps,
ExtraProps,
OutlineProps,
ShadowProps,
BackgroundProps,
SafeAreaProps,
TransformProps,
PlatformProps {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
children?: any;
} </s> remove const Menu = React.memo(
React.forwardRef(
(
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
});
</s> add const Menu = (
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
}); </s> remove React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
</s> add React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
|
[
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89972eeb852c6e36fe121b8f297c8d01d6e6b562
|
src/components/composites/Menu/Menu.tsx
|
const Menu = (
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
});
|
<mask> import { Transition } from '../Transitions';
<mask> import { FocusScope } from '@react-native-aria/focus';
<mask> import { MenuContext } from './MenuContext';
<mask>
<mask> const Menu = React.memo(
<mask> React.forwardRef(
<mask> (
<mask> {
<mask> trigger,
<mask> closeOnSelect = true,
<mask> children,
<mask> onOpen,
<mask> onClose,
<mask> isOpen: isOpenProp,
<mask> defaultIsOpen,
<mask> placement = 'bottom left',
<mask> ...restProps
<mask> }: IMenuProps,
<mask> ref?: any
<mask> ) => {
<mask> const triggerRef = React.useRef(null);
<mask> const [isOpen, setIsOpen] = useControllableState({
<mask> value: isOpenProp,
<mask> defaultValue: defaultIsOpen,
<mask> onChange: (value) => {
<mask> value ? onOpen && onOpen() : onClose && onClose();
<mask> },
<mask> });
<mask>
<mask> const newProps = usePropsResolution('Menu', restProps);
<mask> const handleOpen = React.useCallback(() => {
<mask> setIsOpen(true);
<mask> }, [setIsOpen]);
</s> fix: menu examples and docs </s> remove const newProps = usePropsResolution('Menu', restProps);
const handleOpen = React.useCallback(() => {
setIsOpen(true);
}, [setIsOpen]);
</s> add const newProps = usePropsResolution('Menu', restProps);
const handleOpen = React.useCallback(() => {
setIsOpen(true);
}, [setIsOpen]); </s> remove const handleClose = React.useCallback(() => {
setIsOpen(false);
}, [setIsOpen]);
</s> add const handleClose = React.useCallback(() => {
setIsOpen(false);
}, [setIsOpen]); </s> remove const triggerProps = useMenuTrigger({
handleOpen,
isOpen,
});
</s> add const triggerProps = useMenuTrigger({
handleOpen,
isOpen,
}); </s> remove import React, { forwardRef } from 'react';
</s> add import React, { forwardRef, memo } from 'react'; </s> remove React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
</s> add React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
|
[
"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",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89972eeb852c6e36fe121b8f297c8d01d6e6b562
|
src/components/composites/Menu/Menu.tsx
|
const newProps = usePropsResolution('Menu', restProps);
const handleOpen = React.useCallback(() => {
setIsOpen(true);
}, [setIsOpen]);
|
<mask> value ? onOpen && onOpen() : onClose && onClose();
<mask> },
<mask> });
<mask>
<mask> const newProps = usePropsResolution('Menu', restProps);
<mask> const handleOpen = React.useCallback(() => {
<mask> setIsOpen(true);
<mask> }, [setIsOpen]);
<mask>
<mask> const handleClose = React.useCallback(() => {
<mask> setIsOpen(false);
<mask> }, [setIsOpen]);
<mask>
</s> fix: menu examples and docs </s> remove const Menu = React.memo(
React.forwardRef(
(
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
});
</s> add const Menu = (
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
}); </s> remove const handleClose = React.useCallback(() => {
setIsOpen(false);
}, [setIsOpen]);
</s> add const handleClose = React.useCallback(() => {
setIsOpen(false);
}, [setIsOpen]); </s> remove const triggerProps = useMenuTrigger({
handleOpen,
isOpen,
});
</s> add const triggerProps = useMenuTrigger({
handleOpen,
isOpen,
}); </s> remove let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
};
</s> add let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
}; </s> remove React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
</s> add React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89972eeb852c6e36fe121b8f297c8d01d6e6b562
|
src/components/composites/Menu/Menu.tsx
|
const handleClose = React.useCallback(() => {
setIsOpen(false);
}, [setIsOpen]);
|
<mask> const handleOpen = React.useCallback(() => {
<mask> setIsOpen(true);
<mask> }, [setIsOpen]);
<mask>
<mask> const handleClose = React.useCallback(() => {
<mask> setIsOpen(false);
<mask> }, [setIsOpen]);
<mask>
<mask> const triggerProps = useMenuTrigger({
<mask> handleOpen,
<mask> isOpen,
<mask> });
</s> fix: menu examples and docs </s> remove const triggerProps = useMenuTrigger({
handleOpen,
isOpen,
});
</s> add const triggerProps = useMenuTrigger({
handleOpen,
isOpen,
}); </s> remove const newProps = usePropsResolution('Menu', restProps);
const handleOpen = React.useCallback(() => {
setIsOpen(true);
}, [setIsOpen]);
</s> add const newProps = usePropsResolution('Menu', restProps);
const handleOpen = React.useCallback(() => {
setIsOpen(true);
}, [setIsOpen]); </s> remove const Menu = React.memo(
React.forwardRef(
(
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
});
</s> add const Menu = (
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
}); </s> remove let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
};
</s> add let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
}; </s> remove React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
</s> add React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89972eeb852c6e36fe121b8f297c8d01d6e6b562
|
src/components/composites/Menu/Menu.tsx
|
const triggerProps = useMenuTrigger({
handleOpen,
isOpen,
});
|
<mask> const handleClose = React.useCallback(() => {
<mask> setIsOpen(false);
<mask> }, [setIsOpen]);
<mask>
<mask> const triggerProps = useMenuTrigger({
<mask> handleOpen,
<mask> isOpen,
<mask> });
<mask>
<mask> let updatedTrigger = () => {
<mask> return trigger(
<mask> {
<mask> ...triggerProps,
</s> fix: menu examples and docs </s> remove const handleClose = React.useCallback(() => {
setIsOpen(false);
}, [setIsOpen]);
</s> add const handleClose = React.useCallback(() => {
setIsOpen(false);
}, [setIsOpen]); </s> remove let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
};
</s> add let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
}; </s> remove const newProps = usePropsResolution('Menu', restProps);
const handleOpen = React.useCallback(() => {
setIsOpen(true);
}, [setIsOpen]);
</s> add const newProps = usePropsResolution('Menu', restProps);
const handleOpen = React.useCallback(() => {
setIsOpen(true);
}, [setIsOpen]); </s> remove React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
</s> add React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
} </s> remove const Menu = React.memo(
React.forwardRef(
(
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
});
</s> add const Menu = (
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
});
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89972eeb852c6e36fe121b8f297c8d01d6e6b562
|
src/components/composites/Menu/Menu.tsx
|
let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
};
|
<mask> handleOpen,
<mask> isOpen,
<mask> });
<mask>
<mask> let updatedTrigger = () => {
<mask> return trigger(
<mask> {
<mask> ...triggerProps,
<mask> ref: triggerRef,
<mask> onPress: handleOpen,
<mask> },
<mask> { open: isOpen }
<mask> );
<mask> };
<mask>
<mask> React.useEffect(() => {
<mask> let cleanupFn = () => {};
<mask> if (isOpen) {
<mask> cleanupFn = keyboardDismissHandlerManager.push(handleClose);
</s> fix: menu examples and docs </s> remove React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
</s> add React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
} </s> remove const triggerProps = useMenuTrigger({
handleOpen,
isOpen,
});
</s> add const triggerProps = useMenuTrigger({
handleOpen,
isOpen,
}); </s> remove const handleClose = React.useCallback(() => {
setIsOpen(false);
}, [setIsOpen]);
</s> add const handleClose = React.useCallback(() => {
setIsOpen(false);
}, [setIsOpen]); </s> remove return () => {
cleanupFn();
};
}, [isOpen, handleClose]);
</s> add return () => {
cleanupFn();
};
}, [isOpen, handleClose]); </s> remove const Menu = React.memo(
React.forwardRef(
(
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
});
</s> add const Menu = (
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
});
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89972eeb852c6e36fe121b8f297c8d01d6e6b562
|
src/components/composites/Menu/Menu.tsx
|
React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
|
<mask> { open: isOpen }
<mask> );
<mask> };
<mask>
<mask> React.useEffect(() => {
<mask> let cleanupFn = () => {};
<mask> if (isOpen) {
<mask> cleanupFn = keyboardDismissHandlerManager.push(handleClose);
<mask> } else {
<mask> cleanupFn();
<mask> }
<mask>
<mask> return () => {
<mask> cleanupFn();
<mask> };
<mask> }, [isOpen, handleClose]);
</s> fix: menu examples and docs </s> remove let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
};
</s> add let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
}; </s> remove return () => {
cleanupFn();
};
}, [isOpen, handleClose]);
</s> add return () => {
cleanupFn();
};
}, [isOpen, handleClose]); </s> remove const triggerProps = useMenuTrigger({
handleOpen,
isOpen,
});
</s> add const triggerProps = useMenuTrigger({
handleOpen,
isOpen,
}); </s> remove const Menu = React.memo(
React.forwardRef(
(
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
});
</s> add const Menu = (
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
}); </s> remove export type IPressableProps = PressableProps &
IBoxProps & {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
};
</s> add export interface IPressableProps
extends PressableProps,
ColorProps,
SpaceProps,
LayoutProps,
FlexboxProps,
TypographyProps,
PositionProps,
BorderProps,
ExtraProps,
OutlineProps,
ShadowProps,
BackgroundProps,
SafeAreaProps,
TransformProps,
PlatformProps {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
children?: any;
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89972eeb852c6e36fe121b8f297c8d01d6e6b562
|
src/components/composites/Menu/Menu.tsx
|
return () => {
cleanupFn();
};
}, [isOpen, handleClose]);
|
<mask> } else {
<mask> cleanupFn();
<mask> }
<mask>
<mask> return () => {
<mask> cleanupFn();
<mask> };
<mask> }, [isOpen, handleClose]);
<mask>
<mask> return (
<mask> <>
<mask> {updatedTrigger()}
<mask> <OverlayContainer>
</s> fix: menu examples and docs </s> remove React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
</s> add React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
} </s> remove return (
<>
{updatedTrigger()}
<OverlayContainer>
<Transition
from={{ opacity: 0 }}
entry={{ opacity: 1 }}
exit={{ opacity: 0 }}
visible={isOpen}
style={StyleSheet.absoluteFill}
entryTransition={{ duration: 150 }}
exitTransition={{ duration: 100 }}
>
<Popper
triggerRef={triggerRef}
onClose={handleClose}
placement={placement}
{...restProps}
</s> add return (
<>
{updatedTrigger()}
<OverlayContainer>
<Transition
from={{ opacity: 0 }}
entry={{ opacity: 1 }}
exit={{ opacity: 0 }}
visible={isOpen}
style={StyleSheet.absoluteFill}
entryTransition={{ duration: 150 }}
exitTransition={{ duration: 100 }}
>
<Popper
triggerRef={triggerRef}
onClose={handleClose}
placement={placement}
{...restProps}
>
<Backdrop bg="transparent" onPress={handleClose} />
<Popper.Content>
<MenuContext.Provider
value={{ closeOnSelect, onClose: handleClose }} </s> remove let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
};
</s> add let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
}; </s> remove const Menu = React.memo(
React.forwardRef(
(
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
});
</s> add const Menu = (
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
}); </s> remove export type IPressableProps = PressableProps &
IBoxProps & {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
};
</s> add export interface IPressableProps
extends PressableProps,
ColorProps,
SpaceProps,
LayoutProps,
FlexboxProps,
TypographyProps,
PositionProps,
BorderProps,
ExtraProps,
OutlineProps,
ShadowProps,
BackgroundProps,
SafeAreaProps,
TransformProps,
PlatformProps {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
children?: any;
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89972eeb852c6e36fe121b8f297c8d01d6e6b562
|
src/components/composites/Menu/Menu.tsx
|
return (
<>
{updatedTrigger()}
<OverlayContainer>
<Transition
from={{ opacity: 0 }}
entry={{ opacity: 1 }}
exit={{ opacity: 0 }}
visible={isOpen}
style={StyleSheet.absoluteFill}
entryTransition={{ duration: 150 }}
exitTransition={{ duration: 100 }}
>
<Popper
triggerRef={triggerRef}
onClose={handleClose}
placement={placement}
{...restProps}
>
<Backdrop bg="transparent" onPress={handleClose} />
<Popper.Content>
<MenuContext.Provider
value={{ closeOnSelect, onClose: handleClose }}
|
<mask> cleanupFn();
<mask> };
<mask> }, [isOpen, handleClose]);
<mask>
<mask> return (
<mask> <>
<mask> {updatedTrigger()}
<mask> <OverlayContainer>
<mask> <Transition
<mask> from={{ opacity: 0 }}
<mask> entry={{ opacity: 1 }}
<mask> exit={{ opacity: 0 }}
<mask> visible={isOpen}
<mask> style={StyleSheet.absoluteFill}
<mask> entryTransition={{ duration: 150 }}
<mask> exitTransition={{ duration: 100 }}
<mask> >
<mask> <Popper
<mask> triggerRef={triggerRef}
<mask> onClose={handleClose}
<mask> placement={placement}
<mask> {...restProps}
<mask> >
<mask> <Backdrop bg="transparent" onPress={handleClose} />
<mask> <Popper.Content>
<mask> <MenuContext.Provider
<mask> value={{ closeOnSelect, onClose: handleClose }}
</s> fix: menu examples and docs </s> remove <Backdrop bg="transparent" onPress={handleClose} />
<Popper.Content>
<MenuContext.Provider
value={{ closeOnSelect, onClose: handleClose }}
>
<FocusScope contain restoreFocus autoFocus>
<MenuContent menuRef={ref} {...newProps}>
{children}
</MenuContent>
</FocusScope>
</MenuContext.Provider>
</Popper.Content>
</Popper>
</Transition>
</OverlayContainer>
</>
);
}
)
);
</s> add <FocusScope contain restoreFocus autoFocus>
<MenuContent menuRef={ref} {...newProps}>
{children}
</MenuContent>
</FocusScope>
</MenuContext.Provider>
</Popper.Content>
</Popper>
</Transition>
</OverlayContainer>
</>
);
}; </s> remove return () => {
cleanupFn();
};
}, [isOpen, handleClose]);
</s> add return () => {
cleanupFn();
};
}, [isOpen, handleClose]); </s> remove React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
</s> add React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
} </s> remove const Menu = React.memo(
React.forwardRef(
(
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
});
</s> add const Menu = (
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
}); </s> remove const handleClose = React.useCallback(() => {
setIsOpen(false);
}, [setIsOpen]);
</s> add const handleClose = React.useCallback(() => {
setIsOpen(false);
}, [setIsOpen]);
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89972eeb852c6e36fe121b8f297c8d01d6e6b562
|
src/components/composites/Menu/Menu.tsx
|
<FocusScope contain restoreFocus autoFocus>
<MenuContent menuRef={ref} {...newProps}>
{children}
</MenuContent>
</FocusScope>
</MenuContext.Provider>
</Popper.Content>
</Popper>
</Transition>
</OverlayContainer>
</>
);
};
|
<mask> onClose={handleClose}
<mask> placement={placement}
<mask> {...restProps}
<mask> >
<mask> <Backdrop bg="transparent" onPress={handleClose} />
<mask> <Popper.Content>
<mask> <MenuContext.Provider
<mask> value={{ closeOnSelect, onClose: handleClose }}
<mask> >
<mask> <FocusScope contain restoreFocus autoFocus>
<mask> <MenuContent menuRef={ref} {...newProps}>
<mask> {children}
<mask> </MenuContent>
<mask> </FocusScope>
<mask> </MenuContext.Provider>
<mask> </Popper.Content>
<mask> </Popper>
<mask> </Transition>
<mask> </OverlayContainer>
<mask> </>
<mask> );
<mask> }
<mask> )
<mask> );
<mask>
<mask> const MenuContent = ({
<mask> menuRef,
<mask> ...restProps
<mask> }: Omit<IMenuProps, 'trigger'> & { menuRef: any }) => {
</s> fix: menu examples and docs </s> remove return (
<>
{updatedTrigger()}
<OverlayContainer>
<Transition
from={{ opacity: 0 }}
entry={{ opacity: 1 }}
exit={{ opacity: 0 }}
visible={isOpen}
style={StyleSheet.absoluteFill}
entryTransition={{ duration: 150 }}
exitTransition={{ duration: 100 }}
>
<Popper
triggerRef={triggerRef}
onClose={handleClose}
placement={placement}
{...restProps}
</s> add return (
<>
{updatedTrigger()}
<OverlayContainer>
<Transition
from={{ opacity: 0 }}
entry={{ opacity: 1 }}
exit={{ opacity: 0 }}
visible={isOpen}
style={StyleSheet.absoluteFill}
entryTransition={{ duration: 150 }}
exitTransition={{ duration: 100 }}
>
<Popper
triggerRef={triggerRef}
onClose={handleClose}
placement={placement}
{...restProps}
>
<Backdrop bg="transparent" onPress={handleClose} />
<Popper.Content>
<MenuContext.Provider
value={{ closeOnSelect, onClose: handleClose }} </s> remove const Menu = React.memo(
React.forwardRef(
(
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
});
</s> add const Menu = (
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
}); </s> remove let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
};
</s> add let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
}; </s> remove React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
</s> add React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
} </s> remove export type IPressableProps = PressableProps &
IBoxProps & {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
};
</s> add export interface IPressableProps
extends PressableProps,
ColorProps,
SpaceProps,
LayoutProps,
FlexboxProps,
TypographyProps,
PositionProps,
BorderProps,
ExtraProps,
OutlineProps,
ShadowProps,
BackgroundProps,
SafeAreaProps,
TransformProps,
PlatformProps {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
children?: any;
}
|
[
"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/89972eeb852c6e36fe121b8f297c8d01d6e6b562
|
src/components/composites/Menu/Menu.tsx
|
export default memo(forwardRef(Menu));
|
<mask> </Box>
<mask> );
<mask> };
<mask>
<mask> export default Menu;
</s> fix: menu examples and docs </s> remove export default forwardRef(MenuItem);
</s> add export default memo(forwardRef(MenuItem)); </s> remove let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
};
</s> add let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
}; </s> remove export type IPressableProps = PressableProps &
IBoxProps & {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
};
</s> add export interface IPressableProps
extends PressableProps,
ColorProps,
SpaceProps,
LayoutProps,
FlexboxProps,
TypographyProps,
PositionProps,
BorderProps,
ExtraProps,
OutlineProps,
ShadowProps,
BackgroundProps,
SafeAreaProps,
TransformProps,
PlatformProps {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
children?: any;
} </s> remove <Backdrop bg="transparent" onPress={handleClose} />
<Popper.Content>
<MenuContext.Provider
value={{ closeOnSelect, onClose: handleClose }}
>
<FocusScope contain restoreFocus autoFocus>
<MenuContent menuRef={ref} {...newProps}>
{children}
</MenuContent>
</FocusScope>
</MenuContext.Provider>
</Popper.Content>
</Popper>
</Transition>
</OverlayContainer>
</>
);
}
)
);
</s> add <FocusScope contain restoreFocus autoFocus>
<MenuContent menuRef={ref} {...newProps}>
{children}
</MenuContent>
</FocusScope>
</MenuContext.Provider>
</Popper.Content>
</Popper>
</Transition>
</OverlayContainer>
</>
);
}; </s> remove React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
</s> add React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace"
] |
https://github.com/GeekyAnts/NativeBase/commit/89972eeb852c6e36fe121b8f297c8d01d6e6b562
|
src/components/composites/Menu/Menu.tsx
|
import React, { forwardRef, memo } from 'react';
|
<mask> import React, { forwardRef } from 'react';
<mask> import Text from '../../primitives/Text';
<mask> import { usePropsResolution } from '../../../hooks/useThemeProps';
<mask> import Pressable from '../../primitives/Pressable';
<mask> import type { IMenuItemProps } from './types';
<mask> import { MenuContext } from './MenuContext';
</s> fix: menu examples and docs </s> remove import React from 'react';
</s> add import React, { memo, forwardRef } from 'react'; </s> remove import type { IBoxProps } from '../Box';
</s> add import type {
BorderProps,
ColorProps,
FlexboxProps,
LayoutProps,
PositionProps,
SpaceProps,
TypographyProps,
ExtraProps,
OutlineProps,
ShadowProps,
BackgroundProps,
SafeAreaProps,
TransformProps,
PlatformProps,
} from '../../types'; </s> remove const Menu = React.memo(
React.forwardRef(
(
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
});
</s> add const Menu = (
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
}); </s> remove export type IPressableProps = PressableProps &
IBoxProps & {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
};
</s> add export interface IPressableProps
extends PressableProps,
ColorProps,
SpaceProps,
LayoutProps,
FlexboxProps,
TypographyProps,
PositionProps,
BorderProps,
ExtraProps,
OutlineProps,
ShadowProps,
BackgroundProps,
SafeAreaProps,
TransformProps,
PlatformProps {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
children?: any;
} </s> remove React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
</s> add React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
|
[
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89972eeb852c6e36fe121b8f297c8d01d6e6b562
|
src/components/composites/Menu/MenuItem.tsx
|
export default memo(forwardRef(MenuItem));
|
<mask> </Pressable>
<mask> );
<mask> };
<mask>
<mask> export default forwardRef(MenuItem);
</s> fix: menu examples and docs </s> remove export default Menu;
</s> add export default memo(forwardRef(Menu)); </s> remove let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
};
</s> add let updatedTrigger = () => {
return trigger(
{
...triggerProps,
ref: triggerRef,
onPress: handleOpen,
},
{ open: isOpen }
);
}; </s> remove export type IPressableProps = PressableProps &
IBoxProps & {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
};
</s> add export interface IPressableProps
extends PressableProps,
ColorProps,
SpaceProps,
LayoutProps,
FlexboxProps,
TypographyProps,
PositionProps,
BorderProps,
ExtraProps,
OutlineProps,
ShadowProps,
BackgroundProps,
SafeAreaProps,
TransformProps,
PlatformProps {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
children?: any;
} </s> remove <Backdrop bg="transparent" onPress={handleClose} />
<Popper.Content>
<MenuContext.Provider
value={{ closeOnSelect, onClose: handleClose }}
>
<FocusScope contain restoreFocus autoFocus>
<MenuContent menuRef={ref} {...newProps}>
{children}
</MenuContent>
</FocusScope>
</MenuContext.Provider>
</Popper.Content>
</Popper>
</Transition>
</OverlayContainer>
</>
);
}
)
);
</s> add <FocusScope contain restoreFocus autoFocus>
<MenuContent menuRef={ref} {...newProps}>
{children}
</MenuContent>
</FocusScope>
</MenuContext.Provider>
</Popper.Content>
</Popper>
</Transition>
</OverlayContainer>
</>
);
}; </s> remove React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
</s> add React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace"
] |
https://github.com/GeekyAnts/NativeBase/commit/89972eeb852c6e36fe121b8f297c8d01d6e6b562
|
src/components/composites/Menu/MenuItem.tsx
|
import type {
BorderProps,
ColorProps,
FlexboxProps,
LayoutProps,
PositionProps,
SpaceProps,
TypographyProps,
ExtraProps,
OutlineProps,
ShadowProps,
BackgroundProps,
SafeAreaProps,
TransformProps,
PlatformProps,
} from '../../types';
|
<mask> customOutline,
<mask> customPosition,
<mask> customShadow,
<mask> } from '../../../utils/customProps';
<mask> import type { IBoxProps } from '../Box';
<mask>
<mask> export type IPressableProps = PressableProps &
<mask> IBoxProps & {
<mask> onHoverIn?: any;
<mask> onHoverOut?: any;
</s> fix: menu examples and docs </s> remove export type IPressableProps = PressableProps &
IBoxProps & {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
};
</s> add export interface IPressableProps
extends PressableProps,
ColorProps,
SpaceProps,
LayoutProps,
FlexboxProps,
TypographyProps,
PositionProps,
BorderProps,
ExtraProps,
OutlineProps,
ShadowProps,
BackgroundProps,
SafeAreaProps,
TransformProps,
PlatformProps {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
children?: any;
} </s> remove import React, { forwardRef } from 'react';
</s> add import React, { forwardRef, memo } from 'react'; </s> remove import React from 'react';
</s> add import React, { memo, forwardRef } from 'react'; </s> remove const Menu = React.memo(
React.forwardRef(
(
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
});
</s> add const Menu = (
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
}); </s> remove <Backdrop bg="transparent" onPress={handleClose} />
<Popper.Content>
<MenuContext.Provider
value={{ closeOnSelect, onClose: handleClose }}
>
<FocusScope contain restoreFocus autoFocus>
<MenuContent menuRef={ref} {...newProps}>
{children}
</MenuContent>
</FocusScope>
</MenuContext.Provider>
</Popper.Content>
</Popper>
</Transition>
</OverlayContainer>
</>
);
}
)
);
</s> add <FocusScope contain restoreFocus autoFocus>
<MenuContent menuRef={ref} {...newProps}>
{children}
</MenuContent>
</FocusScope>
</MenuContext.Provider>
</Popper.Content>
</Popper>
</Transition>
</OverlayContainer>
</>
);
};
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89972eeb852c6e36fe121b8f297c8d01d6e6b562
|
src/components/primitives/Pressable/index.tsx
|
export interface IPressableProps
extends PressableProps,
ColorProps,
SpaceProps,
LayoutProps,
FlexboxProps,
TypographyProps,
PositionProps,
BorderProps,
ExtraProps,
OutlineProps,
ShadowProps,
BackgroundProps,
SafeAreaProps,
TransformProps,
PlatformProps {
onHoverIn?: any;
onHoverOut?: any;
onFocus?: any;
onBlur?: any;
_hover?: any;
_pressed?: any;
_focus?: any;
children?: any;
}
|
<mask> customShadow,
<mask> } from '../../../utils/customProps';
<mask> import type { IBoxProps } from '../Box';
<mask>
<mask> export type IPressableProps = PressableProps &
<mask> IBoxProps & {
<mask> onHoverIn?: any;
<mask> onHoverOut?: any;
<mask> onFocus?: any;
<mask> onBlur?: any;
<mask> _hover?: any;
<mask> _pressed?: any;
<mask> _focus?: any;
<mask> };
<mask>
<mask> const useHover = () => {
<mask> const [isHovered, setHovered] = React.useState(false);
<mask> return {
<mask> pressableProps: {
</s> fix: menu examples and docs </s> remove import type { IBoxProps } from '../Box';
</s> add import type {
BorderProps,
ColorProps,
FlexboxProps,
LayoutProps,
PositionProps,
SpaceProps,
TypographyProps,
ExtraProps,
OutlineProps,
ShadowProps,
BackgroundProps,
SafeAreaProps,
TransformProps,
PlatformProps,
} from '../../types'; </s> remove import React, { forwardRef } from 'react';
</s> add import React, { forwardRef, memo } from 'react'; </s> remove import React from 'react';
</s> add import React, { memo, forwardRef } from 'react'; </s> remove const Menu = React.memo(
React.forwardRef(
(
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
});
</s> add const Menu = (
{
trigger,
closeOnSelect = true,
children,
onOpen,
onClose,
isOpen: isOpenProp,
defaultIsOpen,
placement = 'bottom left',
...restProps
}: IMenuProps,
ref?: any
) => {
const triggerRef = React.useRef(null);
const [isOpen, setIsOpen] = useControllableState({
value: isOpenProp,
defaultValue: defaultIsOpen,
onChange: (value) => {
value ? onOpen && onOpen() : onClose && onClose();
},
}); </s> remove React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
</s> add React.useEffect(() => {
let cleanupFn = () => {};
if (isOpen) {
cleanupFn = keyboardDismissHandlerManager.push(handleClose);
} else {
cleanupFn();
}
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89972eeb852c6e36fe121b8f297c8d01d6e6b562
|
src/components/primitives/Pressable/index.tsx
|
<ButtonGroup variant="ghost" space={2}>
|
<mask> <AlertDialog.Body>
<mask> Are you sure? You can't undo this action afterwards.
<mask> </AlertDialog.Body>
<mask> <AlertDialog.Footer>
<mask> <ButtonGroup variant="ghost" spacing={2}>
<mask> <Button onPress={onClose}>CANCEL</Button>
<mask> <Button colorScheme="red" onPress={onClose}>
<mask> DELETE
<mask> </Button>
<mask> </ButtonGroup>
</s> fix: buttongroup composition from flex to stack </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="solid" spacing={6}>
</s> add <ButtonGroup variant="solid" space={6}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
example/storybook/stories/components/composites/AlertDialog/Basic.tsx
|
<ButtonGroup variant="ghost" space={2}>
|
<mask> mt={3}
<mask> />
<mask> </AlertDialog.Body>
<mask> <AlertDialog.Footer>
<mask> <ButtonGroup variant="ghost" spacing={2}>
<mask> <Button onPress={onClose}>SUBMIT</Button>
<mask> <Button colorScheme="red" onPress={onClose}>
<mask> CANCEL
<mask> </Button>
<mask> </ButtonGroup>
</s> fix: buttongroup composition from flex to stack </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="solid" spacing={6}>
</s> add <ButtonGroup variant="solid" space={6}>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
example/storybook/stories/components/composites/AlertDialog/Transition.tsx
|
<ButtonGroup variant="ghost" space={2}>
|
<mask> technologies, by continuing to browse the website, you accept our
<mask> use of cookies and tracking technologies.
<mask> </Modal.Body>
<mask> <Modal.Footer>
<mask> <ButtonGroup variant="ghost" spacing={2}>
<mask> <Button>LEARN MORE</Button>
<mask> <Button
<mask> onPress={() => {
<mask> setModalVisible(!modalVisible);
<mask> }}
</s> fix: buttongroup composition from flex to stack </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
example/storybook/stories/components/composites/Modal/Basic.tsx
|
<ButtonGroup variant="ghost" space={2}>
|
<mask> placeholder="I'll recieve focus on Modal's opening"
<mask> />
<mask> </Modal.Body>
<mask> <Modal.Footer>
<mask> <ButtonGroup variant="ghost" spacing={2}>
<mask> <Button>SAVE</Button>
<mask> <Button
<mask> onPress={() => {
<mask> setModalVisible(!modalVisible);
<mask> }}
</s> fix: buttongroup composition from flex to stack </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
example/storybook/stories/components/composites/Modal/ModalRefEg.tsx
|
<ButtonGroup variant="ghost" space={2}>
|
<mask> Try typing something in the Input.
<mask> <Input mt={4} placeholder="Click here..." />
<mask> </Modal.Body>
<mask> <Modal.Footer>
<mask> <ButtonGroup variant="ghost" spacing={2}>
<mask> <Button>SAVE</Button>
<mask> <Button
<mask> onPress={() => {
<mask> setModalVisible(!modalVisible);
<mask> }}
</s> fix: buttongroup composition from flex to stack </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
example/storybook/stories/components/composites/Modal/ModalWithAvoidKeyboard.tsx
|
<ButtonGroup variant="ghost" space={2}>
|
<mask> Just a one liner would work for us.
<mask> <Input mt={4} placeholder="Something about you..." />
<mask> </Modal.Body>
<mask> <Modal.Footer>
<mask> <ButtonGroup variant="ghost" spacing={2}>
<mask> <Button>SAVE</Button>
<mask> <Button
<mask> onPress={() => {
<mask> setModalVisible(!modalVisible);
<mask> }}
</s> fix: buttongroup composition from flex to stack </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
example/storybook/stories/components/composites/Modal/Size.tsx
|
<ButtonGroup variant="solid" space={6}>
|
<mask> import { Button, ButtonGroup } from 'native-base';
<mask>
<mask> export default function () {
<mask> return (
<mask> <ButtonGroup variant="solid" spacing={6}>
<mask> <Button colorScheme="teal">Save</Button>
<mask> <Button colorScheme="danger">Cancel</Button>
<mask> </ButtonGroup>
<mask> );
<mask> }
</s> fix: buttongroup composition from flex to stack </s> remove
const StyledButtonGroup = styled.View<IButtonGroupProps>(
color,
space,
layout,
flexbox,
border,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
{ flexDirection: 'row', flexWrap: 'wrap' }
);
</s> add import { useThemeProps } from '../../../hooks';
import { Stack } from '../Stack'; </s> remove <StyledButtonGroup>
{React.Children.map(children, (child: JSX.Element, index: number) => {
return React.cloneElement(child, {
ml: index !== 0 ? spacing : undefined,
...props,
});
})}
</StyledButtonGroup>
</s> add <Stack divider={divider} {...newProps}>
{computedChildren}
</Stack> </s> remove ({ children, spacing, ...props }: IButtonGroupProps) => {
</s> add ({
children,
divider,
variant,
size,
colorScheme,
isDisabled,
...props
}: IButtonGroupProps) => {
const newProps = useThemeProps('ButtonGroup', props);
const computedChildren = React.Children.map(
children,
(child: JSX.Element, index: number) => {
return React.cloneElement(child, {
key: `button-group-child-${index}`,
variant,
size,
colorScheme,
isDisabled,
...child.props,
});
}
); </s> remove import Button from './button';
</s> add import Button, { ButtonGroup } from './button';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
example/storybook/stories/components/primitives/Button/ButtonGroup.tsx
|
<mask> import React from 'react';
<mask> import styled from 'styled-components/native';
<mask> import { border, color, flexbox, layout, position, space } from 'styled-system';
<mask> import {
<mask> customBackground,
<mask> customBorder,
<mask> customExtra,
<mask> customLayout,
<mask> customOutline,
<mask> customPosition,
<mask> customShadow,
<mask> } from '../../../utils/customProps';
<mask> import type { IButtonGroupProps } from './types';
<mask>
<mask> const StyledButtonGroup = styled.View<IButtonGroupProps>(
<mask> color,
<mask> space,
</s> fix: buttongroup composition from flex to stack </s> remove
const StyledButtonGroup = styled.View<IButtonGroupProps>(
color,
space,
layout,
flexbox,
border,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
{ flexDirection: 'row', flexWrap: 'wrap' }
);
</s> add import { useThemeProps } from '../../../hooks';
import { Stack } from '../Stack'; </s> remove import Button from './button';
</s> add import Button, { ButtonGroup } from './button'; </s> remove <ButtonGroup variant="solid" spacing={6}>
</s> add <ButtonGroup variant="solid" space={6}> </s> remove variant?: string;
</s> add variant?: 'ghost' | 'outline' | 'solid' | 'link' | 'unstyled';
|
[
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
src/components/primitives/Button/ButtonGroup.tsx
|
|
import { useThemeProps } from '../../../hooks';
import { Stack } from '../Stack';
|
<mask> customPosition,
<mask> customShadow,
<mask> } from '../../../utils/customProps';
<mask> import type { IButtonGroupProps } from './types';
<mask>
<mask> const StyledButtonGroup = styled.View<IButtonGroupProps>(
<mask> color,
<mask> space,
<mask> layout,
<mask> flexbox,
<mask> border,
<mask> position,
<mask> customPosition,
<mask> customBorder,
<mask> customBackground,
<mask> customOutline,
<mask> customShadow,
<mask> customExtra,
<mask> customLayout,
<mask> { flexDirection: 'row', flexWrap: 'wrap' }
<mask> );
<mask>
<mask> export const ButtonGroup = React.memo(
<mask> ({ children, spacing, ...props }: IButtonGroupProps) => {
<mask> return (
<mask> <StyledButtonGroup>
</s> fix: buttongroup composition from flex to stack </s> remove import styled from 'styled-components/native';
import { border, color, flexbox, layout, position, space } from 'styled-system';
import {
customBackground,
customBorder,
customExtra,
customLayout,
customOutline,
customPosition,
customShadow,
} from '../../../utils/customProps';
</s> add </s> remove ({ children, spacing, ...props }: IButtonGroupProps) => {
</s> add ({
children,
divider,
variant,
size,
colorScheme,
isDisabled,
...props
}: IButtonGroupProps) => {
const newProps = useThemeProps('ButtonGroup', props);
const computedChildren = React.Children.map(
children,
(child: JSX.Element, index: number) => {
return React.cloneElement(child, {
key: `button-group-child-${index}`,
variant,
size,
colorScheme,
isDisabled,
...child.props,
});
}
); </s> remove <StyledButtonGroup>
{React.Children.map(children, (child: JSX.Element, index: number) => {
return React.cloneElement(child, {
ml: index !== 0 ? spacing : undefined,
...props,
});
})}
</StyledButtonGroup>
</s> add <Stack divider={divider} {...newProps}>
{computedChildren}
</Stack> </s> remove <ButtonGroup variant="solid" spacing={6}>
</s> add <ButtonGroup variant="solid" space={6}>
|
[
"keep",
"keep",
"keep",
"keep",
"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/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
src/components/primitives/Button/ButtonGroup.tsx
|
({
children,
divider,
variant,
size,
colorScheme,
isDisabled,
...props
}: IButtonGroupProps) => {
const newProps = useThemeProps('ButtonGroup', props);
const computedChildren = React.Children.map(
children,
(child: JSX.Element, index: number) => {
return React.cloneElement(child, {
key: `button-group-child-${index}`,
variant,
size,
colorScheme,
isDisabled,
...child.props,
});
}
);
|
<mask> { flexDirection: 'row', flexWrap: 'wrap' }
<mask> );
<mask>
<mask> export const ButtonGroup = React.memo(
<mask> ({ children, spacing, ...props }: IButtonGroupProps) => {
<mask> return (
<mask> <StyledButtonGroup>
<mask> {React.Children.map(children, (child: JSX.Element, index: number) => {
<mask> return React.cloneElement(child, {
<mask> ml: index !== 0 ? spacing : undefined,
</s> fix: buttongroup composition from flex to stack </s> remove <StyledButtonGroup>
{React.Children.map(children, (child: JSX.Element, index: number) => {
return React.cloneElement(child, {
ml: index !== 0 ? spacing : undefined,
...props,
});
})}
</StyledButtonGroup>
</s> add <Stack divider={divider} {...newProps}>
{computedChildren}
</Stack> </s> remove
const StyledButtonGroup = styled.View<IButtonGroupProps>(
color,
space,
layout,
flexbox,
border,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
{ flexDirection: 'row', flexWrap: 'wrap' }
);
</s> add import { useThemeProps } from '../../../hooks';
import { Stack } from '../Stack'; </s> remove <ButtonGroup variant="solid" spacing={6}>
</s> add <ButtonGroup variant="solid" space={6}>
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
src/components/primitives/Button/ButtonGroup.tsx
|
<Stack divider={divider} {...newProps}>
{computedChildren}
</Stack>
|
<mask>
<mask> export const ButtonGroup = React.memo(
<mask> ({ children, spacing, ...props }: IButtonGroupProps) => {
<mask> return (
<mask> <StyledButtonGroup>
<mask> {React.Children.map(children, (child: JSX.Element, index: number) => {
<mask> return React.cloneElement(child, {
<mask> ml: index !== 0 ? spacing : undefined,
<mask> ...props,
<mask> });
<mask> })}
<mask> </StyledButtonGroup>
<mask> );
<mask> }
<mask> );
</s> fix: buttongroup composition from flex to stack </s> remove ({ children, spacing, ...props }: IButtonGroupProps) => {
</s> add ({
children,
divider,
variant,
size,
colorScheme,
isDisabled,
...props
}: IButtonGroupProps) => {
const newProps = useThemeProps('ButtonGroup', props);
const computedChildren = React.Children.map(
children,
(child: JSX.Element, index: number) => {
return React.cloneElement(child, {
key: `button-group-child-${index}`,
variant,
size,
colorScheme,
isDisabled,
...child.props,
});
}
); </s> remove
const StyledButtonGroup = styled.View<IButtonGroupProps>(
color,
space,
layout,
flexbox,
border,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
{ flexDirection: 'row', flexWrap: 'wrap' }
);
</s> add import { useThemeProps } from '../../../hooks';
import { Stack } from '../Stack'; </s> remove <ButtonGroup variant="solid" spacing={6}>
</s> add <ButtonGroup variant="solid" space={6}> </s> remove import styled from 'styled-components/native';
import { border, color, flexbox, layout, position, space } from 'styled-system';
import {
customBackground,
customBorder,
customExtra,
customLayout,
customOutline,
customPosition,
customShadow,
} from '../../../utils/customProps';
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
src/components/primitives/Button/ButtonGroup.tsx
|
import type { IStackProps } from '../Stack';
|
<mask> import type { ITextProps } from './../Text/types';
<mask> import type { IPressableProps } from '../Pressable';
<mask>
<mask> export type IButtonProps = IPressableProps & {
<mask> colorScheme?: string;
<mask> variant?: 'ghost' | 'outline' | 'solid' | 'link' | 'unstyled';
</s> fix: buttongroup composition from flex to stack </s> remove variant?: string;
</s> add variant?: 'ghost' | 'outline' | 'solid' | 'link' | 'unstyled'; </s> remove variant?: string;
</s> add variant?: 'ghost' | 'outline' | 'solid' | 'link' | 'unstyled'; </s> remove export type IButtonGroupProps = {
</s> add export type IButtonGroupProps = IStackProps & {
direction?: 'column' | 'row'; </s> remove spacing?: string | number;
</s> add colorScheme?: string;
isDisabled?: boolean; </s> remove import styled from 'styled-components/native';
import { border, color, flexbox, layout, position, space } from 'styled-system';
import {
customBackground,
customBorder,
customExtra,
customLayout,
customOutline,
customPosition,
customShadow,
} from '../../../utils/customProps';
</s> add
|
[
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
src/components/primitives/Button/types.ts
|
variant?: 'ghost' | 'outline' | 'solid' | 'link' | 'unstyled';
|
<mask> import type { IPressableProps } from '../Pressable';
<mask>
<mask> export type IButtonProps = IPressableProps & {
<mask> colorScheme?: string;
<mask> variant?: string;
<mask> isLoading?: any;
<mask> size?: 'xs' | 'sm' | 'md' | 'lg';
<mask> startIcon?: JSX.Element | Array<JSX.Element>;
<mask> endIcon?: JSX.Element | Array<JSX.Element>;
<mask> isLoadingText?: string;
</s> fix: buttongroup composition from flex to stack </s> remove spacing?: string | number;
</s> add colorScheme?: string;
isDisabled?: boolean; </s> remove export type IButtonGroupProps = {
</s> add export type IButtonGroupProps = IStackProps & {
direction?: 'column' | 'row'; </s> remove variant?: string;
</s> add variant?: 'ghost' | 'outline' | 'solid' | 'link' | 'unstyled'; </s> remove import styled from 'styled-components/native';
import { border, color, flexbox, layout, position, space } from 'styled-system';
import {
customBackground,
customBorder,
customExtra,
customLayout,
customOutline,
customPosition,
customShadow,
} from '../../../utils/customProps';
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
src/components/primitives/Button/types.ts
|
export type IButtonGroupProps = IStackProps & {
direction?: 'column' | 'row';
|
<mask> isDisabled?: boolean;
<mask> _text?: ITextProps;
<mask> };
<mask>
<mask> export type IButtonGroupProps = {
<mask> children: JSX.Element | Array<JSX.Element>;
<mask> variant?: string;
<mask> size?: 'xs' | 'sm' | 'md' | 'lg';
<mask> spacing?: string | number;
<mask> };
</s> fix: buttongroup composition from flex to stack </s> remove spacing?: string | number;
</s> add colorScheme?: string;
isDisabled?: boolean; </s> remove variant?: string;
</s> add variant?: 'ghost' | 'outline' | 'solid' | 'link' | 'unstyled'; </s> remove variant?: string;
</s> add variant?: 'ghost' | 'outline' | 'solid' | 'link' | 'unstyled';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
src/components/primitives/Button/types.ts
|
variant?: 'ghost' | 'outline' | 'solid' | 'link' | 'unstyled';
|
<mask> };
<mask>
<mask> export type IButtonGroupProps = {
<mask> children: JSX.Element | Array<JSX.Element>;
<mask> variant?: string;
<mask> size?: 'xs' | 'sm' | 'md' | 'lg';
<mask> spacing?: string | number;
<mask> };
</s> fix: buttongroup composition from flex to stack </s> remove spacing?: string | number;
</s> add colorScheme?: string;
isDisabled?: boolean; </s> remove export type IButtonGroupProps = {
</s> add export type IButtonGroupProps = IStackProps & {
direction?: 'column' | 'row'; </s> remove variant?: string;
</s> add variant?: 'ghost' | 'outline' | 'solid' | 'link' | 'unstyled';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
src/components/primitives/Button/types.ts
|
colorScheme?: string;
isDisabled?: boolean;
|
<mask> export type IButtonGroupProps = {
<mask> children: JSX.Element | Array<JSX.Element>;
<mask> variant?: string;
<mask> size?: 'xs' | 'sm' | 'md' | 'lg';
<mask> spacing?: string | number;
<mask> };
</s> fix: buttongroup composition from flex to stack </s> remove variant?: string;
</s> add variant?: 'ghost' | 'outline' | 'solid' | 'link' | 'unstyled'; </s> remove export type IButtonGroupProps = {
</s> add export type IButtonGroupProps = IStackProps & {
direction?: 'column' | 'row'; </s> remove variant?: string;
</s> add variant?: 'ghost' | 'outline' | 'solid' | 'link' | 'unstyled';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
src/components/primitives/Button/types.ts
|
export const ButtonGroup = {
baseStyle: { direction: 'row' },
defaultProps: { space: 1 },
};
|
<mask> size: 'md',
<mask> colorScheme: 'primary',
<mask> };
<mask>
<mask> export default {
<mask> baseStyle,
<mask> variants,
<mask> sizes,
<mask> defaultProps,
</s> fix: buttongroup composition from flex to stack </s> remove <ButtonGroup variant="solid" spacing={6}>
</s> add <ButtonGroup variant="solid" space={6}> </s> remove export type IButtonGroupProps = {
</s> add export type IButtonGroupProps = IStackProps & {
direction?: 'column' | 'row'; </s> remove variant?: string;
</s> add variant?: 'ghost' | 'outline' | 'solid' | 'link' | 'unstyled'; </s> remove spacing?: string | number;
</s> add colorScheme?: string;
isDisabled?: boolean;
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
src/theme/components/button.ts
|
import Button, { ButtonGroup } from './button';
|
<mask> import Avatar from './avatar';
<mask> import AvatarBadge from './avatar-badge';
<mask> import Badge from './badge';
<mask> import Breadcrumb from './breadcrumb';
<mask> import Button from './button';
<mask> import Center from './center';
<mask> import Checkbox from './checkbox';
<mask> import Box from './box';
<mask> import CircularProgress from './circular-progress';
<mask> import Code from './code';
</s> fix: buttongroup composition from flex to stack </s> remove import styled from 'styled-components/native';
import { border, color, flexbox, layout, position, space } from 'styled-system';
import {
customBackground,
customBorder,
customExtra,
customLayout,
customOutline,
customPosition,
customShadow,
} from '../../../utils/customProps';
</s> add </s> remove
const StyledButtonGroup = styled.View<IButtonGroupProps>(
color,
space,
layout,
flexbox,
border,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
{ flexDirection: 'row', flexWrap: 'wrap' }
);
</s> add import { useThemeProps } from '../../../hooks';
import { Stack } from '../Stack'; </s> remove <ButtonGroup variant="solid" spacing={6}>
</s> add <ButtonGroup variant="solid" space={6}> </s> remove variant?: string;
</s> add variant?: 'ghost' | 'outline' | 'solid' | 'link' | 'unstyled';
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
src/theme/components/index.ts
|
ButtonGroup,
|
<mask> Badge,
<mask> Box,
<mask> Breadcrumb,
<mask> Button,
<mask> Center,
<mask> Checkbox,
<mask> CircularProgress,
<mask> Code,
<mask> Container,
<mask> Divider,
</s> fix: buttongroup composition from flex to stack </s> remove <ButtonGroup variant="solid" spacing={6}>
</s> add <ButtonGroup variant="solid" space={6}> </s> remove import Button from './button';
</s> add import Button, { ButtonGroup } from './button'; </s> remove
const StyledButtonGroup = styled.View<IButtonGroupProps>(
color,
space,
layout,
flexbox,
border,
position,
customPosition,
customBorder,
customBackground,
customOutline,
customShadow,
customExtra,
customLayout,
{ flexDirection: 'row', flexWrap: 'wrap' }
);
</s> add import { useThemeProps } from '../../../hooks';
import { Stack } from '../Stack'; </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}> </s> remove <ButtonGroup variant="ghost" spacing={2}>
</s> add <ButtonGroup variant="ghost" space={2}>
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/89ef27ffbe83bd93bbae49fbddfe360ab927c74f
|
src/theme/components/index.ts
|
"indent": ["error", 2, { "SwitchCase": 1 }],
|
<mask> {
<mask> "extends": ["airbnb", "prettier"],
<mask> "parser": "babel-eslint",
<mask> "rules": {
<mask> "indent": ["error", 2],
<mask> "react/require-extension": "off",
<mask> "import/order": ["error", { "newlines-between": "always" }],
<mask> "func-names": "off",
<mask> "import/prefer-default-export": "off",
<mask> "no-prototype-builtins": "off",
</s> Fixes travisCI (#2992)
* fix(travis): adds new travis script
* fix(scripts): fixes eslint scripts
* fix(linting): fixing linting issues
* fix(travis): changes the travis config </s> remove static actionsheetInstance;
</s> add </s> remove static toastInstance;
</s> add </s> remove static contextTypes = {
theme: PropTypes.object,
foregroundColor: PropTypes.string
};
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/8a288c77230473f88556d524df10b2dc3a1c4055
|
.eslintrc.json
|
- 'stable'
cache:
yarn: true
directories:
- node_modules
- website/node_modules
branches:
only:
- master
- next
- patch
|
<mask> language: node_js
<mask> node_js:
<mask> - "node"
<mask> - "10.14.2"
<mask> - "8.14.1"
<mask> - "6.15.1"
<mask> install:
<mask> - react-native init AwesomeNativeBase
<mask> - cd AwesomeNativeBase
<mask> - npm install native-base --save
<mask> - react-native link
</s> Fixes travisCI (#2992)
* fix(travis): adds new travis script
* fix(scripts): fixes eslint scripts
* fix(linting): fixing linting issues
* fix(travis): changes the travis config </s> remove - react-native init AwesomeNativeBase
- cd AwesomeNativeBase
- npm install native-base --save
- react-native link
- react-native run-ios
</s> add - yarn
script:
- yarn lint </s> remove ...ViewPropTypes,
style: PropTypes.oneOfType([
PropTypes.object,
PropTypes.number,
PropTypes.array
])
</s> add ...ViewPropTypes </s> remove "eslint-plugin-react": "^6.2.0",
</s> add "eslint-plugin-react": "^7.16.0", </s> remove "husky": "^3.0.0",
</s> add "husky": "^3.0.9",
|
[
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/8a288c77230473f88556d524df10b2dc3a1c4055
|
.travis.yml
|
- yarn
script:
- yarn lint
|
<mask> - "10.14.2"
<mask> - "8.14.1"
<mask> - "6.15.1"
<mask> install:
<mask> - react-native init AwesomeNativeBase
<mask> - cd AwesomeNativeBase
<mask> - npm install native-base --save
<mask> - react-native link
<mask> - react-native run-ios
</s> Fixes travisCI (#2992)
* fix(travis): adds new travis script
* fix(scripts): fixes eslint scripts
* fix(linting): fixing linting issues
* fix(travis): changes the travis config </s> remove - "node"
- "10.14.2"
- "8.14.1"
- "6.15.1"
</s> add - 'stable'
cache:
yarn: true
directories:
- node_modules
- website/node_modules
branches:
only:
- master
- next
- patch </s> remove ...ViewPropTypes,
style: PropTypes.oneOfType([
PropTypes.object,
PropTypes.number,
PropTypes.array
])
</s> add ...ViewPropTypes </s> remove "eslint-plugin-react": "^6.2.0",
</s> add "eslint-plugin-react": "^7.16.0", </s> remove "husky": "^3.0.0",
</s> add "husky": "^3.0.9",
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace"
] |
https://github.com/GeekyAnts/NativeBase/commit/8a288c77230473f88556d524df10b2dc3a1c4055
|
.travis.yml
|
"eslint-plugin-react": "^7.16.0",
|
<mask> "eslint": "^3.5.0",
<mask> "eslint-config-airbnb": "^11.1.0",
<mask> "eslint-plugin-import": "^1.14.0",
<mask> "eslint-plugin-jsx-a11y": "^2.2.1",
<mask> "eslint-plugin-react": "^6.2.0",
<mask> "eslint-plugin-react-native": "^2.0.0",
<mask> "eslint-watch": "^5.1.2",
<mask> "flow-bin": "0.47.0",
<mask> "husky": "^3.0.0",
<mask> "jest": "^24.8.0",
</s> Fixes travisCI (#2992)
* fix(travis): adds new travis script
* fix(scripts): fixes eslint scripts
* fix(linting): fixing linting issues
* fix(travis): changes the travis config </s> remove "husky": "^3.0.0",
</s> add "husky": "^3.0.9", </s> remove ...ViewPropTypes,
style: PropTypes.oneOfType([
PropTypes.object,
PropTypes.number,
PropTypes.array
])
</s> add ...ViewPropTypes </s> remove - "node"
- "10.14.2"
- "8.14.1"
- "6.15.1"
</s> add - 'stable'
cache:
yarn: true
directories:
- node_modules
- website/node_modules
branches:
only:
- master
- next
- patch </s> remove - react-native init AwesomeNativeBase
- cd AwesomeNativeBase
- npm install native-base --save
- react-native link
- react-native run-ios
</s> add - yarn
script:
- yarn lint
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/8a288c77230473f88556d524df10b2dc3a1c4055
|
package.json
|
"husky": "^3.0.9",
|
<mask> "eslint-plugin-react": "^6.2.0",
<mask> "eslint-plugin-react-native": "^2.0.0",
<mask> "eslint-watch": "^5.1.2",
<mask> "flow-bin": "0.47.0",
<mask> "husky": "^3.0.0",
<mask> "jest": "^24.8.0",
<mask> "prettier": "^1.18.2",
<mask> "pretty-quick": "^1.11.1",
<mask> "react": "16.4.1",
<mask> "react-native": "^0.60.4",
</s> Fixes travisCI (#2992)
* fix(travis): adds new travis script
* fix(scripts): fixes eslint scripts
* fix(linting): fixing linting issues
* fix(travis): changes the travis config </s> remove "eslint-plugin-react": "^6.2.0",
</s> add "eslint-plugin-react": "^7.16.0", </s> remove ...ViewPropTypes,
style: PropTypes.oneOfType([
PropTypes.object,
PropTypes.number,
PropTypes.array
])
</s> add ...ViewPropTypes </s> remove - "node"
- "10.14.2"
- "8.14.1"
- "6.15.1"
</s> add - 'stable'
cache:
yarn: true
directories:
- node_modules
- website/node_modules
branches:
only:
- master
- next
- patch </s> remove - react-native init AwesomeNativeBase
- cd AwesomeNativeBase
- npm install native-base --save
- react-native link
- react-native run-ios
</s> add - yarn
script:
- yarn lint
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/8a288c77230473f88556d524df10b2dc3a1c4055
|
package.json
|
<mask> /* eslint-disable no-use-before-define */
<mask> /* eslint-disable radix */
<mask> import PropTypes from 'prop-types';
<mask> import React, { Component } from 'react';
<mask> import {
<mask> ActionSheetIOS,
<mask> Dimensions,
<mask> FlatList,
</s> Fixes travisCI (#2992)
* fix(travis): adds new travis script
* fix(scripts): fixes eslint scripts
* fix(linting): fixing linting issues
* fix(travis): changes the travis config </s> remove import PropTypes from 'prop-types';
</s> add </s> remove static contextTypes = {
theme: PropTypes.object,
foregroundColor: PropTypes.string
};
</s> add </s> remove static actionsheetInstance;
</s> add </s> remove static toastInstance;
</s> add
|
[
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/8a288c77230473f88556d524df10b2dc3a1c4055
|
src/basic/Actionsheet.js
|
|
<mask> import { Body } from './Body';
<mask> import { ListItem } from './ListItem';
<mask>
<mask> class ActionSheetContainer extends Component {
<mask> static actionsheetInstance;
<mask> static show(config, callback) {
<mask> this.actionsheetInstance._root.showActionSheet(config, callback);
<mask> }
<mask> static hide() {
<mask> this.actionsheetInstance._root.hideActionSheet();
</s> Fixes travisCI (#2992)
* fix(travis): adds new travis script
* fix(scripts): fixes eslint scripts
* fix(linting): fixing linting issues
* fix(travis): changes the travis config </s> remove static contextTypes = {
theme: PropTypes.object,
foregroundColor: PropTypes.string
};
</s> add </s> remove static toastInstance;
</s> add </s> remove import PropTypes from 'prop-types';
</s> add </s> remove import PropTypes from 'prop-types';
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/8a288c77230473f88556d524df10b2dc3a1c4055
|
src/basic/Actionsheet.js
|
|
// eslint-disable-next-line no-console
|
<mask>
<mask> componentDidMount() {
<mask> if (!this.props.autoHide && this.props.duration) {
<mask> console.warn(`It's not recommended to set autoHide false with duration`);
<mask> }
<mask> }
<mask>
</s> Fixes travisCI (#2992)
* fix(travis): adds new travis script
* fix(scripts): fixes eslint scripts
* fix(linting): fixing linting issues
* fix(travis): changes the travis config </s> remove // Temporary fix to avoid the crash.
// To be refactored to getDerivedStateFromProps.
// eslint-disable-next-line camelcase
UNSAFE_componentWillReceiveProps(nextProps) {
const childrenArray = React.Children.toArray(nextProps.children);
remove(childrenArray, item => {
if (item.type.displayName === 'Styled(Input)') {
this.inputProps = item.props;
return item;
}
return null;
});
if (this.props.floatingLabel) {
if (this.inputProps && this.inputProps.value) {
this.setState({ isFocused: true });
this.floatUp(-16);
}
if (this.inputProps && this.inputProps.getRef)
this.inputProps.getRef(this._inputRef);
}
}
</s> add </s> remove static toastInstance;
</s> add
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/8a288c77230473f88556d524df10b2dc3a1c4055
|
src/basic/Actionsheet.js
|
static actionsheetInstance;
|
<mask> console.warn(`It's not recommended to set autoHide false with duration`);
<mask> }
<mask> }
<mask>
<mask> showActionSheet(config, callback) {
<mask> if (Platform.OS === PLATFORM.IOS) {
<mask> if (typeof config.options[0] === 'object') {
<mask> const options = config.options;
<mask> const filtered = options.map(item => {
</s> Fixes travisCI (#2992)
* fix(travis): adds new travis script
* fix(scripts): fixes eslint scripts
* fix(linting): fixing linting issues
* fix(travis): changes the travis config </s> remove // Temporary fix to avoid the crash.
// To be refactored to getDerivedStateFromProps.
// eslint-disable-next-line camelcase
UNSAFE_componentWillReceiveProps(nextProps) {
const childrenArray = React.Children.toArray(nextProps.children);
remove(childrenArray, item => {
if (item.type.displayName === 'Styled(Input)') {
this.inputProps = item.props;
return item;
}
return null;
});
if (this.props.floatingLabel) {
if (this.inputProps && this.inputProps.value) {
this.setState({ isFocused: true });
this.floatUp(-16);
}
if (this.inputProps && this.inputProps.getRef)
this.inputProps.getRef(this._inputRef);
}
}
</s> add </s> remove ...ViewPropTypes,
style: PropTypes.oneOfType([
PropTypes.object,
PropTypes.number,
PropTypes.array
])
</s> add ...ViewPropTypes </s> remove ...ViewPropTypes,
style: PropTypes.oneOfType([
PropTypes.object,
PropTypes.number,
PropTypes.array
])
</s> add ...ViewPropTypes
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/8a288c77230473f88556d524df10b2dc3a1c4055
|
src/basic/Actionsheet.js
|
...ViewPropTypes
|
<mask> }
<mask> }
<mask>
<mask> ActionSheetContainer.propTypes = {
<mask> ...ViewPropTypes,
<mask> style: PropTypes.oneOfType([
<mask> PropTypes.object,
<mask> PropTypes.number,
<mask> PropTypes.array
<mask> ])
<mask> };
<mask>
<mask> const styles = StyleSheet.create({
<mask> containerTouchable: {
<mask> backgroundColor: commonColor.containerTouchableBackgroundColor,
</s> Fixes travisCI (#2992)
* fix(travis): adds new travis script
* fix(scripts): fixes eslint scripts
* fix(linting): fixing linting issues
* fix(travis): changes the travis config </s> remove ...ViewPropTypes,
style: PropTypes.oneOfType([
PropTypes.object,
PropTypes.number,
PropTypes.array
])
</s> add ...ViewPropTypes </s> remove static contextTypes = {
theme: PropTypes.object,
foregroundColor: PropTypes.string
};
</s> add </s> remove // Temporary fix to avoid the crash.
// To be refactored to getDerivedStateFromProps.
// eslint-disable-next-line camelcase
UNSAFE_componentWillReceiveProps(nextProps) {
const childrenArray = React.Children.toArray(nextProps.children);
remove(childrenArray, item => {
if (item.type.displayName === 'Styled(Input)') {
this.inputProps = item.props;
return item;
}
return null;
});
if (this.props.floatingLabel) {
if (this.inputProps && this.inputProps.value) {
this.setState({ isFocused: true });
this.floatUp(-16);
}
if (this.inputProps && this.inputProps.getRef)
this.inputProps.getRef(this._inputRef);
}
}
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/8a288c77230473f88556d524df10b2dc3a1c4055
|
src/basic/Actionsheet.js
|
<mask> import { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask>
<mask> export default class NativeBaseComponent extends Component {
<mask> static contextTypes = {
<mask> theme: PropTypes.object,
<mask> foregroundColor: PropTypes.string
<mask> };
<mask>
<mask> static propTypes = {
<mask> // eslint-disable-next-line react/forbid-prop-types
<mask> theme: PropTypes.object
<mask> };
<mask>
</s> Fixes travisCI (#2992)
* fix(travis): adds new travis script
* fix(scripts): fixes eslint scripts
* fix(linting): fixing linting issues
* fix(travis): changes the travis config </s> remove static actionsheetInstance;
</s> add </s> remove import PropTypes from 'prop-types';
</s> add </s> remove import PropTypes from 'prop-types';
</s> add </s> remove static toastInstance;
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/8a288c77230473f88556d524df10b2dc3a1c4055
|
src/basic/Base/NativeBaseComponent.js
|
|
static contextTypes = {
theme: PropTypes.object,
foregroundColor: PropTypes.string
};
|
<mask> // eslint-disable-next-line react/forbid-prop-types
<mask> theme: PropTypes.object
<mask> };
<mask>
<mask> static childContextTypes = {
<mask> theme: PropTypes.object,
<mask> foregroundColor: PropTypes.string
<mask> };
<mask>
<mask> getChildContext() {
</s> Fixes travisCI (#2992)
* fix(travis): adds new travis script
* fix(scripts): fixes eslint scripts
* fix(linting): fixing linting issues
* fix(travis): changes the travis config </s> remove static contextTypes = {
theme: PropTypes.object,
foregroundColor: PropTypes.string
};
</s> add </s> remove static toastInstance;
</s> add </s> remove ...ViewPropTypes,
style: PropTypes.oneOfType([
PropTypes.object,
PropTypes.number,
PropTypes.array
])
</s> add ...ViewPropTypes </s> remove ...ViewPropTypes,
style: PropTypes.oneOfType([
PropTypes.object,
PropTypes.number,
PropTypes.array
])
</s> add ...ViewPropTypes </s> remove static actionsheetInstance;
</s> add
|
[
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/8a288c77230473f88556d524df10b2dc3a1c4055
|
src/basic/Base/NativeBaseComponent.js
|
// eslint-disable-next-line camelcase
UNSAFE_componentWillUpdate(nextProps) {
if (nextProps.type && this.props.type !== nextProps.type) {
this.setIcon(nextProps.type);
}
}
|
<mask> this.setIcon(props.type);
<mask> }
<mask>
<mask> setIcon(iconType) {
<mask> if (iconType === undefined && get(this, 'context.theme')) {
<mask> // eslint-disable-next-line
<mask> iconType = this.context.theme['@@shoutem.theme/themeStyle'].variables
<mask> .iconFamily;
</s> Fixes travisCI (#2992)
* fix(travis): adds new travis script
* fix(scripts): fixes eslint scripts
* fix(linting): fixing linting issues
* fix(travis): changes the travis config </s> remove // Temporary fix to avoid the crash.
// To be refactored to getDerivedStateFromProps.
// eslint-disable-next-line camelcase
UNSAFE_componentWillReceiveProps(nextProps) {
const childrenArray = React.Children.toArray(nextProps.children);
remove(childrenArray, item => {
if (item.type.displayName === 'Styled(Input)') {
this.inputProps = item.props;
return item;
}
return null;
});
if (this.props.floatingLabel) {
if (this.inputProps && this.inputProps.value) {
this.setState({ isFocused: true });
this.floatUp(-16);
}
if (this.inputProps && this.inputProps.getRef)
this.inputProps.getRef(this._inputRef);
}
}
</s> add </s> remove case 'AntDesign':
this.Icon = AntDesign;
break;
case 'Entypo':
this.Icon = Entypo;
break;
case 'EvilIcons':
this.Icon = EvilIcons;
break;
case 'Feather':
this.Icon = Feather;
break;
case 'FontAwesome':
this.Icon = FontAwesome;
break;
case 'FontAwesome5':
this.Icon = FontAwesome5;
break;
case 'Foundation':
this.Icon = Foundation;
break;
case 'Ionicons':
this.Icon = Ionicons;
break;
case 'MaterialCommunityIcons':
this.Icon = MaterialCommunityIcons;
break;
case 'MaterialIcons':
this.Icon = MaterialIcons;
break;
case 'Octicons':
this.Icon = Octicons;
break;
case 'SimpleLineIcons':
this.Icon = SimpleLineIcons;
break;
case 'Zocial':
this.Icon = Zocial;
break;
default:
this.Icon = Ionicons;
}
}
// eslint-disable-next-line camelcase
UNSAFE_componentWillUpdate(nextProps) {
if (nextProps.type && this.props.type !== nextProps.type) {
this.setIcon(nextProps.type);
</s> add case 'AntDesign':
this.Icon = AntDesign;
break;
case 'Entypo':
this.Icon = Entypo;
break;
case 'EvilIcons':
this.Icon = EvilIcons;
break;
case 'Feather':
this.Icon = Feather;
break;
case 'FontAwesome':
this.Icon = FontAwesome;
break;
case 'FontAwesome5':
this.Icon = FontAwesome5;
break;
case 'Foundation':
this.Icon = Foundation;
break;
case 'Ionicons':
this.Icon = Ionicons;
break;
case 'MaterialCommunityIcons':
this.Icon = MaterialCommunityIcons;
break;
case 'MaterialIcons':
this.Icon = MaterialIcons;
break;
case 'Octicons':
this.Icon = Octicons;
break;
case 'SimpleLineIcons':
this.Icon = SimpleLineIcons;
break;
case 'Zocial':
this.Icon = Zocial;
break;
default:
this.Icon = Ionicons; </s> remove static toastInstance;
</s> add
|
[
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/8a288c77230473f88556d524df10b2dc3a1c4055
|
src/basic/IconNB.js
|
case 'AntDesign':
this.Icon = AntDesign;
break;
case 'Entypo':
this.Icon = Entypo;
break;
case 'EvilIcons':
this.Icon = EvilIcons;
break;
case 'Feather':
this.Icon = Feather;
break;
case 'FontAwesome':
this.Icon = FontAwesome;
break;
case 'FontAwesome5':
this.Icon = FontAwesome5;
break;
case 'Foundation':
this.Icon = Foundation;
break;
case 'Ionicons':
this.Icon = Ionicons;
break;
case 'MaterialCommunityIcons':
this.Icon = MaterialCommunityIcons;
break;
case 'MaterialIcons':
this.Icon = MaterialIcons;
break;
case 'Octicons':
this.Icon = Octicons;
break;
case 'SimpleLineIcons':
this.Icon = SimpleLineIcons;
break;
case 'Zocial':
this.Icon = Zocial;
break;
default:
this.Icon = Ionicons;
|
<mask> iconType = this.context.theme['@@shoutem.theme/themeStyle'].variables
<mask> .iconFamily;
<mask> }
<mask> switch (iconType) {
<mask> case 'AntDesign':
<mask> this.Icon = AntDesign;
<mask> break;
<mask> case 'Entypo':
<mask> this.Icon = Entypo;
<mask> break;
<mask> case 'EvilIcons':
<mask> this.Icon = EvilIcons;
<mask> break;
<mask> case 'Feather':
<mask> this.Icon = Feather;
<mask> break;
<mask> case 'FontAwesome':
<mask> this.Icon = FontAwesome;
<mask> break;
<mask> case 'FontAwesome5':
<mask> this.Icon = FontAwesome5;
<mask> break;
<mask> case 'Foundation':
<mask> this.Icon = Foundation;
<mask> break;
<mask> case 'Ionicons':
<mask> this.Icon = Ionicons;
<mask> break;
<mask> case 'MaterialCommunityIcons':
<mask> this.Icon = MaterialCommunityIcons;
<mask> break;
<mask> case 'MaterialIcons':
<mask> this.Icon = MaterialIcons;
<mask> break;
<mask> case 'Octicons':
<mask> this.Icon = Octicons;
<mask> break;
<mask> case 'SimpleLineIcons':
<mask> this.Icon = SimpleLineIcons;
<mask> break;
<mask> case 'Zocial':
<mask> this.Icon = Zocial;
<mask> break;
<mask> default:
<mask> this.Icon = Ionicons;
<mask> }
<mask> }
<mask>
<mask> // eslint-disable-next-line camelcase
<mask> UNSAFE_componentWillUpdate(nextProps) {
<mask> if (nextProps.type && this.props.type !== nextProps.type) {
<mask> this.setIcon(nextProps.type);
<mask> }
<mask> }
<mask>
<mask> render() {
<mask> return <this.Icon ref={c => (this._root = c)} {...this.props} />;
</s> Fixes travisCI (#2992)
* fix(travis): adds new travis script
* fix(scripts): fixes eslint scripts
* fix(linting): fixing linting issues
* fix(travis): changes the travis config </s> remove // Temporary fix to avoid the crash.
// To be refactored to getDerivedStateFromProps.
// eslint-disable-next-line camelcase
UNSAFE_componentWillReceiveProps(nextProps) {
const childrenArray = React.Children.toArray(nextProps.children);
remove(childrenArray, item => {
if (item.type.displayName === 'Styled(Input)') {
this.inputProps = item.props;
return item;
}
return null;
});
if (this.props.floatingLabel) {
if (this.inputProps && this.inputProps.value) {
this.setState({ isFocused: true });
this.floatUp(-16);
}
if (this.inputProps && this.inputProps.getRef)
this.inputProps.getRef(this._inputRef);
}
}
</s> add
|
[
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"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/8a288c77230473f88556d524df10b2dc3a1c4055
|
src/basic/IconNB.js
|
<mask>
<mask> return computeProps(this.props, defaultProps);
<mask> }
<mask>
<mask> // Temporary fix to avoid the crash.
<mask> // To be refactored to getDerivedStateFromProps.
<mask>
<mask> // eslint-disable-next-line camelcase
<mask> UNSAFE_componentWillReceiveProps(nextProps) {
<mask> const childrenArray = React.Children.toArray(nextProps.children);
<mask>
<mask> remove(childrenArray, item => {
<mask> if (item.type.displayName === 'Styled(Input)') {
<mask> this.inputProps = item.props;
<mask> return item;
<mask> }
<mask> return null;
<mask> });
<mask> if (this.props.floatingLabel) {
<mask> if (this.inputProps && this.inputProps.value) {
<mask> this.setState({ isFocused: true });
<mask> this.floatUp(-16);
<mask> }
<mask> if (this.inputProps && this.inputProps.getRef)
<mask> this.inputProps.getRef(this._inputRef);
<mask> }
<mask> }
<mask>
<mask> renderChildren() {
<mask> const newChildren = [];
<mask> const childrenArray = React.Children.toArray(this.props.children);
<mask>
<mask> let label = [];
</s> Fixes travisCI (#2992)
* fix(travis): adds new travis script
* fix(scripts): fixes eslint scripts
* fix(linting): fixing linting issues
* fix(travis): changes the travis config
|
[
"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",
"keep",
"keep",
"keep",
"keep",
"keep"
] |
https://github.com/GeekyAnts/NativeBase/commit/8a288c77230473f88556d524df10b2dc3a1c4055
|
src/basic/Item.js
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.