Merge pull request #58 from slate71/update-react

Update React to 15.5 and fix PropTypes and createClass
greena13 · May 8, 2017 · 6bcadd6 · 6bcadd6
2 parents 624a853 + c13a770
commit 6bcadd6
Show file tree

Hide file tree

Showing 10 changed files with 3,917 additions and 3,161 deletions.
diff --git a/build/global/react-hotkeys.js b/build/global/react-hotkeys.js
diff --git a/build/global/react-hotkeys.min.js b/build/global/react-hotkeys.min.js
diff --git a/build/npm/lib/FocusTrap.js b/build/npm/lib/FocusTrap.js
@@ -6,6 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
@@ -14,35 +20,47 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
 
-var FocusTrap = _react2.default.createClass({
-  displayName: 'FocusTrap',
-
-
-  propTypes: {
-    onFocus: _react2.default.PropTypes.func,
-    onBlur: _react2.default.PropTypes.func,
-    component: _react2.default.PropTypes.any,
-    children: _react2.default.PropTypes.node
-  },
-
-  getDefaultProps: function getDefaultProps() {
-    return {
-      component: 'div'
-    };
-  },
-  render: function render() {
-    var _props = this.props;
-    var Component = _props.component;
-    var children = _props.children;
-
-    var props = _objectWithoutProperties(_props, ['component', 'children']);
-
-    return _react2.default.createElement(
-      Component,
-      _extends({ tabIndex: '-1' }, props),
-      children
-    );
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var FocusTrap = function (_React$Component) {
+  _inherits(FocusTrap, _React$Component);
+
+  function FocusTrap() {
+    _classCallCheck(this, FocusTrap);
+
+    return _possibleConstructorReturn(this, (FocusTrap.__proto__ || Object.getPrototypeOf(FocusTrap)).apply(this, arguments));
   }
-});
 
+  _createClass(FocusTrap, [{
+    key: 'render',
+    value: function render() {
+      var _props = this.props,
+          Component = _props.component,
+          children = _props.children,
+          props = _objectWithoutProperties(_props, ['component', 'children']);
+
+      return _react2.default.createElement(
+        Component,
+        _extends({ tabIndex: '-1' }, props),
+        children
+      );
+    }
+  }]);
+
+  return FocusTrap;
+}(_react2.default.Component);
+
+FocusTrap.propTypes = {
+  onFocus: _propTypes2.default.func,
+  onBlur: _propTypes2.default.func,
+  component: _propTypes2.default.any,
+  children: _propTypes2.default.node
+};
+FocusTrap.defaultProps = {
+  component: 'div'
+};
 exports.default = FocusTrap;
diff --git a/build/npm/lib/HotKeyMapMixin.js b/build/npm/lib/HotKeyMapMixin.js
@@ -5,6 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = HotKeyMapMixin;
 
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
@@ -20,17 +24,17 @@ var _isEqual2 = _interopRequireDefault(_isEqual);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function HotKeyMapMixin() {
-  var hotKeyMap = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
+  var hotKeyMap = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
 
   return {
 
     contextTypes: {
-      hotKeyMap: _react2.default.PropTypes.object
+      hotKeyMap: _propTypes2.default.object
     },
 
     childContextTypes: {
-      hotKeyMap: _react2.default.PropTypes.object
+      hotKeyMap: _propTypes2.default.object
     },
 
     getChildContext: function getChildContext() {
@@ -61,4 +65,4 @@ function HotKeyMapMixin() {
       return this.__hotKeyMap__;
     }
   };
-};
+}
diff --git a/build/npm/lib/HotKeys.js b/build/npm/lib/HotKeys.js
@@ -6,10 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _createReactClass = require('create-react-class');
+
+var _createReactClass2 = _interopRequireDefault(_createReactClass);
+
 var _reactDom = require('react-dom');
 
 var _reactDom2 = _interopRequireDefault(_reactDom);
@@ -62,28 +70,26 @@ function getSequencesFromMap(hotKeyMap, hotKeyName) {
   return [sequences];
 }
 
-var HotKeys = _react2.default.createClass({
+var HotKeys = (0, _createReactClass2.default)({
   displayName: 'HotKeys',
-
-
   mixins: [(0, _HotKeyMapMixin2.default)()],
 
   propTypes: {
-    children: _react2.default.PropTypes.node,
-    onFocus: _react2.default.PropTypes.func,
-    onBlur: _react2.default.PropTypes.func,
-    keyMap: _react2.default.PropTypes.object,
-    handlers: _react2.default.PropTypes.object,
-    focused: _react2.default.PropTypes.bool, // externally controlled focus
-    attach: _react2.default.PropTypes.any // dom element to listen for key events
+    children: _propTypes2.default.node,
+    onFocus: _propTypes2.default.func,
+    onBlur: _propTypes2.default.func,
+    keyMap: _propTypes2.default.object,
+    handlers: _propTypes2.default.object,
+    focused: _propTypes2.default.bool, // externally controlled focus
+    attach: _propTypes2.default.any // dom element to listen for key events
   },
 
   contextTypes: {
-    hotKeyParent: _react2.default.PropTypes.any
+    hotKeyParent: _propTypes2.default.any
   },
 
   childContextTypes: {
-    hotKeyParent: _react2.default.PropTypes.any
+    hotKeyParent: _propTypes2.default.any
   },
 
   getChildContext: function getChildContext() {
@@ -116,17 +122,17 @@ var HotKeys = _react2.default.createClass({
   updateHotKeys: function updateHotKeys() {
     var _this = this;
 
-    var force = arguments.length <= 0 || arguments[0] === undefined ? false : arguments[0];
-    var prevProps = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
-    var _props$handlers = this.props.handlers;
-    var handlers = _props$handlers === undefined ? {} : _props$handlers;
-    var _prevProps$handlers = prevProps.handlers;
-    var prevHandlers = _prevProps$handlers === undefined ? handlers : _prevProps$handlers;
+    var force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    var prevProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var _props$handlers = this.props.handlers,
+        handlers = _props$handlers === undefined ? {} : _props$handlers;
+    var _prevProps$handlers = prevProps.handlers,
+        prevHandlers = _prevProps$handlers === undefined ? handlers : _prevProps$handlers;
 
     // Ensure map is up-to-date to begin with
     // We will only bother continuing if the map was actually updated
 
-    if (!force && (0, _isEqual2.default)(handlers, prevHandlers) && !this.updateMap()) {
+    if (!force && !this.updateMap() && (0, _isEqual2.default)(handlers, prevHandlers)) {
       return;
     }
 
@@ -172,7 +178,7 @@ var HotKeys = _react2.default.createClass({
     });
   },
   childHandledSequence: function childHandledSequence() {
-    var sequence = arguments.length <= 0 || arguments[0] === undefined ? null : arguments[0];
+    var sequence = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
 
     this.__lastChildSequence__ = sequence;
 
@@ -203,14 +209,13 @@ var HotKeys = _react2.default.createClass({
     }
   },
   render: function render() {
-    var _props3 = this.props;
-    var children = _props3.children;
-    var keyMap = _props3.keyMap;
-    var handlers = _props3.handlers;
-    var focused = _props3.focused;
-    var attach = _props3.attach;
-
-    var props = _objectWithoutProperties(_props3, ['children', 'keyMap', 'handlers', 'focused', 'attach']);
+    var _props3 = this.props,
+        children = _props3.children,
+        keyMap = _props3.keyMap,
+        handlers = _props3.handlers,
+        focused = _props3.focused,
+        attach = _props3.attach,
+        props = _objectWithoutProperties(_props3, ['children', 'keyMap', 'handlers', 'focused', 'attach']);
 
     return _react2.default.createElement(
       _FocusTrap2.default,

diff --git a/build/npm/package.json b/build/npm/package.json
@@ -8,7 +8,9 @@
   },
   "dependencies": {
     "lodash": "^4.13.1",
-    "mousetrap": "^1.5.2"
+    "mousetrap": "^1.5.2",
+    "prop-types": "^15.5.8",
+    "create-react-class": "^15.5.2"
   },
   "peerDependencies": {
     "react": ">= 0.14.0",

diff --git a/lib/FocusTrap.js b/lib/FocusTrap.js
@@ -1,19 +1,17 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 
-const FocusTrap = React.createClass({
+class FocusTrap extends React.Component {
+  static propTypes = {
+    onFocus: PropTypes.func,
+    onBlur: PropTypes.func,
+    component: PropTypes.any,
+    children: PropTypes.node
+  };
 
-  propTypes: {
-    onFocus: React.PropTypes.func,
-    onBlur: React.PropTypes.func,
-    component: React.PropTypes.any,
-    children: React.PropTypes.node
-  },
-
-  getDefaultProps() {
-    return {
-      component: 'div'
-    };
-  },
+  static defaultProps = {
+    component: 'div'
+  };
 
   render() {
     const {
@@ -28,7 +26,6 @@ const FocusTrap = React.createClass({
       </Component>
     );
   }
-
-});
+}
 
 export default FocusTrap;
diff --git a/lib/HotKeyMapMixin.js b/lib/HotKeyMapMixin.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 import assign from 'lodash/assign';
 import isEqual from 'lodash/isEqual';
@@ -7,11 +8,11 @@ export default function HotKeyMapMixin(hotKeyMap = {}) {
   return {
 
     contextTypes: {
-      hotKeyMap: React.PropTypes.object
+      hotKeyMap: PropTypes.object
     },
 
     childContextTypes: {
-      hotKeyMap: React.PropTypes.object
+      hotKeyMap: PropTypes.object
     },
 
     getChildContext() {
@@ -48,4 +49,4 @@ export default function HotKeyMapMixin(hotKeyMap = {}) {
 
   };
 
-};
+}
diff --git a/lib/HotKeys.js b/lib/HotKeys.js
@@ -1,4 +1,6 @@
+import PropTypes from 'prop-types';
 import React from 'react';
+import createReactClass from 'create-react-class';
 import ReactDOM from 'react-dom';
 import FocusTrap from './FocusTrap';
 import HotKeyMapMixin from './HotKeyMapMixin';
@@ -24,26 +26,26 @@ function getSequencesFromMap(hotKeyMap, hotKeyName) {
   return [sequences];
 }
 
-const HotKeys = React.createClass({
-
+const HotKeys = createReactClass({
+  displayName: 'HotKeys',
   mixins: [HotKeyMapMixin()],
 
   propTypes: {
-    children: React.PropTypes.node,
-    onFocus: React.PropTypes.func,
-    onBlur: React.PropTypes.func,
-    keyMap: React.PropTypes.object,
-    handlers: React.PropTypes.object,
-    focused: React.PropTypes.bool, // externally controlled focus
-    attach: React.PropTypes.any // dom element to listen for key events
+    children: PropTypes.node,
+    onFocus: PropTypes.func,
+    onBlur: PropTypes.func,
+    keyMap: PropTypes.object,
+    handlers: PropTypes.object,
+    focused: PropTypes.bool, // externally controlled focus
+    attach: PropTypes.any // dom element to listen for key events
   },
 
   contextTypes: {
-    hotKeyParent: React.PropTypes.any
+    hotKeyParent: PropTypes.any
   },
 
   childContextTypes: {
-    hotKeyParent: React.PropTypes.any
+    hotKeyParent: PropTypes.any
   },
 
   getChildContext() {
@@ -168,8 +170,7 @@ const HotKeys = React.createClass({
         {children}
       </FocusTrap>
     );
-  }
-
+  },
 });
 
 export default HotKeys;