@ubloimmo/uikit 1.11.8 → 1.11.9

package/dist/components/Form/Form.context.js

@@ -1,75 +1,75 @@
 /**
-* @ubloimmo/uikit version 1.11.8
+* @ubloimmo/uikit version 1.11.9
 *
 * Copyright © Ublo 2025
 * https://ublo.immo
 */
 
 
-import { j as de } from "../../node_modules/react/jsx-runtime.js";
-import { arrayMove as me } from "../../node_modules/@dnd-kit/sortable/dist/sortable.esm.js";
-import { isObject as G, isFunction as A, isUndefined as be, isBoolean as W, deepValueOf as fe, isNullish as Y, isString as ee, isNull as Fe } from "@ubloimmo/front-util";
+import { j as me } from "../../node_modules/react/jsx-runtime.js";
+import { arrayMove as be } from "../../node_modules/@dnd-kit/sortable/dist/sortable.esm.js";
+import { isObject as _, isFunction as A, isUndefined as ee, isBoolean as U, deepValueOf as fe, isNullish as Y, isString as te, isNull as Fe } from "@ubloimmo/front-util";
 import { l as Z } from "../../node_modules/lodash/lodash.js";
-import { createContext as he, useMemo as B, useContext as ge, useState as _, useCallback as y, useEffect as se, useReducer as pe } from "react";
-import { setObjectValue as we, formErrorTranslation as Ce, isSchemaFieldRequired as ye, isFormCustomField as te, isFormField as Ee, builtFormTableId as qe, isFormDivider as xe, isFormCustomContent as Te, isFormText as De, buildFormText as Ie, isFormTable as Re, isFormFeatureSwitch as Ve } from "./Form.utils.js";
+import { createContext as he, useMemo as B, useContext as ge, useState as W, useCallback as E, useRef as we, useEffect as ne, useReducer as pe } from "react";
+import { setObjectValue as ye, formErrorTranslation as Ce, isSchemaFieldRequired as Ee, isFormCustomField as re, isFormField as qe, builtFormTableId as xe, isFormDivider as Re, isFormCustomContent as Te, isFormText as De, buildFormText as Ie, isFormTable as Ve, isFormFeatureSwitch as $e } from "./Form.utils.js";
 import "../Dialog/Dialog.component.js";
-import { useDialogManager as $e } from "../Dialog/Dialog.context.js";
+import { useDialogManager as ve } from "../Dialog/Dialog.context.js";
 import "../../utils/comparison.utils.js";
