react-input-message - npm Package Compare versions

Comparing version 0.10.1 to 0.10.2

Message.js

@@ -31,4 +31,2 @@ 'use strict';
 function messagesForNames(names, messages) {
-  if (!names.length) return messages;
-
   var messagesForNames = {};
@@ -55,34 +53,32 @@
   Message.prototype.componentWillMount = function componentWillMount() {
-    var _props = this.props;
-    var messagesForNames = _props.messagesForNames;
-    var messages = _props.messages;
-
-    var props = _objectWithoutProperties(_props, ['messagesForNames', 'messages']);
-
-    this.setState({
-      messages: messagesForNames.apply(undefined, [this.resolveNames(), messages].concat(props))
-    });
+    this.setState(this.getMessageState(this.props, this.context));
   };
 
   Message.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps, nextContext) {
-    var messagesForNames = nextProps.messagesForNames;
-    var messages = nextProps.messages;
+    this.setState(this.getMessageState(nextProps, nextContext));
+  };
 
-    var props = _objectWithoutProperties(nextProps, ['messagesForNames', 'messages']);
+  Message.prototype.getMessageState = function getMessageState(props, context) {
+    var messagesForNames = props.messagesForNames;
+    var messages = props.messages;
 
-    this.setState({
-      messages: messagesForNames.apply(undefined, [this.resolveNames(nextProps, nextContext), messages].concat(props))
-    });
+    var args = _objectWithoutProperties(props, ['messagesForNames', 'messages']);
+
+    var names = this.resolveNames(props, context);
+
+    messages = names == null ? messages : messagesForNames(names, messages, args);
+
+    return { messages: messages };
   };
 
   Message.prototype.render = function render() {
-    var _props2 = this.props;
+    var _props = this.props;
     var
     /* eslint-disable no-unused-vars */
-    messages = _props2.messages;
-    var fieldFor = _props2.for;
-    var Component = _props2.component;
-    var children = _props2.children;
+    messages = _props.messages;
+    var fieldFor = _props.for;
+    var Component = _props.component;
+    var children = _props.children;
 
-    var props = _objectWithoutProperties(_props2, ['messages', 'for', 'component', 'children']);
+    var props = _objectWithoutProperties(_props, ['messages', 'for', 'component', 'children']);
 
@@ -100,5 +96,3 @@ var activeMessages = this.state.messages;
 
-  Message.prototype.resolveNames = function resolveNames() {
-    var props = arguments.length <= 0 || arguments[0] === undefined ? this.props : arguments[0];
-    var context = arguments.length <= 1 || arguments[1] === undefined ? this.context : arguments[1];
+  Message.prototype.resolveNames = function resolveNames(props, context) {
     var messageContainer = context.messageContainer;
@@ -109,4 +103,7 @@ var forNames = props['for'];
 
-    if (!forNames && group && messageContainer) forNames = messageContainer.namesForGroup(group);
+    if (!forNames) {
+      if (!group || !messageContainer) return null;
 
+      forNames = messageContainer.namesForGroup(group);
+    }
     return forNames ? [].concat(forNames) : [];
@@ -113,0 +110,0 @@ };

MessageContainer.js

@@ -36,7 +36,11 @@ 'use strict';
 
-  function MessageContainer(props, context) {
+  function MessageContainer() {
     _classCallCheck(this, MessageContainer);
 
-    var _this = _possibleConstructorReturn(this, _React$Component.call(this, props, context));
+    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
 
+    var _this = _possibleConstructorReturn(this, _React$Component.call.apply(_React$Component, [this].concat(args)));
+
     _initialiseProps.call(_this);
@@ -86,5 +90,2 @@
 
-MessageContainer.defaultProps = {
-  messages: Object.create(null)
-};
 MessageContainer.propTypes = {
@@ -94,2 +95,5 @@ messages: _react2.default.PropTypes.object,
 };
+MessageContainer.defaultProps = {
+  messages: Object.create(null)
+};
 MessageContainer.childContextTypes = {
@@ -103,5 +107,4 @@ messageContainer: _react2.default.PropTypes.object
   this.namesForGroup = function (groups) {
-    groups = Object.keys(_this2._groups);
+    groups = groups || Object.keys(_this2._groups);
     groups = [].concat(groups);
-
     return uniq(groups.reduce(function (fields, group) {
@@ -113,6 +116,7 @@ return fields.concat(_this2._groups[group]);
   this.addToGroup = function (grpName, names) {
+    grpName = grpName || '@@unassigned-group';
+    names = names && [].concat(names);
+
     var group = _this2._groups[grpName];
 
-    names = names && [].concat(names);
-
     if (!names || !names.length) return;
@@ -119,0 +123,0 @@

MessageTrigger.js

@@ -104,3 +104,3 @@ 'use strict';
 
-    if (!messageContainer || !group || !forNames) return;
+    if (!messageContainer || !forNames) return;
 
@@ -117,4 +117,5 @@ this.removeFromGroup = messageContainer.addToGroup(group, forNames);
 
+    // falsy groups will return all form fields
 
-    if (!forNames && group && messageContainer) forNames = messageContainer.namesForGroup(group);
+    if (!forNames && messageContainer) forNames = messageContainer.namesForGroup(group);
 
@@ -121,0 +122,0 @@ return forNames ? [].concat(forNames) : [];

package.json

 {
   "name": "react-input-message",
   "description": "unopinionated form input annotation",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "repository": {
@@ -6,0 +6,0 @@ "url": "git://github.com/jquense/react-input-message.git"

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

525

increased by0.38%

Worsened metrics

Total package byte prevSize

25010

decreased by-0.25%

No dependency changes