Merge branch 'master' into a11y-improvements

Author: Erin Doyle

css/SingleDatePickerInput.scss

@@ -5,6 +5,10 @@
   border: 1px solid $react-dates-color-border;
 }
 
+.SingleDatePickerInput--disabled {
+  background: $react-dates-color-gray-lighter;
+}
+
 .SingleDatePickerInput--rtl {
   direction: rtl;
 }

package.json

@@ -14,8 +14,8 @@
     "lint": "eslint --ext .js,.jsx src test",
     "mocha": "mocha ./test/_helpers",
     "storybook:uninstall": "npm uninstall --no-save @storybook/react && rimraf node_modules/@storybook node_modules/react-modal node_modules/react-dom-factories node_modules/react-svg-loader",
-    "react:clean": "npm run storybook:uninstall && npm install --no-save ajv ajv-keywords && npm uninstall --no-save react react-dom react-addons-test-utils react-test-renderer && rimraf node_modules/react-test-renderer node_modules/react && npm prune",
-    "react:14": "rimraf node_modules/.bin/npm && npm run react:clean && npm i --no-save [email protected] [email protected] [email protected] && npm run storybook:uninstall && npm prune",
+    "react:clean": "npm run storybook:uninstall && npm i --no-save ajv ajv-keywords && npm uninstall --no-save react react-dom react-addons-test-utils react-test-renderer && rimraf node_modules/react-test-renderer node_modules/react && npm prune",
+    "react:14": "rimraf node_modules/.bin/npm && npm run react:clean && npm i --no-save [email protected] [email protected] [email protected] enzyme-adapter-react-14 && npm run storybook:uninstall && npm prune && npm i --no-save enzyme-adapter-react-14",
     "react:15": "rimraf node_modules/.bin/npm && npm run react:clean && npm i --no-save react@15 react-dom@15 react-addons-test-utils@15 react-test-renderer@15 && npm run storybook:uninstall && npm prune",
     "pretest": "npm run --silent lint",
     "tests-only": "npm run mocha --silent test",
@@ -63,39 +63,40 @@
     "chai": "^4.1.1",
     "coveralls": "^2.13.1",
     "cross-env": "^5.0.5",
-    "enzyme": "^2.9.1",
-    "eslint": "^4.5.0",
+    "enzyme": "^3.0.0",
+    "enzyme-adapter-react-15": "^1.0.0",
+    "eslint": "^4.7.2",
     "eslint-config-airbnb": "^15.1.0",
     "eslint-plugin-import": "^2.7.0",
     "eslint-plugin-jsx-a11y": "^5.1.1",
-    "eslint-plugin-react": "^7.3.0",
+    "eslint-plugin-react": "^7.4.0",
     "git-directory-deploy": "^1.5.1",
     "imports-loader": "^0.7.1",
     "in-publish": "^2.0.0",
     "json-loader": "^0.5.7",
-    "karma": "^1.7.0",
+    "karma": "^1.7.1",
     "karma-chai": "^0.1.0",
     "karma-firefox-launcher": "^1.0.1",
     "karma-mocha": "^1.3.0",
     "karma-sinon": "^1.0.5",
-    "karma-webpack": "^2.0.3",
-    "mocha": "^3.5.0",
+    "karma-webpack": "^2.0.4",
+    "mocha": "^3.5.3",
     "mocha-wrap": "^2.1.1",
     "moment": "^2.18.1",
-    "moment-jalaali": "^0.7.0",
+    "moment-jalaali": "^0.7.2",
     "node-sass": "^4.5.3",
-    "nyc": "^11.1.0",
+    "nyc": "^11.2.1",
     "raw-loader": "^0.5.1",
     "react": "^0.14 || ^15.5.4",
     "react-addons-shallow-compare": "^0.14 || ^15.5.2",
     "react-addons-test-utils": "^0.14 || ^15.5.1",
     "react-dom": "^0.14 || ^15.5.4",
     "react-svg-loader": "^1.1.1",
     "react-test-renderer": "^15.6.1",
-    "rimraf": "^2.6.1",
+    "rimraf": "^2.6.2",
     "safe-publish-latest": "^1.1.1",
     "sass-loader": "^6.0.6",
-    "sinon": "^3.2.1",
+    "sinon": "^4.0.0",
     "sinon-sandbox": "^1.0.2",
     "style-loader": "^0.16.1",
     "webpack": "^2.6.1"

src/components/DateRangePickerInput.jsx

@@ -259,6 +259,7 @@ export default class DateRangePickerInput extends React.Component {
               'DateRangePickerInput__clear-dates--hide': !(startDate || endDate),
               'DateRangePickerInput__clear-dates--hover': isClearDatesHovered,
             })}
+            disabled={disabled}
             onMouseEnter={this.onClearDatesMouseEnter}
             onMouseLeave={this.onClearDatesMouseLeave}
             onClick={onClearDates}

src/components/SingleDatePickerInput.jsx

@@ -146,6 +146,7 @@ export default class SingleDatePickerInput extends React.Component {
     return (
       <div
         className={cx('SingleDatePickerInput', {
+          'SingleDatePickerInput--disabled': disabled,
           'SingleDatePickerInput--rtl': isRTL,
         })}
       >
@@ -179,6 +180,7 @@ export default class SingleDatePickerInput extends React.Component {
               'SingleDatePickerInput__clear-date--hide': !displayValue,
               'SingleDatePickerInput__clear-date--hover': isClearDateHovered,
             })}
+            disabled={disabled}
             aria-label={phrases.clearDate}
             onMouseEnter={this.onClearDateMouseEnter}
             onMouseLeave={this.onClearDateMouseLeave}

test/_helpers/enzymeSetup.js

@@ -0,0 +1,9 @@
+const configure = require('enzyme').configure;
+let Adapter;
+try {
+  Adapter = require('enzyme-adapter-react-15');
+} catch (e) {
+  Adapter = require('enzyme-adapter-react-14');
+}
+
+configure({ adapter: new Adapter(), disableLifecycleMethods: true });

test/components/DateInput_spec.jsx

@@ -323,7 +323,7 @@ describe('DateInput', () => {
       it('focuses and selects inputRef when becoming focused', () => {
         const wrapper = shallow(
           <DateInput id="date" focused={false} isFocused={false} />,
-          { lifecycleExperimental: true },
+          { disableLifecycleMethods: false },
         );
 
         wrapper.instance().inputRef = el;
@@ -338,7 +338,7 @@ describe('DateInput', () => {
       it('blurs when becoming unfocused', () => {
         const wrapper = shallow(
           <DateInput id="date" focused isFocused />,
-          { lifecycleExperimental: true },
+          { disableLifecycleMethods: false },
         );
 
         wrapper.instance().inputRef = el;