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

package/dist/types/fields.d.ts

@@ -178,4 +178,9 @@ export interface PropertyFieldBindingProps<T extends CMSType, M extends Record<s
      * Should this field be disabled
      */
     disabled?: boolean;
+    /**
+     * Index of the field in the array.
+     * Only used when the field is part of an array.
+     */
+    index?: number;
 }

package/dist/types/properties.d.ts

@@ -207,7 +207,7 @@ export type PropertyBuilderProps<M extends Record<string, any> = any> = {
  * current value of the property, as well as the path and entity ID.
  * @group Entity properties
  */
-export type PropertyBuilder<T extends CMSType = any, M extends Record<string, any> = any> = ({ values, previousValues, propertyValue, path, entityId }: PropertyBuilderProps<M>) => Property<T> | null;
+export type PropertyBuilder<T extends CMSType = any, M extends Record<string, any> = any> = ({ values, previousValues, propertyValue, index, path, entityId }: PropertyBuilderProps<M>) => Property<T> | null;
 /**
  * @group Entity properties
  */

package/dist/util/resolutions.d.ts

@@ -43,7 +43,8 @@ export declare function resolveArrayProperty<T extends any[], M>({ propertyKey,
  * @param properties
  * @param value
  */
-export declare function resolveProperties<M extends Record<string, any>>({ properties, ignoreMissingFields, ...props }: {
+export declare function resolveProperties<M extends Record<string, any>>({ propertyKey, properties, ignoreMissingFields, ...props }: {
+    propertyKey?: string;
     properties: PropertiesOrBuilders<M>;
     values?: Partial<M>;
     previousValues?: Partial<M>;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@firecms/core",
     "type": "module",
-    "version": "3.0.0-canary.94",
+    "version": "3.0.0-canary.96",
     "description": "Awesome Firebase/Firestore-based headless open-source CMS",
     "funding": {
         "url": "https://github.com/sponsors/firecmsco"
@@ -46,8 +46,8 @@
         "./package.json": "./package.json"
     },
     "dependencies": {
-        "@firecms/formex": "^3.0.0-canary.94",
-        "@firecms/ui": "^3.0.0-canary.94",
+        "@firecms/formex": "^3.0.0-canary.96",
+        "@firecms/ui": "^3.0.0-canary.96",
         "@hello-pangea/dnd": "^16.6.0",
         "@radix-ui/react-portal": "^1.1.1",
         "clsx": "^2.1.1",
@@ -100,7 +100,7 @@
         "dist",
         "src"
     ],
-    "gitHead": "b8ffd164de526795849d098ba9a0356381f43102",
+    "gitHead": "aae97531a2c2fb0be4a324e806af26783f6d2346",
     "publishConfig": {
         "access": "public"
     },

package/src/core/EntityEditView.tsx

@@ -746,7 +746,7 @@ export function EntityEditViewInner<M extends Record<string, any>>({
                         const underlyingValueHasChanged: boolean =
                             !!underlyingChanges &&
                             Object.keys(underlyingChanges).includes(key) &&
-                            !!formex.touched[key];
+                            formex.touched[key];
 
                         const disabled = (!autoSave && formex.isSubmitting) || isReadOnly(property) || Boolean(property.disabled);
                         const hidden = isHidden(property);

package/src/form/PropertyFieldBinding.tsx

@@ -51,6 +51,9 @@ export const PropertyFieldBinding = React.memo(PropertyFieldBindingInternal, (a:
     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;
 
@@ -79,6 +82,7 @@ function PropertyFieldBindingInternal<T extends CMSType = CMSType, M extends Rec
      partOfArray,
      partOfBlock,
      autoFocus,
+     index,
  }: PropertyFieldBindingProps<T, M>): ReactElement<PropertyFieldBindingProps<T, M>> {
 
     const customizationController = useCustomizationController();
@@ -97,7 +101,8 @@ function PropertyFieldBindingInternal<T extends CMSType = CMSType, M extends Rec
                     values: fieldProps.form.values,
                     path: context.path,
                     entityId: context.entityId,
-                    fields: customizationController.propertyConfigs
+                    fields: customizationController.propertyConfigs,
+                    index
                 });
 
                 if (resolvedProperty === null || isHidden(resolvedProperty)) {
@@ -120,11 +125,13 @@ function PropertyFieldBindingInternal<T extends CMSType = CMSType, M extends Rec
                         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 as ComponentType<FieldProps<T>>;
                 }

package/src/form/field_bindings/RepeatFieldBinding.tsx

@@ -63,7 +63,7 @@ export function RepeatFieldBinding<T extends Array<any>>({
             autoFocus: internalId === lastAddedId
         };
         return <ErrorBoundary>
-            <PropertyFieldBinding {...fieldProps}/>
+            <PropertyFieldBinding {...fieldProps} index={index}/>
         </ErrorBoundary>;
     };
 

package/src/types/fields.tsx

@@ -217,4 +217,10 @@ export interface PropertyFieldBindingProps<T extends CMSType, M extends Record<s
      * Should this field be disabled
      */
     disabled?: boolean;
+
+    /**
+     * Index of the field in the array.
+     * Only used when the field is part of an array.
+     */
+    index?: number;
 }

package/src/types/properties.ts

@@ -277,6 +277,7 @@ export type PropertyBuilder<T extends CMSType = any, M extends Record<string, an
          values,
          previousValues,
          propertyValue,
+         index,
          path,
          entityId
      }: PropertyBuilderProps<M>) => Property<T> | null;

package/src/util/resolutions.ts

@@ -255,16 +255,17 @@ export function resolveArrayProperty<T extends any[], M>({
         } else {
             const of = property.of;
             const resolvedProperties: ResolvedProperty[] = Array.isArray(propertyValue)
-                ? propertyValue.map((v: any, index: number) => resolveProperty({
-                    propertyKey: `${propertyKey}.${index}`,
-                    propertyOrBuilder: of,
-                    ignoreMissingFields,
-                    ...props,
-                    index
-                })).filter(e => Boolean(e)) as ResolvedProperty[]
+                ? propertyValue.map((v: any, index: number) => {
+                    return resolveProperty({
+                        propertyKey: `${propertyKey}.${index}`,
+                        propertyOrBuilder: of,
+                        ignoreMissingFields,
+                        ...props,
+                        index
+                    });
+                }).filter(e => Boolean(e)) as ResolvedProperty[]
                 : [];
             const ofProperty = resolveProperty({
-                propertyKey: `${propertyKey}`,
                 propertyOrBuilder: of,
                 ignoreMissingFields,
                 ...props
@@ -295,6 +296,7 @@ export function resolveArrayProperty<T extends any[], M>({
             }).filter(e => Boolean(e)) as ResolvedProperty[]
             : [];
         const properties = resolveProperties<any>({
+            propertyKey,
             properties: property.oneOf.properties,
             ignoreMissingFields,
             ...props
@@ -327,10 +329,12 @@ export function resolveArrayProperty<T extends any[], M>({
  * @param value
  */
 export function resolveProperties<M extends Record<string, any>>({
+                                                                     propertyKey,
                                                                      properties,
                                                                      ignoreMissingFields,
                                                                      ...props
                                                                  }: {
+    propertyKey?: string,
     properties: PropertiesOrBuilders<M>,
     values?: Partial<M>,
     previousValues?: Partial<M>,
@@ -344,7 +348,7 @@ export function resolveProperties<M extends Record<string, any>>({
     return Object.entries<PropertyOrBuilder>(properties as Record<string, PropertyOrBuilder>)
         .map(([key, property]) => {
             const childResolvedProperty = resolveProperty({
-                propertyKey: key,
+                propertyKey: propertyKey ? `${propertyKey}.${key}` : undefined,
                 propertyOrBuilder: property,
                 ignoreMissingFields,
                 ...props