@gsc-basic/components 1.0.2 → 1.0.4

package/dist/es/node_modules/@tanstack/form-core/dist/esm/FormApi.js

@@ -32,7 +32,7 @@ class ut {
    */
   constructor(p) {
     this.options = {}, this.fieldInfo = {}, this.prevTransformArray = [], this.mount = () => {
-      const t = this.fieldMetaDerived.mount(), i = this.store.mount(), s = this.store.subscribe(() => {
+      const t = this.fieldMetaDerived.mount(), s = this.store.mount(), i = this.store.subscribe(() => {
         H(this);
       }), e = y.on(
         "request-form-state",
@@ -54,7 +54,7 @@ class ut {
           n.payload.id === this._formId && (this._devtoolsSubmissionOverride = !0, this.handleSubmit(), this._devtoolsSubmissionOverride = !1);
         }
       ), r = () => {
-        a(), o(), e(), s(), t(), i(), y.emit("form-unmounted", {
+        a(), o(), e(), i(), t(), s(), y.emit("form-unmounted", {
           id: this._formId
         });
       };
@@ -67,12 +67,12 @@ class ut {
       }), l && this.validateSync("mount"), r;
     }, this.update = (t) => {
       if (!t) return;
-      const i = this.options;
+      const s = this.options;
       this.options = t;
-      const s = !!t.transform?.deps?.some(
+      const i = !!t.transform?.deps?.some(
         (a, r) => a !== this.prevTransformArray[r]
-      ), e = t.defaultValues && !w(t.defaultValues, i.defaultValues) && !this.state.isTouched, o = !w(t.defaultState, i.defaultState) && !this.state.isTouched;
-      !e && !o && !s || (A(() => {
+      ), e = t.defaultValues && !w(t.defaultValues, s.defaultValues) && !this.state.isTouched, o = !w(t.defaultState, s.defaultState) && !this.state.isTouched;
+      !e && !o && !i || (A(() => {
         this.baseStore.setState(
           () => R(
             Object.assign(
@@ -82,7 +82,7 @@ class ut {
               e ? {
                 values: t.defaultValues
               } : {},
-              s ? { _force_re_eval: !this.state._force_re_eval } : {}
+              i ? { _force_re_eval: !this.state._force_re_eval } : {}
             )
           )
         );
@@ -91,9 +91,9 @@ class ut {
         state: this.store.state,
         options: this.options
       }));
-    }, this.reset = (t, i) => {
-      const { fieldMeta: s } = this.state, e = this.resetFieldMeta(s);
-      t && !i?.keepDefaultValues && (this.options = {
+    }, this.reset = (t, s) => {
+      const { fieldMeta: i } = this.state, e = this.resetFieldMeta(i);
+      t && !s?.keepDefaultValues && (this.options = {
         ...this.options,
         defaultValues: t
       }), this.baseStore.setState(
@@ -104,13 +104,13 @@ class ut {
         })
       );
     }, this.validateAllFields = async (t) => {
-      const i = [];
+      const s = [];
       return A(() => {
         Object.values(this.fieldInfo).forEach(
           (e) => {
             if (!e.instance) return;
             const o = e.instance;
-            i.push(
+            s.push(
               // Remember, `validate` is either a sync operation or a promise
               Promise.resolve().then(
                 () => o.validate(t, { skipFormValidation: !0 })
@@ -118,34 +118,38 @@ class ut {
             ), e.instance.state.meta.isTouched || e.instance.setMeta((a) => ({ ...a, isTouched: !0 }));
           }
         );
-      }), (await Promise.all(i)).flat();
-    }, this.validateArrayFieldsStartingFrom = async (t, i, s) => {
-      const e = this.getFieldValue(t), o = Array.isArray(e) ? Math.max(e.length - 1, 0) : null, a = [`${t}[${i}]`];
-      for (let d = i + 1; d <= (o ?? 0); d++)
+      }), (await Promise.all(s)).flat();
+    }, this.validateArrayFieldsStartingFrom = async (t, s, i) => {
+      const e = this.getFieldValue(t), o = Array.isArray(e) ? Math.max(e.length - 1, 0) : null, a = [`${t}[${s}]`];
+      for (let d = s + 1; d <= (o ?? 0); d++)
         a.push(`${t}[${d}]`);
       const r = Object.keys(this.fieldInfo).filter(
-        (d) => a.some((c) => d.startsWith(c))
+        (d) => a.some((h) => d.startsWith(h))
       ), l = [];
       return A(() => {
         r.forEach((d) => {
           l.push(
-            Promise.resolve().then(() => this.validateField(d, s))
+            Promise.resolve().then(() => this.validateField(d, i))
           );
         });
       }), (await Promise.all(l)).flat();
-    }, this.validateField = (t, i) => {
-      const s = this.fieldInfo[t]?.instance;
-      return s ? (s.state.meta.isTouched || s.setMeta((e) => ({ ...e, isTouched: !0 })), s.validate(i)) : [];
+    }, this.validateField = (t, s) => {
+      const i = this.fieldInfo[t]?.instance;
+      if (!i) {
+        const { hasErrored: e } = this.validateSync(s);
+        return e && !this.options.asyncAlways ? this.getFieldMeta(t)?.errors ?? [] : this.validateAsync(s).then(() => this.getFieldMeta(t)?.errors ?? []);
+      }
+      return i.state.meta.isTouched || i.setMeta((e) => ({ ...e, isTouched: !0 })), i.validate(s);
     }, this.validateSync = (t) => {
-      const i = J(t, {
+      const s = J(t, {
         ...this.options,
         form: this,
         validationLogic: this.options.validationLogic || z
       });
-      let s = !1;
+      let i = !1;
       const e = {};
       return A(() => {
-        for (const r of i) {
+        for (const r of s) {
           if (!r.validate) continue;
           const l = this.runValidator({
             validate: r.validate,
@@ -155,7 +159,7 @@ class ut {
               validationSource: "form"
             },
             type: "validate"
-          }), { formError: n, fieldErrors: d } = k(l), c = j(r.cause), m = /* @__PURE__ */ new Set([
+          }), { formError: n, fieldErrors: d } = k(l), h = j(r.cause), m = /* @__PURE__ */ new Set([
             ...Object.keys(this.state.fieldMeta),
             ...Object.keys(d || {})
           ]);
@@ -164,43 +168,43 @@ class ut {
               continue;
             const S = this.getFieldMeta(v) ?? $, {
               errorMap: M,
-              errorSourceMap: h
+              errorSourceMap: c
             } = S, V = d?.[v], { newErrorValue: F, newSource: b } = q({
               newFormValidatorError: V,
               isPreviousErrorFromFormValidator: (
                 // These conditional checks are required, otherwise we get runtime errors.
                 // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-                h?.[c] === "form"
+                c?.[h] === "form"
               ),
               // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-              previousErrorValue: M?.[c]
+              previousErrorValue: M?.[h]
             });
             b === "form" && (e[v] = {
               ...e[v],
-              [c]: V
-            }), M?.[c] !== F && this.setFieldMeta(v, (g = $) => ({
+              [h]: V
+            }), M?.[h] !== F && this.setFieldMeta(v, (g = $) => ({
               ...g,
               errorMap: {
                 ...g.errorMap,
-                [c]: F
+                [h]: F
               },
               errorSourceMap: {
                 ...g.errorSourceMap,
-                [c]: b
+                [h]: b
               }
             }));
           }
-          this.state.errorMap?.[c] !== n && this.baseStore.setState((v) => ({
+          this.state.errorMap?.[h] !== n && this.baseStore.setState((v) => ({
             ...v,
             errorMap: {
               ...v.errorMap,
-              [c]: n
+              [h]: n
             }
-          })), (n || d) && (s = !0);
+          })), (n || d) && (i = !0);
         }
         const o = j("submit");
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        this.state.errorMap?.[o] && t !== "submit" && !s && this.baseStore.setState((r) => ({
+        this.state.errorMap?.[o] && t !== "submit" && !i && this.baseStore.setState((r) => ({
           ...r,
           errorMap: {
             ...r.errorMap,
@@ -209,39 +213,39 @@ class ut {
         }));
         const a = j("server");
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        this.state.errorMap?.[a] && t !== "server" && !s && this.baseStore.setState((r) => ({
+        this.state.errorMap?.[a] && t !== "server" && !i && this.baseStore.setState((r) => ({
           ...r,
           errorMap: {
             ...r.errorMap,
             [a]: void 0
           }
         }));
-      }), { hasErrored: s, fieldsErrorMap: e };
+      }), { hasErrored: i, fieldsErrorMap: e };
     }, this.validateAsync = async (t) => {
-      const i = Q(t, {
+      const s = Q(t, {
         ...this.options,
         form: this,
         validationLogic: this.options.validationLogic || z
       });
       this.state.isFormValidating || this.baseStore.setState((r) => ({ ...r, isFormValidating: !0 }));
-      const s = [];
+      const i = [];
       let e;
-      for (const r of i) {
+      for (const r of s) {
         if (!r.validate) continue;
         const l = j(r.cause);
         this.state.validationMetaMap[l]?.lastAbortController.abort();
         const d = new AbortController();
         this.state.validationMetaMap[l] = {
           lastAbortController: d
-        }, s.push(
-          new Promise(async (c) => {
+        }, i.push(
+          new Promise(async (h) => {
             let m;
             try {
-              m = await new Promise((h, V) => {
+              m = await new Promise((c, V) => {
                 setTimeout(async () => {
-                  if (d.signal.aborted) return h(void 0);
+                  if (d.signal.aborted) return c(void 0);
                   try {
-                    h(
+                    c(
                       await this.runValidator({
                         validate: r.validate,
                         value: {
@@ -258,8 +262,8 @@ class ut {
                   }
                 }, r.debounceMs);
               });
-            } catch (h) {
-              m = h;
+            } catch (c) {
+              m = c;
             }
             const { formError: v, fieldErrors: S } = k(m);
             S && (e = e ? {
@@ -267,17 +271,17 @@ class ut {
               ...S
             } : S);
             const M = j(r.cause);
-            for (const h of Object.keys(
+            for (const c of Object.keys(
               this.state.fieldMeta
             )) {
-              if (this.baseStore.state.fieldMetaBase[h] === void 0)
+              if (this.baseStore.state.fieldMetaBase[c] === void 0)
                 continue;
-              const V = this.getFieldMeta(h);
+              const V = this.getFieldMeta(c);
               if (!V) continue;
               const {
                 errorMap: F,
                 errorSourceMap: b
-              } = V, g = e?.[h], { newErrorValue: I, newSource: L } = q({
+              } = V, g = e?.[c], { newErrorValue: I, newSource: L } = q({
                 newFormValidatorError: g,
                 isPreviousErrorFromFormValidator: (
                   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
@@ -287,7 +291,7 @@ class ut {
                 previousErrorValue: F?.[M]
               });
               // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-              F?.[M] !== I && this.setFieldMeta(h, (O) => ({
+              F?.[M] !== I && this.setFieldMeta(c, (O) => ({
                 ...O,
                 errorMap: {
                   ...O.errorMap,
@@ -299,13 +303,13 @@ class ut {
                 }
               }));
             }
-            this.baseStore.setState((h) => ({
-              ...h,
+            this.baseStore.setState((c) => ({
+              ...c,
               errorMap: {
-                ...h.errorMap,
+                ...c.errorMap,
                 [M]: v
               }
-            })), c(
+            })), h(
               e ? { fieldErrors: e, errorMapKey: M } : void 0
             );
           })
@@ -313,8 +317,8 @@ class ut {
       }
       let o = [];
       const a = {};
-      if (s.length) {
-        o = await Promise.all(s);
+      if (i.length) {
+        o = await Promise.all(i);
         for (const r of o)
           if (r?.fieldErrors) {
             const { errorMapKey: l } = r;
@@ -334,8 +338,8 @@ class ut {
         isFormValidating: !1
       })), a;
     }, this.validate = (t) => {
-      const { hasErrored: i, fieldsErrorMap: s } = this.validateSync(t);
-      return i && !this.options.asyncAlways ? s : this.validateAsync(t);
+      const { hasErrored: s, fieldsErrorMap: i } = this.validateSync(t);
+      return s && !this.options.asyncAlways ? i : this.validateAsync(t);
     }, this._handleSubmit = async (t) => {
       this.baseStore.setState((e) => ({
         ...e,
@@ -352,24 +356,24 @@ class ut {
           }
         );
       });
-      const i = t ?? this.options.onSubmitMeta;
+      const s = t ?? this.options.onSubmitMeta;
       if (!this.state.canSubmit && !this._devtoolsSubmissionOverride) {
         this.options.onSubmitInvalid?.({
           value: this.state.values,
           formApi: this,
-          meta: i
+          meta: s
         });
         return;
       }
       this.baseStore.setState((e) => ({ ...e, isSubmitting: !0 }));
-      const s = () => {
+      const i = () => {
         this.baseStore.setState((e) => ({ ...e, isSubmitting: !1 }));
       };
       if (await this.validateAllFields("submit"), !this.state.isFieldsValid) {
-        s(), this.options.onSubmitInvalid?.({
+        i(), this.options.onSubmitInvalid?.({
           value: this.state.values,
           formApi: this,
-          meta: i
+          meta: s
         }), y.emit("form-submission", {
           id: this._formId,
           submissionAttempt: this.state.submissionAttempts,
@@ -380,10 +384,10 @@ class ut {
         return;
       }
       if (await this.validate("submit"), !this.state.isValid) {
-        s(), this.options.onSubmitInvalid?.({
+        i(), this.options.onSubmitInvalid?.({
           value: this.state.values,
           formApi: this,
-          meta: i
+          meta: s
         }), y.emit("form-submission", {
           id: this._formId,
           submissionAttempt: this.state.submissionAttempts,
@@ -402,12 +406,12 @@ class ut {
             });
           }
         );
-      }), this.options.listeners?.onSubmit?.({ formApi: this, meta: i });
+      }), this.options.listeners?.onSubmit?.({ formApi: this, meta: s });
       try {
         await this.options.onSubmit?.({
           value: this.state.values,
           formApi: this,
-          meta: i
+          meta: s
         }), A(() => {
           this.baseStore.setState((e) => ({
             ...e,
@@ -418,7 +422,7 @@ class ut {
             id: this._formId,
             submissionAttempt: this.state.submissionAttempts,
             successful: !0
-          }), s();
+          }), i();
         });
       } catch (e) {
         throw this.baseStore.setState((o) => ({
@@ -431,7 +435,7 @@ class ut {
           successful: !1,
           stage: "inflight",
           onError: e
-        }), s(), e;
+        }), i(), e;
       }
     }, this.getFieldValue = (t) => T(this.state.values, t), this.getFieldMeta = (t) => this.state.fieldMeta[t], this.getFieldInfo = (t) => this.fieldInfo[t] ||= {
       instance: null,
@@ -443,25 +447,25 @@ class ut {
         onServer: void 0,
         onDynamic: void 0
       }
-    }, this.setFieldMeta = (t, i) => {
-      this.baseStore.setState((s) => ({
-        ...s,
+    }, this.setFieldMeta = (t, s) => {
+      this.baseStore.setState((i) => ({
+        ...i,
         fieldMetaBase: {
-          ...s.fieldMetaBase,
+          ...i.fieldMetaBase,
           [t]: X(
-            i,
-            s.fieldMetaBase[t]
+            s,
+            i.fieldMetaBase[t]
           )
         }
       }));
     }, this.resetFieldMeta = (t) => Object.keys(t).reduce(
-      (i, s) => {
-        const e = s;
-        return i[e] = $, i;
+      (s, i) => {
+        const e = i;
+        return s[e] = $, s;
       },
       {}
-    ), this.setFieldValue = (t, i, s) => {
-      const e = s?.dontUpdateMeta ?? !1, o = s?.dontRunListeners ?? !1, a = s?.dontValidate ?? !1;
+    ), this.setFieldValue = (t, s, i) => {
+      const e = i?.dontUpdateMeta ?? !1, o = i?.dontRunListeners ?? !1, a = i?.dontValidate ?? !1;
       A(() => {
         e || this.setFieldMeta(t, (r) => ({
           ...r,
@@ -474,104 +478,104 @@ class ut {
           }
         })), this.baseStore.setState((r) => ({
           ...r,
-          values: _(r.values, t, i)
+          values: _(r.values, t, s)
         }));
       }), o || this.getFieldInfo(t).instance?.triggerOnChangeListener(), a || this.validateField(t, "change");
     }, this.deleteField = (t) => {
-      const s = [...Object.keys(this.fieldInfo).filter((e) => {
+      const i = [...Object.keys(this.fieldInfo).filter((e) => {
         const o = t.toString();
         return e !== o && e.startsWith(o);
       }), t];
       this.baseStore.setState((e) => {
         const o = { ...e };
-        return s.forEach((a) => {
+        return i.forEach((a) => {
           o.values = Y(o.values, a), delete this.fieldInfo[a], delete o.fieldMetaBase[a];
         }), o;
       });
-    }, this.pushFieldValue = (t, i, s) => {
+    }, this.pushFieldValue = (t, s, i) => {
       this.setFieldValue(
         t,
-        (e) => [...Array.isArray(e) ? e : [], i],
-        s
+        (e) => [...Array.isArray(e) ? e : [], s],
+        i
       );
-    }, this.insertFieldValue = async (t, i, s, e) => {
+    }, this.insertFieldValue = async (t, s, i, e) => {
       this.setFieldValue(
         t,
         (a) => [
-          ...a.slice(0, i),
-          s,
-          ...a.slice(i)
+          ...a.slice(0, s),
+          i,
+          ...a.slice(s)
         ],
         B(e, { dontValidate: !0 })
       );
       const o = e?.dontValidate ?? !1;
-      o || await this.validateField(t, "change"), P(this).handleArrayInsert(t, i), o || await this.validateArrayFieldsStartingFrom(t, i, "change");
-    }, this.replaceFieldValue = async (t, i, s, e) => {
+      o || await this.validateField(t, "change"), P(this).handleArrayInsert(t, s), o || await this.validateArrayFieldsStartingFrom(t, s, "change");
+    }, this.replaceFieldValue = async (t, s, i, e) => {
       this.setFieldValue(
         t,
         (a) => a.map(
-          (r, l) => l === i ? s : r
+          (r, l) => l === s ? i : r
         ),
         B(e, { dontValidate: !0 })
-      ), (e?.dontValidate ?? !1) || (await this.validateField(t, "change"), await this.validateArrayFieldsStartingFrom(t, i, "change"));
-    }, this.removeFieldValue = async (t, i, s) => {
+      ), (e?.dontValidate ?? !1) || (await this.validateField(t, "change"), await this.validateArrayFieldsStartingFrom(t, s, "change"));
+    }, this.removeFieldValue = async (t, s, i) => {
       const e = this.getFieldValue(t), o = Array.isArray(e) ? Math.max(e.length - 1, 0) : null;
       if (this.setFieldValue(
         t,
         (r) => r.filter(
-          (l, n) => n !== i
+          (l, n) => n !== s
         ),
-        B(s, { dontValidate: !0 })
-      ), P(this).handleArrayRemove(t, i), o !== null) {
+        B(i, { dontValidate: !0 })
+      ), P(this).handleArrayRemove(t, s), o !== null) {
         const r = `${t}[${o}]`;
         this.deleteField(r);
       }
-      (s?.dontValidate ?? !1) || (await this.validateField(t, "change"), await this.validateArrayFieldsStartingFrom(t, i, "change"));
-    }, this.swapFieldValues = (t, i, s, e) => {
+      (i?.dontValidate ?? !1) || (await this.validateField(t, "change"), await this.validateArrayFieldsStartingFrom(t, s, "change"));
+    }, this.swapFieldValues = (t, s, i, e) => {
       this.setFieldValue(
         t,
         (a) => {
-          const r = a[i], l = a[s];
-          return _(_(a, `${i}`, l), `${s}`, r);
+          const r = a[s], l = a[i];
+          return _(_(a, `${s}`, l), `${i}`, r);
         },
         B(e, { dontValidate: !0 })
-      ), P(this).handleArraySwap(t, i, s), (e?.dontValidate ?? !1) || (this.validateField(t, "change"), this.validateField(`${t}[${i}]`, "change"), this.validateField(`${t}[${s}]`, "change"));
-    }, this.moveFieldValues = (t, i, s, e) => {
+      ), P(this).handleArraySwap(t, s, i), (e?.dontValidate ?? !1) || (this.validateField(t, "change"), this.validateField(`${t}[${s}]`, "change"), this.validateField(`${t}[${i}]`, "change"));
+    }, this.moveFieldValues = (t, s, i, e) => {
       this.setFieldValue(
         t,
         (a) => {
           const r = [...a];
-          return r.splice(s, 0, r.splice(i, 1)[0]), r;
+          return r.splice(i, 0, r.splice(s, 1)[0]), r;
         },
         B(e, { dontValidate: !0 })
-      ), P(this).handleArrayMove(t, i, s), (e?.dontValidate ?? !1) || (this.validateField(t, "change"), this.validateField(`${t}[${i}]`, "change"), this.validateField(`${t}[${s}]`, "change"));
-    }, this.clearFieldValues = (t, i) => {
-      const s = this.getFieldValue(t), e = Array.isArray(s) ? Math.max(s.length - 1, 0) : null;
+      ), P(this).handleArrayMove(t, s, i), (e?.dontValidate ?? !1) || (this.validateField(t, "change"), this.validateField(`${t}[${s}]`, "change"), this.validateField(`${t}[${i}]`, "change"));
+    }, this.clearFieldValues = (t, s) => {
+      const i = this.getFieldValue(t), e = Array.isArray(i) ? Math.max(i.length - 1, 0) : null;
       if (this.setFieldValue(
         t,
         [],
-        B(i, { dontValidate: !0 })
+        B(s, { dontValidate: !0 })
       ), e !== null)
         for (let a = 0; a <= e; a++) {
           const r = `${t}[${a}]`;
           this.deleteField(r);
         }
-      (i?.dontValidate ?? !1) || this.validateField(t, "change");
+      (s?.dontValidate ?? !1) || this.validateField(t, "change");
     }, this.resetField = (t) => {
-      this.baseStore.setState((i) => ({
-        ...i,
+      this.baseStore.setState((s) => ({
+        ...s,
         fieldMetaBase: {
-          ...i.fieldMetaBase,
+          ...s.fieldMetaBase,
           [t]: $
         },
-        values: this.options.defaultValues ? _(i.values, t, T(this.options.defaultValues, t)) : i.values
+        values: this.options.defaultValues ? _(s.values, t, T(this.options.defaultValues, t)) : s.values
       }));
     }, this.setErrorMap = (t) => {
       A(() => {
-        Object.entries(t).forEach(([i, s]) => {
-          const e = i;
-          if (W(s)) {
-            const { formError: o, fieldErrors: a } = k(s);
+        Object.entries(t).forEach(([s, i]) => {
+          const e = s;
+          if (W(i)) {
+            const { formError: o, fieldErrors: a } = k(i);
             for (const r of Object.keys(
               this.fieldInfo
             ))
@@ -598,7 +602,7 @@ class ut {
               ...o,
               errorMap: {
                 ...o.errorMap,
-                [e]: s
+                [e]: i
               }
             }));
         });
@@ -609,9 +613,9 @@ class ut {
         errorMap: this.state.errorMap
       },
       fields: Object.entries(this.state.fieldMeta).reduce(
-        (t, [i, s]) => (Object.keys(s).length && s.errors.length && (t[i] = {
-          errors: s.errors,
-          errorMap: s.errorMap
+        (t, [s, i]) => (Object.keys(i).length && i.errors.length && (t[s] = {
+          errors: i.errors,
+          errorMap: i.errorMap
         }), t),
         {}
       )
@@ -632,23 +636,23 @@ class ut {
       })
     ), this.fieldMetaDerived = new N({
       deps: [this.baseStore],
-      fn: ({ prevDepVals: t, currDepVals: i, prevVal: s }) => {
-        const e = s, o = t?.[0], a = i[0];
+      fn: ({ prevDepVals: t, currDepVals: s, prevVal: i }) => {
+        const e = i, o = t?.[0], a = s[0];
         let r = 0;
         const l = {};
         for (const n of Object.keys(
           a.fieldMetaBase
         )) {
-          const d = a.fieldMetaBase[n], c = o?.fieldMetaBase[n], m = e?.[n], v = T(a.values, n);
+          const d = a.fieldMetaBase[n], h = o?.fieldMetaBase[n], m = e?.[n], v = T(a.values, n);
           let S = m?.errors;
-          if (!c || d.errorMap !== c.errorMap) {
+          if (!h || d.errorMap !== h.errorMap) {
             S = Object.values(d.errorMap ?? {}).filter(
               (b) => b !== void 0
             );
             const F = this.getFieldInfo(n)?.instance;
-            F && !F.options.disableErrorFlat && (S = S.flat(1));
+            (!F || !F.options.disableErrorFlat) && (S = S.flat(1));
           }
-          const M = !x(S), h = !d.isDirty, V = w(
+          const M = !x(S), c = !d.isDirty, V = w(
             v,
             T(this.options.defaultValues, n)
           ) || w(
@@ -656,14 +660,14 @@ class ut {
             // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
             this.getFieldInfo(n)?.instance?.options.defaultValue
           );
-          if (m && m.isPristine === h && m.isValid === M && m.isDefaultValue === V && m.errors === S && d === c) {
+          if (m && m.isPristine === c && m.isValid === M && m.isDefaultValue === V && m.errors === S && d === h) {
             l[n] = m, r++;
             continue;
           }
           l[n] = {
             ...d,
             errors: S ?? [],
-            isPristine: h,
+            isPristine: c,
             isValid: M,
             isDefaultValue: V
           };
@@ -672,26 +676,26 @@ class ut {
       }
     }), this.store = new N({
       deps: [this.baseStore, this.fieldMetaDerived],
-      fn: ({ prevDepVals: t, currDepVals: i, prevVal: s }) => {
-        const e = s, o = t?.[0], a = i[0], r = i[1], l = Object.values(r).filter(
+      fn: ({ prevDepVals: t, currDepVals: s, prevVal: i }) => {
+        const e = i, o = t?.[0], a = s[0], r = s[1], l = Object.values(r).filter(
           Boolean
         ), n = l.some(
           (u) => u.isValidating
-        ), d = l.every((u) => u.isValid), c = l.some((u) => u.isTouched), m = l.some((u) => u.isBlurred), v = l.every(
+        ), d = l.every((u) => u.isValid), h = l.some((u) => u.isTouched), m = l.some((u) => u.isBlurred), v = l.every(
           (u) => u.isDefaultValue
         ), S = (
           // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-          c && a.errorMap?.onMount
-        ), M = l.some((u) => u.isDirty), h = !M, V = !!// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+          h && a.errorMap?.onMount
+        ), M = l.some((u) => u.isDirty), c = !M, V = !!// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         (a.errorMap?.onMount || // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         l.some((u) => u?.errorMap?.onMount)), F = !!n;
         let b = e?.errors ?? [];
         (!o || a.errorMap !== o.errorMap) && (b = Object.values(a.errorMap).reduce((u, E) => E === void 0 ? u : E && W(E) ? (u.push(E.form), u) : (u.push(E), u), []));
-        const g = b.length === 0, I = d && g, L = this.options.canSubmitWhenInvalid ?? !1, O = a.submissionAttempts === 0 && !c && !V || !F && !a.isSubmitting && I || L;
+        const g = b.length === 0, I = d && g, L = this.options.canSubmitWhenInvalid ?? !1, O = a.submissionAttempts === 0 && !h && !V || !F && !a.isSubmitting && I || L;
         let D = a.errorMap;
         if (S && (b = b.filter(
           (u) => u !== a.errorMap.onMount
-        ), D = Object.assign(D, { onMount: void 0 })), e && o && e.errorMap === D && e.fieldMeta === this.fieldMetaDerived.state && e.errors === b && e.isFieldsValidating === n && e.isFieldsValid === d && e.isFormValid === g && e.isValid === I && e.canSubmit === O && e.isTouched === c && e.isBlurred === m && e.isPristine === h && e.isDefaultValue === v && e.isDirty === M && w(o, a))
+        ), D = Object.assign(D, { onMount: void 0 })), e && o && e.errorMap === D && e.fieldMeta === this.fieldMetaDerived.state && e.errors === b && e.isFieldsValidating === n && e.isFieldsValid === d && e.isFormValid === g && e.isValid === I && e.canSubmit === O && e.isTouched === h && e.isBlurred === m && e.isPristine === c && e.isDefaultValue === v && e.isDirty === M && w(o, a))
           return e;
         let K = {
           ...a,
@@ -703,9 +707,9 @@ class ut {
           isFormValid: g,
           isValid: I,
           canSubmit: O,
-          isTouched: c,
+          isTouched: h,
           isBlurred: m,
-          isPristine: h,
+          isPristine: c,
           isDefaultValue: v,
           isDirty: M
         };