@codegateinc/react-form-builder-v2 - npm Package Compare versions

Comparing version 1.2.11 to 1.2.12

dist/react-form-builder-v2.cjs.development.js

@@ -195,2 +195,3 @@ 'use strict';
       });
+      return hasError;
     }
@@ -364,2 +365,3 @@ };
       });
+      return hasError;
     }
@@ -523,3 +525,3 @@ });
     validateAll: function validateAll() {
-      return Object.values(form).forEach(function (field) {
+      return Object.values(form).some(function (field) {
         return field.validate();
@@ -526,0 +528,0 @@ });

dist/react-form-builder-v2.cjs.production.min.js

@@ -1,2 +0,2 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var r=require("react"),e=require("ramda");function n(){return(n=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var t in n)Object.prototype.hasOwnProperty.call(n,t)&&(r[t]=n[t])}return r}).apply(this,arguments)}var t=function(r){return null!=r},a=function(r,e){return t(r)&&e(r)};exports.useField=function(a){var i=a.key,u=a.label,o=a.validationRules,s=void 0===o?[]:o,l=a.isRequired,c=void 0!==l&&l,v=a.placeholder,f=a.validateOnBlur,d=void 0!==f&&f,h=a.liveParser,g=a.submitParser,M=r.useState(a.initialValue),y=M[0],E=M[1],k=r.useState({value:null!=y?y:"",isPristine:!0,errorMessage:"",hasError:!1}),b=k[0],O=k[1],P=function(r,n){if(void 0===n&&(n=!1),!n&&b.isPristine||!s)return{errorMessage:"",hasError:!1};var a,i=t(r)?r:b.value;if(c&&e.isEmpty(i))return{errorMessage:null==(a=s[0])?void 0:a.errorMessage,hasError:!0};if(!c&&!Boolean(i)&&!s)return{errorMessage:"",hasError:!1};var u=s.find((function(r){return!r.validate(i)}));return{errorMessage:u?u.errorMessage:"",hasError:Boolean(null==u?void 0:u.errorMessage)}};return{key:i,label:u,isRequired:c,placeholder:v,submitParser:g,parentKey:"",hasError:b.hasError,value:b.value,hasChange:b.value!==y,errorMessage:b.errorMessage,onBlur:function(){if(d){var r=P(void 0,!0),e=r.errorMessage,t=r.hasError;O((function(r){return n({},r,{isPristine:!1,errorMessage:e,hasError:t})}))}},onChangeValue:function(r){var e=P(r,!d),t=e.hasError,a=e.errorMessage;O((function(e){return n({},e,{value:h?h(r):r,isPristine:e.isPristine?d:e.isPristine,errorMessage:a,hasError:t})}))},onChangeInitialValue:function(r){b.value===y&&O((function(e){return n({},e,{value:r})})),E(r)},validateOnSubmit:function(){var r=P(void 0,!0),e=r.hasError,t=r.errorMessage;return O((function(r){return n({},r,{errorMessage:t,hasError:e})})),{hasError:e,errorMessage:t}},setError:function(r){return O((function(e){return n({},e,{errorMessage:r})}))},resetState:function(){return O((function(r){return n({},r,{isPristine:!0,errorMessage:"",value:null!=y?y:""})}))},validate:function(){var r=P(void 0,!0),e=r.hasError,t=r.errorMessage;O((function(r){return n({},r,{errorMessage:t,hasError:e})}))}}},exports.useForm=function(i,u){var o=Object.entries(i).reduce((function(r,e){var t;return n({},r,((t={})[e[0]]=e[1],t))}),{}),s=r.useState({}),l=s[0],c=s[1],v=r.useRef(l),f=n({},o,Object.entries(l).reduce((function(r,e){var t,a=e[0],i=e[1],u=i.parentKey.split(".").filter(Boolean);if(u.length>0){var o=u.reduce((function(e,t,a){var o,s;return n({},r,e,((s={})[t]=n({},r[t],e[t]||{},a===u.length-1?{children:[].concat((null==(o=e[t])?void 0:o.children)||[],[i])}:{}),s))}),{}),s=Object.keys(o).filter((function(r){return Object.keys(o[r]).length})).reduce((function(r,e){var t;return n({},r,((t={})[e]=o[e],t))}),{});return n({},r,s)}return n({},r,((t={})[a]=i,t))}),{})),d=Object.values(f).filter((function(r){return r.isRequired})).some((function(r){return Boolean(r.errorMessage)}));return r.useEffect((function(){v.current=l}),[l]),{form:f,hasError:d,isFilled:Object.values(f).filter((function(r){return r.isRequired})).every((function(r){return!e.isEmpty(r.value)})),formHasChanges:function(){return Object.values(f).some((function(r){return r.hasChange}))},setError:function(r,e){f[r].setError(e),a(u.onError,(function(n){var t;return n(((t={})[r]=e,t))}))},setFieldValue:function(r,e){f[r].onChangeValue(e)},setFieldInitialValue:function(r,e){f[r].onChangeInitialValue(e)},addFields:function(r){return c((function(a){return n({},a,r.reduce((function(r,a){return n({},r,function r(a,i){var u;return a.children?a.children.reduce((function(e,t){return n({},e,r(t,i+"."+a.key))}),{}):((u={})[a.key]=function(r,a,i,u){var o,s,l,c,v;void 0===u&&(u="");var f=function(r,n,a){if(void 0===a&&(a=!1),!a&&r.isPristine||!r.validationRules)return{errorMessage:"",hasError:!1};var i,u=t(n)?n:r.value;if(r.isRequired&&e.isEmpty(u))return{errorMessage:null==(i=r.validationRules[0])?void 0:i.errorMessage,hasError:!0};if(!r.isRequired&&!Boolean(u)&&!r.validationRules)return{errorMessage:"",hasError:!1};var o=r.validationRules.find((function(r){return!r.validate(u)}));return{errorMessage:o?o.errorMessage:"",hasError:Boolean(null==o?void 0:o.errorMessage)}};return n({},r,{value:"",hasChange:!1,isPristine:!0,parentKey:u,hasError:null==(o=a.current)||null==(s=o[r.key])?void 0:s.hasError,isRequired:r.isRequired||!1,validateOnBlur:r.validateOnBlur||!1,localInitialValue:null!=(l=r.initialValue)?l:"",errorMessage:null==(c=a.current)||null==(v=c[r.key])?void 0:v.errorMessage,onChangeValue:function(e){return i((function(t){var a,i,u,o=n({},t[r.key],{value:r.liveParser?r.liveParser(e):e,hasChange:e!==(null==(a=t[r.key])?void 0:a.localInitialValue),isPristine:null!=(i=t[r.key])&&i.isPristine?r.validateOnBlur||!1:t[r.key].isPristine}),s=f(o,e);return n({},t,((u={})[r.key]=n({},o,{errorMessage:s.errorMessage,hasError:s.hasError}),u))}))},onBlur:function(){if(r.validateOnBlur){var e,t=f(null==(e=a.current)?void 0:e[r.key],void 0,!0),u=t.errorMessage,o=t.hasError;i((function(e){var t;return n({},e,((t={})[r.key]=n({},e[r.key],{isPristine:!1,errorMessage:u,hasError:o}),t))}))}},validateOnSubmit:function(){var e,t=f(null==(e=a.current)?void 0:e[r.key],void 0,!0),u=t.errorMessage,o=t.hasError;return i((function(e){var t;return n({},e,((t={})[r.key]=n({},e[r.key],{errorMessage:u,hasError:o}),t))})),{errorMessage:u,hasError:o}},onChangeInitialValue:function(e){var t,u;(null==(t=a.current)?void 0:t.value)===(null==(u=a.current)?void 0:u.localInitialValue)&&i((function(t){var a;return n({},t,((a={})[r.key]=n({},t[r.key],{value:e,localInitialValue:e}),a))}))},setError:function(e){return i((function(t){var a;return n({},t,((a={})[r.key]=n({},t[r.key],{errorMessage:e}),a))}))},resetState:function(){return i((function(e){var t,a;return n({},e,((a={})[r.key]=n({},e[r.key],{isPristine:!0,errorMessage:"",value:null!=(t=r.initialValue)?t:""}),a))}))},validate:function(){var e,t=f(null==(e=a.current)?void 0:e[r.key],void 0,!0),u=t.hasError,o=t.errorMessage;i((function(e){var t;return n({},e,((t={})[r.key]=n({},e[r.key],{errorMessage:o,hasError:u}),t))}))}})}(a,v,c,i),u)}(a,""))}),{}))}))},removeFieldIds:function(r){return c((function(e){return Object.keys(e).reduce((function(t,a){var i;return r.includes(a)?t:n({},t,((i={})[a]=e[a],i))}),{})}))},resetForm:function(){return Object.keys(f).forEach((function(r){return f[r].resetState()}))},submit:function(){var r=Object.values(f).map((function(r){var e=r.validateOnSubmit();return{key:r.key,errorMessage:e.errorMessage||(e.hasError?"This field is required":"")}})).filter((function(r){return Boolean(r.errorMessage)})).reduce((function(r,e){var t;return n({},r,((t={})[e.key]=e.errorMessage,t))}),{});if(Object.values(r).length>0)return a(u.onError,(function(e){return e(r)}));var e=Object.values(f).reduce((function(r,e){var t,a=e.value,i=e.submitParser;return n({},r,((t={})[e.key]=i?i(a):a,t))}),{});u.onSuccess(e)},validateAll:function(){return Object.values(f).forEach((function(r){return r.validate()}))}}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var r=require("react"),e=require("ramda");function n(){return(n=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var t in n)Object.prototype.hasOwnProperty.call(n,t)&&(r[t]=n[t])}return r}).apply(this,arguments)}var t=function(r){return null!=r},a=function(r,e){return t(r)&&e(r)};exports.useField=function(a){var u=a.key,i=a.label,o=a.validationRules,s=void 0===o?[]:o,l=a.isRequired,c=void 0!==l&&l,v=a.placeholder,f=a.validateOnBlur,d=void 0!==f&&f,g=a.liveParser,h=a.submitParser,M=r.useState(a.initialValue),y=M[0],E=M[1],k=r.useState({value:null!=y?y:"",isPristine:!0,errorMessage:"",hasError:!1}),b=k[0],O=k[1],P=function(r,n){if(void 0===n&&(n=!1),!n&&b.isPristine||!s)return{errorMessage:"",hasError:!1};var a,u=t(r)?r:b.value;if(c&&e.isEmpty(u))return{errorMessage:null==(a=s[0])?void 0:a.errorMessage,hasError:!0};if(!c&&!Boolean(u)&&!s)return{errorMessage:"",hasError:!1};var i=s.find((function(r){return!r.validate(u)}));return{errorMessage:i?i.errorMessage:"",hasError:Boolean(null==i?void 0:i.errorMessage)}};return{key:u,label:i,isRequired:c,placeholder:v,submitParser:h,parentKey:"",hasError:b.hasError,value:b.value,hasChange:b.value!==y,errorMessage:b.errorMessage,onBlur:function(){if(d){var r=P(void 0,!0),e=r.errorMessage,t=r.hasError;O((function(r){return n({},r,{isPristine:!1,errorMessage:e,hasError:t})}))}},onChangeValue:function(r){var e=P(r,!d),t=e.hasError,a=e.errorMessage;O((function(e){return n({},e,{value:g?g(r):r,isPristine:e.isPristine?d:e.isPristine,errorMessage:a,hasError:t})}))},onChangeInitialValue:function(r){b.value===y&&O((function(e){return n({},e,{value:r})})),E(r)},validateOnSubmit:function(){var r=P(void 0,!0),e=r.hasError,t=r.errorMessage;return O((function(r){return n({},r,{errorMessage:t,hasError:e})})),{hasError:e,errorMessage:t}},setError:function(r){return O((function(e){return n({},e,{errorMessage:r})}))},resetState:function(){return O((function(r){return n({},r,{isPristine:!0,errorMessage:"",value:null!=y?y:""})}))},validate:function(){var r=P(void 0,!0),e=r.hasError,t=r.errorMessage;return O((function(r){return n({},r,{errorMessage:t,hasError:e})})),e}}},exports.useForm=function(u,i){var o=Object.entries(u).reduce((function(r,e){var t;return n({},r,((t={})[e[0]]=e[1],t))}),{}),s=r.useState({}),l=s[0],c=s[1],v=r.useRef(l),f=n({},o,Object.entries(l).reduce((function(r,e){var t,a=e[0],u=e[1],i=u.parentKey.split(".").filter(Boolean);if(i.length>0){var o=i.reduce((function(e,t,a){var o,s;return n({},r,e,((s={})[t]=n({},r[t],e[t]||{},a===i.length-1?{children:[].concat((null==(o=e[t])?void 0:o.children)||[],[u])}:{}),s))}),{}),s=Object.keys(o).filter((function(r){return Object.keys(o[r]).length})).reduce((function(r,e){var t;return n({},r,((t={})[e]=o[e],t))}),{});return n({},r,s)}return n({},r,((t={})[a]=u,t))}),{})),d=Object.values(f).filter((function(r){return r.isRequired})).some((function(r){return Boolean(r.errorMessage)}));return r.useEffect((function(){v.current=l}),[l]),{form:f,hasError:d,isFilled:Object.values(f).filter((function(r){return r.isRequired})).every((function(r){return!e.isEmpty(r.value)})),formHasChanges:function(){return Object.values(f).some((function(r){return r.hasChange}))},setError:function(r,e){f[r].setError(e),a(i.onError,(function(n){var t;return n(((t={})[r]=e,t))}))},setFieldValue:function(r,e){f[r].onChangeValue(e)},setFieldInitialValue:function(r,e){f[r].onChangeInitialValue(e)},addFields:function(r){return c((function(a){return n({},a,r.reduce((function(r,a){return n({},r,function r(a,u){var i;return a.children?a.children.reduce((function(e,t){return n({},e,r(t,u+"."+a.key))}),{}):((i={})[a.key]=function(r,a,u,i){var o,s,l,c,v;void 0===i&&(i="");var f=function(r,n,a){if(void 0===a&&(a=!1),!a&&r.isPristine||!r.validationRules)return{errorMessage:"",hasError:!1};var u,i=t(n)?n:r.value;if(r.isRequired&&e.isEmpty(i))return{errorMessage:null==(u=r.validationRules[0])?void 0:u.errorMessage,hasError:!0};if(!r.isRequired&&!Boolean(i)&&!r.validationRules)return{errorMessage:"",hasError:!1};var o=r.validationRules.find((function(r){return!r.validate(i)}));return{errorMessage:o?o.errorMessage:"",hasError:Boolean(null==o?void 0:o.errorMessage)}};return n({},r,{value:"",hasChange:!1,isPristine:!0,parentKey:i,hasError:null==(o=a.current)||null==(s=o[r.key])?void 0:s.hasError,isRequired:r.isRequired||!1,validateOnBlur:r.validateOnBlur||!1,localInitialValue:null!=(l=r.initialValue)?l:"",errorMessage:null==(c=a.current)||null==(v=c[r.key])?void 0:v.errorMessage,onChangeValue:function(e){return u((function(t){var a,u,i,o=n({},t[r.key],{value:r.liveParser?r.liveParser(e):e,hasChange:e!==(null==(a=t[r.key])?void 0:a.localInitialValue),isPristine:null!=(u=t[r.key])&&u.isPristine?r.validateOnBlur||!1:t[r.key].isPristine}),s=f(o,e);return n({},t,((i={})[r.key]=n({},o,{errorMessage:s.errorMessage,hasError:s.hasError}),i))}))},onBlur:function(){if(r.validateOnBlur){var e,t=f(null==(e=a.current)?void 0:e[r.key],void 0,!0),i=t.errorMessage,o=t.hasError;u((function(e){var t;return n({},e,((t={})[r.key]=n({},e[r.key],{isPristine:!1,errorMessage:i,hasError:o}),t))}))}},validateOnSubmit:function(){var e,t=f(null==(e=a.current)?void 0:e[r.key],void 0,!0),i=t.errorMessage,o=t.hasError;return u((function(e){var t;return n({},e,((t={})[r.key]=n({},e[r.key],{errorMessage:i,hasError:o}),t))})),{errorMessage:i,hasError:o}},onChangeInitialValue:function(e){var t,i;(null==(t=a.current)?void 0:t.value)===(null==(i=a.current)?void 0:i.localInitialValue)&&u((function(t){var a;return n({},t,((a={})[r.key]=n({},t[r.key],{value:e,localInitialValue:e}),a))}))},setError:function(e){return u((function(t){var a;return n({},t,((a={})[r.key]=n({},t[r.key],{errorMessage:e}),a))}))},resetState:function(){return u((function(e){var t,a;return n({},e,((a={})[r.key]=n({},e[r.key],{isPristine:!0,errorMessage:"",value:null!=(t=r.initialValue)?t:""}),a))}))},validate:function(){var e,t=f(null==(e=a.current)?void 0:e[r.key],void 0,!0),i=t.hasError,o=t.errorMessage;return u((function(e){var t;return n({},e,((t={})[r.key]=n({},e[r.key],{errorMessage:o,hasError:i}),t))})),i}})}(a,v,c,u),i)}(a,""))}),{}))}))},removeFieldIds:function(r){return c((function(e){return Object.keys(e).reduce((function(t,a){var u;return r.includes(a)?t:n({},t,((u={})[a]=e[a],u))}),{})}))},resetForm:function(){return Object.keys(f).forEach((function(r){return f[r].resetState()}))},submit:function(){var r=Object.values(f).map((function(r){var e=r.validateOnSubmit();return{key:r.key,errorMessage:e.errorMessage||(e.hasError?"This field is required":"")}})).filter((function(r){return Boolean(r.errorMessage)})).reduce((function(r,e){var t;return n({},r,((t={})[e.key]=e.errorMessage,t))}),{});if(Object.values(r).length>0)return a(i.onError,(function(e){return e(r)}));var e=Object.values(f).reduce((function(r,e){var t,a=e.value,u=e.submitParser;return n({},r,((t={})[e.key]=u?u(a):a,t))}),{});i.onSuccess(e)},validateAll:function(){return Object.values(f).some((function(r){return r.validate()}))}}};
 //# sourceMappingURL=react-form-builder-v2.cjs.production.min.js.map

