From 8df827a5734f8ea674da203b0de2e0b95015458d Mon Sep 17 00:00:00 2001 From: Ashok Date: Thu, 7 Apr 2016 16:31:32 +1000 Subject: [PATCH 1/2] Prevent the form submit if enter is clicked form textarea --- src/form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/form.js b/src/form.js index dc653e4..bfd50d7 100644 --- a/src/form.js +++ b/src/form.js @@ -249,7 +249,7 @@ export default React.createClass({ }, onKeyDown(event) { - if (event.key === 'Enter') { + if (event.key === 'Enter' && event.target.type !== 'textarea') { this.onSubmit(event); } }, From 089bd89b23e5355a49dcacac66b71dc7abd39d8f Mon Sep 17 00:00:00 2001 From: Ashok Date: Thu, 7 Apr 2016 17:33:25 +1000 Subject: [PATCH 2/2] Changed the form.js in lib as well --- dist/react-formable.js | 4 ++-- dist/react-formable.min.js | 2 +- lib/form.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/react-formable.js b/dist/react-formable.js index 5b20720..fe17cc1 100644 --- a/dist/react-formable.js +++ b/dist/react-formable.js @@ -596,7 +596,7 @@ exports['default'] = _react2['default'].createClass({ }, onKeyDown: function onKeyDown(event) { - if (event.key === 'Enter') { + if (event.key === 'Enter' && event.target.type !== 'textarea') { this.onSubmit(event); } }, @@ -900,4 +900,4 @@ module.exports = exports['default']; }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) },{}]},{},[6])(6) -}); \ No newline at end of file +}); diff --git a/dist/react-formable.min.js b/dist/react-formable.min.js index 825b59a..3703c06 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,u){if(!t[i]){if(!r[i]){var f="function"==typeof require&&require;if(!u&&f)return f(i,!0);if(s)return s(i,!0);var l=new Error("Cannot find module '"+i+"'");throw l.code="MODULE_NOT_FOUND",l}var a=t[i]={exports:{}};r[i][0].call(a.exports,function(e){var t=r[i][1][e];return o(t?t:e)},a,a.exports,e,r,t,n)}return t[i].exports}for(var s="function"==typeof require&&require,i=0;ie&&JSON.stringify(n)!==JSON.stringify(s));return n.valid=!n.errors.length,n},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=this,r=[],t=function(e){return e.props&&e.props.name||"Errors"===e.type.displayName},n=function(t){return"Errors"===t.type.displayName?{errors:e.state.errors,fieldErrors:e.state.fieldErrors}:((0,v["default"])(!t.ref,'Attempting to attach ref "'+t.ref+'" to "'+t.props.name+'" will be bad for your health'),(0,v["default"])(-1===r.indexOf(t.props.name),'Duplicate name "'+t.props.name+'" found. Duplicate fields will be ignored'),r=r.concat(t.props.name),{ref:t.ref||t.props.name,onChange:(0,m["default"])(t.props.onChange||d["default"],e.onChange),onSubmit:(0,m["default"])(t.props.onSubmit||d["default"],e.onSubmit),errors:e.state.errors,fieldErrors:t.props.fieldErrors||e.state.fieldErrors[t.props.name]})};return i["default"].createElement("form",o({},this.props,{ref:"form",onSubmit:this.onSubmit,onChange:function(){},onKeyDown:this.onKeyDown}),(0,h["default"])(t,n,this.props.children))}})}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./helpers/cloneChildren":7,"./helpers/compose":8,"./helpers/identity":10,"./helpers/uniq":11,"./helpers/values":12,warning:1}],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"),s=n(o),i=e("./fieldset"),u=n(i),f=e("./fieldlist"),l=n(f),a=e("./inputs/input"),p=n(a),d=e("./errors"),c=n(d);t.Form=s["default"],t.getBlankForm=o.getBlankForm,t.Fieldset=u["default"],t.Fieldlist=l["default"],t.Input=p["default"],t.Errors=c["default"],t["default"]=s["default"]},{"./errors":2,"./fieldlist":3,"./fieldset":4,"./form":5,"./inputs/input":13}],7:[function(e,r,t){(function(e){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e,r,t){return"object"!=typeof t||null===t?t:i["default"].Children.map(t,function(t){return"object"!=typeof t||null===t?t:e(t)?i["default"].cloneElement(t,r(t),t.props&&t.props.children):i["default"].cloneElement(t,{},o(e,r,t.props&&t.props.children))})}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=o;var s="undefined"!=typeof window?window.React:"undefined"!=typeof e?e.React:null,i=n(s);r.exports=t["default"]}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],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){return[].concat.apply([],e)}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=n,r.exports=t["default"]},{}],10:[function(e,r,t){"use strict";function n(e){return e}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=n,r.exports=t["default"]},{}],11:[function(e,r,t){"use strict";function n(e){return e.reduce(function(e,r){return-1===e.indexOf(r)?e.concat(r):e},[])}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=n,r.exports=t["default"]},{}],12:[function(e,r,t){"use strict";function n(e){var r=[];for(var t in e)r=r.concat(e[t]);return r}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=n,r.exports=t["default"]},{}],13:[function(e,r,t){(function(e){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0});var o=Object.assign||function(e){for(var r=1;re&&JSON.stringify(n)!==JSON.stringify(s));return n.valid=!n.errors.length,n},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&&"textarea"!==e.target.type&&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=this,r=[],t=function(e){return e.props&&e.props.name||"Errors"===e.type.displayName},n=function(t){return"Errors"===t.type.displayName?{errors:e.state.errors,fieldErrors:e.state.fieldErrors}:((0,v["default"])(!t.ref,'Attempting to attach ref "'+t.ref+'" to "'+t.props.name+'" will be bad for your health'),(0,v["default"])(-1===r.indexOf(t.props.name),'Duplicate name "'+t.props.name+'" found. Duplicate fields will be ignored'),r=r.concat(t.props.name),{ref:t.ref||t.props.name,onChange:(0,m["default"])(t.props.onChange||d["default"],e.onChange),onSubmit:(0,m["default"])(t.props.onSubmit||d["default"],e.onSubmit),errors:e.state.errors,fieldErrors:t.props.fieldErrors||e.state.fieldErrors[t.props.name]})};return i["default"].createElement("form",o({},this.props,{ref:"form",onSubmit:this.onSubmit,onChange:function(){},onKeyDown:this.onKeyDown}),(0,h["default"])(t,n,this.props.children))}})}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{"./helpers/cloneChildren":7,"./helpers/compose":8,"./helpers/identity":10,"./helpers/uniq":11,"./helpers/values":12,warning:1}],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"),s=n(o),i=e("./fieldset"),u=n(i),f=e("./fieldlist"),l=n(f),a=e("./inputs/input"),p=n(a),d=e("./errors"),c=n(d);t.Form=s["default"],t.getBlankForm=o.getBlankForm,t.Fieldset=u["default"],t.Fieldlist=l["default"],t.Input=p["default"],t.Errors=c["default"],t["default"]=s["default"]},{"./errors":2,"./fieldlist":3,"./fieldset":4,"./form":5,"./inputs/input":13}],7:[function(e,r,t){(function(e){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e,r,t){return"object"!=typeof t||null===t?t:i["default"].Children.map(t,function(t){return"object"!=typeof t||null===t?t:e(t)?i["default"].cloneElement(t,r(t),t.props&&t.props.children):i["default"].cloneElement(t,{},o(e,r,t.props&&t.props.children))})}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=o;var s="undefined"!=typeof window?window.React:"undefined"!=typeof e?e.React:null,i=n(s);r.exports=t["default"]}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{}],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){return[].concat.apply([],e)}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=n,r.exports=t["default"]},{}],10:[function(e,r,t){"use strict";function n(e){return e}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=n,r.exports=t["default"]},{}],11:[function(e,r,t){"use strict";function n(e){return e.reduce(function(e,r){return-1===e.indexOf(r)?e.concat(r):e},[])}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=n,r.exports=t["default"]},{}],12:[function(e,r,t){"use strict";function n(e){var r=[];for(var t in e)r=r.concat(e[t]);return r}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=n,r.exports=t["default"]},{}],13:[function(e,r,t){(function(e){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0});var o=Object.assign||function(e){for(var r=1;r