Merge pull request #24 from AddJam/master

Allow disabled style to be overridden
xgfe · Aug 2, 2016 · 170537c · 170537c
2 parents 068beeb + f486dd4
commit 170537c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -197,6 +197,11 @@ class DatePicker extends Component {
   render() {
     let customStyles = this.props.customStyles;
     this.format = this.props.format || FORMATS[this.props.mode];
+    const dateInputStyle = [
+      Style.dateInput, customStyles.dateInput,
+      this.state.disabled && Style.disabled,
+      this.state.disabled && customStyles.disabled
+    ]
 
     return (
       <TouchableHighlight
@@ -205,7 +210,7 @@ class DatePicker extends Component {
         onPress={this.onPressDate}
       >
         <View style={[Style.dateTouchBody, customStyles.dateTouchBody]}>
-          <View style={[Style.dateInput, customStyles.dateInput, this.state.disabled && Style.disabled]}>
+          <View style={dateInputStyle}>
             {this.getTitleElement()}
           </View>
           {this.props.showIcon && <Image