@firecms/core 3.0.0-canary.94 → 3.0.0-canary.95

package/dist/index.umd.js

@@ -14860,6 +14860,9 @@
     if (a.propertyKey !== b.propertyKey) {
       return false;
     }
+    if (a.index !== b.index) {
+      return false;
+    }
     const aIsBuilder = isPropertyBuilder(a.property) || a.property.fromBuilder;
     const bIsBuilder = isPropertyBuilder(b.property) || b.property.fromBuilder;
     const baseCheck = (aIsBuilder === bIsBuilder || equal(a.property, b.property)) && a.disabled === b.disabled;
@@ -14881,7 +14884,8 @@
     tableMode,
     partOfArray,
     partOfBlock,
-    autoFocus
+    autoFocus,
+    index
   }) {
     const customizationController = useCustomizationController();
     return /* @__PURE__ */ jsxRuntime.jsx(
@@ -14896,7 +14900,8 @@
             values: fieldProps.form.values,
             path: context.path,
             entityId: context.entityId,
-            fields: customizationController.propertyConfigs
+            fields: customizationController.propertyConfigs,
+            index
           });
           if (resolvedProperty === null || isHidden(resolvedProperty)) {
             return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {});
@@ -14918,11 +14923,13 @@
               throw new Error(`INTERNAL: Could not find field config for property ${propertyKey}`);
             }
             const configProperty = resolveProperty({
+              propertyKey,
               propertyOrBuilder: propertyConfig.property,
               values: fieldProps.form.values,
               path: context.path,
               entityId: context.entityId,
-              fields: customizationController.propertyConfigs
+              fields: customizationController.propertyConfigs,
+              index
             });
             Component = configProperty.Field;
           }
@@ -15824,7 +15831,7 @@
         partOfBlock: false,
         autoFocus: internalId === lastAddedId
       };
-      return /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { children: /* @__PURE__ */ jsxRuntime.jsx(PropertyFieldBinding, { ...fieldProps }) });
+      return /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { children: /* @__PURE__ */ jsxRuntime.jsx(PropertyFieldBinding, { ...fieldProps, index }) });
     };
     const arrayContainer = /* @__PURE__ */ jsxRuntime.jsx(
       FormikArrayContainer,
@@ -17336,15 +17343,16 @@
         };
       } else {
         const of = property.of;
-        const resolvedProperties = Array.isArray(propertyValue) ? propertyValue.map((v, index) => resolveProperty({
-          propertyKey: `${propertyKey}.${index}`,
-          propertyOrBuilder: of,
-          ignoreMissingFields,
-          ...props,
-          index
-        })).filter((e) => Boolean(e)) : [];
+        const resolvedProperties = Array.isArray(propertyValue) ? propertyValue.map((v, index) => {
+          return resolveProperty({
+            propertyKey: `${propertyKey}.${index}`,
+            propertyOrBuilder: of,
+            ignoreMissingFields,
+            ...props,
+            index
+          });
+        }).filter((e) => Boolean(e)) : [];
         const ofProperty = resolveProperty({
-          propertyKey: `${propertyKey}`,
           propertyOrBuilder: of,
           ignoreMissingFields,
           ...props
@@ -17373,6 +17381,7 @@
         });
       }).filter((e) => Boolean(e)) : [];
       const properties = resolveProperties({
+        propertyKey,
         properties: property.oneOf.properties,
         ignoreMissingFields,
         ...props
@@ -17398,13 +17407,14 @@
     }
   }
   function resolveProperties({
+    propertyKey,
     properties,
     ignoreMissingFields,
     ...props
   }) {
     return Object.entries(properties).map(([key, property]) => {
       const childResolvedProperty = resolveProperty({
-        propertyKey: key,
+        propertyKey: propertyKey ? `${propertyKey}.${key}` : void 0,
         propertyOrBuilder: property,
         ignoreMissingFields,
         ...props
@@ -18184,7 +18194,7 @@
     const formFields = /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: getFormFieldKeys(resolvedCollection).map((key) => {
       const property = resolvedCollection.properties[key];
       if (property) {
-        const underlyingValueHasChanged = !!underlyingChanges && Object.keys(underlyingChanges).includes(key) && !!formex$1.touched[key];
+        const underlyingValueHasChanged = !!underlyingChanges && Object.keys(underlyingChanges).includes(key) && formex$1.touched[key];
         const disabled2 = !autoSave && formex$1.isSubmitting || isReadOnly(property) || Boolean(property.disabled);
         const hidden = isHidden(property);
         if (hidden) return null;