@firecms/collection_editor 3.0.0-canary.43 → 3.0.0-canary.45

package/dist/index.es.js

@@ -1,23 +1,23 @@
 import { jsx as e, jsxs as a, Fragment as R } from "react/jsx-runtime";
-import { FieldCaption as X, SearchIconsView as vr, toSnakeCase as xt, singular as yr, IconForView as dt, ArrayContainer as br, serializeRegExp as Cr, useSnackbarController as Ie, resolveEnumValues as Nr, isPropertyBuilder as ie, useCustomizationController as Ae, getFieldConfig as Le, ErrorBoundary as me, PropertyConfigBadge as $e, unslugify as wt, useNavigationController as Te, mergeDeep as K, DEFAULT_FIELD_CONFIGS as Kt, isValidRegExp as xr, getFieldId as Wt, DeleteConfirmationDialog as ct, useLargeLayout as Pr, makePropertiesEditable as He, resolveEntityView as wr, useSelectionController as Tr, CircularProgressCenter as ut, EntityCollectionTable as kr, slugify as Or, useAuthController as _e, randomString as Ft, removeUndefined as Et, ErrorView as Zt, removeInitialAndTrailingSlashes as Vr, getDefaultPropertiesOrder as Ir, joinCollectionLists as _r } from "@firecms/core";
+import { FieldCaption as X, SearchIconsView as yr, toSnakeCase as Pt, singular as br, IconForView as dt, ArrayContainer as Cr, serializeRegExp as Nr, useSnackbarController as Ie, resolveEnumValues as Pr, isPropertyBuilder as ie, useCustomizationController as Ae, getFieldConfig as Le, ErrorBoundary as me, PropertyConfigBadge as $e, unslugify as wt, useNavigationController as Te, mergeDeep as K, DEFAULT_FIELD_CONFIGS as Kt, isValidRegExp as xr, getFieldId as Wt, DeleteConfirmationDialog as ct, useLargeLayout as wr, makePropertiesEditable as He, resolveEntityView as Tr, useSelectionController as kr, CircularProgressCenter as ut, EntityCollectionTable as Or, slugify as Vr, useAuthController as _e, randomString as Ft, removeUndefined as Et, ErrorView as Zt, removeInitialAndTrailingSlashes as Ir, getDefaultPropertiesOrder as _r, joinCollectionLists as Fr } from "@firecms/core";
 import * as Ue from "react";
-import Y, { useState as j, useEffect as ue, useMemo as Jt, useCallback as J, useRef as je, useDeferredValue as Fr, useContext as Qt } from "react";
+import Y, { useState as j, useEffect as ue, useMemo as Jt, useCallback as J, useRef as je, useDeferredValue as Er, useContext as Qt } from "react";
 import be from "react-fast-compare";
-import { useAutoComplete as Er, Container as ht, Typography as V, Tooltip as te, IconButton as ae, Chip as Pt, TextField as Oe, cn as fe, DebouncedTextField as W, Autocomplete as Sr, AutocompleteItem as Ar, ExpandablePanel as Tt, SettingsIcon as Ye, Select as Ne, SelectItem as ee, BooleanSwitchWithLabel as pt, Dialog as Fe, AutoAwesomeIcon as ft, Badge as Dr, ListIcon as Br, Button as z, CircularProgress as Ge, Paper as ge, DialogContent as De, DialogActions as Be, RuleIcon as Mr, FileUploadIcon as zr, MultiSelect as Rr, MultiSelectItem as St, Checkbox as At, cardMixin as Xt, cardClickableMixin as er, cardSelectedMixin as tr, FunctionsIcon as Ur, RemoveCircleIcon as jr, defaultBorderMixin as kt, RemoveIcon as qr, DragHandleIcon as Lr, AddIcon as ce, SelectGroup as Dt, InfoLabel as $r, DeleteIcon as mt, ContentCopyIcon as Hr, CodeIcon as Yr, Table as Bt, TableBody as Mt, TableRow as Ct, TableCell as Re, Alert as Gr, Icon as it, Card as rr, coolIconKeys as zt, Tabs as Kr, Tab as Nt, ArrowBackIcon as nt, LoadingButton as Rt, DoneIcon as Wr, Menu as Zr, MoreVertIcon as Jr, MenuItem as Qr, SaveIcon as Xr, UndoIcon as ei } from "@firecms/ui";
+import { useAutoComplete as Sr, Container as ht, Typography as V, Tooltip as te, IconButton as ae, Chip as xt, TextField as Oe, cn as fe, DebouncedTextField as W, Autocomplete as Ar, AutocompleteItem as Dr, ExpandablePanel as Tt, SettingsIcon as Ye, Select as Ne, SelectItem as ee, BooleanSwitchWithLabel as pt, Dialog as Fe, AutoAwesomeIcon as ft, Badge as Br, ListIcon as Mr, Button as z, CircularProgress as Ge, Paper as ge, DialogContent as De, DialogActions as Be, RuleIcon as zr, FileUploadIcon as Rr, MultiSelect as Ur, MultiSelectItem as St, Checkbox as At, cardMixin as Xt, cardClickableMixin as er, cardSelectedMixin as tr, FunctionsIcon as jr, RemoveCircleIcon as qr, defaultBorderMixin as kt, RemoveIcon as Lr, DragHandleIcon as $r, AddIcon as ce, SelectGroup as Dt, InfoLabel as Hr, DeleteIcon as mt, ContentCopyIcon as Yr, CodeIcon as Gr, Table as Bt, TableBody as Mt, TableRow as Ct, TableCell as Re, Alert as Kr, Icon as it, Card as rr, coolIconKeys as zt, Tabs as Wr, Tab as Nt, ArrowBackIcon as nt, LoadingButton as Rt, DoneIcon as Zr, Menu as Jr, MoreVertIcon as Qr, MenuItem as Xr, SaveIcon as ei, UndoIcon as ti } from "@firecms/ui";
 import * as at from "yup";
 import { useFormex as G, Field as $, getIn as I, useCreateFormex as Ot, Formex as Vt } from "@firecms/formex";