-import { cssLengthUsage as ve } from "../../utils/css.utils.js";
-import { useLogger as Se } from "../../utils/log.utils.js";
-import { useMergedProps as Oe } from "../../utils/props.utils.js";
-import { isEmptyString as ne } from "../../utils/string.utils.js";
-import { useUikitTranslation as Pe } from "../../utils/translation/translation.provider.js";
-const re = "FORM_DEBUG_ENABLED", Me = (e, s, i) => {
-  const [o, r] = _(() => G(e.defaultValues) ? { ...e.defaultValues } : A(e.query) || be(e.query) ? {} : G(e.query) ? e.query : {}), [f, l] = _(A(e.query)), [n, d] = _(o), u = y(
-    async (w) => {
+import { cssLengthUsage as Se } from "../../utils/css.utils.js";
+import { useLogger as Oe } from "../../utils/log.utils.js";
+import { useMergedProps as Pe } from "../../utils/props.utils.js";
+import { isEmptyString as oe } from "../../utils/string.utils.js";
+import { useUikitTranslation as Me } from "../../utils/translation/translation.provider.js";
+const se = "FORM_DEBUG_ENABLED", ke = (e, s, o) => {
+  const [i, r] = W(() => _(e.defaultValues) ? { ...e.defaultValues } : A(e.query) || ee(e.query) ? {} : _(e.query) ? e.query : {}), [b, l] = W(A(e.query)), [n, d] = W(i), c = E(
+    async (f) => {
       if (!A(e.query)) {
-        if (G(e.query)) {
-          const m = w ? Z.merge({ ...o }, { ...e.query }) : { ...e.query };
-          d(m), r(m);
+        if (_(e.query)) {
+          const p = f ? Z.merge({ ...i }, { ...e.query }) : { ...e.query };
+          d(p), r(p);
         }
         return;
       }
       l(!0);
       try {
-        const m = await e.query(), q = w ? Z.merge({ ...o }, m) : m;
-        d(q), r(q);
-      } catch (m) {
-        s.error(m), s.warn("Failed to load form data");
+        const p = await e.query(), F = f ? Z.merge({ ...i }, p) : p;
+        d(F), r(F);
+      } catch (p) {
+        s.error(p), s.warn("Failed to load form data");
       }
       l(!1);
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [e.query]
-  );
-  se(() => {
-    u(i.shouldMergeQueryData);
-  }, [e.query, u]);
-  const h = y(
-    (w, m) => {
-      if (f)
+  ), h = we(e.reloadKey ?? null);
+  ne(() => {
+    !ee(e.reloadKey) && e.reloadKey !== h.current ? (h.current = e.reloadKey, c(!1)) : c(o.shouldMergeQueryData);
+  }, [e.query, c, e.reloadKey]);
+  const x = E(
+    (f, p) => {
+      if (b)
         return s.warn("Cannot mutate form data while loading"), n;
-      if (e.readonly || e.disabled)
+      if (o.readonly || o.disabled)
         return s.warn("Form is readonly or disabled"), n;
-      const q = we(
+      const F = ye(
         n,
-        w,
-        m
+        f,
+        p
       );
-      return d(q), q;
+      return d(F), F;
     },
-    [n, f, e, s]
+    [n, b, s, o]
   );
   return {
     data: n,
-    initialData: o,
+    initialData: i,
     setData: d,
     setInitialData: r,
-    mutateFormData: h,
-    isLoading: f,
+    mutateFormData: x,
+    isLoading: b,
     setIsLoading: l
   };
-}, oe = {
+}, ie = {
   readonly: !1,
   disabled: !1,
   defaultEditing: !1,
@@ -78,109 +78,109 @@ const re = "FORM_DEBUG_ENABLED", Me = (e, s, i) => {
   validateOnSubmit: !0,
   debug: !1,
   shouldMergeQueryData: !0
-}, ke = (e) => {
-  const s = Oe(
-    oe,
+}, ze = (e) => {
+  const s = Pe(
+    ie,
     e
-  ), i = B(() => !!(s.debug || re in window && window[re]), [s]);
+  ), o = B(() => !!(s.debug || se in window && window[se]), [s]);
   return B(
     () => ({
       ...s,
-      debug: i
+      debug: o
     }),
-    [s, i]
+    [s, o]
   );
-}, H = {
+}, G = {
   errors: [],
   isValid: !0
-}, ze = (e, s, i) => {
-  const o = B(() => e ?? null, [e]), r = y(() => {
-    var u;
-    if (!o) return H;
-    const n = o.safeParse(s.data);
-    if (!((u = n.error) != null && u.errors) || !n.error.errors.length)
-      return H;
-    const d = n.error.errors.map(({ path: h, ...w }) => ({
-      ...w,
+}, Ae = (e, s, o) => {
+  const i = B(() => e ?? null, [e]), r = E(() => {
+    var c;
+    if (!i) return G;
+    const n = i.safeParse(s.data);
+    if (!((c = n.error) != null && c.errors) || !n.error.errors.length)
+      return G;
+    const d = n.error.errors.map(({ path: h, ...x }) => ({
+      ...x,
       path: h.join(".")
     }));
     return {
       errors: s.isLoading ? [] : d,
       isValid: n.success
     };
-  }, [o, s.data, s.isLoading]), [f, l] = pe(
+  }, [i, s.data, s.isLoading]), [b, l] = pe(
     r,
     r()
   );
-  return se(() => {
-    i.validateOnChange && l();
+  return ne(() => {
+    o.validateOnChange && l();
   }, [s.data, l]), {
-    ...f,
-    schema: o,
+    ...b,
+    schema: i,
     triggerFormValidation: l,
     computeFormValidation: r
   };
-}, Ae = (e, s) => {
-  const i = B(() => {
+}, Be = (e, s) => {
+  const o = B(() => {
     const r = Math.max(e.columns, 2);
     return Math.ceil(r / 2) * 2;
-  }, [e]), o = y(
+  }, [e]), i = E(
     (r) => {
-      const f = Math.max(1, Math.round(i / 2)), l = A(r == null ? void 0 : r.hidden) ? r.hidden(s.isEditing) : W(r == null ? void 0 : r.hidden) ? r.hidden : !1, n = (r == null ? void 0 : r.size) ?? f, d = r != null && r.fixedWidth ? ve(r.fixedWidth) : null, u = `span ${n}`;
+      const b = Math.max(1, Math.round(o / 2)), l = A(r == null ? void 0 : r.hidden) ? r.hidden(s.isEditing) : U(r == null ? void 0 : r.hidden) ? r.hidden : !1, n = (r == null ? void 0 : r.size) ?? b, d = r != null && r.fixedWidth ? Se(r.fixedWidth) : null, c = `span ${n}`;
       return {
         ...r,
         fixedWidth: d,
         hidden: l,
         size: n,
-        columnEnd: u,
+        columnEnd: c,
         readonly: (r == null ? void 0 : r.readonly) ?? !1
       };
     },
-    [i, s]
+    [o, s]
   );
   return {
-    columns: i,
-    buildFormFieldLayout: o,
+    columns: o,
+    buildFormFieldLayout: i,
     asModal: e.asModal
   };
-}, Be = (e, s, i, o, r, f) => {
-  const l = Pe(), n = y(
+}, Ne = (e, s, o, i, r, b) => {
+  const l = Me(), n = E(
     (a) => fe(e.data, a, !0) ?? null,
     [e]
-  ), d = y(
-    (a, b) => (t) => {
-      e.mutateFormData(a, t), !Y(b) && b(t);
+  ), d = E(
+    (a, m) => (t) => {
+      e.mutateFormData(a, t), !Y(m) && m(t);
     },
     [e]
-  ), u = y(
-    (a, b, t) => {
-      const D = {
-        error: b ?? !1,
+  ), c = E(
+    (a, m, t) => {
+      const T = {
+        error: m ?? !1,
         errorText: t
       };
-      if (s.isValid || !s.errors.length) return D;
-      const p = s.errors.find((F) => F.path === a);
-      if (!p) return D;
-      const C = Ce(p, l), R = ee(t) && ne(t) ? "" : p.code === "custom" ? p.message : t ?? C;
+      if (s.isValid || !s.errors.length) return T;
+      const y = s.errors.find((g) => g.path === a);
+      if (!y) return T;
+      const C = Ce(y, l), I = te(t) && oe(t) ? "" : y.code === "custom" ? y.message : t ?? C;
       return {
-        error: b ?? !0,
-        errorText: R
+        error: m ?? !0,
+        errorText: I
       };
     },
     [s, l]
-  ), h = y(
-    (a, b) => W(b) ? b : s.schema ? ye(s.schema, a) : !1,
+  ), h = E(
+    (a, m) => U(m) ? m : s.schema ? Ee(s.schema, a) : !1,
     [s]
-  ), w = y(
+  ), x = E(
     (a) => {
       const {
-        source: b,
+        source: m,
         onChange: t,
-        disabled: D,
-        errorText: p,
+        disabled: T,
+        errorText: y,
         error: C,
-        required: R,
-        layout: F,
+        required: I,
+        layout: g,
         type: v,
         testId: S,
         overrideTestId: O,
@@ -188,309 +188,309 @@ const re = "FORM_DEBUG_ENABLED", Me = (e, s, i) => {
       } = a;
       return {
         ...N,
-        ...u(b, C, p),
+        ...c(m, C, y),
         onChange: d(
-          b,
+          m,
           t
         ),
         value: n(
-          b
+          m
         ),
         type: v,
-        disabled: D || i.disabled,
-        required: h(b, R),
-        layout: o.buildFormFieldLayout(F),
+        disabled: T || o.disabled,
+        required: h(m, I),
+        layout: i.buildFormFieldLayout(g),
         testId: S,
         overrideTestId: O
       };
     },
     [
-      u,
+      c,
       d,
       n,
-      i.disabled,
+      o.disabled,
       h,
-      o
+      i
     ]
-  ), m = y(
+  ), f = E(
     (a) => {
       const {
-        source: b,
+        source: m,
         CustomInput: t,
-        kind: D,
-        layout: p,
+        kind: T,
+        layout: y,
         onChange: C,
-        disabled: R,
-        errorText: F,
+        disabled: I,
+        errorText: g,
         error: v,
         required: S,
         ...O
       } = a;
       return {
         ...O,
-        ...u(b, v, F),
+        ...c(m, v, g),
         CustomInput: t,
         onChange: d(
-          b,
+          m,
           C
         ),
         value: n(
-          b
+          m
         ),
-        disabled: R || i.disabled,
-        required: h(b, S),
-        layout: o.buildFormFieldLayout(p)
+        disabled: I || o.disabled,
+        required: h(m, S),
+        layout: i.buildFormFieldLayout(y)
       };
     },
     [
-      o,
-      u,
+      i,
+      c,
       n,
       h,
-      i.disabled,
+      o.disabled,
       d
     ]
-  ), q = y(
-    (a, b) => {
+  ), p = E(
+    (a, m) => {
       var L;
-      const t = a, D = t.source, p = D, C = n(D) ?? [], R = (c) => {
-        const g = [...C], x = g.length, T = { ...g[c] }, I = () => {
+      const t = a, T = t.source, y = T, C = n(T) ?? [], I = (u) => {
+        const w = [...C], q = w.length, R = { ...w[u] }, D = () => {
           r.debug(
-            `Table row deletion at index ${c} cancelled. No changes were made to the table data.`
+            `Table row deletion at index ${u} cancelled. No changes were made to the table data.`
           );
         }, P = () => {
           const $ = [...C], V = $.length;
-          if (V !== x)
+          if (V !== q)
             return r.error(
-              `Table row length changed before delete confirmation. Was ${x}, is now ${V}. Indices may not match anymore. Aborting deletion.`
-            ), I();
-          const J = { ...$[c] };
-          if (!Z.isEqual(T, J))
+              `Table row length changed before delete confirmation. Was ${q}, is now ${V}. Indices may not match anymore. Aborting deletion.`
+            ), D();
+          const Q = { ...$[u] };
+          if (!Z.isEqual(R, Q))
             return r.error(
-              `Table row data at index ${c} changed between pre- and post-confirmation. Aborting deletion.`
-            ), I();
-          $.splice(c, 1), e.mutateFormData(
-            p,
+              `Table row data at index ${u} changed between pre- and post-confirmation. Aborting deletion.`
+            ), D();
+          $.splice(u, 1), e.mutateFormData(
+            y,
             $
           );
         };
         if (t.tryDeletingRow) {
           const $ = {
-            index: c,
-            data: T,
+            index: u,
+            data: R,
             confirmDelete: P,
-            cancelDelete: I
+            cancelDelete: D
           };
           t.tryDeletingRow($);
           return;
         }
         P();
-      }, F = {
+      }, g = {
         deletable: (t == null ? void 0 : t.deletable) ?? !1,
         swappable: (t == null ? void 0 : t.swappable) ?? !1,
         selectable: (t == null ? void 0 : t.selectable) ?? !1
-      }, v = (c) => {
-        const g = [...C, c];
+      }, v = (u) => {
+        const w = [...C, u];
         e.mutateFormData(
-          p,
-          g
+          y,
+          w
         );
-      }, S = (c, g) => {
-        const x = me([...C], c, g);
+      }, S = (u, w) => {
+        const q = be([...C], u, w);
         e.mutateFormData(
-          p,
-          x
+          y,
+          q
         );
-      }, O = (c, g) => {
-        if (!F.selectable || !F.selectable.property) return;
-        const T = [...C][c];
-        if (!T) return;
-        if (F.selectable.property in T) {
-          const P = T[F.selectable.property];
-          if (!W(P) && !Y(P)) return;
+      }, O = (u, w) => {
+        if (!g.selectable || !g.selectable.property) return;
+        const R = [...C][u];
+        if (!R) return;
+        if (g.selectable.property in R) {
+          const P = R[g.selectable.property];
+          if (!U(P) && !Y(P)) return;
         }
-        const I = `${p}.${c}.${F.selectable.property}`;
+        const D = `${y}.${u}.${g.selectable.property}`;
         e.mutateFormData(
-          I,
-          g
+          D,
+          w
         );
-      }, N = (c) => {
-        if (!F.selectable || !ee(F.selectable.property)) return;
-        const { property: g } = F.selectable;
+      }, N = (u) => {
+        if (!g.selectable || !te(g.selectable.property)) return;
+        const { property: w } = g.selectable;
         if (!C.length) return;
-        const T = [...C].map((I) => ({
-          ...I,
-          [g]: c
+        const R = [...C].map((D) => ({
+          ...D,
+          [w]: u
         }));
         e.mutateFormData(
-          p,
-          T
+          y,
+          R
         );
-      }, Q = t.columns.map(
-        ({ label: c, tooltip: g, compact: x, required: T, source: I }) => ({
-          label: c,
-          tooltip: g,
-          compact: x,
+      }, H = t.columns.map(
+        ({ label: u, tooltip: w, compact: q, required: R, source: D }) => ({
+          label: u,
+          tooltip: w,
+          compact: q,
           required: h(
-            `${t.source}.0.${I}`,
-            T
+            `${t.source}.0.${D}`,
+            R
           )
         })
-      ), j = ((L = t.columns) == null ? void 0 : L.map(({ layout: c }) => (c == null ? void 0 : c.size) ?? 1)) ?? [], M = C.map((c, g) => {
-        const x = `${t.source}.${g}`;
-        let T = !1;
+      ), j = ((L = t.columns) == null ? void 0 : L.map(({ layout: u }) => (u == null ? void 0 : u.size) ?? 1)) ?? [], M = C.map((u, w) => {
+        const q = `${t.source}.${w}`;
+        let R = !1;
         if (t.disableRow) {
           const V = t.disableRow(
-            c,
-            g
+            u,
+            w
           );
-          W(V) && V && (T = !0);
+          U(V) && V && (R = !0);
         }
-        const I = t.overrideRowModifiers ? {
-          ...F,
-          ...t.overrideRowModifiers(c, g) ?? {}
-        } : F, P = (t.columns ?? []).map(({ source: V, ...J }) => {
-          const K = `${x}.${V}`, z = {
-            ...J,
-            source: K,
-            id: K
+        const D = t.overrideRowModifiers ? {
+          ...g,
+          ...t.overrideRowModifiers(u, w) ?? {}
+        } : g, P = (t.columns ?? []).map(({ source: V, ...Q }) => {
+          const J = `${q}.${V}`, z = {
+            ...Q,
+            source: J,
+            id: J
           };
-          if (te(z)) {
-            const X = z.disabled || T;
-            return m({ ...z, disabled: X });
+          if (re(z)) {
+            const X = z.disabled || R;
+            return f({ ...z, disabled: X });
           }
-          if (Ee(z)) {
-            const X = z.disabled || T;
-            return w({ ...z, disabled: X });
+          if (qe(z)) {
+            const X = z.disabled || R;
+            return x({ ...z, disabled: X });
           }
-          return r.error(`Invalid table cell for source ${K}`), null;
+          return r.error(`Invalid table cell for source ${J}`), null;
         }).filter(
           (V) => !Fe(V)
-        ), $ = F.selectable ? n(
-          `${x}.${F.selectable.property}`
+        ), $ = g.selectable ? n(
+          `${q}.${g.selectable.property}`
         ) ?? !1 : !1;
         return {
           cells: P,
-          id: x,
-          stableId: x,
-          modifiers: I,
+          id: q,
+          stableId: q,
+          modifiers: D,
           selected: $
         };
-      }), U = M.filter(({ selected: c }) => c).length, ae = U === M.length ? !0 : U > 0 ? "mixed" : !1, le = qe(String(t.source), b), k = u(
-        p,
+      }), K = M.filter(({ selected: u }) => u).length, le = K === M.length ? !0 : K > 0 ? "mixed" : !1, ce = xe(String(t.source), m), k = c(
+        y,
         t.error,
         t.errorText
       );
       if (!k.error) {
-        const c = M.some(
-          ({ cells: g }) => g.some(({ error: x }) => x)
+        const u = M.some(
+          ({ cells: w }) => w.some(({ error: q }) => q)
         );
-        k.error = k.error || c, k.errorText = k.errorText ?? l.validation.invalid();
+        k.error = k.error || u, k.errorText = k.errorText ?? l.validation.invalid();
       }
-      const ce = j.reduce((c, g) => c + g, 0), ue = t != null && t.footer && t.footer.kind === "select" ? {
+      const ue = j.reduce((u, w) => u + w, 0), de = t != null && t.footer && t.footer.kind === "select" ? {
         ...t.footer,
         testId: t.footer.testId,
         overrideTestId: t.footer.overrideTestId
       } : t == null ? void 0 : t.footer;
       return {
         kind: "table",
-        stableId: le,
+        stableId: ce,
         rows: M,
-        headers: Q,
+        headers: H,
         colSpans: j,
-        layout: o.buildFormFieldLayout({
+        layout: i.buildFormFieldLayout({
           ...t.layout ?? {},
-          size: o.columns
+          size: i.columns
         }),
         id: t.id ?? null,
         maxBodyHeight: t.maxBodyHeight ?? null,
         label: t.label,
         assistiveText: t.assistiveText,
-        required: h(p, t.required),
+        required: h(y, t.required),
         ...k,
-        modifiers: F,
-        deleteRow: R,
+        modifiers: g,
+        deleteRow: I,
         appendRow: v,
         swapRows: S,
         setRowSelection: O,
         setTableSelection: N,
         data: C,
-        footer: ue ?? null,
-        columnsCount: ce,
+        footer: de ?? null,
+        columnsCount: ue,
         EmptyCard: t.EmptyCard ?? null,
         tableLayout: t.tableLayout ?? "auto",
-        selected: ae
+        selected: le
       };
     },
     [
       n,
-      u,
-      o,
+      c,
+      i,
       h,
       e,
       r,
-      m,
-      w,
+      f,
+      x,
       l.validation
     ]
-  ), E = y(
+  ), F = E(
     (a) => {
-      const b = a, {
+      const m = a, {
         kind: t,
-        source: D,
-        variant: p,
+        source: T,
+        variant: y,
         onChange: C,
-        disabled: R,
-        required: F,
+        disabled: I,
+        required: g,
         error: v,
         ...S
-      } = b, O = R || i.disabled, N = h(
-        D,
-        F
-      ), Q = o.buildFormFieldLayout({
-        ...b.layout ?? {},
-        size: o.columns
-      }), j = n(D), M = d(
-        D,
+      } = m, O = I || o.disabled, N = h(
+        T,
+        g
+      ), H = i.buildFormFieldLayout({
+        ...m.layout ?? {},
+        size: i.columns
+      }), j = n(T), M = d(
+        T,
         C
-      ), U = {
+      ), K = {
         ...S,
-        variant: p,
+        variant: y,
         kind: t,
         onChange: M,
         disabled: O,
         required: N,
-        ...u(D, v),
-        layout: Q
+        ...c(T, v),
+        layout: H
       };
-      return p === "select" ? {
-        ...U,
+      return y === "select" ? {
+        ...K,
         value: j
       } : {
-        ...U,
+        ...K,
         active: j
       };
     },
     [
-      o,
-      u,
+      i,
+      c,
       n,
       h,
-      i.disabled,
+      o.disabled,
       d
     ]
   );
-  return B(() => !f || !f.length ? [] : f.map((a, b) => xe(a) || Te(a) ? a : De(a) ? Ie(a) : te(a) ? m(a) : Re(a) ? q(a, b) : Ve(a) ? E(a) : w(a)), [
-    m,
-    w,
-    q,
-    E,
-    f
+  return B(() => !b || !b.length ? [] : b.map((a, m) => Re(a) || Te(a) ? a : De(a) ? Ie(a) : re(a) ? f(a) : Ve(a) ? p(a, m) : $e(a) ? F(a) : x(a)), [
+    f,
+    x,
+    p,
+    F,
+    b
   ]);
-}, Ne = (e, s, i, o, r, f, l, n) => {
-  const [d, u] = _(!1), h = y(
-    async (m) => {
-      if (m == null || m.preventDefault(), m == null || m.stopPropagation(), i.disabled || i.readonly || !o.isEditing || d)
+}, je = (e, s, o, i, r, b, l, n) => {
+  const [d, c] = W(!1), h = E(
+    async (f) => {
+      if (f == null || f.preventDefault(), f == null || f.stopPropagation(), o.disabled || o.readonly || !i.isEditing || d)
         return;
       if (!A(r)) {
         n.warn("No onSubmit function provided, aborted submission");
@@ -500,131 +500,131 @@ const re = "FORM_DEBUG_ENABLED", Me = (e, s, i) => {
         n.warn("Form is not valid, aborted submission");
         return;
       }
-      if (i.validateOnSubmit) {
-        const { isValid: E } = s.computeFormValidation();
-        if (!E) {
+      if (o.validateOnSubmit) {
+        const { isValid: F } = s.computeFormValidation();
+        if (!F) {
           n.warn("Form is not valid, aborted submission");
           return;
         }
       }
-      let q;
+      let p;
       if (Y(s.schema))
-        n.warn("No schema provided, submitting without validation"), q = e.data;
+        n.warn("No schema provided, submitting without validation"), p = e.data;
       else {
-        const E = await s.schema.safeParseAsync(e.data);
-        if (!E.success || !E.data) {
+        const F = await s.schema.safeParseAsync(e.data);
+        if (!F.success || !F.data) {
           n.warn("Unable to sanitize form data, aborted submission");
           return;
         }
-        q = E.data;
+        p = F.data;
       }
       try {
-        u(!0);
-        const E = await r(q);
-        if (W(E)) {
-          !E && f && f(
+        c(!0);
+        const F = await r(p);
+        if (U(F)) {
+          !F && b && b(
             new Error("Failed to submit form: `onSubmit` returned false.")
           );
           return;
         }
-        const a = G(E) ? E : q;
-        o.stopEditing(), e.setData(a), e.setInitialData(a), u(!1);
-      } catch (E) {
-        n.error(E), f && f(
-          new Error(`Failed to submit form: ${E.message}`)
-        ), u(!1);
+        const a = _(F) ? F : p;
+        i.stopEditing(), e.setData(a), e.setInitialData(a), c(!1);
+      } catch (F) {
+        n.error(F), b && b(
+          new Error(`Failed to submit form: ${F.message}`)
+        ), c(!1);
       }
     },
     [
-      i.disabled,
-      i.readonly,
-      i.validateOnSubmit,
-      o,
+      o.disabled,
+      o.readonly,
+      o.validateOnSubmit,
+      i,
       d,
       r,
       s,
       n,
       e,
-      f
+      b
     ]
-  ), w = y(() => {
-    d || (o.isEditing && e.setData(e.initialData), o.stopEditing(), l && l());
-  }, [o, e, d]);
-  return { submitForm: h, isSubmitting: d, cancelEdition: w };
-}, je = (e, s, i) => {
-  const { closeDialog: o, isDialogRegistered: r, isDialogOpen: f } = $e(), l = B(
+  ), x = E(() => {
+    d || (i.isEditing && e.setData(e.initialData), i.stopEditing(), l && l());
+  }, [i, e, d]);
+  return { submitForm: h, isSubmitting: d, cancelEdition: x };
+}, Ke = (e, s, o) => {
+  const { closeDialog: i, isDialogRegistered: r, isDialogOpen: b } = ve(), l = B(
     () => (s == null ? void 0 : s.reference) ?? "",
     [s == null ? void 0 : s.reference]
-  ), [n, d] = _(
+  ), [n, d] = W(
     !!e.defaultEditing || !1
-  ), u = y(
-    (m) => {
-      d((q) => (m !== q && A(i) && i(m), m));
+  ), c = E(
+    (f) => {
+      d((p) => (f !== p && A(o) && o(f), f));
     },
-    [i]
-  ), h = y(() => {
-    e.readonly || u(!0);
-  }, [e.readonly, u]), w = y(() => {
-    e.defaultEditing !== "force" && u(!1), !ne(l) && r(l) && f(l) && o(l);
+    [o]
+  ), h = E(() => {
+    e.readonly || c(!0);
+  }, [e.readonly, c]), x = E(() => {
+    e.defaultEditing !== "force" && c(!1), !oe(l) && r(l) && b(l) && i(l);
   }, [
     e.defaultEditing,
     l,
     r,
-    f,
-    o,
-    u
+    b,
+    i,
+    c
   ]);
   return {
     isEditing: n,
     startEditing: h,
-    stopEditing: w
+    stopEditing: x
   };
 }, Ue = ({
   columns: e,
   asModal: s,
-  embedded: i,
-  onEditStateChanged: o,
+  embedded: o,
+  onEditStateChanged: i,
   ...r
-}, f) => {
-  const l = ke(r), n = Me(r, f, l), d = ze(
+}, b) => {
+  const l = ze(r), n = ke(r, b, l), d = Ae(
     r.schema,
     n,
     l
-  ), u = je(
+  ), c = Ke(
     l,
     s,
-    o
-  ), h = Ae(
-    { columns: e, asModal: s, embedded: i },
-    u
-  ), w = Be(
+    i
+  ), h = Be(
+    { columns: e, asModal: s, embedded: o },
+    c
+  ), x = Ne(
     n,
     d,
     l,
     h,
-    f,
+    b,
     r.content
-  ), m = Ne(
+  ), f = je(
     n,
     d,
     l,
-    u,
+    c,
     r.onSubmit,
     r.onSubmitError,
     r.onCancelled,
-    f
+    b
   );
   return {
     ...n,
     ...d,
-    ...m,
-    ...u,
+    ...f,
+    ...c,
     ...l,
     ...h,
-    content: w
+    content: x
   };
 }, We = {
-  ...oe,
+  ...ie,
   data: {},
   initialData: {},
   setData: () => {
@@ -647,10 +647,10 @@ const re = "FORM_DEBUG_ENABLED", Me = (e, s, i) => {
   },
   cancelEdition: () => {
   },
-  ...H,
+  ...G,
   triggerFormValidation: () => {
   },
-  computeFormValidation: () => H,
+  computeFormValidation: () => G,
   columns: 2,
   buildFormFieldLayout: () => ({
     readonly: !1,
@@ -660,21 +660,21 @@ const re = "FORM_DEBUG_ENABLED", Me = (e, s, i) => {
     fixedWidth: null
   }),
   asModal: null
-}, ie = he(We), nt = () => ge(
-  ie
-), ot = (e) => {
-  const s = Se("Form Context"), i = Ue(e, s);
-  return /* @__PURE__ */ de.jsx(
-    ie.Provider,
+}, ae = he(We), ot = () => ge(
+  ae
+), it = (e) => {
+  const s = Oe("Form Context"), o = Ue(e, s);
+  return /* @__PURE__ */ me.jsx(
+    ae.Provider,
     {
-      value: i,
+      value: o,
       children: e.children
     }
   );
 };
 export {
-  ot as FormProvider,
+  it as FormProvider,
   Ue as useForm,
-  nt as useFormContext,
-  ke as useFormModifiers
+  ot as useFormContext,
+  ze as useFormModifiers
 };