React 15: Use PropTypes from a separate package (#34)

* Use PropTypes from a separate package to accommodate changes in React 15 * Use PropTypes from a separate package to accommodate changes in React 15 * Added PropTypes to the dependencies
gor181 · May 4, 2017 · bbe1833 · bbe1833
1 parent 9af2c68
commit bbe1833
Show file tree

Hide file tree

Showing 8 changed files with 1,042 additions and 34 deletions.
diff --git a/dist/react-notification-system-redux.js b/dist/react-notification-system-redux.js
diff --git a/dist/react-notification-system-redux.min.js b/dist/react-notification-system-redux.min.js
diff --git a/example/src/components/container.js b/example/src/components/container.js
@@ -1,4 +1,5 @@
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import {connect} from 'react-redux';
 import ReactDOM from 'react-dom';
 

diff --git a/lib/actions.js b/lib/actions.js
@@ -29,8 +29,8 @@ var _const = require('./const');
 // }
 
 function show() {
-  var opts = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-  var level = arguments.length <= 1 || arguments[1] === undefined ? 'success' : arguments[1];
+  var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var level = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'success';
 
   return _extends({
     type: _const.RNS_SHOW_NOTIFICATION

diff --git a/lib/notifications.js b/lib/notifications.js
@@ -6,6 +6,10 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
 var _actions = require('./actions');
 
 var actions = _interopRequireWildcard(_actions);
@@ -105,10 +109,9 @@ var Notifications = function (_React$Component) {
     key: 'render',
     value: function () {
       function render() {
-        var _props = this.props;
-        var notifications = _props.notifications;
-
-        var rest = _objectWithoutProperties(_props, ['notifications']);
+        var _props = this.props,
+            notifications = _props.notifications,
+            rest = _objectWithoutProperties(_props, ['notifications']);
 
         return _react2['default'].createElement(_reactNotificationSystem2['default'], _extends({ ref: 'notify' }, rest));
       }
@@ -121,11 +124,11 @@ var Notifications = function (_React$Component) {
 }(_react2['default'].Component);
 
 Notifications.propTypes = {
-  notifications: _react.PropTypes.array
+  notifications: _propTypes2['default'].array
 };
 
 Notifications.contextTypes = {
-  store: _react.PropTypes.object
+  store: _propTypes2['default'].object
 };
 
 // Tie actions to Notifications component instance

diff --git a/lib/reducer.js b/lib/reducer.js
@@ -13,14 +13,13 @@ function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr
 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; }
 
 function Notifications() {
-  var state = arguments.length <= 0 || arguments[0] === undefined ? [] : arguments[0];
-  var action = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
+  var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var action = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
   switch (action.type) {
     case _const.RNS_SHOW_NOTIFICATION:
-      var type = action.type;
-
-      var rest = _objectWithoutProperties(action, ['type']);
+      var type = action.type,
+          rest = _objectWithoutProperties(action, ['type']);
 
       return [].concat(_toConsumableArray(state), [_extends({}, rest, { uid: action.uid })]);
     case _const.RNS_HIDE_NOTIFICATION:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-notification-system-redux",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "react-notification-system-redux",
   "main": "lib/notifications.js",
   "author": "Goran Udosic",
@@ -44,6 +44,7 @@
     "sinon": "^1.17.6"
   },
   "dependencies": {
+    "prop-types": "^15.5.8",
     "react-notification-system": "^0.2.x"
   },
   "peerDependencies": {

diff --git a/src/notifications.js b/src/notifications.js
@@ -1,4 +1,5 @@
-import React, {PropTypes} from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 import * as actions from './actions';
 import reducer from './reducer';