-import { extractEnumFromValues as ti, buildPropertyFromData as ri, buildEntityPropertiesFromData as ii } from "@firecms/schema_inference";
-import { DragDropContext as ni, Droppable as ai, Draggable as oi } from "@hello-pangea/dnd";
-import li from "json5";
-import { Highlight as si, themes as di } from "prism-react-renderer";
-import { ImportFileUpload as ci, DataNewPropertiesMapping as ui, ImportNewPropertyFieldPreview as pi, getInferenceType as ir, convertDataToEntity as mi, useImportConfig as hi, ImportSaveInProgress as fi } from "@firecms/data_import_export";
-import { useNavigate as gi } from "react-router";
-const vi = at.object().shape({
+import { extractEnumFromValues as ri, buildPropertyFromData as ii, buildEntityPropertiesFromData as ni } from "@firecms/schema_inference";
+import { DragDropContext as ai, Droppable as oi, Draggable as li } from "@hello-pangea/dnd";
+import si from "json5";
+import { Highlight as di, themes as ci } from "prism-react-renderer";
+import { ImportFileUpload as ui, DataNewPropertiesMapping as pi, ImportNewPropertyFieldPreview as mi, getInferenceType as ir, convertDataToEntity as hi, useImportConfig as fi, ImportSaveInProgress as gi } from "@firecms/data_import_export";
+import { useNavigate as vi } from "react-router";
+const yi = at.object().shape({
   id: at.string().required("Required"),
   name: at.string().required("Required"),
   path: at.string().required("Required")
 });
-function yi({
+function bi({
   isNewCollection: t,
   reservedGroups: r,
   existingPaths: n,
@@ -33,23 +33,23 @@ function yi({
     errors: s,
     setFieldTouched: f,
     isSubmitting: g,
-    submitCount: P
-  } = G(), [y, x] = j(!1), [v, b] = j(!1), w = (h) => {
-    u("name", h), !I(p, "path") && t && h && u("path", xt(h)), !I(p, "id") && t && h && u("id", xt(h)), !I(p, "singularName") && t && h && u("singularName", yr(h));
+    submitCount: x
+  } = G(), [y, P] = j(!1), [v, b] = j(!1), T = (h) => {
+    u("name", h), !I(p, "path") && t && h && u("path", Pt(h)), !I(p, "id") && t && h && u("id", Pt(h)), !I(p, "singularName") && t && h && u("singularName", br(h));
   };
   ue(() => {
     s.id && b(!0);
   }, [s.id]);
-  const T = /* @__PURE__ */ e(dt, { collectionOrView: c }), C = l?.filter((h) => !r?.includes(h)), {
+  const w = /* @__PURE__ */ e(dt, { collectionOrView: c }), C = l?.filter((h) => !r?.includes(h)), {
     inputFocused: O,
     autoCompleteOpen: N,
     setAutoCompleteOpen: F
-  } = Er({
+  } = Sr({
     ref: d
   }), D = !!o;
   let _;
   typeof c.customId == "object" ? _ = "code_defined" : c.customId === !0 ? _ = "true" : c.customId === !1 ? _ = "false" : c.customId === "optional" && (_ = "optional");
-  const S = P > 0;
+  const S = x > 0;
   return /* @__PURE__ */ e("div", { className: "overflow-auto my-auto", children: /* @__PURE__ */ a(ht, { maxWidth: "4xl", className: "flex flex-col gap-4 p-8 m-auto", children: [
     /* @__PURE__ */ a("div", { children: [
       /* @__PURE__ */ a(
@@ -62,14 +62,14 @@ function yi({
               ae,
               {
                 shape: "square",
-                onClick: () => x(!0),
-                children: T
+                onClick: () => P(!0),
+                children: w
               }
             ) })
           ]
         }
       ),
-      o && /* @__PURE__ */ e(Pt, { colorScheme: "tealDarker", children: /* @__PURE__ */ a(V, { variant: "caption", children: [
+      o && /* @__PURE__ */ e(xt, { colorScheme: "tealDarker", children: /* @__PURE__ */ a(V, { variant: "caption", children: [
         "This is a subcollection of ",
         /* @__PURE__ */ e("b", { children: o.name })
       ] }) })
@@ -80,7 +80,7 @@ function yi({
           Oe,
           {
             value: c.name ?? "",
-            onChange: (h) => w(h.target.value),
+            onChange: (h) => T(h.target.value),
             label: "Name",
             required: !0,
             error: S && !!s.name
@@ -117,12 +117,12 @@ function yi({
           }
         ),
         /* @__PURE__ */ e(
-          Sr,
+          Ar,
           {
             open: N && (C ?? []).length > 0,
             setOpen: F,
             children: C?.map((h, B) => /* @__PURE__ */ e(
-              Ar,
+              Dr,
               {
                 onClick: () => {
                   F(!1), u("group", h ?? null);
@@ -269,15 +269,15 @@ function yi({
       Fe,
       {
         open: y,
-        onOpenChange: x,
+        onOpenChange: P,
         maxWidth: "xl",
         fullWidth: !0,
         children: /* @__PURE__ */ e("div", { className: "p-4 overflow-auto min-h-[200px]", children: /* @__PURE__ */ e(
-          vr,
+          yr,
           {
             selectedIcon: c.icon,
             onIconSelected: (h) => {
-              x(!1), u("icon", h);
+              P(!1), u("icon", h);
             }
           }
         ) })
@@ -288,7 +288,7 @@ function yi({
 function he(t) {
   return "properties." + t.replaceAll(".", ".properties.");
 }
-function bi(t) {
+function nr(t) {
   return t ? "properties." + t.replaceAll(".", ".properties.") + ".properties" : "properties";
 }
 function Ce(t) {
@@ -297,7 +297,7 @@ function Ce(t) {
 function ne(t, r) {
   return r ? `${r}.${t}` : t;
 }
-function nr(t, r) {
+function ar(t, r) {
   const n = r ? `${r}.${t}` : t;
   return he(n);
 }
@@ -315,8 +315,8 @@ function Ci({
     validateOnChange: !0,
     validation: (p) => {
       const s = {};
-      p.enumValues && p.enumValues.forEach((g, P) => {
-        g?.label || (s.enumValues = s.enumValues ?? [], s.enumValues[P] = s.enumValues[P] ?? {}, s.enumValues[P].label = "You must specify a label for this enum value entry"), g?.id || (s.enumValues = s.enumValues ?? [], s.enumValues[P] = s.enumValues[P] ?? {}, s.enumValues[P].id = "You must specify an ID for this enum value entry");
+      p.enumValues && p.enumValues.forEach((g, x) => {
+        g?.label || (s.enumValues = s.enumValues ?? [], s.enumValues[x] = s.enumValues[x] ?? {}, s.enumValues[x].label = "You must specify a label for this enum value entry"), g?.id || (s.enumValues = s.enumValues ?? [], s.enumValues[x] = s.enumValues[x] ?? {}, s.enumValues[x].id = "You must specify an ID for this enum value entry");
       });
       const f = !!(s?.enumValues && Object.keys(s?.enumValues).length > 0);
       return n?.(f), s;
@@ -348,26 +348,26 @@ function Ni({
 }) {
   const {
     setFieldValue: c
-  } = G(), [u, m] = Y.useState(), [p, s] = Y.useState(), [f, g] = Y.useState(!1), y = Y.useRef(/* @__PURE__ */ new Set()).current, x = (b, w) => {
-    const T = u === w, C = r?.enumValues && r?.enumValues[b];
+  } = G(), [u, m] = Y.useState(), [p, s] = Y.useState(), [f, g] = Y.useState(!1), y = Y.useRef(/* @__PURE__ */ new Set()).current, P = (b, T) => {
+    const w = u === T, C = r?.enumValues && r?.enumValues[b];
     return /* @__PURE__ */ e(
-      xi,
+      Pi,
       {
         index: b,
         disabled: n,
         enumValuesPath: i,
-        autoFocus: T,
+        autoFocus: w,
         entryError: C,
-        shouldUpdateId: l || T,
+        shouldUpdateId: l || w,
         onDialogOpen: () => s(b),
         inferredEntry: y.has(t.enumValues[b]?.id)
       },
-      `${w}`
+      `${T}`
     );
   };
   return /* @__PURE__ */ a("div", { className: "col-span-12", children: [
     /* @__PURE__ */ a("div", { className: "ml-3.5 flex flex-row items-center", children: [
-      /* @__PURE__ */ e(Br, {}),
+      /* @__PURE__ */ e(Mr, {}),
       /* @__PURE__ */ e(
         V,
         {
@@ -387,7 +387,7 @@ function Ni({
             d && (g(!0), d?.().then((b) => {
               if (!b)
                 return;
-              const w = b.flat(), T = Array.from(new Set(w)), C = t.enumValues, N = ti(T).filter((F) => !C?.some((D) => D.id === F.id));
+              const T = b.flat(), w = Array.from(new Set(T)), C = t.enumValues, N = ri(w).filter((F) => !C?.some((D) => D.id === F.id));
               N.forEach((F) => {
                 y.add(F.id);
               }), c(i, [...N, ...C], !0);
@@ -404,14 +404,14 @@ function Ni({
     ] }),
     /* @__PURE__ */ a(ge, { className: "p-4 m-1", children: [
       /* @__PURE__ */ e(
-        br,
+        Cr,
         {
           droppableId: i,
           addLabel: "Add enum value",
           value: t.enumValues,
           disabled: n,
           size: "small",
-          buildEntry: x,
+          buildEntry: P,
           onInternalIdAdded: m,
           includeAddButton: !0,
           onValueChange: (b) => c(i, b),
@@ -419,7 +419,7 @@ function Ni({
         }
       ),
       /* @__PURE__ */ e(
-        Pi,
+        xi,
         {
           index: p,
           open: p !== void 0,
@@ -430,7 +430,7 @@ function Ni({
     ] })
   ] });
 }
-const xi = Y.memo(
+const Pi = Y.memo(
   function({
     index: r,
     shouldUpdateId: n,
@@ -447,9 +447,9 @@ const xi = Y.memo(
       errors: s,
       setFieldValue: f,
       touched: g
-    } = G(), P = Y.useRef(!I(m, `${i}[${r}].id`)), y = n || P.current, x = I(m, `${i}[${r}].id`), v = I(m, `${i}[${r}].label`), b = Y.useRef(v);
+    } = G(), x = Y.useRef(!I(m, `${i}[${r}].id`)), y = n || x.current, P = I(m, `${i}[${r}].id`), v = I(m, `${i}[${r}].label`), b = Y.useRef(v);
     return Y.useEffect(() => {
-      (b.current === x || !x) && y && f(`${i}[${r}].id`, v), b.current = v;
+      (b.current === P || !P) && y && f(`${i}[${r}].id`, v), b.current = v;
     }, [v]), /* @__PURE__ */ a(R, { children: [
       /* @__PURE__ */ a("div", { className: "flex w-full align-center justify-center", children: [
         /* @__PURE__ */ e(
@@ -467,7 +467,7 @@ const xi = Y.memo(
             error: !!u?.label
           }
         ),
-        !d && /* @__PURE__ */ e(Dr, { color: "error", invisible: !u?.id, children: /* @__PURE__ */ e(
+        !d && /* @__PURE__ */ e(Br, { color: "error", invisible: !u?.id, children: /* @__PURE__ */ e(
           ae,
           {
             size: "small",
@@ -500,7 +500,7 @@ const xi = Y.memo(
     return r.index === n.index && r.enumValuesPath === n.enumValuesPath && r.shouldUpdateId === n.shouldUpdateId && r.inferredEntry === n.inferredEntry && be(r.entryError, n.entryError) && r.autoFocus === n.autoFocus;
   }
 );
-function Pi({
+function xi({
   index: t,
   open: r,
   onClose: n,
@@ -640,7 +640,7 @@ function Se({
     values: m,
     handleChange: p,
     errors: s
-  } = G(), f = "validation.length", g = "validation.min", P = "validation.max", y = "validation.trim", x = "validation.matches", v = "validation.lowercase", b = "validation.uppercase", w = I(s, x), T = I(m, x), C = typeof T == "string" ? T : Cr(T);
+  } = G(), f = "validation.length", g = "validation.min", x = "validation.max", y = "validation.trim", P = "validation.matches", v = "validation.lowercase", b = "validation.uppercase", T = I(s, P), w = I(m, P), C = typeof w == "string" ? w : Nr(w);
   return /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2", children: [
     /* @__PURE__ */ e(Ee, { disabled: c }),
     /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2 col-span-12", children: [
@@ -721,9 +721,9 @@ function Se({
       i && /* @__PURE__ */ e("div", { className: "col-span-4", children: /* @__PURE__ */ e(
         W,
         {
-          value: I(m, P),
+          value: I(m, x),
           label: "Max length",
-          name: P,
+          name: x,
           type: "number",
           size: "small",
           disabled: c,
@@ -735,16 +735,16 @@ function Se({
       /* @__PURE__ */ e(
         $,
         {
-          name: x,
+          name: P,
           as: W,
           label: "Matches regex",
           size: "small",
           disabled: c,
           value: C,
-          error: !!w
+          error: !!T
         }
       ),
-      /* @__PURE__ */ e(X, { error: !!w, children: w ? "Not a valid regexp" : "e.g. /^\\d+$/ for digits only" })
+      /* @__PURE__ */ e(X, { error: !!T, children: T ? "Not a valid regexp" : "e.g. /^\\d+$/ for digits only" })
     ] })
   ] });
 }
@@ -785,7 +785,7 @@ function It({
     ) })
   ] });
 }
-function xe({
+function Pe({
   children: t
 }) {
   return /* @__PURE__ */ e(
@@ -795,7 +795,7 @@ function xe({
       asField: !0,
       className: "p-4",
       title: /* @__PURE__ */ a("div", { className: "flex flex-row text-gray-500", children: [
-        /* @__PURE__ */ e(Mr, {}),
+        /* @__PURE__ */ e(zr, {}),
         /* @__PURE__ */ e(
           V,
           {
@@ -821,7 +821,7 @@ function Ut({
     values: d,
     setFieldError: c,
     setFieldValue: u
-  } = G(), m = Ie(), p = t ? "of.enumValues" : "enumValues", s = I(d, "defaultValue"), f = I(d, p), g = Jt(() => !f || typeof f == "boolean" ? [] : Nr(f) ?? [], [f]);
+  } = G(), m = Ie(), p = t ? "of.enumValues" : "enumValues", s = I(d, "defaultValue"), f = I(d, p), g = Jt(() => !f || typeof f == "boolean" ? [] : Pr(f) ?? [], [f]);
   return /* @__PURE__ */ a(R, { children: [
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
       Ci,
@@ -833,11 +833,11 @@ function Ut({
         onError: (y) => {
           c(p, y ? "This enum property is missing some values" : void 0);
         },
-        getData: o ? () => o().then((y) => y.map((x) => d.id && I(x, d.id)).filter(Boolean)) : void 0,
+        getData: o ? () => o().then((y) => y.map((P) => d.id && I(P, d.id)).filter(Boolean)) : void 0,
         onValuesChanged: (y) => {
           if (d && (u(p, y), !t)) {
-            const x = y.filter((v) => !!v?.id).map((v) => v.id);
-            s && !x.includes(s) && (u("defaultValue", void 0), m.open({
+            const P = y.filter((v) => !!v?.id).map((v) => v.id);
+            s && !P.includes(s) && (u("defaultValue", void 0), m.open({
               type: "warning",
               message: "Default value was cleared"
             }));
@@ -845,7 +845,7 @@ function Ut({
         }
       }
     ) }),
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(xe, { children: [
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(Pe, { children: [
       !t && /* @__PURE__ */ e(
         Se,
         {
@@ -892,15 +892,15 @@ function jt({
   const {
     values: i,
     setFieldValue: l
-  } = G(), o = t ? "of.storage" : "storage", d = `${o}.acceptedFiles`, c = `${o}.fileName`, u = `${o}.storagePath`, m = `${o}.storeUrl`, p = I(i, c) ?? "{rand}_{file}", s = I(i, u) ?? "/", f = I(i, d), g = Array.isArray(f) ? f : void 0, P = !g || g.length === 0, y = (b) => {
-    b ? b.includes("all") || b.length >= Object.keys(ot).length ? l(d, void 0) : P ? l(d, Object.keys(ot).filter((w) => !b.includes(w))) : l(d, b) : l(d, void 0);
-  }, x = typeof p == "function", v = typeof s == "function";
+  } = G(), o = t ? "of.storage" : "storage", d = `${o}.acceptedFiles`, c = `${o}.fileName`, u = `${o}.storagePath`, m = `${o}.storeUrl`, p = I(i, c) ?? "{rand}_{file}", s = I(i, u) ?? "/", f = I(i, d), g = Array.isArray(f) ? f : void 0, x = !g || g.length === 0, y = (b) => {
+    b ? b.includes("all") || b.length >= Object.keys(ot).length ? l(d, void 0) : x ? l(d, Object.keys(ot).filter((T) => !b.includes(T))) : l(d, b) : l(d, void 0);
+  }, P = typeof p == "function", v = typeof s == "function";
   return /* @__PURE__ */ a(R, { children: [
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
       Tt,
       {
         title: /* @__PURE__ */ a("div", { className: "flex flex-row text-gray-500", children: [
-          /* @__PURE__ */ e(zr, {}),
+          /* @__PURE__ */ e(Rr, {}),
           /* @__PURE__ */ e(
             V,
             {
@@ -912,14 +912,14 @@ function jt({
         ] }),
         children: /* @__PURE__ */ a("div", { className: "grid grid-cols-12 gap-2 p-4", children: [
           /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(
-            Rr,
+            Ur,
             {
               disabled: n,
               name: d,
               value: g ?? [],
               onMultiValueChange: y,
-              label: P ? void 0 : "Allowed file types",
-              renderValues: (b) => !b || b.length === 0 ? "All file types allowed" : b.map((w) => ot[w]).filter((w) => !!w).join(", "),
+              label: x ? void 0 : "Allowed file types",
+              renderValues: (b) => !b || b.length === 0 ? "All file types allowed" : b.map((T) => ot[T]).filter((T) => !!T).join(", "),
               children: [
                 /* @__PURE__ */ a(St, { value: "all", className: "flex items-center gap-2", children: [
                   /* @__PURE__ */ e(
@@ -930,20 +930,20 @@ function jt({
                   ),
                   "All"
                 ] }, "all"),
-                Object.entries(ot).map(([b, w]) => /* @__PURE__ */ a(St, { value: b, className: "flex items-center gap-2", children: [
+                Object.entries(ot).map(([b, T]) => /* @__PURE__ */ a(St, { value: b, className: "flex items-center gap-2", children: [
                   /* @__PURE__ */ e(
                     At,
                     {
-                      checked: P || g.indexOf(b) > -1
+                      checked: x || g.indexOf(b) > -1
                     }
                   ),
-                  /* @__PURE__ */ e("div", { className: "flex-grow", children: w }),
+                  /* @__PURE__ */ e("div", { className: "flex-grow", children: T }),
                   /* @__PURE__ */ e(
                     z,
                     {
                       size: "small",
                       variant: "outlined",
-                      onClick: (T) => (T.preventDefault(), T.stopPropagation(), l(d, [b])),
+                      onClick: (w) => (w.preventDefault(), w.stopPropagation(), l(d, [b])),
                       children: "Only"
                     }
                   )
@@ -958,8 +958,8 @@ function jt({
               as: W,
               label: "File name",
               size: "small",
-              disabled: x || n,
-              value: x ? "-" : p
+              disabled: P || n,
+              value: P ? "-" : p
             }
           ) }),
           /* @__PURE__ */ a("div", { className: "col-span-12", children: [
@@ -991,12 +991,12 @@ function jt({
               {
                 name: m,
                 type: "checkbox",
-                children: ({ field: b, form: w }) => /* @__PURE__ */ e(
+                children: ({ field: b, form: T }) => /* @__PURE__ */ e(
                   le,
                   {
                     label: "Save URL instead of storage path",
                     disabled: r || n,
-                    form: w,
+                    form: T,
                     field: b
                   }
                 )
@@ -1007,7 +1007,7 @@ function jt({
         ] })
       }
     ) }),
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(xe, { children: [
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(Pe, { children: [
       !t && /* @__PURE__ */ e("div", { className: "grid grid-cols-12 gap-2", children: /* @__PURE__ */ e(Ee, { disabled: n }) }),
       t && /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(It, { disabled: n }) })
     ] }) })
@@ -1033,7 +1033,7 @@ function wi(t) {
       } : { [r]: i };
   }).filter((r) => !!r).reduce((r, n) => ({ ...r, ...n }), {});
 }
-function ar({
+function or({
   property: t,
   onClick: r,
   hasError: n,
@@ -1123,10 +1123,10 @@ function Ti({
             "div",
             {
               className: "h-8 w-8 p-1 rounded-full shadow text-white bg-gray-500",
-              children: /* @__PURE__ */ e(Ur, { color: "inherit", size: "medium" })
+              children: /* @__PURE__ */ e(jr, { color: "inherit", size: "medium" })
             }
           ),
-          /* @__PURE__ */ e(jr, { color: "disabled", size: "small", className: "absolute -right-2 -top-2" })
+          /* @__PURE__ */ e(qr, { color: "disabled", size: "small", className: "absolute -right-2 -top-2" })
         ] }),
         /* @__PURE__ */ e(
           ge,
@@ -1210,13 +1210,13 @@ const gt = Y.memo(
     inferredPropertyKeys: s,
     collectionEditable: f
   }) {
-    const g = o ?? Object.keys(l), P = J((y) => {
+    const g = o ?? Object.keys(l), x = J((y) => {
       if (!y.destination)
         return;
-      const x = y.source.index, v = y.destination.index, b = Array.from(g), [w] = b.splice(x, 1);
-      b.splice(v, 0, w), u && u(b, r);
+      const P = y.source.index, v = y.destination.index, b = Array.from(g), [T] = b.splice(P, 1);
+      b.splice(v, 0, T), u && u(b, r);
     }, [r, u, g]);
-    return /* @__PURE__ */ e(R, { children: /* @__PURE__ */ e(ni, { onDragEnd: P, children: /* @__PURE__ */ e(ai, { droppableId: `droppable_${r}`, children: (y, x) => /* @__PURE__ */ a(
+    return /* @__PURE__ */ e(R, { children: /* @__PURE__ */ e(ai, { onDragEnd: x, children: /* @__PURE__ */ e(oi, { droppableId: `droppable_${r}`, children: (y, P) => /* @__PURE__ */ a(
       "div",
       {
         ...y.droppableProps,
@@ -1224,9 +1224,9 @@ const gt = Y.memo(
         className: p,
         children: [
           g && g.map((v, b) => {
-            const w = l[v], T = d?.find((C) => C.key === v);
-            return !w && !T ? (console.warn(`Property ${v} not found in properties or additionalFields`), null) : /* @__PURE__ */ e(
-              oi,
+            const T = l[v], w = d?.find((C) => C.key === v);
+            return !T && !w ? (console.warn(`Property ${v} not found in properties or additionalFields`), null) : /* @__PURE__ */ e(
+              li,
               {
                 draggableId: `array_field_${r}_${v}}`,
                 index: b,
@@ -1234,8 +1234,8 @@ const gt = Y.memo(
                   ki,
                   {
                     propertyKey: v,
-                    propertyOrBuilder: w,
-                    additionalField: T,
+                    propertyOrBuilder: T,
+                    additionalField: w,
                     provided: C,
                     errors: c,
                     namespace: r,
@@ -1277,17 +1277,17 @@ function ki({
   inferredPropertyKeys: p,
   collectionEditable: s
 }) {
-  const f = p?.includes(r ? `${r}.${t}` : t), g = ne(t, r), y = nr(t, r) in d;
-  let x;
+  const f = p?.includes(r ? `${r}.${t}` : t), g = ne(t, r), y = ar(t, r) in d;
+  let P;
   if (typeof n == "object") {
-    const w = n;
-    w.dataType === "map" && w.properties && (x = /* @__PURE__ */ e(
+    const T = n;
+    T.dataType === "map" && T.properties && (P = /* @__PURE__ */ e(
       gt,
       {
         selectedPropertyKey: o,
         namespace: g,
-        properties: w.properties,
-        propertiesOrder: w.propertiesOrder,
+        properties: T.properties,
+        propertiesOrder: T.propertiesOrder,
         errors: d,
         onPropertyClick: c,
         onPropertyMove: u,
@@ -1305,7 +1305,7 @@ function ki({
       ...l.dragHandleProps,
       className: "relative -ml-8",
       children: [
-        x && /* @__PURE__ */ e(
+        P && /* @__PURE__ */ e(
           "div",
           {
             className: "absolute border-l " + kt,
@@ -1317,7 +1317,7 @@ function ki({
           }
         ),
         !ie(n) && !i && b ? /* @__PURE__ */ e(
-          ar,
+          or,
           {
             property: n,
             onClick: c ? () => c(t, r) : void 0,
@@ -1342,7 +1342,7 @@ function ki({
               size: "small",
               color: "inherit",
               onClick: () => m(t, r),
-              children: /* @__PURE__ */ e(qr, { size: "small" })
+              children: /* @__PURE__ */ e(Lr, { size: "small" })
             }
           ) }),
           u && /* @__PURE__ */ e(te, { title: "Move", children: /* @__PURE__ */ e(
@@ -1350,11 +1350,11 @@ function ki({
             {
               component: "span",
               size: "small",
-              children: /* @__PURE__ */ e(Lr, { size: "small" })
+              children: /* @__PURE__ */ e($r, { size: "small" })
             }
           ) })
         ] }),
-        x && /* @__PURE__ */ e("div", { className: "ml-16", children: x })
+        P && /* @__PURE__ */ e("div", { className: "ml-16", children: P })
       ]
     }
   );
@@ -1363,26 +1363,26 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
   const {
     values: o,
     setFieldValue: d
-  } = G(), [c, u] = j(!1), [m, p] = j(), [s, f] = j(), g = o.propertiesOrder ?? Object.keys(o.properties ?? {}), P = ({
-    id: T,
+  } = G(), [c, u] = j(!1), [m, p] = j(), [s, f] = j(), g = o.propertiesOrder ?? Object.keys(o.properties ?? {}), x = ({
+    id: w,
     property: C
   }) => {
-    if (!T)
+    if (!w)
       throw Error();
     d("properties", {
       ...o.properties ?? {},
-      [T]: C
+      [w]: C
     }, !1);
-    const O = o.propertiesOrder ?? Object.keys(o.properties ?? {}), N = O.includes(T) ? O : [...O, T];
+    const O = o.propertiesOrder ?? Object.keys(o.properties ?? {}), N = O.includes(w) ? O : [...O, w];
     d("propertiesOrder", N, !1), u(!1);
-  }, y = J((T, C) => {
-    const O = T ? ne(T, C) : void 0;
+  }, y = J((w, C) => {
+    const O = w ? ne(w, C) : void 0;
     if (!O)
       throw Error("collection editor miss config");
-    const N = he(O), F = Ce(C), D = I(o, F) ?? Object.keys(I(o, bi(C)));
-    d(N, void 0, !1), d(F, D.filter((_) => _ !== T), !1), u(!1), p(void 0), f(void 0);
-  }, [d, o]), x = m ? ne(m, s) : void 0, v = x ? I(o.properties, x.replaceAll(".", ".properties.")) : void 0, b = !g || g.length < 1, w = J((T, C) => {
-    d(Ce(C), T, !1);
+    const N = he(O), F = Ce(C), D = I(o, F) ?? Object.keys(I(o, nr(C)));
+    d(N, void 0, !1), d(F, D.filter((_) => _ !== w), !1), u(!1), p(void 0), f(void 0);
+  }, [d, o]), P = m ? ne(m, s) : void 0, v = P ? I(o.properties, P.replaceAll(".", ".properties.")) : void 0, b = !g || g.length < 1, T = J((w, C) => {
+    d(Ce(C), w, !1);
   }, []);
   return /* @__PURE__ */ a(R, { children: [
     /* @__PURE__ */ a("div", { className: "col-span-12", children: [
@@ -1410,10 +1410,10 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
             propertiesOrder: g,
             errors: {},
             collectionEditable: l,
-            onPropertyClick: (T, C) => {
-              p(T), f(C), u(!0);
+            onPropertyClick: (w, C) => {
+              p(w), f(C), u(!0);
             },
-            onPropertyMove: w
+            onPropertyMove: T
           }
         ),
         b && /* @__PURE__ */ e(
@@ -1433,7 +1433,7 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
           position: "start",
           size: "small",
           label: "Spread children as columns",
-          onValueChange: (T) => d("spreadChildren", T),
+          onValueChange: (w) => d("spreadChildren", w),
           value: o.spreadChildren ?? !1
         }
       ),
@@ -1461,7 +1461,7 @@ function Oi({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
         existingProperty: !!m,
         autoUpdateId: !m,
         autoOpenTypeSelect: !m,
-        onPropertyChanged: P,
+        onPropertyChanged: x,
         existingPropertyKeys: m ? void 0 : g,
         propertyConfigs: i
       }
@@ -1483,9 +1483,9 @@ function Vi({
     errors: m,
     setFieldValue: p,
     touched: s
-  } = G(), [f, g] = j(!1), P = I(c, "of"), y = I(s, "of") && I(m, "of"), x = ({ id: b, property: w, namespace: T }) => {
-    console.log("onPropertyChanged", b, w, T), p("of", w);
-  }, v = P && Le(P, o);
+  } = G(), [f, g] = j(!1), x = I(c, "of"), y = I(s, "of") && I(m, "of"), P = ({ id: b, property: T, namespace: w }) => {
+    console.log("onPropertyChanged", b, T, w), p("of", T);
+  }, v = x && Le(x, o);
   return /* @__PURE__ */ a(R, { children: [
     /* @__PURE__ */ a("div", { className: "col-span-12", children: [
       /* @__PURE__ */ e(V, { variant: "subtitle2", children: "Repeat component" }),
@@ -1493,12 +1493,12 @@ function Vi({
         $,
         {
           name: "of",
-          value: P,
+          value: x,
           children: ({}) => /* @__PURE__ */ a(ge, { className: "p-2 mt-4", children: [
-            P && /* @__PURE__ */ e(
-              ar,
+            x && /* @__PURE__ */ e(
+              or,
               {
-                property: P,
+                property: x,
                 onClick: n ? void 0 : () => g(!0),
                 includeName: !1,
                 includeEditButton: !0,
@@ -1506,7 +1506,7 @@ function Vi({
                 hasError: !1
               }
             ),
-            !n && !P && /* @__PURE__ */ a(
+            !n && !x && /* @__PURE__ */ a(
               z,
               {
                 variant: "text",
@@ -1530,9 +1530,9 @@ function Vi({
                 autoOpenTypeSelect: !r,
                 onOkClicked: () => g(!1),
                 allowDataInference: l,
-                property: P,
+                property: x,
                 includeIdAndName: !1,
-                onPropertyChanged: x,
+                onPropertyChanged: P,
                 forceShowErrors: t,
                 propertyConfigs: o,
                 collectionEditable: d
@@ -1542,7 +1542,7 @@ function Vi({
         }
       )
     ] }),
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(xe, { children: /* @__PURE__ */ e(It, { disabled: n }) }) })
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Pe, { children: /* @__PURE__ */ e(It, { disabled: n }) }) })
   ] });
 }
 const Ii = Y.forwardRef(
@@ -1560,7 +1560,7 @@ const Ii = Y.forwardRef(
       setFieldTouched: p,
       touched: s,
       validate: f
-    } = G(), g = "name", P = r && I(c, g), y = "id", x = r && I(c, y), v = "description", b = r && I(c, v);
+    } = G(), g = "name", x = r && I(c, g), y = "id", P = r && I(c, y), v = "description", b = r && I(c, v);
     return /* @__PURE__ */ a("div", { className: "flex flex-col gap-2 col-span-12", children: [
       /* @__PURE__ */ a("div", { children: [
         /* @__PURE__ */ e(
@@ -1570,18 +1570,18 @@ const Ii = Y.forwardRef(
             inputRef: d,
             as: W,
             value: u[g],
-            onChange: (w) => {
-              const T = w.target.value;
-              !I(s, y) && l && m(y, T ? xt(T) : "", !1), m(g, T, !0), p(g, !0);
+            onChange: (T) => {
+              const w = T.target.value;
+              !I(s, y) && l && m(y, w ? Pt(w) : "", !1), m(g, w, !0), p(g, !0);
             },
             style: { fontSize: 20 },
             placeholder: "Field name",
             required: !0,
             disabled: i,
-            error: !!P
+            error: !!x
           }
         ),
-        /* @__PURE__ */ e(X, { error: !!P, children: P })
+        /* @__PURE__ */ e(X, { error: !!x, children: x })
       ] }),
       /* @__PURE__ */ a("div", { children: [
         /* @__PURE__ */ e(
@@ -1591,17 +1591,17 @@ const Ii = Y.forwardRef(
             as: W,
             label: "ID",
             value: u[y],
-            onChange: (w) => {
-              const T = w.target.value;
-              !I(s, g) && l && m(g, T ? wt(T) : ""), m(y, T, !0), p(y, !0);
+            onChange: (T) => {
+              const w = T.target.value;
+              !I(s, g) && l && m(g, w ? wt(w) : ""), m(y, w, !0), p(y, !0);
             },
             disabled: n || i,
             required: !0,
             size: "small",
-            error: !!x
+            error: !!P
           }
         ),
-        /* @__PURE__ */ e(X, { error: !!x, children: x })
+        /* @__PURE__ */ e(X, { error: !!P, children: P })
       ] }),
       /* @__PURE__ */ a("div", { children: [
         /* @__PURE__ */ e(
@@ -1626,7 +1626,7 @@ function _i({
 }) {
   const { values: i, setFieldValue: l } = G();
   return /* @__PURE__ */ a(R, { children: [
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(xe, { children: [
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ a(Pe, { children: [
       t === "text_field" && /* @__PURE__ */ e(
         Se,
         {
@@ -1695,7 +1695,7 @@ function _i({
 function Fi({ disabled: t }) {
   const { values: r } = G(), n = I(r, "defaultValue");
   return /* @__PURE__ */ a(R, { children: [
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(xe, { children: /* @__PURE__ */ e(Ee, { disabled: t }) }) }),
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Pe, { children: /* @__PURE__ */ e(Ee, { disabled: t }) }) }),
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
       $,
       {
@@ -1714,29 +1714,35 @@ function Fi({ disabled: t }) {
     ) })
   ] });
 }
-function Ei({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i, collectionEditable: l }) {
+function Ei({
+  disabled: t,
+  getData: r,
+  allowDataInference: n,
+  propertyConfigs: i,
+  collectionEditable: l
+}) {
   const {
     values: o,
     setFieldValue: d
   } = G(), [c, u] = j(!1), [m, p] = j(), [s, f] = j(), g = ({
-    id: w,
-    property: T
+    id: T,
+    property: w
   }) => {
-    if (!w)
+    if (!T)
       throw Error();
     d("oneOf.properties", {
       ...o.oneOf?.properties ?? {},
-      [w]: T
+      [T]: w
     }, !1);
-    const C = o.oneOf?.propertiesOrder ?? Object.keys(o.oneOf?.properties ?? {}), O = C.includes(w) ? C : [...C, w];
+    const C = o.oneOf?.propertiesOrder ?? Object.keys(o.oneOf?.properties ?? {}), O = C.includes(T) ? C : [...C, T];
     d("oneOf.propertiesOrder", O, !1), u(!1);
-  }, P = m ? ne(m, s) : void 0, y = P ? I(o.oneOf?.properties, P.replaceAll(".", ".properties.")) : void 0, x = J((w, T) => {
-    const C = w ? ne(w, T) : void 0;
+  }, x = m ? ne(m, s) : void 0, y = x ? I(o.oneOf?.properties, x.replaceAll(".", ".properties.")) : void 0, P = J((T, w) => {
+    const C = T ? ne(T, w) : void 0;
     if (!C)
       throw Error("collection editor miss config");
     d(`oneOf.${he(C)}`, void 0, !1);
-    const O = `oneOf.${Ce(T)}`, N = I(o, O);
-    d(O, N.filter((F) => F !== w), !1), u(!1), p(void 0), f(void 0);
+    const O = `oneOf.${Ce(w)}`, N = I(o, O) ?? Object.keys(I(o, nr(w)));
+    d(O, N.filter((F) => F !== T), !1), u(!1), p(void 0), f(void 0);
   }, [d, o]), v = /* @__PURE__ */ a(
     z,
     {
@@ -1749,8 +1755,8 @@ function Ei({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
         o.name ?? "this block"
       ]
     }
-  ), b = J((w, T) => {
-    d(`oneOf.${Ce(T)}`, w, !1);
+  ), b = J((T, w) => {
+    d(`oneOf.${Ce(w)}`, T, !1);
   }, []);
   return /* @__PURE__ */ a(R, { children: [
     /* @__PURE__ */ a("div", { className: "col-span-12", children: [
@@ -1766,8 +1772,8 @@ function Ei({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
             propertiesOrder: o.oneOf?.propertiesOrder,
             errors: {},
             collectionEditable: l,
-            onPropertyClick: t ? void 0 : (w, T) => {
-              p(w), f(T), u(!0);
+            onPropertyClick: t ? void 0 : (T, w) => {
+              p(T), f(w), u(!0);
             },
             onPropertyMove: t ? void 0 : b
           }
@@ -1790,7 +1796,7 @@ function Ei({ disabled: t, getData: r, allowDataInference: n, propertyConfigs: i
           u(!1), p(void 0), f(void 0);
         },
         collectionEditable: l,
-        onDelete: x,
+        onDelete: P,
         propertyKey: m,
         propertyNamespace: s,
         property: y,
@@ -1912,7 +1918,7 @@ function Si({ disabled: t }) {
 function Ai({ disabled: t }) {
   const { values: r, setFieldValue: n } = G();
   return /* @__PURE__ */ a(R, { children: [
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(xe, { children: /* @__PURE__ */ e(Si, { disabled: t }) }) }),
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Pe, { children: /* @__PURE__ */ e(Si, { disabled: t }) }) }),
     /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(
       Oe,
       {
@@ -2109,7 +2115,7 @@ function Bi({ disabled: t }) {
       ),
       /* @__PURE__ */ e(X, { error: !!p, children: p ?? "Update this field automatically when creating or updating the entity" })
     ] }),
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(xe, { children: /* @__PURE__ */ e(Ee, { disabled: t }) }) })
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Pe, { children: /* @__PURE__ */ e(Ee, { disabled: t }) }) })
   ] });
 }
 function Mi({ disabled: t }) {
@@ -2144,9 +2150,9 @@ function Mi({ disabled: t }) {
   ] });
 }
 function zi({ disabled: t }) {
-  return /* @__PURE__ */ e(R, { children: /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(xe, { children: /* @__PURE__ */ e(Ee, { disabled: t }) }) }) });
+  return /* @__PURE__ */ e(R, { children: /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Pe, { children: /* @__PURE__ */ e(Ee, { disabled: t }) }) }) });
 }
-function or(t, r, n) {
+function lr(t, r, n) {
   let i;
   return r === "text_field" ? i = K(
     t,
@@ -2358,7 +2364,7 @@ function or(t, r, n) {
     propertyConfig: r
   }), i;
 }
-function lr({ value: t, optionDisabled: r, propertyConfig: n, existing: i }) {
+function sr({ value: t, optionDisabled: r, propertyConfig: n, existing: i }) {
   return /* @__PURE__ */ e(
     ee,
     {
@@ -2428,7 +2434,7 @@ function Ri({
         ]
       }
     ) }),
-    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(xe, { children: /* @__PURE__ */ e(
+    /* @__PURE__ */ e("div", { className: "col-span-12", children: /* @__PURE__ */ e(Pe, { children: /* @__PURE__ */ e(
       Se,
       {
         disabled: t,
@@ -2473,7 +2479,7 @@ const Ui = [
   "key_value",
   "repeat",
   "block"
-], sr = Object.entries(Kt).filter(([t]) => Ui.includes(t)).map(([t, r]) => ({ [t]: r })).reduce((t, r) => ({ ...t, ...r }), {}), dr = Y.memo(
+], dr = Object.entries(Kt).filter(([t]) => Ui.includes(t)).map(([t, r]) => ({ [t]: r })).reduce((t, r) => ({ ...t, ...r }), {}), cr = Y.memo(
   function(r) {
     const {
       includeIdAndName: n = !0,
@@ -2488,13 +2494,13 @@ const Ui = [
       onPropertyChanged: s,
       onPropertyChangedImmediate: f = !0,
       onDelete: g,
-      onError: P,
+      onError: x,
       initialErrors: y,
-      forceShowErrors: x,
+      forceShowErrors: P,
       allowDataInference: v,
       getController: b,
-      getData: w,
-      propertyConfigs: T,
+      getData: T,
+      propertyConfigs: w,
       collectionEditable: C
     } = r, O = {
       id: "",
@@ -2560,16 +2566,16 @@ const Ui = [
         onDelete: g,
         includeIdAndTitle: n,
         propertyNamespace: m,
-        onError: P,
-        showErrors: x || _.submitCount > 0,
+        onError: x,
+        showErrors: P || _.submitCount > 0,
         existing: l,
         autoUpdateId: o,
         inArray: d,
         autoOpenTypeSelect: i,
         disabled: N,
-        getData: w,
+        getData: T,
         allowDataInference: v,
-        propertyConfigs: T,
+        propertyConfigs: w,
         collectionEditable: C,
         ..._
       }
@@ -2603,7 +2609,7 @@ function Ve({
           },
           children: [
             /* @__PURE__ */ e(De, { children: /* @__PURE__ */ e(
-              dr,
+              cr,
               {
                 ...d,
                 onPropertyChanged: (m) => {
@@ -2659,12 +2665,12 @@ function ji({
   showErrors: s,
   disabled: f,
   inArray: g,
-  getData: P,
+  getData: x,
   allowDataInference: y,
-  propertyConfigs: x,
+  propertyConfigs: P,
   collectionEditable: v
 }) {
-  const [b, w] = j(o), [T, C] = j(!1), [O, N] = j(t?.dataType ? Wt(t) : void 0), F = Object.entries(sr).concat(Object.entries(x)), D = g ? F.filter(([Z, H]) => !ie(H.property) && H.property?.dataType !== "array") : F, _ = Fr(t), S = je(null), h = je(t), B = s && I(r, "selectedWidget");
+  const [b, T] = j(o), [w, C] = j(!1), [O, N] = j(t?.dataType ? Wt(t) : void 0), F = Object.entries(dr).concat(Object.entries(P)), D = g ? F.filter(([Z, H]) => !ie(H.property) && H.property?.dataType !== "array") : F, _ = Er(t), S = je(null), h = je(t), B = s && I(r, "selectedWidget");
   ue(() => {
     if (c && (!d || _.id)) {
       const {
@@ -2681,7 +2687,7 @@ function ji({
     t?.id && p && p(t?.id, m, r);
   }, [r, p, m, t?.id]);
   const oe = (Z) => {
-    N(Z), n(or(t, Z, x)), setTimeout(() => {
+    N(Z), n(lr(t, Z, P)), setTimeout(() => {
       S.current?.focus();
     }, 0);
   };
@@ -2706,7 +2712,7 @@ function ji({
       allowDataInference: y,
       updateIds: !i,
       disabled: f,
-      getData: P,
+      getData: x,
       showErrors: s
     }
   ) : O === "multi_select" || O === "multi_number_select" ? q = /* @__PURE__ */ e(
@@ -2716,7 +2722,7 @@ function ji({
       updateIds: !i,
       disabled: f,
       allowDataInference: y,
-      getData: P,
+      getData: x,
       showErrors: s
     }
   ) : O === "file_upload" ? q = /* @__PURE__ */ e(
@@ -2737,19 +2743,19 @@ function ji({
     Oi,
     {
       disabled: f,
-      getData: P,
+      getData: x,
       allowDataInference: y,
       collectionEditable: v,
-      propertyConfigs: x
+      propertyConfigs: P
     }
   ) : O === "block" ? q = /* @__PURE__ */ e(
     Ei,
     {
       disabled: f,
-      getData: P,
+      getData: x,
       allowDataInference: y,
       collectionEditable: v,
-      propertyConfigs: x
+      propertyConfigs: P
     }
   ) : O === "reference" ? q = /* @__PURE__ */ e(
     qt,
@@ -2772,14 +2778,14 @@ function ji({
     {
       showErrors: s,
       existing: i,
-      getData: P,
+      getData: x,
       allowDataInference: y,
       disabled: f,
       collectionEditable: v,
-      propertyConfigs: x
+      propertyConfigs: P
     }
   ) : O === "key_value" ? q = /* @__PURE__ */ e(zi, { disabled: f }) : q = null, /* @__PURE__ */ a(R, { children: [
-    f && /* @__PURE__ */ a($r, { mode: "warn", children: [
+    f && /* @__PURE__ */ a(Hr, { mode: "warn", children: [
       /* @__PURE__ */ e(V, { children: "This property can't be edited" }),
       /* @__PURE__ */ a(V, { variant: "caption", children: [
         "You may not have permission to edit it or it is defined in code with no ",
@@ -2796,13 +2802,13 @@ function ji({
             value: O ?? "",
             placeholder: "Select a property widget",
             open: b,
-            onOpenChange: w,
+            onOpenChange: T,
             position: "item-aligned",
             disabled: f,
             renderValue: (Z) => {
               if (!Z)
                 return /* @__PURE__ */ e("em", { children: "Select a property widget" });
-              const H = Z, Q = Kt[H] ?? x[H], se = Q.property, Me = se && !ie(se) ? Le(se, x) : void 0, we = ie(se) || i && se.dataType !== t?.dataType, de = Me ? K(Me, Q) : Q;
+              const H = Z, Q = Kt[H] ?? P[H], se = Q.property, Me = se && !ie(se) ? Le(se, P) : void 0, we = ie(se) || i && se.dataType !== t?.dataType, de = Me ? K(Me, Q) : Q;
               return /* @__PURE__ */ a(
                 "div",
                 {
@@ -2836,7 +2842,7 @@ function ji({
             children: D.map(([Z, H]) => {
               const Q = H.property, se = i && !ie(Q) && Q.dataType !== t?.dataType;
               return /* @__PURE__ */ e(
-                lr,
+                sr,
                 {
                   value: Z,
                   optionDisabled: se,
@@ -2887,7 +2893,7 @@ function ji({
     u && /* @__PURE__ */ e(
       ct,
       {
-        open: T,
+        open: w,
         onAccept: () => u(t?.id, m),
         onCancel: () => C(!1),
         title: /* @__PURE__ */ e("div", { children: "Delete this property?" }),
@@ -2919,7 +2925,7 @@ function Yi({
 }) {
   const i = Ie(), l = t ? `import { EntityCollection } from "firecms";
 
-const ` + (t?.name ? Hi(t.name) : "my") + "Collection:EntityCollection = " + li.stringify(cr(t), null, "	") : "No collection selected";
+const ` + (t?.name ? Hi(t.name) : "my") + "Collection:EntityCollection = " + si.stringify(ur(t), null, "	") : "No collection selected";
   return /* @__PURE__ */ a(
     Fe,
     {
@@ -2945,9 +2951,9 @@ const ` + (t?.name ? Hi(t.name) : "my") + "Collection:EntityCollection = " + li.
             "."
           ] }),
           /* @__PURE__ */ e(
-            si,
+            di,
             {
-              theme: di.vsDark,
+              theme: ci.vsDark,
               code: l,
               language: "typescript",
               children: ({
@@ -2971,7 +2977,7 @@ const ` + (t?.name ? Hi(t.name) : "my") + "Collection:EntityCollection = " + li.
                 message: "Copied"
               }), navigator.clipboard.writeText(l)),
               children: [
-                /* @__PURE__ */ e(Hr, { size: "small" }),
+                /* @__PURE__ */ e(Yr, { size: "small" }),
                 "Copy to clipboard"
               ]
             }
@@ -2982,7 +2988,7 @@ const ` + (t?.name ? Hi(t.name) : "my") + "Collection:EntityCollection = " + li.
     }
   );
 }
-function cr(t) {
+function ur(t) {
   const r = (n) => {
     const i = {
       ...n
@@ -3008,7 +3014,7 @@ function cr(t) {
     properties: Object.entries(t.properties ?? {}).map(([n, i]) => ({
       [n]: r(i)
     })).reduce((n, i) => ({ ...n, ...i }), {}),
-    subcollections: (t.subcollections ?? []).map(cr)
+    subcollections: (t.subcollections ?? []).map(ur)
   };
 }
 function Gi({
@@ -3028,11 +3034,11 @@ function Gi({
   const {
     values: f,
     setFieldValue: g,
-    setFieldError: P,
+    setFieldError: x,
     setFieldTouched: y,
-    errors: x,
+    errors: P,
     dirty: v
-  } = G(), b = Ie(), w = Pr(), T = !w, [C, O] = j(), [N, F] = j(), [D, _] = j(), S = N ? ne(N, D) : void 0, h = S ? I(f.properties, S.replaceAll(".", ".properties.")) : void 0, [B, oe] = j(!1), [q, Z] = j(!1), [H, Q] = j(!1), [se, Me] = j([]), we = Y.useRef(f.propertiesOrder ? { "": f.propertiesOrder } : {});
+  } = G(), b = Ie(), T = wr(), w = !T, [C, O] = j(), [N, F] = j(), [D, _] = j(), S = N ? ne(N, D) : void 0, h = S ? I(f.properties, S.replaceAll(".", ".properties.")) : void 0, [B, oe] = j(!1), [q, Z] = j(!1), [H, Q] = j(!1), [se, Me] = j([]), we = Y.useRef(f.propertiesOrder ? { "": f.propertiesOrder } : {});
   ue(() => {
     l && l(v);
   }, [v]);
@@ -3087,7 +3093,7 @@ function Gi({
       [A]: U
     }, !1);
     const k = [...f.propertiesOrder ?? Object.keys(f.properties), A];
-    ve(k), Q(!1), w && (O(k.indexOf(A)), F(A)), _(void 0);
+    ve(k), Q(!1), T && (O(k.indexOf(A)), F(A)), _(void 0);
   }, pe = ({
     id: A,
     property: U,
@@ -3121,7 +3127,7 @@ function Gi({
       propertyPath: E
     }), E) {
       const M = k && Object.keys(k).length > 0;
-      i(A, U, M ? k : void 0), P(he(E), M ? "Property error" : void 0);
+      i(A, U, M ? k : void 0), x(he(E), M ? "Property error" : void 0);
     }
   }, []), Ze = () => {
     O(void 0), F(void 0);
@@ -3134,7 +3140,7 @@ function Gi({
     /* @__PURE__ */ a("div", { className: fe(
       "p-4 md:p-8 pb-20 md:pb-20",
       "col-span-12 lg:col-span-5 h-full overflow-auto",
-      !T && "border-r " + kt
+      !w && "border-r " + kt
     ), children: [
       /* @__PURE__ */ a("div", { className: "flex my-2", children: [
         /* @__PURE__ */ a("div", { className: "flex-grow mb-4", children: [
@@ -3149,7 +3155,7 @@ function Gi({
               placeholder: "Collection name",
               size: "small",
               required: !0,
-              error: !!x?.name
+              error: !!P?.name
             }
           ),
           Xe && /* @__PURE__ */ a(
@@ -3173,7 +3179,7 @@ function Gi({
               variant: "filled",
               disabled: q,
               onClick: () => oe(!0),
-              children: /* @__PURE__ */ e(Yr, {})
+              children: /* @__PURE__ */ e(Gr, {})
             }
           ) }),
           de && /* @__PURE__ */ e(te, { title: "Add new properties based on data", children: /* @__PURE__ */ e(
@@ -3208,7 +3214,7 @@ function Gi({
           onPropertyMove: Ke,
           onPropertyRemove: r ? ke : void 0,
           collectionEditable: s,
-          errors: x
+          errors: P
         }
       ) }),
       /* @__PURE__ */ e(
@@ -3224,13 +3230,13 @@ function Gi({
         }
       )
     ] }),
-    !T && /* @__PURE__ */ e("div", { className: "col-span-12 lg:col-span-7 p-4 md:py-8 md:px-4 h-full overflow-auto pb-20 md:pb-20", children: /* @__PURE__ */ a(
+    !w && /* @__PURE__ */ e("div", { className: "col-span-12 lg:col-span-7 p-4 md:py-8 md:px-4 h-full overflow-auto pb-20 md:pb-20", children: /* @__PURE__ */ a(
       ge,
       {
         className: "sticky top-8 p-4 min-h-full border border-transparent w-full flex flex-col justify-center ",
         children: [
           S && h && !ie(h) && /* @__PURE__ */ e(
-            dr,
+            cr,
             {
               inArray: !1,
               existingProperty: !r,
@@ -3269,7 +3275,7 @@ function Gi({
         ]
       }
     ) }),
-    T && /* @__PURE__ */ e(
+    w && /* @__PURE__ */ e(
       Ve,
       {
         inArray: !1,
@@ -3289,7 +3295,7 @@ function Gi({
         getData: u,
         propertyConfigs: p,
         collectionEditable: s,
-        onOkClicked: T ? Ze : void 0
+        onOkClicked: w ? Ze : void 0
       },
       `edit_view_${C}`
     )
@@ -3394,10 +3400,10 @@ function Zi({
   getUser: l,
   parentCollectionIds: o
 }) {
-  const { entityViews: d } = Ae(), [c, u] = Y.useState(), [m, p] = Y.useState(!1), [s, f] = Y.useState(), [g, P] = Y.useState(), {
+  const { entityViews: d } = Ae(), [c, u] = Y.useState(), [m, p] = Y.useState(!1), [s, f] = Y.useState(), [g, x] = Y.useState(), {
     values: y,
-    setFieldValue: x
-  } = G(), v = t.subcollections ?? [], b = y.entityViews?.filter((C) => typeof C == "string").map((C) => wr(C, d)).filter(Boolean) ?? [], w = t.entityViews?.filter((C) => typeof C != "string") ?? [], T = b.length + w.length;
+    setFieldValue: P
+  } = G(), v = t.subcollections ?? [], b = y.entityViews?.filter((C) => typeof C == "string").map((C) => Tr(C, d)).filter(Boolean) ?? [], T = t.entityViews?.filter((C) => typeof C != "string") ?? [], w = b.length + T.length;
   return /* @__PURE__ */ a("div", { className: "overflow-auto my-auto", children: [
     /* @__PURE__ */ e(ht, { maxWidth: "2xl", className: "flex flex-col gap-4 p-8 m-auto", children: /* @__PURE__ */ a("div", { className: "flex  flex-col gap-16", children: [
       /* @__PURE__ */ a("div", { className: "flex-grow flex flex-col gap-4 items-start", children: [
@@ -3409,7 +3415,7 @@ function Zi({
           v && v.length > 0 && /* @__PURE__ */ e(Bt, { children: /* @__PURE__ */ e(Mt, { children: v.map((C) => /* @__PURE__ */ a(
             Ct,
             {
-              onClick: () => P({
+              onClick: () => x({
                 isNewCollection: !1,
                 editedCollectionId: C.id
               }),
@@ -3446,7 +3452,7 @@ function Zi({
             z,
             {
               onClick: () => {
-                P({
+                x({
                   isNewCollection: !0
                 });
               },
@@ -3459,7 +3465,7 @@ function Zi({
       ] }),
       /* @__PURE__ */ a("div", { className: "flex-grow  flex flex-col gap-4 items-start", children: [
         /* @__PURE__ */ e(V, { variant: "h5", children: "Custom views" }),
-        T === 0 && /* @__PURE__ */ e(Gr, { action: /* @__PURE__ */ e(
+        w === 0 && /* @__PURE__ */ e(Kr, { action: /* @__PURE__ */ e(
           z,
           {
             variant: "text",
@@ -3499,7 +3505,7 @@ function Zi({
                 }
               )
             ] }, C.key)),
-            w.map((C) => /* @__PURE__ */ e(Ct, { children: /* @__PURE__ */ a(
+            T.map((C) => /* @__PURE__ */ e(Ct, { children: /* @__PURE__ */ a(
               Re,
               {
                 align: "left",
@@ -3553,7 +3559,7 @@ function Zi({
       {
         open: !!s,
         onAccept: () => {
-          x("entityViews", y.entityViews?.filter((C) => C !== s)), f(void 0);
+          P("entityViews", y.entityViews?.filter((C) => C !== s)), f(void 0);
         },
         onCancel: () => f(void 0),
         title: /* @__PURE__ */ e(R, { children: "Remove this view?" }),
@@ -3565,7 +3571,7 @@ function Zi({
       }
     ),
     /* @__PURE__ */ e(
-      pr,
+      mr,
       {
         open: !!g,
         configController: n,
@@ -3576,7 +3582,7 @@ function Zi({
         ...g,
         getUser: l,
         handleClose: () => {
-          P(void 0);
+          x(void 0);
         }
       }
     ),
@@ -3585,7 +3591,7 @@ function Zi({
       {
         open: m,
         onClose: (C) => {
-          C && x("entityViews", [...y.entityViews ?? [], C]), p(!1);
+          C && P("entityViews", [...y.entityViews ?? [], C]), p(!1);
         }
       }
     )
@@ -4023,8 +4029,8 @@ function Ji({
   const [o, d] = j(!1), [c, u] = j();
   ue(() => {
     r && l && (d(!0), r(t).then((g) => {
-      const P = g.filter((y) => !(l ?? []).find((x) => x.trim().toLowerCase() === y.trim().toLowerCase()));
-      u(P);
+      const x = g.filter((y) => !(l ?? []).find((P) => P.trim().toLowerCase() === y.trim().toLowerCase()));
+      u(x);
     }).finally(() => d(!1)));
   }, [l, t, r]);
   const {
@@ -4041,7 +4047,7 @@ function Ji({
         children: /* @__PURE__ */ e(V, { variant: "h4", className: "flex-grow", children: "New collection" })
       }
     ),
-    n && /* @__PURE__ */ e(Pt, { colorScheme: "tealDarker", children: /* @__PURE__ */ a(V, { variant: "caption", children: [
+    n && /* @__PURE__ */ e(xt, { colorScheme: "tealDarker", children: /* @__PURE__ */ a(V, { variant: "caption", children: [
       "This is a subcollection of ",
       /* @__PURE__ */ e("b", { children: n.name })
     ] }) }),
@@ -4056,8 +4062,8 @@ function Ji({
       ),
       /* @__PURE__ */ a("div", { className: "flex flex-wrap gap-x-2 gap-y-1 items-center my-2 min-h-7", children: [
         o && !c && /* @__PURE__ */ e(Ge, { size: "small" }),
-        c?.map((g, P) => /* @__PURE__ */ e(
-          Pt,
+        c?.map((g, x) => /* @__PURE__ */ e(
+          xt,
           {
             colorScheme: "cyanLighter",
             onClick: () => {
@@ -4137,7 +4143,7 @@ function Ji({
           children: "● Create a collection from a file (csv, json, xls, xslx...)"
         }
       ),
-      /* @__PURE__ */ e(ci, { onDataAdded: (g, P) => i(g, P) })
+      /* @__PURE__ */ e(ui, { onDataAdded: (g, x) => i(g, x) })
     ] }),
     /* @__PURE__ */ e("div", { children: /* @__PURE__ */ e(z, { variant: "text", onClick: () => i(), className: "my-2", children: "Continue from scratch" }) })
   ] }) });
@@ -4176,58 +4182,58 @@ function Qi({
     values: o
   } = G(), [d, c] = j(void 0), u = Y.useRef(o.propertiesOrder ? { "": o.propertiesOrder } : {}), m = d ? d.id : void 0, p = d || void 0, s = ({
     id: g,
-    property: P,
+    property: x,
     previousId: y,
-    namespace: x
+    namespace: P
   }) => {
-    const v = g ? ne(g, x) : void 0, b = v ? he(v) : void 0, w = (C) => C ? u.current[C] ?? I(o, Ce(C)) : u.current[""], T = (C, O) => {
+    const v = g ? ne(g, P) : void 0, b = v ? he(v) : void 0, T = (C) => C ? u.current[C] ?? I(o, Ce(C)) : u.current[""], w = (C, O) => {
       const N = Ce(O);
       i(N, C, !1), u.current[O ?? ""] = C;
     };
     if (y && y !== g) {
-      const C = ne(y, x), O = he(C), F = w(x).map((_) => _ === y ? g : _).filter((_) => _ !== void 0);
-      T(F, x);
+      const C = ne(y, P), O = he(C), F = T(P).map((_) => _ === y ? g : _).filter((_) => _ !== void 0);
+      w(F, P);
       const D = { ...t.headersMapping };
       Object.keys(D).forEach((_) => {
         D[_] === y && (D[_] = g ?? "");
       }), t.setHeadersMapping(D), i(O, void 0, !1), l(O, !1, !1);
     }
-    b && (i(b, P, !1), l(b, !0, !1));
+    b && (i(b, x, !1), l(b, !0, !1));
   }, f = async ({
     id: g,
-    importKey: P,
+    importKey: x,
     property: y,
-    namespace: x
+    namespace: P
   }) => {
-    const v = g ? ne(g, x) : void 0, b = v ? he(v) : void 0, w = t.importData.map((C) => I(C, P)), T = {
-      ...ri(w, y, ir),
+    const v = g ? ne(g, P) : void 0, b = v ? he(v) : void 0, T = t.importData.map((C) => I(C, x)), w = {
+      ...ii(T, y, ir),
       editable: !0
     };
-    b && (T ? i(b, T, !1) : i(b, y, !1), l(b, !0, !1));
+    b && (w ? i(b, w, !1) : i(b, y, !1), l(b, !0, !1));
   };
   return /* @__PURE__ */ a("div", { className: "overflow-auto my-auto", children: [
     /* @__PURE__ */ a(ht, { maxWidth: "6xl", className: "flex flex-col gap-4 p-8 m-auto", children: [
       /* @__PURE__ */ e(V, { variant: "h6", className: "my-4 ml-3.5", children: "Data property mapping" }),
       /* @__PURE__ */ e(
-        ui,
+        pi,
         {
           importConfig: t,
           destinationProperties: o.properties,
           buildPropertyView: ({
             property: g,
-            propertyKey: P,
+            propertyKey: x,
             importKey: y,
-            isIdColumn: x
-          }) => x ? /* @__PURE__ */ e(V, { children: " This column will be used as ID" }) : /* @__PURE__ */ e(
-            pi,
+            isIdColumn: P
+          }) => P ? /* @__PURE__ */ e(V, { children: " This column will be used as ID" }) : /* @__PURE__ */ e(
+            mi,
             {
               property: g,
-              propertyKey: P,
+              propertyKey: x,
               onPropertyNameChanged: (v, b) => i(`properties.${v}.name`, b, !1),
               onEditClick: () => {
-                !P || !g || c({
+                !x || !g || c({
                   ...g,
-                  id: P,
+                  id: x,
                   editable: !0
                 });
               },
@@ -4240,7 +4246,7 @@ function Qi({
                     ...v,
                     importKey: y
                   }),
-                  propertyKey: P,
+                  propertyKey: x,
                   propertyConfigs: r
                 }
               )
@@ -4301,7 +4307,7 @@ function Xi({
           position: "item-aligned",
           renderValue: (m) => d ? /* @__PURE__ */ e($e, { propertyConfig: d }) : null,
           onValueChange: (m) => {
-            const p = or(t, m, i);
+            const p = lr(t, m, i);
             n && r({
               id: n,
               property: p,
@@ -4309,8 +4315,8 @@ function Xi({
               namespace: void 0
             });
           },
-          children: Object.entries(sr).map(([m, p]) => /* @__PURE__ */ e(
-            lr,
+          children: Object.entries(dr).map(([m, p]) => /* @__PURE__ */ e(
+            sr,
             {
               value: m,
               optionDisabled: !1,
@@ -4331,15 +4337,15 @@ function en({
 }) {
   const [i, l] = j(!1);
   async function o() {
-    const c = t.importData.map((u) => mi(u, t.idColumn, t.headersMapping, r, "TEMP_PATH", t.defaultValues));
+    const c = t.importData.map((u) => hi(u, t.idColumn, t.headersMapping, r, "TEMP_PATH", t.defaultValues));
     t.setEntities(c);
   }
   ue(() => {
     o().finally(() => l(!1));
   }, []);
-  const d = Tr();
+  const d = kr();
   return i ? /* @__PURE__ */ e(ut, {}) : /* @__PURE__ */ e(
-    kr,
+    Or,
     {
       title: /* @__PURE__ */ a("div", { children: [
         /* @__PURE__ */ e(V, { variant: "subtitle2", children: "Imported data preview" }),
@@ -4358,15 +4364,16 @@ function en({
         key: c,
         disabled: !1
       })),
-      properties: r
+      properties: r,
+      enablePopupIcon: !1
     }
   );
 }
-function ur(t, r = "") {
+function pr(t, r = "") {
   const n = Object.keys(t).reduce((o, d) => {
-    const c = t[d], u = Or(d), m = r ? `${r}.${u}` : u;
+    const c = t[d], u = Vr(d), m = r ? `${r}.${u}` : u;
     if (c.dataType === "map" && c.properties) {
-      const f = ur(c.properties, m);
+      const f = pr(c.properties, m);
       return {
         headersMapping: { ...o.headersMapping, [d]: m },
         properties: {
@@ -4394,7 +4401,7 @@ function ur(t, r = "") {
     idColumn: l
   };
 }
-function pr(t) {
+function mr(t) {
   const r = t.open, [n, i] = Ue.useState(!1), [l, o] = Ue.useState(!1), d = J(() => {
     n ? o(!0) : t.handleClose(void 0);
   }, [n, t.handleClose]);
@@ -4435,10 +4442,10 @@ function tn(t) {
   const { propertyConfigs: r } = Ae(), n = Te(), i = _e(), {
     topLevelNavigation: l,
     collections: o
-  } = n, d = t.initialValues, c = !d?.path && (t.parentCollectionIds ?? []).length === 0, u = (t.parentCollection ? t.parentCollection.subcollections : o) ?? [], m = u.map((b) => b.path.trim().toLowerCase()), p = u.map((b) => b.id?.trim().toLowerCase()).filter(Boolean), [s, f] = Ue.useState(), [g, P] = Ue.useState(!1);
+  } = n, d = t.initialValues, c = !d?.path && (t.parentCollectionIds ?? []).length === 0, u = (t.parentCollection ? t.parentCollection.subcollections : o) ?? [], m = u.map((b) => b.path.trim().toLowerCase()), p = u.map((b) => b.id?.trim().toLowerCase()).filter(Boolean), [s, f] = Ue.useState(), [g, x] = Ue.useState(!1);
   if (ue(() => {
     try {
-      n.initialised && (t.editedCollectionId ? f(n.getCollectionFromPaths([...t.parentCollectionIds ?? [], t.editedCollectionId])) : f(void 0), P(!0));
+      n.initialised && (t.editedCollectionId ? f(n.getCollectionFromPaths([...t.parentCollectionIds ?? [], t.editedCollectionId])) : f(void 0), x(!0));
     } catch (b) {
       console.error(b);
     }
@@ -4446,10 +4453,10 @@ function tn(t) {
     throw Error("Internal: Navigation not ready in collection editor");
   const {
     groups: y
-  } = l, x = s ? {
+  } = l, P = s ? {
     ...s,
     id: s.id ?? s.path ?? Ft(16)
-  } : void 0, v = x ? nn(x, r) : {
+  } : void 0, v = P ? nn(P, r) : {
     id: d?.path ?? Ft(16),
     path: d?.path ?? "",
     name: d?.name ?? "",
@@ -4489,17 +4496,17 @@ function rn({
   pathSuggestions: s,
   getUser: f,
   parentCollection: g,
-  getData: P,
+  getData: x,
   existingPaths: y,
-  existingIds: x,
+  existingIds: P,
   includeTemplates: v,
   collection: b,
-  setCollection: w,
-  initialValues: T,
+  setCollection: T,
+  initialValues: w,
   propertyConfigs: C,
   groups: O
 }) {
-  const N = hi(), F = Te(), D = Ie(), _ = je({}), S = t ? v ? "welcome" : "details" : "properties", [h, B] = j(S), [oe, q] = Ue.useState(), Z = (k) => {
+  const N = fi(), F = Te(), D = Ie(), _ = je({}), S = t ? v ? "welcome" : "details" : "properties", [h, B] = j(S), [oe, q] = Ue.useState(), Z = (k) => {
     const E = k.id || k.path;
     return r.saveCollection({
       id: E,
@@ -4518,15 +4525,15 @@ function rn({
   }, [o, i]), se = J(async (k) => {
     try {
       if (!Q)
-        return w(k), Promise.resolve(k);
+        return T(k), Promise.resolve(k);
       B("loading");
       const E = await Q?.(k);
       if (!E)
-        return w(k), Promise.resolve(k);
+        return T(k), Promise.resolve(k);
       const M = {
         ...k ?? {}
       };
-      return Object.keys(E.properties ?? {}).length > 0 && (M.properties = E.properties, M.propertiesOrder = E.propertiesOrder), M.propertiesOrder ? (w(M), console.debug("Inferred collection", {
+      return Object.keys(E.properties ?? {}).length > 0 && (M.properties = E.properties, M.propertiesOrder = E.propertiesOrder), M.propertiesOrder ? (T(M), console.debug("Inferred collection", {
         newCollection: k ?? {},
         values: M
       }), M) : (M.propertiesOrder = Object.keys(M.properties), M);
@@ -4537,13 +4544,13 @@ function rn({
       }), k;
     }
   }, [i, Q]), de = Ot({
-    initialValues: T,
+    initialValues: w,
     onSubmit: (k, E) => {
       console.log("Submitting collection", k);
       try {
         if (!t) {
           Z(k).then(() => {
-            E.resetForm({ values: T }), d(k);
+            E.resetForm({ values: w }), d(k);
           });
           return;
         }
@@ -4558,7 +4565,7 @@ function rn({
         }).finally(() => {
           H();
         }) : (E.resetForm({ values: k }), H()) : h === "extra_view" ? (H(), E.resetForm({ values: k })) : h === "import_data_mapping" || h === "import_data_preview" ? H() : h === "properties" ? Z(k).then(() => {
-          E.resetForm({ values: T }), H(), d(k);
+          E.resetForm({ values: w }), H(), d(k);
         }) : (H(), E.resetForm({ values: k }));
       } catch (M) {
         D.open({
@@ -4569,7 +4576,7 @@ function rn({
     },
     validation: (k) => {
       let E = {};
-      const M = (h === "properties" || h === "subcollections" || h === "details") && vi;
+      const M = (h === "properties" || h === "subcollections" || h === "details") && yi;
       if (M)
         try {
           M.validateSync(k, { abortEarly: !1 });
@@ -4581,7 +4588,7 @@ function rn({
       if (h === "properties" && (E = { ...E, ..._.current }), h === "details") {
         const L = Gt(k.path, t, y, k.id);
         L && (E.path = L);
-        const ye = an(k.id, t, y, x);
+        const ye = an(k.id, t, y, P);
         ye && (E.id = ye);
       }
       return E;
@@ -4592,13 +4599,13 @@ function rn({
     isSubmitting: ke,
     dirty: Ke,
     submitCount: vt
-  } = de, pe = re.path, We = l?.includes("/") ? l?.split("/").slice(0, -1).join("/") + "/" + pe : pe, Ze = Gt(pe, t, y, re.id), Je = !Ze && i ? F.convertIdsToPaths(i) : void 0, Qe = Ze ? void 0 : F.resolveAliasesFrom(We), ze = Qe && P ? () => P(Qe, Je ?? []) : void 0;
+  } = de, pe = re.path, We = l?.includes("/") ? l?.split("/").slice(0, -1).join("/") + "/" + pe : pe, Ze = Gt(pe, t, y, re.id), Je = !Ze && i ? F.convertIdsToPaths(i) : void 0, Qe = Ze ? void 0 : F.resolveAliasesFrom(We), ze = Qe && x ? () => x(Qe, Je ?? []) : void 0;
   ue(() => {
     p(Ke);
   }, [Ke]);
   function Xe(k, E) {
-    N.setInUse(!0), ii(k, ir).then((M) => {
-      const L = ur(M);
+    N.setInUse(!0), ni(k, ir).then((M) => {
+      const L = pr(M);
       N.setIdColumn(L.idColumn), N.setImportData(k), N.setHeadersMapping(L.headersMapping);
       const ye = (E ?? []).filter((tt) => L.headersMapping[tt]) ?? Object.keys(L.properties);
       N.setHeadingsOrder(ye), N.setOriginProperties(L.properties);
@@ -4612,7 +4619,7 @@ function rn({
   }, U = b?.editable === void 0 || b?.editable === !0 || t;
   return /* @__PURE__ */ e(De, { fullHeight: !0, children: /* @__PURE__ */ e(Vt, { value: de, children: /* @__PURE__ */ a(R, { children: [
     !t && /* @__PURE__ */ a(
-      Kr,
+      Wr,
       {
         value: h,
         className: fe(kt, "justify-end bg-gray-50 dark:bg-gray-950 border-b"),
@@ -4665,7 +4672,7 @@ function rn({
             }
           ),
           h === "import_data_saving" && N && /* @__PURE__ */ e(
-            fi,
+            gi,
             {
               importConfig: N,
               collection: re,
@@ -4679,10 +4686,10 @@ function rn({
             }
           ),
           h === "details" && /* @__PURE__ */ e(
-            yi,
+            bi,
             {
               existingPaths: y,
-              existingIds: x,
+              existingIds: P,
               groups: O,
               parentCollectionIds: i,
               parentCollection: g,
@@ -4709,7 +4716,7 @@ function rn({
               onPropertyError: (k, E, M) => {
                 const L = Et({
                   ..._.current,
-                  [nr(k, E)]: Et(M, !0)
+                  [ar(k, E)]: Et(M, !0)
                 }, !0);
                 _.current = L, de.validate();
               },
@@ -4822,7 +4829,7 @@ function rn({
                     type: "submit",
                     loading: ke,
                     disabled: ke || h === "details" && !yt,
-                    startIcon: h === "properties" ? /* @__PURE__ */ e(Wr, {}) : void 0,
+                    startIcon: h === "properties" ? /* @__PURE__ */ e(Zr, {}) : void 0,
                     children: [
                       h === "details" && "Next",
                       h === "properties" && "Create collection"
@@ -4853,13 +4860,13 @@ function nn(t, r) {
     ...i
   } = t, l = {};
   return n && Object.keys(n).forEach((o) => {
-    l[o] = mr(n[o], r);
+    l[o] = hr(n[o], r);
   }), {
     ...i,
     properties: l
   };
 }
-function mr(t, r) {
+function hr(t, r) {
   let n = t;
   if (r && typeof n == "object" && n.propertyConfig) {
     const i = r[n.propertyConfig];
@@ -4868,7 +4875,7 @@ function mr(t, r) {
     else if (i && (n = K(i.property, n)), !ie(n) && n.dataType === "map" && n.properties) {
       const l = {};
       Object.keys(n.properties).forEach((o) => {
-        l[o] = mr(n.properties[o], r);
+        l[o] = hr(n.properties[o], r);
       }), n = {
         ...n,
         properties: l
@@ -4879,13 +4886,13 @@ function mr(t, r) {
 }
 const Gt = (t, r, n, i) => {
   let l;
-  return t || (l = "You must specify a path in the database for this collection"), r && n?.includes(t.trim().toLowerCase()) && !i && (l = "There is already a collection with the specified path. If you want to have multiple collections referring to the same database path, make sure the have different ids"), Vr(t).split("/").length % 2 === 0 && (l = `Collection paths must have an odd number of segments: ${t}`), l;
+  return t || (l = "You must specify a path in the database for this collection"), r && n?.includes(t.trim().toLowerCase()) && !i && (l = "There is already a collection with the specified path. If you want to have multiple collections referring to the same database path, make sure the have different ids"), Ir(t).split("/").length % 2 === 0 && (l = `Collection paths must have an odd number of segments: ${t}`), l;
 }, an = (t, r, n, i) => {
   if (!t)
     return;
   let l;
   return r && n?.includes(t.trim().toLowerCase()) && (l = "There is already a collection that uses this value as a path"), r && i?.includes(t.trim().toLowerCase()) && (l = "There is already a collection which uses this id"), l;
-}, hr = Y.createContext({}), fr = Y.createContext({}), on = Y.memo(
+}, fr = Y.createContext({}), gr = Y.createContext({}), on = Y.memo(
   function({
     children: r,
     collectionConfigController: n,
@@ -4898,11 +4905,11 @@ const Gt = (t, r, n, i) => {
     getData: m,
     onAnalyticsEvent: p
   }) {
-    const s = Te(), f = gi(), g = Ie(), { propertyConfigs: P } = Ae(), [y, x] = Y.useState(), [v, b] = Y.useState(), w = J(() => ({
+    const s = Te(), f = vi(), g = Ie(), { propertyConfigs: x } = Ae(), [y, P] = Y.useState(), [v, b] = Y.useState(), T = J(() => ({
       createCollections: !0,
       editCollections: !0,
       deleteCollections: !0
-    }), []), T = J(({
+    }), []), w = J(({
       id: N,
       fullPath: F,
       parentCollectionIds: D,
@@ -4911,7 +4918,7 @@ const Gt = (t, r, n, i) => {
       console.debug("Edit collection", N, F, D, _), p?.("edit_collection", {
         id: N,
         fullPath: F
-      }), x({
+      }), P({
         editedCollectionId: N,
         fullPath: F,
         parentCollectionIds: D,
@@ -4960,7 +4967,7 @@ const Gt = (t, r, n, i) => {
         initialValues: D,
         redirect: _,
         sourceClick: S
-      }), x({
+      }), P({
         isNewCollection: !0,
         parentCollectionIds: N,
         parentCollection: F,
@@ -4968,20 +4975,20 @@ const Gt = (t, r, n, i) => {
         redirect: _
       });
     }, []);
-    return /* @__PURE__ */ e(hr.Provider, { value: n, children: /* @__PURE__ */ a(
-      fr.Provider,
+    return /* @__PURE__ */ e(fr.Provider, { value: n, children: /* @__PURE__ */ a(
+      gr.Provider,
       {
         value: {
-          editCollection: T,
+          editCollection: w,
           createCollection: O,
           editProperty: C,
-          configPermissions: i ?? w,
+          configPermissions: i ?? T,
           getPathSuggestions: c
         },
         children: [
           r,
           /* @__PURE__ */ e(
-            pr,
+            mr,
             {
               open: !!y,
               configController: n,
@@ -4998,7 +5005,7 @@ const Gt = (t, r, n, i) => {
                   const F = s.buildUrlCollectionPath(N.id ?? N.path);
                   f(F);
                 }
-                x(void 0);
+                P(void 0);
               }
             }
           ),
@@ -5066,7 +5073,7 @@ const Gt = (t, r, n, i) => {
               forceShowErrors: !1,
               existingPropertyKeys: [],
               allowDataInference: !0,
-              propertyConfigs: P,
+              propertyConfigs: x,
               property: v?.property,
               propertyKey: v?.propertyKey
             }
@@ -5076,14 +5083,14 @@ const Gt = (t, r, n, i) => {
     ) });
   },
   be
-), Pe = () => Qt(fr);
+), xe = () => Qt(gr);
 function ln({
   path: t,
   parentCollectionIds: r,
   collection: n,
   tableController: i
 }) {
-  const l = _e(), o = Te(), d = Pe(), c = o.getCollectionFromIds(r), u = d.configPermissions ? d.configPermissions({
+  const l = _e(), o = Te(), d = xe(), c = o.getCollectionFromIds(r), u = d.configPermissions ? d.configPermissions({
     user: l.user,
     collection: n
   }).editCollections : !0;
@@ -5103,12 +5110,12 @@ function ln({
     }
   ) });
 }
-const gr = () => Qt(hr);
+const vr = () => Qt(fr);
 function sn({
   path: t,
   collection: r
 }) {
-  const n = Ie(), i = _e(), l = gr(), o = Pe(), d = o.configPermissions({
+  const n = Ie(), i = _e(), l = vr(), o = xe(), d = o.configPermissions({
     user: i.user,
     collection: r
   }), c = J(() => {
@@ -5124,10 +5131,10 @@ function sn({
   return /* @__PURE__ */ a(R, { children: [
     /* @__PURE__ */ a("div", { children: [
       d.deleteCollections && /* @__PURE__ */ e(
-        Zr,
+        Jr,
         {
-          trigger: /* @__PURE__ */ e(ae, { children: /* @__PURE__ */ e(Jr, { size: "small" }) }),
-          children: /* @__PURE__ */ a(Qr, { onClick: (s) => {
+          trigger: /* @__PURE__ */ e(ae, { children: /* @__PURE__ */ e(Qr, { size: "small" }) }),
+          children: /* @__PURE__ */ a(Xr, { onClick: (s) => {
             s.preventDefault(), s.stopPropagation(), m(!0);
           }, children: [
             /* @__PURE__ */ e(mt, {}),
@@ -5169,7 +5176,7 @@ function dn({
   parentCollectionIds: l,
   collection: o
 }) {
-  const d = Pe();
+  const d = xe();
   return /* @__PURE__ */ e(te, { title: "Edit", children: /* @__PURE__ */ e(
     ae,
     {
@@ -5193,7 +5200,7 @@ function cn({
   parentCollectionIds: r,
   collection: n
 }) {
-  const i = _e(), l = Pe(), o = l.configPermissions ? l.configPermissions({
+  const i = _e(), l = xe(), o = l.configPermissions ? l.configPermissions({
     user: i.user,
     collection: n
   }).editCollections : !0;
@@ -5205,7 +5212,7 @@ function cn({
         l.editProperty({
           editedCollectionId: n.id,
           parentCollectionIds: r,
-          currentPropertiesOrder: Ir(n),
+          currentPropertiesOrder: _r(n),
           collection: n
         });
       },
@@ -5214,7 +5221,7 @@ function cn({
   ) });
 }
 function un() {
-  const t = Pe();
+  const t = xe();
   return /* @__PURE__ */ e("div", { className: "bg-gray-50 dark:bg-gray-900 min-w-fit rounded", children: /* @__PURE__ */ a(
     z,
     {
@@ -5238,7 +5245,7 @@ function pn({
   collection: n,
   tableController: i
 }) {
-  const l = _e(), o = Pe(), d = gr(), c = Ie(), u = o.configPermissions ? o.configPermissions({
+  const l = _e(), o = xe(), d = vr(), c = Ie(), u = o.configPermissions ? o.configPermissions({
     user: l.user,
     collection: n
   }).editCollections : !0;
@@ -5270,7 +5277,7 @@ function pn({
                 message: "Default config saved"
               });
             }),
-            children: /* @__PURE__ */ e(Xr, {})
+            children: /* @__PURE__ */ e(ei, {})
           }
         )
       }
@@ -5288,7 +5295,7 @@ function pn({
             onClick: () => {
               i.clearFilter?.(), n?.initialFilter && i.setFilterValues?.(n?.initialFilter), n?.initialSort && i.setSortBy?.(n?.initialSort);
             },
-            children: /* @__PURE__ */ e(ei, {})
+            children: /* @__PURE__ */ e(ti, {})
           }
         )
       }
@@ -5304,7 +5311,7 @@ function mn({
 }) {
   if (!r.navigation.topLevelNavigation)
     throw Error("Navigation not ready in FireCMSHomePage");
-  const n = _e(), i = Pe(), l = i.configPermissions ? i.configPermissions({
+  const n = _e(), i = xe(), l = i.configPermissions ? i.configPermissions({
     user: n.user
   }).createCollections : !0;
   return /* @__PURE__ */ e(
@@ -5386,7 +5393,7 @@ function hn({}) {
   const t = Te();
   if (!t.topLevelNavigation)
     throw Error("Navigation not ready in FireCMSHomePage");
-  const r = _e(), n = Pe(), i = n.configPermissions ? n.configPermissions({
+  const r = _e(), n = xe(), i = n.configPermissions ? n.configPermissions({
     user: r.user
   }).createCollections : !0;
   return !t.initialised || t.collections === void 0 || (t.collections ?? []).length > 0 ? null : /* @__PURE__ */ a(
@@ -5420,11 +5427,11 @@ const In = (t, r, n) => {
     He(d.properties), d.subcollections?.forEach(i);
   }, l = r ?? [];
   l.forEach(i), console.debug("Collections specified in code:", t), console.debug("Collections stored in the backend", l);
-  const o = _r(t, l, [], n);
+  const o = Fr(t, l, [], n);
   return console.debug("Collections after joining:", o), o;
 };
 function _n({ path: t }) {
-  const r = Te(), n = fn(t), i = r.getParentCollectionIds(t), l = Pe();
+  const r = Te(), n = fn(t), i = r.getParentCollectionIds(t), l = xe();
   return /* @__PURE__ */ a("div", { className: "p-1 flex flex-col items-center", children: [
     /* @__PURE__ */ e(Zt, { error: "No collection for path: " + n }),
     /* @__PURE__ */ e(
@@ -5454,14 +5461,14 @@ export {
   _n as MissingReferenceWidget,
   qe as editableProperty,
   ne as getFullId,
-  nr as getFullIdPath,
+  ar as getFullIdPath,
   he as idToPropertiesPath,
   In as mergeCollections,
   Ce as namespaceToPropertiesOrderPath,
-  bi as namespaceToPropertiesPath,
+  nr as namespaceToPropertiesPath,
   wi as removeNonEditableProperties,
-  Pe as useCollectionEditorController,
+  xe as useCollectionEditorController,
   Vn as useCollectionEditorPlugin,
-  gr as useCollectionsConfigController
+  vr as useCollectionsConfigController
 };
 //# sourceMappingURL=index.es.js.map