fixed mapPropsToState issue

Author: Justin Menestrina

lib/actions.js

@@ -15,8 +15,8 @@ var initializeAlert = exports.initializeAlert = function initializeAlert(alertNa
   return { type: alertConstants.INITIALIZE_ALERT, alertName: alertName };
 };
 
-var createAlert = exports.createAlert = function createAlert(alertName) {
-  return { type: alertConstants.CREATE_ALERT, alertName: alertName };
+var createAlert = exports.createAlert = function createAlert(alertName, alertMessage) {
+  return { type: alertConstants.CREATE_ALERT, alertName: alertName, alertMessage: alertMessage };
 };
 
 var dismissAlert = exports.dismissAlert = function dismissAlert(alertName) {

lib/alertContainer.js

@@ -28,6 +28,11 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 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 defaultState = {
+  isVisible: false,
+  message: ''
+};
+
 var createAlert = function createAlert(config) {
   return function (WrappedComponent) {
     var alertName = config.alertName;
@@ -62,7 +67,7 @@ var createAlert = function createAlert(config) {
           var _this2 = this;
 
           if (!this.props.isVisible) return false;
-          return _react2.default.createElement(WrappedComponent, { close: function close() {
+          return _react2.default.createElement(WrappedComponent, { message: this.props.message, close: function close() {
               return _this2.close();
             } });
         }
@@ -72,7 +77,12 @@ var createAlert = function createAlert(config) {
     }(_react.Component);
 
     function mapStateToProps(state) {
-      return { isVisible: state.alerts ? state.alerts[alertName] : false };
+      var alerts = state.alerts;
+      if (!alerts[alertName]) return defaultState;
+      return {
+        isVisible: alerts[alertName].isVisible,
+        message: alerts[alertName].message
+      };
     };
 
     function mapDispatchToProps(dispatch) {

lib/reducer.js

@@ -16,14 +16,16 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+var initialState = { isVisible: false, message: '' };
+
 var behaviors = (_behaviors = {}, _defineProperty(_behaviors, alertTypes.CREATE_ALERT, function (state, action) {
-  return true;
+  var alertMessage = action.alertMessage;
+
+  return { isVisible: true, message: alertMessage };
 }), _defineProperty(_behaviors, alertTypes.DISMISS_ALERT, function (state, action) {
-  return false;
+  return initialState;
 }), _behaviors);
 
-var initialAlertState = false;
-
 var reducer = function reducer(state, action) {
   var behavior = behaviors[action.type];
   return behavior ? behavior(state, action) : state;
@@ -37,20 +39,18 @@ var alertReducer = function alertReducer() {
 
   if (state === undefined) return state;
   if (type === alertTypes.INITIALIZE_ALERT) {
-    return _extends({}, state, _defineProperty({}, alertName, false));
+    return _extends({}, state, _defineProperty({}, alertName, initialState));
   }
   if (type === alertTypes.DISMISS_ALL_ALERTS) {
     return Object.keys(state).reduce(function (acc, alert) {
-      var prev = Object.assign({}, acc, _defineProperty({}, alert, initialAlertState));
-      return prev;
+      return Object.assign({}, acc, _defineProperty({}, alert, initialState));
     }, {});
   }
 
   if (state[alertName] === undefined) return state;
   if (type === alertTypes.DESTROY_ALERT) {
     return Object.keys(state).reduce(function (acc, alert) {
-      var prev = alert === alertName ? acc : _extends({}, acc, _defineProperty({}, alert, state[alert]));
-      return prev;
+      return alert === alertName ? acc : _extends({}, acc, _defineProperty({}, alert, state[alert]));
     }, {});
   }
   return Object.assign({}, state, _defineProperty({}, alertName, reducer(state[alertName], action)));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-redux-alerts",
-  "version": "1.5.0",
+  "version": "1.5.6",
   "description": "A lightweight library for creating keyed alerts in a Redux app",
   "main": "./lib/index.js",
   "scripts": {

src/alertContainer.js

@@ -3,6 +3,11 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import * as alertActions from './actions'; 
 
+const defaultState = {
+  isVisible: false,
+  message: ''
+};
+
 const createAlert = config => WrappedComponent => {
   const { alertName } = config;
 
@@ -21,15 +26,20 @@ const createAlert = config => WrappedComponent => {
     render() {
       if(!this.props.isVisible) return false;
       return (
-        <WrappedComponent {...this.props} close={() => this.close()} />
+        <WrappedComponent message={this.props.message} close={() => this.close()} />
         );
     }
   }
 
-  function mapStateToProps (state) {
-    return { isVisible: state.alerts ? state.alerts[alertName] : false };
+ function mapStateToProps(state) {
+    const alerts = state.alerts;
+    if (!alerts[alertName]) return defaultState;
+    return {
+      isVisible: alerts[alertName].isVisible,
+      message: alerts[alertName].message
+    };
   };
-
+    
   function mapDispatchToProps (dispatch) {
     return { actions: bindActionCreators(alertActions, dispatch) };
   };

src/reducer.js

@@ -5,14 +5,10 @@ const initialState = {isVisible: false, message: '' };
 const behaviors = {
   [alertTypes.CREATE_ALERT](state, action) {
     const { alertMessage } = action;
-    return Object.assign({},
-      state,
-      { isVisible: true, message: alertMessage });
+    return { isVisible: true, message: alertMessage };
   },
   [alertTypes.DISMISS_ALERT](state, action) {
-    return Object.assign({},
-      state,
-      { isVisible: false });
+    return initialState;
   }
 };