From 12bddfc5a492a0d193f7944ecfca03658cd2dc32 Mon Sep 17 00:00:00 2001 From: Kevin Welcher Date: Thu, 14 Apr 2016 15:38:27 -0400 Subject: [PATCH] Updating to 0.7.1 --- bower.json | 2 +- dist/react-formable.js | 23 ++++++++++++++++++++--- dist/react-formable.min.js | 2 +- lib/fieldset.js | 6 ++++-- lib/helpers/cloneChildren.js | 17 ++++++++++++++++- package.json | 2 +- 6 files changed, 43 insertions(+), 9 deletions(-) diff --git a/bower.json b/bower.json index 0429bd3..058882d 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "react-formable", - "version": "0.7.0", + "version": "0.7.1", "description": "formable", "main": "dist/react-formable.min.js", "homepage": "https://github.com/kaw2k/react-formable", diff --git a/dist/react-formable.js b/dist/react-formable.js index 258ede7..affd06c 100644 --- a/dist/react-formable.js +++ b/dist/react-formable.js @@ -260,7 +260,9 @@ exports['default'] = _react2['default'].createClass({ errors: _react.PropTypes.arrayOf(_react.PropTypes.string), fieldErrors: _react.PropTypes.object, name: _react.PropTypes.string.isRequired, - children: _react.PropTypes.node + children: _react.PropTypes.node, + onChange: _react.PropTypes.func, + onSubmit: _react.PropTypes.func }, getInputs: function getInputs() { @@ -282,7 +284,7 @@ exports['default'] = _react2['default'].createClass({ render: function render() { (0, _warning2['default'])(this.props.name, 'Fieldset found without a name prop. The children of this component will behave eratically'); var errorsRule = (0, _helpersCloneChildren.createErrorsRule)(this.props.errors, this.props.fieldErrors); - var formableRule = (0, _helpersCloneChildren.createFormableRule)(this.props.errors, this.props.fieldErrors); + var formableRule = (0, _helpersCloneChildren.createFormableRule)(this.props.errors, this.props.fieldErrors, this.props.onSubmit, this.props.onChange); return _react2['default'].createElement( 'div', @@ -673,6 +675,21 @@ function createErrorsRule() { }; } +function combineListsIfLists() { + var combined = []; + + for (var _len = arguments.length, lists = Array(_len), _key = 0; _key < _len; _key++) { + lists[_key] = arguments[_key]; + } + + lists.forEach(function (list) { + if (list && list.length) { + combined.push.apply(combined, _toConsumableArray(list)); + } + }); + return combined; +} + /* * Get extra properties for something we are going to weave our formable magic into. */ @@ -687,7 +704,7 @@ function getFormableComponentProperties(errors, fieldErrors, onSubmit, onChange) onChange: (0, _compose2['default'])(onChange, child.props.onChange || _identity2['default']), onSubmit: (0, _compose2['default'])(onSubmit, child.props.onSubmit || _identity2['default']), errors: errors, - fieldErrors: child.props.fieldErrors || fieldErrors[child.props.name] + fieldErrors: combineListsIfLists(child.props.fieldErrors, fieldErrors[child.props.name]) }; }; } diff --git a/dist/react-formable.min.js b/dist/react-formable.min.js index a81a09b..24f8cfe 100644 --- a/dist/react-formable.min.js +++ b/dist/react-formable.min.js @@ -1 +1 @@ -!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var r;r="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,r.formable=e()}}(function(){return function e(r,t,n){function o(i,s){if(!t[i]){if(!r[i]){var l="function"==typeof require&&require;if(!s&&l)return l(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var f=t[i]={exports:{}};r[i][0].call(f.exports,function(e){var t=r[i][1][e];return o(t?t:e)},f,f.exports,e,r,t,n)}return t[i].exports}for(var u="function"==typeof require&&require,i=0;iu&&JSON.stringify(i)!==JSON.stringify(s));return i.errors=(0,l["default"])(i.errors.filter(v["default"])),i.valid=!i.errors.length,i},onChange:function(){this.props.onChange(this.serialize()),this.props.showErrorsOnChange&&this.showFieldErrors()},onSubmit:function(e){e&&e.preventDefault&&e.preventDefault(),this.props.showErrorsOnSubmit&&this.showFieldErrors(),this.props.onSubmit(this.serialize())},onKeyDown:function(e){"Enter"===e.key&&this.onSubmit(e)},showFieldErrors:function(){var e=this.serialize(),r=e.fieldErrors,t=e.errors;return this.setState({errors:t,fieldErrors:r}),t},clearFieldErrors:function(){this.setState({fieldErrors:{},errors:[]})},render:function(){var e=(0,d.createErrorsRule)(this.state.errors,this.state.fieldErrors),r=(0,d.createFormableRule)(this.state.errors,this.state.fieldErrors,this.onSubmit,this.onChange);return i["default"].createElement("form",o({},this.props,{ref:"form",onSubmit:this.onSubmit,onChange:function(){},onKeyDown:this.onKeyDown}),(0,p["default"])([e,r],this.props.children))}})}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./helpers/cloneChildren":7,"./helpers/identity":11,"./helpers/tree":14,"./helpers/uniq":15,"./helpers/values":16}],6:[function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0});var o=e("./form"),u=n(o),i=e("./fieldset"),s=n(i),l=e("./fieldlist"),a=n(l),f=e("./inputs/input"),d=n(f),p=e("./errors"),c=n(p),h=e("./validators/required"),y=n(h),v=e("./validators/greaterThan"),g=n(v),m=e("./validators/lessThan"),b=n(m),w=e("./validators/maxLength"),_=n(w),P=e("./validators/minLength"),E=n(P),O=e("./validators/test"),T=n(O),j=e("./validators/equalsField"),x=n(j),M={required:y["default"],greaterThan:g["default"],lessThan:b["default"],maxLength:_["default"],minLength:E["default"],test:T["default"],equalsField:x["default"]};t.Form=u["default"],t.getBlankForm=o.getBlankForm,t.Fieldset=s["default"],t.Fieldlist=a["default"],t.Input=d["default"],t.Errors=c["default"],t.validators=M,t["default"]=u["default"]},{"./errors":2,"./fieldlist":3,"./fieldset":4,"./form":5,"./inputs/input":17,"./validators/equalsField":18,"./validators/greaterThan":19,"./validators/lessThan":20,"./validators/maxLength":21,"./validators/minLength":22,"./validators/required":23,"./validators/test":24}],7:[function(e,r,t){(function(r){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e){if(Array.isArray(e)){for(var r=0,t=Array(e.length);r=e?r:void 0}}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=n,r.exports=t["default"]},{}],21:[function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e,r){return function(t){return(0,i["default"])(t)||t.length>e?r:void 0}}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=o;var u=e("../helpers/isNil"),i=n(u);r.exports=t["default"]},{"../helpers/isNil":12}],22:[function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e,r){return function(t){return(0,i["default"])(t)||t.lengthu&&JSON.stringify(i)!==JSON.stringify(s));return i.errors=(0,a["default"])(i.errors.filter(g["default"])),i.valid=!i.errors.length,i},onChange:function(){this.props.onChange(this.serialize()),this.props.showErrorsOnChange&&this.showFieldErrors()},onSubmit:function(e){e&&e.preventDefault&&e.preventDefault(),this.props.showErrorsOnSubmit&&this.showFieldErrors(),this.props.onSubmit(this.serialize())},onKeyDown:function(e){"Enter"===e.key&&this.onSubmit(e)},showFieldErrors:function(){var e=this.serialize(),r=e.fieldErrors,t=e.errors;return this.setState({errors:t,fieldErrors:r}),t},clearFieldErrors:function(){this.setState({fieldErrors:{},errors:[]})},render:function(){var e=(0,d.createErrorsRule)(this.state.errors,this.state.fieldErrors),r=(0,d.createFormableRule)(this.state.errors,this.state.fieldErrors,this.onSubmit,this.onChange);return i["default"].createElement("form",o({},this.props,{ref:"form",onSubmit:this.onSubmit,onChange:function(){},onKeyDown:this.onKeyDown}),(0,p["default"])([e,r],this.props.children))}})}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./helpers/cloneChildren":7,"./helpers/identity":11,"./helpers/tree":14,"./helpers/uniq":15,"./helpers/values":16}],6:[function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0});var o=e("./form"),u=n(o),i=e("./fieldset"),s=n(i),a=e("./fieldlist"),l=n(a),f=e("./inputs/input"),d=n(f),p=e("./errors"),c=n(p),h=e("./validators/required"),y=n(h),g=e("./validators/greaterThan"),v=n(g),m=e("./validators/lessThan"),b=n(m),w=e("./validators/maxLength"),_=n(w),P=e("./validators/minLength"),E=n(P),O=e("./validators/test"),T=n(O),j=e("./validators/equalsField"),x=n(j),M={required:y["default"],greaterThan:v["default"],lessThan:b["default"],maxLength:_["default"],minLength:E["default"],test:T["default"],equalsField:x["default"]};t.Form=u["default"],t.getBlankForm=o.getBlankForm,t.Fieldset=s["default"],t.Fieldlist=l["default"],t.Input=d["default"],t.Errors=c["default"],t.validators=M,t["default"]=u["default"]},{"./errors":2,"./fieldlist":3,"./fieldset":4,"./form":5,"./inputs/input":17,"./validators/equalsField":18,"./validators/greaterThan":19,"./validators/lessThan":20,"./validators/maxLength":21,"./validators/minLength":22,"./validators/required":23,"./validators/test":24}],7:[function(e,r,t){(function(r){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e){if(Array.isArray(e)){for(var r=0,t=Array(e.length);rn;n++)t[n]=arguments[n];return t.forEach(function(r){r&&r.length&&e.push.apply(e,o(r))}),e}function a(e,r,t,n){return function(o,u){return(0,m["default"])(!o.ref,'Attempting to attach ref "'+o.ref+'" to "'+o.props.name+'" will be bad for your health'),(0,m["default"])(-1===u.indexOf(o.props.name),'Duplicate name "'+o.props.name+'" found. Duplicate fields will be ignored'),u.push(o.props.name),{ref:o.ref||o.props.name,onChange:(0,g["default"])(n,o.props.onChange||h["default"]),onSubmit:(0,g["default"])(t,o.props.onSubmit||h["default"]),errors:e,fieldErrors:s(o.props.fieldErrors,r[o.props.name])}}}function l(){var e=arguments.length<=0||void 0===arguments[0]?[]:arguments[0],r=arguments.length<=1||void 0===arguments[1]?{}:arguments[1],t=arguments.length<=2||void 0===arguments[2]?h["default"]:arguments[2],n=arguments.length<=3||void 0===arguments[3]?h["default"]:arguments[3];return{predicate:function(e){return e.props&&e.props.name},clone:function(o,u){return p["default"].cloneElement(o,a(e,r,t,n)(o,u),o.props&&o.props.children)}}}function f(e,r){var t=arguments.length<=2||void 0===arguments[2]?[]:arguments[2];if(r){var n=function(){var n=[b].concat(o(e),[u(e)]),i=p["default"].Children.map(r,function(e){return n.find(function(r){return r.predicate(e)}).clone(e,t)});return{v:1==p["default"].Children.count(i)?i[0]:i}}();if("object"==typeof n)return n.v}}Object.defineProperty(t,"__esModule",{value:!0}),t.createErrorsRule=i,t.createFormableRule=l,t["default"]=f;var d="undefined"!=typeof window?window.React:"undefined"!=typeof r?r.React:null,p=n(d),c=e("./identity"),h=n(c),y=e("./compose"),g=n(y),v=e("warning"),m=n(v),b={predicate:function(e){return"object"!=typeof e||null===e},clone:h["default"]}}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./compose":8,"./identity":11,warning:1}],8:[function(e,r,t){"use strict";function n(e,r){return function(){return e(r.apply(void 0,arguments))}}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=n,r.exports=t["default"]},{}],9:[function(e,r,t){"use strict";function n(e,r){var t=r.split("."),n=e,o=void 0;for(o=0;o=e?r:void 0}}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=n,r.exports=t["default"]},{}],21:[function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e,r){return function(t){return(0,i["default"])(t)||t.length>e?r:void 0}}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=o;var u=e("../helpers/isNil"),i=n(u);r.exports=t["default"]},{"../helpers/isNil":12}],22:[function(e,r,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e,r){return function(t){return(0,i["default"])(t)||t.length