diff --git a/dist/src/basic/Checkbox.js b/dist/src/basic/Checkbox.js index 428a148a6..c6e6a9d12 100644 --- a/dist/src/basic/Checkbox.js +++ b/dist/src/basic/Checkbox.js @@ -1,2 +1,2 @@ -Object.defineProperty(exports,"__esModule",{value:true});exports.CheckBox=undefined;var _extends=Object.assign||function(target){for(var i=1;i (this._root = c)}\n {...this.prepareRootProps(variables)}\n >\n \n \n );\n }\n}\n\nCheckBox.propTypes = {\n ...TouchableOpacity.propTypes,\n style: PropTypes.oneOfType([\n PropTypes.object,\n PropTypes.number,\n PropTypes.array\n ]),\n checked: PropTypes.bool,\n onPress: PropTypes.func\n};\n\nconst StyledCheckBox = connectStyle(\n 'NativeBase.CheckBox',\n {},\n mapPropsToStyleNames\n)(CheckBox);\n\nexport { StyledCheckBox as CheckBox };\n"]} \ No newline at end of file +{"version":3,"sources":["../../../src/basic/Checkbox.js"],"names":["CheckBox","variables","props","color","checked","checkboxType","borderColor","checkStyle","borderRadius","getBorderRadius","getBorderColor","backgroundColor","checkboxBgColor","checkboxDefaultColor","CheckboxRadius","defaultProps","style","getInitialStyle","context","theme","variable","platformStyle","platform","_root","c","prepareRootProps","checkboxTickColor","fontSize","CheckboxFontSize","lineHeight","CheckboxIconSize","marginTop","CheckboxIconMarginTop","textShadowRadius","checkboxTextShadowRadius","PLATFORM","IOS","MATERIAL","Component","contextTypes","PropTypes","object","propTypes","TouchableOpacity","oneOfType","number","array","bool","onPress","func","StyledCheckBox","mapPropsToStyleNames"],"mappings":"21BAAA,4B,2CACA,qC,mDACA,yCACA,4D,iDACA,iEAEA,mE,yEACA,qD,iDACA,2DACA,mD,67BAEMA,S,0SAKYC,S,CAAW,YAC6B,KAAKC,KADlC,CACjBC,KADiB,QACjBA,KADiB,CACVC,OADU,QACVA,OADU,CACDC,YADC,QACDA,YADC,CACaC,WADb,QACaA,WADb,CAEzB,MAAO,CACLC,WAAY,CACVC,aAAe,KAAKC,eAAL,CAAqBJ,YAArB,CAAmCJ,SAAnC,CADL,CAEVK,YAAa,KAAKI,cAAL,CAAoBJ,WAApB,CAAgCH,KAAhC,CAAsCF,SAAtC,CAFH,CAGVU,gBACEP,UAAY,IAAZ,CACID,OAASF,UAAUW,eADvB,CAEIX,UAAUY,oBANN,CADP,CAAP,CAUD,C,sDAEcP,W,CAAaH,K,CAAOF,S,CACnC,CACE,GAAG,CAAC,CAACK,WAAL,CAAiB,CACf,MAAOA,YAAP,CACD,CACD,MAAOH,QAASF,UAAUW,eAA1B,CACD,C,wDAEeP,Y,CAAcJ,S,CAC9B,CACI,GAAGI,cAAgB,SAAnB,CAA6B,CAC3B,MAAO,GAAP,CACD,CACD,GAAGA,cAAgB,QAAnB,CAA4B,CAC1B,MAAO,EAAP,CACD,CACD,MAAOJ,WAAUa,cAAjB,CACH,C,0DAEgBb,S,CAAW,CAC1B,GAAMc,cAAe,CACnBC,MAAO,KAAKC,eAAL,CAAqBhB,SAArB,EAAgCM,UADpB,CAArB,CAIA,MAAO,2BAAa,KAAKL,KAAlB,CAAyBa,YAAzB,CAAP,CACD,C,uCACQ,oBACCX,QADD,CACa,KAAKF,KADlB,CACCE,OADD,CAEP,GAAMH,WAAY,KAAKiB,OAAL,CAAaC,KAAb,CACd,KAAKD,OAAL,CAAaC,KAAb,CAAmB,4BAAnB,EAAiDlB,SADnC,CAEdmB,kBAFJ,CAGA,GAAMC,eAAgBpB,UAAUoB,aAAhC,CACA,GAAMC,UAAWrB,UAAUqB,QAA3B,CACA,MACE,+BAAC,6BAAD,WACE,IAAK,sBAAM,QAAKC,KAAL,CAAaC,CAAnB,EADP,EAEM,KAAKC,gBAAL,CAAsBxB,SAAtB,CAFN,mDAIE,8BAAC,kBAAD,EACE,MAAO,CACLE,MACEC,UAAY,IAAZ,CACIH,UAAUyB,iBADd,CAEIzB,UAAUY,oBAJX,CAKLc,SAAU1B,UAAU2B,gBALf,CAMLC,WAAY5B,UAAU6B,gBANjB,CAOLC,UAAW9B,UAAU+B,qBAPhB,CAQLC,iBAAkBhC,UAAUiC,wBARvB,CADT,CAWE,KACEZ,WAAaa,sBAASC,GAAtB,EAA6Bf,gBAAkBc,sBAASE,QAAxD,CACI,eADJ,CAEI,cAdR,iDAJF,CADF,CAwBD,C,sBA5EoBC,gB,EAAjBtC,Q,CACGuC,Y,CAAe,CACpBpB,MAAOqB,oBAAUC,MADG,C,CA8ExBzC,SAAS0C,SAAT,aACKC,8BAAiBD,SADtB,EAEE1B,MAAOwB,oBAAUI,SAAV,CAAoB,CACzBJ,oBAAUC,MADe,CAEzBD,oBAAUK,MAFe,CAGzBL,oBAAUM,KAHe,CAApB,CAFT,CAOE1C,QAASoC,oBAAUO,IAPrB,CAQEC,QAASR,oBAAUS,IARrB,GAWA,GAAMC,gBAAiB,yCACrB,qBADqB,CAErB,EAFqB,CAGrBC,8BAHqB,EAIrBnD,QAJqB,CAAvB,C,QAM2BA,Q,CAAlBkD,c","file":"Checkbox.js","sourcesContent":["import React, { Component } from 'react';\nimport PropTypes from 'prop-types';\nimport { TouchableOpacity } from 'react-native';\nimport IconNB from 'react-native-vector-icons/Ionicons';\nimport { connectStyle } from 'native-base-shoutem-theme';\n\nimport mapPropsToStyleNames from '../utils/mapPropsToStyleNames';\nimport variable from '../theme/variables/platform';\nimport { PLATFORM } from '../theme/variables/commonColor';\nimport computeProps from '../utils/computeProps';\n\nclass CheckBox extends Component {\n static contextTypes = {\n theme: PropTypes.object\n };\n\n getInitialStyle(variables) {\n const { color, checked, checkboxType, borderColor } = this.props;\n return {\n checkStyle: {\n borderRadius : this.getBorderRadius(checkboxType, variables),\n borderColor: this.getBorderColor(borderColor,color,variables), \n backgroundColor: \n checked === true\n ? color || variables.checkboxBgColor\n : variables.checkboxDefaultColor\n }\n };\n }\n\n getBorderColor(borderColor, color, variables)\n {\n if(!!borderColor){\n return borderColor;\n }\n return color || variables.checkboxBgColor;\n }\n\n getBorderRadius(checkboxType, variables)\n {\n if(checkboxType == \"rounded\"){\n return 13;\n }\n if(checkboxType == \"square\"){\n return 0;\n }\n return variables.CheckboxRadius;\n }\n\n prepareRootProps(variables) {\n const defaultProps = {\n style: this.getInitialStyle(variables).checkStyle\n };\n\n return computeProps(this.props, defaultProps);\n }\n render() {\n const { checked } = this.props;\n const variables = this.context.theme\n ? this.context.theme['@@shoutem.theme/themeStyle'].variables\n : variable;\n const platformStyle = variables.platformStyle;\n const platform = variables.platform;\n return (\n (this._root = c)}\n {...this.prepareRootProps(variables)}\n >\n \n \n );\n }\n}\n\nCheckBox.propTypes = {\n ...TouchableOpacity.propTypes,\n style: PropTypes.oneOfType([\n PropTypes.object,\n PropTypes.number,\n PropTypes.array\n ]),\n checked: PropTypes.bool,\n onPress: PropTypes.func\n};\n\nconst StyledCheckBox = connectStyle(\n 'NativeBase.CheckBox',\n {},\n mapPropsToStyleNames\n)(CheckBox);\n\nexport { StyledCheckBox as CheckBox };\n"]} \ No newline at end of file diff --git a/dist/src/theme/components/CheckBox.js b/dist/src/theme/components/CheckBox.js index cbe6f6116..526ed3244 100644 --- a/dist/src/theme/components/CheckBox.js +++ b/dist/src/theme/components/CheckBox.js @@ -1,2 +1,2 @@ -Object.defineProperty(exports,"__esModule",{value:true});var _platform=require('./../variables/platform');var _platform2=_interopRequireDefault(_platform);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}exports.default=function(){var variables=arguments.length>0&&arguments[0]!==undefined?arguments[0]:_platform2.default;var checkBoxTheme={'.checked':{'NativeBase.Icon':{color:variables.checkboxTickColor},'NativeBase.IconNB':{color:variables.checkboxTickColor}},'NativeBase.Icon':{color:'transparent',lineHeight:variables.CheckboxIconSize,marginTop:variables.CheckboxIconMarginTop,fontSize:variables.CheckboxFontSize},'NativeBase.IconNB':{color:'transparent',lineHeight:variables.CheckboxIconSize,marginTop:variables.CheckboxIconMarginTop,fontSize:variables.CheckboxFontSize},borderRadius:variables.CheckboxRadius,overflow:'hidden',width:variables.checkboxSize,height:variables.checkboxSize,borderWidth:variables.CheckboxBorderWidth,paddingLeft:variables.CheckboxPaddingLeft-1,paddingBottom:variables.CheckboxPaddingBottom,left:10};return checkBoxTheme;}; +Object.defineProperty(exports,"__esModule",{value:true});var _platform=require('./../variables/platform');var _platform2=_interopRequireDefault(_platform);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}exports.default=function(){var variables=arguments.length>0&&arguments[0]!==undefined?arguments[0]:_platform2.default;var checkBoxTheme={'.checked':{'NativeBase.Icon':{color:variables.checkboxTickColor},'NativeBase.IconNB':{color:variables.checkboxTickColor}},'NativeBase.Icon':{color:'transparent',lineHeight:variables.CheckboxIconSize,marginTop:variables.CheckboxIconMarginTop,fontSize:variables.CheckboxFontSize},'NativeBase.IconNB':{color:'transparent',lineHeight:variables.CheckboxIconSize,marginTop:variables.CheckboxIconMarginTop,fontSize:variables.CheckboxFontSize},overflow:'hidden',width:variables.checkboxSize,height:variables.checkboxSize,borderWidth:variables.CheckboxBorderWidth,paddingLeft:variables.CheckboxPaddingLeft-1,paddingBottom:variables.CheckboxPaddingBottom,left:10};return checkBoxTheme;}; //# sourceMappingURL=CheckBox.js.map \ No newline at end of file diff --git a/dist/src/theme/components/CheckBox.js.map b/dist/src/theme/components/CheckBox.js.map index 8a46936e6..1619690bd 100644 --- a/dist/src/theme/components/CheckBox.js.map +++ b/dist/src/theme/components/CheckBox.js.map @@ -1 +1 @@ -{"version":3,"sources":["../../../../src/theme/components/CheckBox.js"],"names":["variables","variable","checkBoxTheme","color","checkboxTickColor","lineHeight","CheckboxIconSize","marginTop","CheckboxIconMarginTop","fontSize","CheckboxFontSize","borderRadius","CheckboxRadius","overflow","width","checkboxSize","height","borderWidth","CheckboxBorderWidth","paddingLeft","CheckboxPaddingLeft","paddingBottom","CheckboxPaddingBottom","left"],"mappings":"yDAEA,iD,oJAEe,UAAoC,IAAnCA,UAAmC,2DAAbC,kBAAa,CACjD,GAAMC,eAAgB,CACpB,WAAY,CACV,kBAAmB,CACjBC,MAAOH,UAAUI,iBADA,CADT,CAIV,oBAAqB,CACnBD,MAAOH,UAAUI,iBADE,CAJX,CADQ,CASpB,kBAAmB,CACjBD,MAAO,aADU,CAEjBE,WAAYL,UAAUM,gBAFL,CAGjBC,UAAWP,UAAUQ,qBAHJ,CAIjBC,SAAUT,UAAUU,gBAJH,CATC,CAepB,oBAAqB,CACnBP,MAAO,aADY,CAEnBE,WAAYL,UAAUM,gBAFH,CAGnBC,UAAWP,UAAUQ,qBAHF,CAInBC,SAAUT,UAAUU,gBAJD,CAfD,CAqBpBC,aAAcX,UAAUY,cArBJ,CAsBpBC,SAAU,QAtBU,CAuBpBC,MAAOd,UAAUe,YAvBG,CAwBpBC,OAAQhB,UAAUe,YAxBE,CAyBpBE,YAAajB,UAAUkB,mBAzBH,CA0BpBC,YAAanB,UAAUoB,mBAAV,CAAgC,CA1BzB,CA2BpBC,cAAerB,UAAUsB,qBA3BL,CA4BpBC,KAAM,EA5Bc,CAAtB,CA+BA,MAAOrB,cAAP,CACD,C","file":"CheckBox.js","sourcesContent":["// @flow\n\nimport variable from './../variables/platform';\n\nexport default (variables /* : * */ = variable) => {\n const checkBoxTheme = {\n '.checked': {\n 'NativeBase.Icon': {\n color: variables.checkboxTickColor\n },\n 'NativeBase.IconNB': {\n color: variables.checkboxTickColor\n }\n },\n 'NativeBase.Icon': {\n color: 'transparent',\n lineHeight: variables.CheckboxIconSize,\n marginTop: variables.CheckboxIconMarginTop,\n fontSize: variables.CheckboxFontSize\n },\n 'NativeBase.IconNB': {\n color: 'transparent',\n lineHeight: variables.CheckboxIconSize,\n marginTop: variables.CheckboxIconMarginTop,\n fontSize: variables.CheckboxFontSize\n },\n borderRadius: variables.CheckboxRadius,\n overflow: 'hidden',\n width: variables.checkboxSize,\n height: variables.checkboxSize,\n borderWidth: variables.CheckboxBorderWidth,\n paddingLeft: variables.CheckboxPaddingLeft - 1,\n paddingBottom: variables.CheckboxPaddingBottom,\n left: 10\n };\n\n return checkBoxTheme;\n};\n"]} \ No newline at end of file +{"version":3,"sources":["../../../../src/theme/components/CheckBox.js"],"names":["variables","variable","checkBoxTheme","color","checkboxTickColor","lineHeight","CheckboxIconSize","marginTop","CheckboxIconMarginTop","fontSize","CheckboxFontSize","overflow","width","checkboxSize","height","borderWidth","CheckboxBorderWidth","paddingLeft","CheckboxPaddingLeft","paddingBottom","CheckboxPaddingBottom","left"],"mappings":"yDAEA,iD,oJAEe,UAAoC,IAAnCA,UAAmC,2DAAbC,kBAAa,CACjD,GAAMC,eAAgB,CACpB,WAAY,CACV,kBAAmB,CACjBC,MAAOH,UAAUI,iBADA,CADT,CAIV,oBAAqB,CACnBD,MAAOH,UAAUI,iBADE,CAJX,CADQ,CASpB,kBAAmB,CACjBD,MAAO,aADU,CAEjBE,WAAYL,UAAUM,gBAFL,CAGjBC,UAAWP,UAAUQ,qBAHJ,CAIjBC,SAAUT,UAAUU,gBAJH,CATC,CAepB,oBAAqB,CACnBP,MAAO,aADY,CAEnBE,WAAYL,UAAUM,gBAFH,CAGnBC,UAAWP,UAAUQ,qBAHF,CAInBC,SAAUT,UAAUU,gBAJD,CAfD,CAqBpBC,SAAU,QArBU,CAsBpBC,MAAOZ,UAAUa,YAtBG,CAuBpBC,OAAQd,UAAUa,YAvBE,CAwBpBE,YAAaf,UAAUgB,mBAxBH,CAyBpBC,YAAajB,UAAUkB,mBAAV,CAAgC,CAzBzB,CA0BpBC,cAAenB,UAAUoB,qBA1BL,CA2BpBC,KAAM,EA3Bc,CAAtB,CA8BA,MAAOnB,cAAP,CACD,C","file":"CheckBox.js","sourcesContent":["// @flow\n\nimport variable from './../variables/platform';\n\nexport default (variables /* : * */ = variable) => {\n const checkBoxTheme = {\n '.checked': {\n 'NativeBase.Icon': {\n color: variables.checkboxTickColor\n },\n 'NativeBase.IconNB': {\n color: variables.checkboxTickColor\n }\n },\n 'NativeBase.Icon': {\n color: 'transparent',\n lineHeight: variables.CheckboxIconSize,\n marginTop: variables.CheckboxIconMarginTop,\n fontSize: variables.CheckboxFontSize\n },\n 'NativeBase.IconNB': {\n color: 'transparent',\n lineHeight: variables.CheckboxIconSize,\n marginTop: variables.CheckboxIconMarginTop,\n fontSize: variables.CheckboxFontSize\n },\n overflow: 'hidden',\n width: variables.checkboxSize,\n height: variables.checkboxSize,\n borderWidth: variables.CheckboxBorderWidth,\n paddingLeft: variables.CheckboxPaddingLeft - 1,\n paddingBottom: variables.CheckboxPaddingBottom,\n left: 10\n };\n\n return checkBoxTheme;\n};\n"]} \ No newline at end of file diff --git a/src/basic/Checkbox.js b/src/basic/Checkbox.js index 96d390a66..c1f992e80 100644 --- a/src/basic/Checkbox.js +++ b/src/basic/Checkbox.js @@ -15,12 +15,12 @@ class CheckBox extends Component { }; getInitialStyle(variables) { - const { color, checked, checkboxType } = this.props; + const { color, checked, checkboxType, borderColor } = this.props; return { checkStyle: { - borderRadius : this.getBorderRadius(checkboxType), - borderColor: color || variables.checkboxBgColor, - backgroundColor: + borderRadius : this.getBorderRadius(checkboxType, variables), + borderColor: this.getBorderColor(borderColor,color,variables), + backgroundColor: checked === true ? color || variables.checkboxBgColor : variables.checkboxDefaultColor @@ -28,7 +28,15 @@ class CheckBox extends Component { }; } - getBorderRadius(checkboxType) + getBorderColor(borderColor, color, variables) + { + if(!!borderColor){ + return borderColor; + } + return color || variables.checkboxBgColor; + } + + getBorderRadius(checkboxType, variables) { if(checkboxType == "rounded"){ return 13; diff --git a/src/theme/components/CheckBox.js b/src/theme/components/CheckBox.js index 7a858c3c3..d0bcccc68 100644 --- a/src/theme/components/CheckBox.js +++ b/src/theme/components/CheckBox.js @@ -24,7 +24,6 @@ export default (variables /* : * */ = variable) => { marginTop: variables.CheckboxIconMarginTop, fontSize: variables.CheckboxFontSize }, - borderRadius: variables.CheckboxRadius, overflow: 'hidden', width: variables.checkboxSize, height: variables.checkboxSize,