dist/react-form-builder-v2.esm.js

@@ -191,2 +191,3 @@ import { useState, useRef, useEffect } from 'react';
       });
+      return hasError;
     }
@@ -360,2 +361,3 @@ };
       });
+      return hasError;
     }
@@ -519,3 +521,3 @@ });
     validateAll: function validateAll() {
-      return Object.values(form).forEach(function (field) {
+      return Object.values(form).some(function (field) {
         return field.validate();
@@ -522,0 +524,0 @@ });

dist/react-form-builder-v2.umd.development.js

@@ -194,2 +194,3 @@ (function (global, factory) {
         });
+        return hasError;
       }
@@ -363,2 +364,3 @@ };
         });
+        return hasError;
       }
@@ -522,3 +524,3 @@ });
       validateAll: function validateAll() {
-        return Object.values(form).forEach(function (field) {
+        return Object.values(form).some(function (field) {
           return field.validate();
@@ -525,0 +527,0 @@ });

dist/react-form-builder-v2.umd.production.min.js

@@ -1,2 +0,2 @@
-!function(r,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("react"),require("ramda")):"function"==typeof define&&define.amd?define(["exports","react","ramda"],e):e((r=r||self)["@codegateinc/react-form-builder-v2"]={},r.React,r.ramda)}(this,(function(r,e,n){"use strict";function t(){return(t=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var t in n)Object.prototype.hasOwnProperty.call(n,t)&&(r[t]=n[t])}return r}).apply(this,arguments)}var a=function(r){return null!=r},i=function(r,e){return a(r)&&e(r)};r.useField=function(r){var i=r.key,u=r.label,o=r.validationRules,s=void 0===o?[]:o,l=r.isRequired,c=void 0!==l&&l,v=r.placeholder,f=r.validateOnBlur,d=void 0!==f&&f,h=r.liveParser,g=r.submitParser,y=e.useState(r.initialValue),M=y[0],E=y[1],k=e.useState({value:null!=M?M:"",isPristine:!0,errorMessage:"",hasError:!1}),b=k[0],O=k[1],m=function(r,e){if(void 0===e&&(e=!1),!e&&b.isPristine||!s)return{errorMessage:"",hasError:!1};var t,i=a(r)?r:b.value;if(c&&n.isEmpty(i))return{errorMessage:null==(t=s[0])?void 0:t.errorMessage,hasError:!0};if(!c&&!Boolean(i)&&!s)return{errorMessage:"",hasError:!1};var u=s.find((function(r){return!r.validate(i)}));return{errorMessage:u?u.errorMessage:"",hasError:Boolean(null==u?void 0:u.errorMessage)}};return{key:i,label:u,isRequired:c,placeholder:v,submitParser:g,parentKey:"",hasError:b.hasError,value:b.value,hasChange:b.value!==M,errorMessage:b.errorMessage,onBlur:function(){if(d){var r=m(void 0,!0),e=r.errorMessage,n=r.hasError;O((function(r){return t({},r,{isPristine:!1,errorMessage:e,hasError:n})}))}},onChangeValue:function(r){var e=m(r,!d),n=e.hasError,a=e.errorMessage;O((function(e){return t({},e,{value:h?h(r):r,isPristine:e.isPristine?d:e.isPristine,errorMessage:a,hasError:n})}))},onChangeInitialValue:function(r){b.value===M&&O((function(e){return t({},e,{value:r})})),E(r)},validateOnSubmit:function(){var r=m(void 0,!0),e=r.hasError,n=r.errorMessage;return O((function(r){return t({},r,{errorMessage:n,hasError:e})})),{hasError:e,errorMessage:n}},setError:function(r){return O((function(e){return t({},e,{errorMessage:r})}))},resetState:function(){return O((function(r){return t({},r,{isPristine:!0,errorMessage:"",value:null!=M?M:""})}))},validate:function(){var r=m(void 0,!0),e=r.hasError,n=r.errorMessage;O((function(r){return t({},r,{errorMessage:n,hasError:e})}))}}},r.useForm=function(r,u){var o=Object.entries(r).reduce((function(r,e){var n;return t({},r,((n={})[e[0]]=e[1],n))}),{}),s=e.useState({}),l=s[0],c=s[1],v=e.useRef(l),f=t({},o,Object.entries(l).reduce((function(r,e){var n,a=e[0],i=e[1],u=i.parentKey.split(".").filter(Boolean);if(u.length>0){var o=u.reduce((function(e,n,a){var o,s;return t({},r,e,((s={})[n]=t({},r[n],e[n]||{},a===u.length-1?{children:[].concat((null==(o=e[n])?void 0:o.children)||[],[i])}:{}),s))}),{}),s=Object.keys(o).filter((function(r){return Object.keys(o[r]).length})).reduce((function(r,e){var n;return t({},r,((n={})[e]=o[e],n))}),{});return t({},r,s)}return t({},r,((n={})[a]=i,n))}),{})),d=Object.values(f).filter((function(r){return r.isRequired})).some((function(r){return Boolean(r.errorMessage)}));return e.useEffect((function(){v.current=l}),[l]),{form:f,hasError:d,isFilled:Object.values(f).filter((function(r){return r.isRequired})).every((function(r){return!n.isEmpty(r.value)})),formHasChanges:function(){return Object.values(f).some((function(r){return r.hasChange}))},setError:function(r,e){f[r].setError(e),i(u.onError,(function(n){var t;return n(((t={})[r]=e,t))}))},setFieldValue:function(r,e){f[r].onChangeValue(e)},setFieldInitialValue:function(r,e){f[r].onChangeInitialValue(e)},addFields:function(r){return c((function(e){return t({},e,r.reduce((function(r,e){return t({},r,function r(e,i){var u;return e.children?e.children.reduce((function(n,a){return t({},n,r(a,i+"."+e.key))}),{}):((u={})[e.key]=function(r,e,i,u){var o,s,l,c,v;void 0===u&&(u="");var f=function(r,e,t){if(void 0===t&&(t=!1),!t&&r.isPristine||!r.validationRules)return{errorMessage:"",hasError:!1};var i,u=a(e)?e:r.value;if(r.isRequired&&n.isEmpty(u))return{errorMessage:null==(i=r.validationRules[0])?void 0:i.errorMessage,hasError:!0};if(!r.isRequired&&!Boolean(u)&&!r.validationRules)return{errorMessage:"",hasError:!1};var o=r.validationRules.find((function(r){return!r.validate(u)}));return{errorMessage:o?o.errorMessage:"",hasError:Boolean(null==o?void 0:o.errorMessage)}};return t({},r,{value:"",hasChange:!1,isPristine:!0,parentKey:u,hasError:null==(o=e.current)||null==(s=o[r.key])?void 0:s.hasError,isRequired:r.isRequired||!1,validateOnBlur:r.validateOnBlur||!1,localInitialValue:null!=(l=r.initialValue)?l:"",errorMessage:null==(c=e.current)||null==(v=c[r.key])?void 0:v.errorMessage,onChangeValue:function(e){return i((function(n){var a,i,u,o=t({},n[r.key],{value:r.liveParser?r.liveParser(e):e,hasChange:e!==(null==(a=n[r.key])?void 0:a.localInitialValue),isPristine:null!=(i=n[r.key])&&i.isPristine?r.validateOnBlur||!1:n[r.key].isPristine}),s=f(o,e);return t({},n,((u={})[r.key]=t({},o,{errorMessage:s.errorMessage,hasError:s.hasError}),u))}))},onBlur:function(){if(r.validateOnBlur){var n,a=f(null==(n=e.current)?void 0:n[r.key],void 0,!0),u=a.errorMessage,o=a.hasError;i((function(e){var n;return t({},e,((n={})[r.key]=t({},e[r.key],{isPristine:!1,errorMessage:u,hasError:o}),n))}))}},validateOnSubmit:function(){var n,a=f(null==(n=e.current)?void 0:n[r.key],void 0,!0),u=a.errorMessage,o=a.hasError;return i((function(e){var n;return t({},e,((n={})[r.key]=t({},e[r.key],{errorMessage:u,hasError:o}),n))})),{errorMessage:u,hasError:o}},onChangeInitialValue:function(n){var a,u;(null==(a=e.current)?void 0:a.value)===(null==(u=e.current)?void 0:u.localInitialValue)&&i((function(e){var a;return t({},e,((a={})[r.key]=t({},e[r.key],{value:n,localInitialValue:n}),a))}))},setError:function(e){return i((function(n){var a;return t({},n,((a={})[r.key]=t({},n[r.key],{errorMessage:e}),a))}))},resetState:function(){return i((function(e){var n,a;return t({},e,((a={})[r.key]=t({},e[r.key],{isPristine:!0,errorMessage:"",value:null!=(n=r.initialValue)?n:""}),a))}))},validate:function(){var n,a=f(null==(n=e.current)?void 0:n[r.key],void 0,!0),u=a.hasError,o=a.errorMessage;i((function(e){var n;return t({},e,((n={})[r.key]=t({},e[r.key],{errorMessage:o,hasError:u}),n))}))}})}(e,v,c,i),u)}(e,""))}),{}))}))},removeFieldIds:function(r){return c((function(e){return Object.keys(e).reduce((function(n,a){var i;return r.includes(a)?n:t({},n,((i={})[a]=e[a],i))}),{})}))},resetForm:function(){return Object.keys(f).forEach((function(r){return f[r].resetState()}))},submit:function(){var r=Object.values(f).map((function(r){var e=r.validateOnSubmit();return{key:r.key,errorMessage:e.errorMessage||(e.hasError?"This field is required":"")}})).filter((function(r){return Boolean(r.errorMessage)})).reduce((function(r,e){var n;return t({},r,((n={})[e.key]=e.errorMessage,n))}),{});if(Object.values(r).length>0)return i(u.onError,(function(e){return e(r)}));var e=Object.values(f).reduce((function(r,e){var n,a=e.value,i=e.submitParser;return t({},r,((n={})[e.key]=i?i(a):a,n))}),{});u.onSuccess(e)},validateAll:function(){return Object.values(f).forEach((function(r){return r.validate()}))}}},Object.defineProperty(r,"__esModule",{value:!0})}));
+!function(r,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("react"),require("ramda")):"function"==typeof define&&define.amd?define(["exports","react","ramda"],e):e((r=r||self)["@codegateinc/react-form-builder-v2"]={},r.React,r.ramda)}(this,(function(r,e,n){"use strict";function t(){return(t=Object.assign||function(r){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var t in n)Object.prototype.hasOwnProperty.call(n,t)&&(r[t]=n[t])}return r}).apply(this,arguments)}var a=function(r){return null!=r},i=function(r,e){return a(r)&&e(r)};r.useField=function(r){var i=r.key,u=r.label,o=r.validationRules,s=void 0===o?[]:o,l=r.isRequired,c=void 0!==l&&l,v=r.placeholder,f=r.validateOnBlur,d=void 0!==f&&f,g=r.liveParser,h=r.submitParser,y=e.useState(r.initialValue),M=y[0],E=y[1],k=e.useState({value:null!=M?M:"",isPristine:!0,errorMessage:"",hasError:!1}),b=k[0],m=k[1],O=function(r,e){if(void 0===e&&(e=!1),!e&&b.isPristine||!s)return{errorMessage:"",hasError:!1};var t,i=a(r)?r:b.value;if(c&&n.isEmpty(i))return{errorMessage:null==(t=s[0])?void 0:t.errorMessage,hasError:!0};if(!c&&!Boolean(i)&&!s)return{errorMessage:"",hasError:!1};var u=s.find((function(r){return!r.validate(i)}));return{errorMessage:u?u.errorMessage:"",hasError:Boolean(null==u?void 0:u.errorMessage)}};return{key:i,label:u,isRequired:c,placeholder:v,submitParser:h,parentKey:"",hasError:b.hasError,value:b.value,hasChange:b.value!==M,errorMessage:b.errorMessage,onBlur:function(){if(d){var r=O(void 0,!0),e=r.errorMessage,n=r.hasError;m((function(r){return t({},r,{isPristine:!1,errorMessage:e,hasError:n})}))}},onChangeValue:function(r){var e=O(r,!d),n=e.hasError,a=e.errorMessage;m((function(e){return t({},e,{value:g?g(r):r,isPristine:e.isPristine?d:e.isPristine,errorMessage:a,hasError:n})}))},onChangeInitialValue:function(r){b.value===M&&m((function(e){return t({},e,{value:r})})),E(r)},validateOnSubmit:function(){var r=O(void 0,!0),e=r.hasError,n=r.errorMessage;return m((function(r){return t({},r,{errorMessage:n,hasError:e})})),{hasError:e,errorMessage:n}},setError:function(r){return m((function(e){return t({},e,{errorMessage:r})}))},resetState:function(){return m((function(r){return t({},r,{isPristine:!0,errorMessage:"",value:null!=M?M:""})}))},validate:function(){var r=O(void 0,!0),e=r.hasError,n=r.errorMessage;return m((function(r){return t({},r,{errorMessage:n,hasError:e})})),e}}},r.useForm=function(r,u){var o=Object.entries(r).reduce((function(r,e){var n;return t({},r,((n={})[e[0]]=e[1],n))}),{}),s=e.useState({}),l=s[0],c=s[1],v=e.useRef(l),f=t({},o,Object.entries(l).reduce((function(r,e){var n,a=e[0],i=e[1],u=i.parentKey.split(".").filter(Boolean);if(u.length>0){var o=u.reduce((function(e,n,a){var o,s;return t({},r,e,((s={})[n]=t({},r[n],e[n]||{},a===u.length-1?{children:[].concat((null==(o=e[n])?void 0:o.children)||[],[i])}:{}),s))}),{}),s=Object.keys(o).filter((function(r){return Object.keys(o[r]).length})).reduce((function(r,e){var n;return t({},r,((n={})[e]=o[e],n))}),{});return t({},r,s)}return t({},r,((n={})[a]=i,n))}),{})),d=Object.values(f).filter((function(r){return r.isRequired})).some((function(r){return Boolean(r.errorMessage)}));return e.useEffect((function(){v.current=l}),[l]),{form:f,hasError:d,isFilled:Object.values(f).filter((function(r){return r.isRequired})).every((function(r){return!n.isEmpty(r.value)})),formHasChanges:function(){return Object.values(f).some((function(r){return r.hasChange}))},setError:function(r,e){f[r].setError(e),i(u.onError,(function(n){var t;return n(((t={})[r]=e,t))}))},setFieldValue:function(r,e){f[r].onChangeValue(e)},setFieldInitialValue:function(r,e){f[r].onChangeInitialValue(e)},addFields:function(r){return c((function(e){return t({},e,r.reduce((function(r,e){return t({},r,function r(e,i){var u;return e.children?e.children.reduce((function(n,a){return t({},n,r(a,i+"."+e.key))}),{}):((u={})[e.key]=function(r,e,i,u){var o,s,l,c,v;void 0===u&&(u="");var f=function(r,e,t){if(void 0===t&&(t=!1),!t&&r.isPristine||!r.validationRules)return{errorMessage:"",hasError:!1};var i,u=a(e)?e:r.value;if(r.isRequired&&n.isEmpty(u))return{errorMessage:null==(i=r.validationRules[0])?void 0:i.errorMessage,hasError:!0};if(!r.isRequired&&!Boolean(u)&&!r.validationRules)return{errorMessage:"",hasError:!1};var o=r.validationRules.find((function(r){return!r.validate(u)}));return{errorMessage:o?o.errorMessage:"",hasError:Boolean(null==o?void 0:o.errorMessage)}};return t({},r,{value:"",hasChange:!1,isPristine:!0,parentKey:u,hasError:null==(o=e.current)||null==(s=o[r.key])?void 0:s.hasError,isRequired:r.isRequired||!1,validateOnBlur:r.validateOnBlur||!1,localInitialValue:null!=(l=r.initialValue)?l:"",errorMessage:null==(c=e.current)||null==(v=c[r.key])?void 0:v.errorMessage,onChangeValue:function(e){return i((function(n){var a,i,u,o=t({},n[r.key],{value:r.liveParser?r.liveParser(e):e,hasChange:e!==(null==(a=n[r.key])?void 0:a.localInitialValue),isPristine:null!=(i=n[r.key])&&i.isPristine?r.validateOnBlur||!1:n[r.key].isPristine}),s=f(o,e);return t({},n,((u={})[r.key]=t({},o,{errorMessage:s.errorMessage,hasError:s.hasError}),u))}))},onBlur:function(){if(r.validateOnBlur){var n,a=f(null==(n=e.current)?void 0:n[r.key],void 0,!0),u=a.errorMessage,o=a.hasError;i((function(e){var n;return t({},e,((n={})[r.key]=t({},e[r.key],{isPristine:!1,errorMessage:u,hasError:o}),n))}))}},validateOnSubmit:function(){var n,a=f(null==(n=e.current)?void 0:n[r.key],void 0,!0),u=a.errorMessage,o=a.hasError;return i((function(e){var n;return t({},e,((n={})[r.key]=t({},e[r.key],{errorMessage:u,hasError:o}),n))})),{errorMessage:u,hasError:o}},onChangeInitialValue:function(n){var a,u;(null==(a=e.current)?void 0:a.value)===(null==(u=e.current)?void 0:u.localInitialValue)&&i((function(e){var a;return t({},e,((a={})[r.key]=t({},e[r.key],{value:n,localInitialValue:n}),a))}))},setError:function(e){return i((function(n){var a;return t({},n,((a={})[r.key]=t({},n[r.key],{errorMessage:e}),a))}))},resetState:function(){return i((function(e){var n,a;return t({},e,((a={})[r.key]=t({},e[r.key],{isPristine:!0,errorMessage:"",value:null!=(n=r.initialValue)?n:""}),a))}))},validate:function(){var n,a=f(null==(n=e.current)?void 0:n[r.key],void 0,!0),u=a.hasError,o=a.errorMessage;return i((function(e){var n;return t({},e,((n={})[r.key]=t({},e[r.key],{errorMessage:o,hasError:u}),n))})),u}})}(e,v,c,i),u)}(e,""))}),{}))}))},removeFieldIds:function(r){return c((function(e){return Object.keys(e).reduce((function(n,a){var i;return r.includes(a)?n:t({},n,((i={})[a]=e[a],i))}),{})}))},resetForm:function(){return Object.keys(f).forEach((function(r){return f[r].resetState()}))},submit:function(){var r=Object.values(f).map((function(r){var e=r.validateOnSubmit();return{key:r.key,errorMessage:e.errorMessage||(e.hasError?"This field is required":"")}})).filter((function(r){return Boolean(r.errorMessage)})).reduce((function(r,e){var n;return t({},r,((n={})[e.key]=e.errorMessage,n))}),{});if(Object.values(r).length>0)return i(u.onError,(function(e){return e(r)}));var e=Object.values(f).reduce((function(r,e){var n,a=e.value,i=e.submitParser;return t({},r,((n={})[e.key]=i?i(a):a,n))}),{});u.onSuccess(e)},validateAll:function(){return Object.values(f).some((function(r){return r.validate()}))}}},Object.defineProperty(r,"__esModule",{value:!0})}));
 //# sourceMappingURL=react-form-builder-v2.umd.production.min.js.map

