diff --git a/.eslintrc b/.eslintrc
index e105893fa7..94f930c885 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -215,8 +215,6 @@
     "react/jsx-sort-props": 0,
     "react/jsx-uses-react": 1,
     "react/jsx-uses-vars": 1,
-    "react/no-did-mount-set-state": [1, "allow-in-func"],
-    "react/no-did-update-set-state": [1, "allow-in-func"],
     "react/no-multi-comp": 0,
     "react/no-unknown-property": 0,
     "react/prop-types": 0,
diff --git a/index.js b/index.js
index 6b8b5d26b4..a63913b52a 100644
--- a/index.js
+++ b/index.js
@@ -29,7 +29,6 @@ class DatePicker extends Component {
     this.state = {
       date: this.getDate(),
       modalVisible: false,
-      disabled: this.props.disabled,
       animatedHeight: new Animated.Value(0)
     };
 
@@ -180,7 +179,7 @@ class DatePicker extends Component {
   }
 
   onPressDate() {
-    if (this.state.disabled) {
+    if (this.props.disabled) {
       return true;
     }
 
@@ -229,8 +228,8 @@ class DatePicker extends Component {
     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
+      this.props.disabled && Style.disabled,
+      this.props.disabled && customStyles.disabled
     ];
 
     return (
diff --git a/test/index.test.js b/test/index.test.js
index 6c3e1da9b5..5f029a0334 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -62,9 +62,9 @@ describe('DatePicker:', () => {
     expect(wrapper.prop('iconSource')).to.deep.equal(require('../date_icon.png'));
     expect(wrapper.prop('customStyles')).to.deep.equal({});
     expect(wrapper.prop('showIcon')).to.equal(true);
+    expect(wrapper.prop('disabled')).to.equal(false);
 
     expect(wrapper.state('date')).to.be.a('date');
-    expect(wrapper.state('disabled')).to.equal(false);
     expect(wrapper.state('modalVisible')).to.equal(false);
     expect(wrapper.state('animatedHeight')).to.deep.equal(new Animated.Value(0));
 
@@ -92,9 +92,9 @@ describe('DatePicker:', () => {
     expect(wrapper1.prop('iconSource')).to.deep.equal({});
     expect(wrapper1.prop('customStyles')).to.deep.equal({testStyle: 123});
     expect(wrapper1.prop('showIcon')).to.equal(false);
+    expect(wrapper1.prop('disabled')).to.equal(true);
 
     expect(wrapper1.state('date')).to.deep.equal(Moment('2016-05-11', 'YYYY-MM-DD').toDate());
-    expect(wrapper1.state('disabled')).to.equal(true);
 
     // find not work with mount, and defaultProps not work with shallow...
     const wrapper2 = shallow(<DatePicker date={new Date('2016/09/09')}/>);
@@ -278,12 +278,12 @@ describe('DatePicker:', () => {
     const datePicker = wrapper.instance();
     datePicker.setModalVisible = setModalVisible;
 
-    wrapper.setState({disabled: true});
+    wrapper.setProps({disabled: true});
     datePicker.onPressDate();
 
     expect(setModalVisible.callCount).to.equal(0);
 
-    wrapper.setState({disabled: false});
+    wrapper.setProps({disabled: false});
     datePicker.onPressDate();
     expect(wrapper.state('date')).to.deep.equal(datePicker.getDate());
     expect(setModalVisible.callCount).to.equal(1);
@@ -311,7 +311,7 @@ describe('DatePicker:', () => {
     expect(datePicker.onStartShouldSetResponder()).to.equal(true);
     expect(datePicker.onMoveShouldSetResponder()).to.equal(true);
 
-    expect(datePicker.props.modalOnResponderTerminationRequest()).to.equal(false);
+    expect(datePicker.props.modalOnResponderTerminationRequest()).to.equal(true);
   });
 
   it('getTitleElement - with placeholder', () => {