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

package/dist/form/PropertyFieldBinding.d.ts

@@ -26,5 +26,5 @@ import { CMSType, PropertyFieldBindingProps } from "../types";
  * @group Form custom fields
  */
 export declare const PropertyFieldBinding: typeof PropertyFieldBindingInternal;
-declare function PropertyFieldBindingInternal<T extends CMSType = CMSType, M extends Record<string, any> = Record<string, any>>({ propertyKey, property, context, includeDescription, underlyingValueHasChanged, disabled, tableMode, partOfArray, partOfBlock, autoFocus, }: PropertyFieldBindingProps<T, M>): ReactElement<PropertyFieldBindingProps<T, M>>;
+declare function PropertyFieldBindingInternal<T extends CMSType = CMSType, M extends Record<string, any> = Record<string, any>>({ propertyKey, property, context, includeDescription, underlyingValueHasChanged, disabled, tableMode, partOfArray, partOfBlock, autoFocus, index, }: PropertyFieldBindingProps<T, M>): ReactElement<PropertyFieldBindingProps<T, M>>;
 export {};

package/dist/index.es.js

@@ -14856,6 +14856,9 @@ const PropertyFieldBinding = React__default.memo(PropertyFieldBindingInternal, (
   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;
@@ -14877,7 +14880,8 @@ function PropertyFieldBindingInternal({
   tableMode,
   partOfArray,
   partOfBlock,
-  autoFocus
+  autoFocus,
+  index
 }) {
   const customizationController = useCustomizationController();
   return /* @__PURE__ */ jsx(
@@ -14892,7 +14896,8 @@ function PropertyFieldBindingInternal({
           values: fieldProps.form.values,
           path: context.path,
           entityId: context.entityId,
-          fields: customizationController.propertyConfigs
+          fields: customizationController.propertyConfigs,
+          index
         });
         if (resolvedProperty === null || isHidden(resolvedProperty)) {
           return /* @__PURE__ */ jsx(Fragment, {});
@@ -14914,11 +14919,13 @@ function PropertyFieldBindingInternal({
             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;
         }
@@ -15820,7 +15827,7 @@ function RepeatFieldBinding({
       partOfBlock: false,
       autoFocus: internalId === lastAddedId
     };
-    return /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(PropertyFieldBinding, { ...fieldProps }) });
+    return /* @__PURE__ */ jsx(ErrorBoundary, { children: /* @__PURE__ */ jsx(PropertyFieldBinding, { ...fieldProps, index }) });
   };
   const arrayContainer = /* @__PURE__ */ jsx(
     FormikArrayContainer,
@@ -17332,15 +17339,16 @@ function resolveArrayProperty({
       };
     } 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
@@ -17369,6 +17377,7 @@ function resolveArrayProperty({
       });
     }).filter((e) => Boolean(e)) : [];
     const properties = resolveProperties({
+      propertyKey,
       properties: property.oneOf.properties,
       ignoreMissingFields,
       ...props
@@ -17394,13 +17403,14 @@ function resolveArrayProperty({
   }
 }
 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
@@ -18180,7 +18190,7 @@ function EntityEditViewInner({
   const formFields = /* @__PURE__ */ jsx(Fragment, { children: getFormFieldKeys(resolvedCollection).map((key) => {
     const property = resolvedCollection.properties[key];
     if (property) {
-      const underlyingValueHasChanged = !!underlyingChanges && Object.keys(underlyingChanges).includes(key) && !!formex.touched[key];
+      const underlyingValueHasChanged = !!underlyingChanges && Object.keys(underlyingChanges).includes(key) && formex.touched[key];
       const disabled2 = !autoSave && formex.isSubmitting || isReadOnly(property) || Boolean(property.disabled);
       const hidden = isHidden(property);
       if (hidden) return null;