index.d.ts

@@ -45,3 +45,3 @@ type VoidFunction = () => void
     submit: VoidFunction,
-    validateAll: VoidFunction,
+    validateAll(): boolean,
     formHasChanges(): boolean,
@@ -48,0 +48,0 @@ setError(field: string, errorMessage: string): void,

package.json

@@ -6,3 +6,3 @@ {
     "typings": "index.d.ts",
-    "version": "1.2.11",
+    "version": "1.2.12",
     "main": "dist/index.js",
@@ -9,0 +9,0 @@ "scripts": {

src/main/generateField.ts

@@ -154,4 +154,6 @@ import React from 'react'
             }))
+
+            return hasError
         }
     } as ExtendedConfig<T>
 }

src/main/types.ts

@@ -48,5 +48,5 @@ import { VoidFunction } from 'lib/types'
     onBlur: VoidFunction,
-    validate: VoidFunction,
     parentKey: string,
     hasError: boolean,
+    validate(): boolean,
     validateOnSubmit(): ValidateOnSubmitProps,
@@ -53,0 +53,0 @@ onChangeValue(newValue: T): void,

src/main/useField.ts

@@ -142,4 +142,6 @@ import { useState } from 'react'
             }))
+
+            return hasError
         }
     }
 }

src/main/useForm.ts

@@ -173,4 +173,4 @@ import { useEffect, useRef, useState } from 'react'
             .values<GateField<any>>(form)
-            .forEach(field => field.validate())
+            .some(field => field.validate())
     }
 }

No alert changes

Improved metrics

Total package byte prevSize

245966

increased by0.26%

Lines of code

2054

increased by0.39%

No dependency changes