@firecms/core 3.0.0-alpha.35 → 3.0.0-alpha.37

package/dist/types/firecms.d.ts

@@ -79,7 +79,7 @@ export type FireCMSProps<UserType extends User, EC extends EntityCollection> = {
      * You can use the key to reference the custom field in
      * the `propertyConfig` prop of a property in a collection.
      */
-    fields?: Record<string, PropertyConfig>;
+    propertyConfigs?: Record<string, PropertyConfig>;
     /**
      * List of additional custom views for entities.
      * You can use the key to reference the custom view in

package/dist/types/firecms_context.d.ts

@@ -90,7 +90,7 @@ export type FireCMSContext<UserType extends User = User, AuthControllerType exte
      * You can use the key to reference the custom field in
      * the `propertyConfig` prop of a property in a collection.
      */
-    fields: Record<string, PropertyConfig>;
+    propertyConfigs: Record<string, PropertyConfig>;
     /**
      * List of additional custom views for entities.
      * You can use the key to reference the custom view in

package/dist/types/plugins.d.ts

@@ -62,6 +62,7 @@ export type FireCMSPlugin<PROPS = any, FORM_PROPS = any, EC extends EntityCollec
     };
     homePage?: {
         additionalChildrenStart?: React.ReactNode;
+        additionalChildrenEnd?: React.ReactNode;
         /**
          * Use this component to add custom actions to the navigation card
          * in the home page.

package/dist/util/builders.d.ts

@@ -0,0 +1,64 @@
+import { AdditionalFieldDelegate, ArrayProperty, BooleanProperty, CMSType, DateProperty, EntityCallbacks, EntityCollection, EnumValueConfig, EnumValues, GeopointProperty, MapProperty, NumberProperty, PropertiesOrBuilders, PropertyBuilder, PropertyConfig, PropertyOrBuilder, ReferenceProperty, StringProperty, User } from "../types";
+/**
+ * Identity function we use to defeat the type system of Typescript and build
+ * collection views with all its properties
+ * @param collection
+ * @group Builder
+ */
+export declare function buildCollection<M extends Record<string, any> = any, UserType extends User = User>(collection: EntityCollection<M, UserType>): EntityCollection<M, UserType>;
+/**
+ * Identity function we use to defeat the type system of Typescript and preserve
+ * the property keys.
+ * @param property
+ * @group Builder
+ */
+export declare function buildProperty<T extends CMSType = CMSType, P extends PropertyOrBuilder<T> = PropertyOrBuilder<T>, M extends Record<string, any> = Record<string, any>>(property: P): P extends StringProperty ? StringProperty : P extends NumberProperty ? NumberProperty : P extends BooleanProperty ? BooleanProperty : P extends DateProperty ? DateProperty : P extends GeopointProperty ? GeopointProperty : P extends ReferenceProperty ? ReferenceProperty : P extends ArrayProperty ? ArrayProperty : P extends MapProperty ? MapProperty : P extends PropertyBuilder<T, M> ? PropertyBuilder<T, M> : never;
+/**
+ * Identity function we use to defeat the type system of Typescript and preserve
+ * the properties keys.
+ * @param properties
+ * @group Builder
+ */
+export declare function buildProperties<M extends Record<string, any>>(properties: PropertiesOrBuilders<M>): PropertiesOrBuilders<M>;
+/**
+ * Identity function we use to defeat the type system of Typescript and preserve
+ * the properties keys.
+ * @param propertiesOrBuilder
+ * @group Builder
+ */
+export declare function buildPropertiesOrBuilder<M extends Record<string, any>>(propertiesOrBuilder: PropertiesOrBuilders<M>): PropertiesOrBuilders<M>;
+/**
+ * Identity function we use to defeat the type system of Typescript and preserve
+ * the properties keys.
+ * @param enumValues
+ * @group Builder
+ */
+export declare function buildEnumValues(enumValues: EnumValues): EnumValues;
+/**
+ * Identity function we use to defeat the type system of Typescript and preserve
+ * the properties keys.
+ * @param enumValueConfig
+ * @group Builder
+ */
+export declare function buildEnumValueConfig(enumValueConfig: EnumValueConfig): EnumValueConfig;
+/**
+ * Identity function we use to defeat the type system of Typescript and preserve
+ * the properties keys.
+ * @param callbacks
+ * @group Builder
+ */
+export declare function buildEntityCallbacks<M extends Record<string, any> = any>(callbacks: EntityCallbacks<M>): EntityCallbacks<M>;
+/**
+ * Identity function we use to defeat the type system of Typescript and build
+ * additional field delegates views with all its properties
+ * @param additionalFieldDelegate
+ * @group Builder
+ */
+export declare function buildAdditionalFieldDelegate<M extends Record<string, any>, UserType extends User = User>(additionalFieldDelegate: AdditionalFieldDelegate<M, UserType>): AdditionalFieldDelegate<M, UserType>;
+/**
+ * Identity function we use to defeat the type system of Typescript and build
+ * additional field delegates views with all its properties
+ * @param propertyConfig
+ * @group Builder
+ */
+export declare function buildFieldConfig<T extends CMSType = CMSType>(propertyConfig: PropertyConfig<T>): PropertyConfig<T>;

package/dist/util/index.d.ts

@@ -19,3 +19,4 @@ export * from "./debounce";
 export * from "./flatten_object";
 export * from "./make_properties_editable";
 export * from "./join_collections";
+export * from "./builders";

package/dist/util/objects.d.ts

@@ -7,3 +7,4 @@ export declare function removeFunctions(o: object | undefined): any;
 export declare function getHashValue<T>(v: T): any;
 export declare function removeUndefined(value: any, removeEmptyStrings?: boolean): any;
 export declare function isEmptyObject(obj: object): boolean;
+export declare function removePropsIfExisting(source: any, comparison: any): any;

package/package.json

@@ -1,141 +1,141 @@
 {
-  "name": "@firecms/core",
-  "version": "3.0.0-alpha.35",
-  "type": "module",
-  "description": "Awesome Firebase/Firestore-based headless open-source CMS",
-  "funding": {
-    "url": "https://github.com/sponsors/firecmsco"
-  },
-  "author": "FireCMS",
-  "license": "MIT",
-  "repository": "git@github.com:FireCMSco/firecms.git",
-  "main": "./dist/index.umd.js",
-  "module": "./dist/index.es.js",
-  "types": "./dist/index.d.ts",
-  "source": "src/index.ts",
-  "engines": {
-    "node": ">=14"
-  },
-  "exports": {
-    ".": {
-      "import": "./dist/index.es.js",
-      "require": "./dist/index.umd.js",
-      "types": "./dist/index.d.ts"
+    "name": "@firecms/core",
+    "version": "3.0.0-alpha.37",
+    "description": "Awesome Firebase/Firestore-based headless open-source CMS",
+    "funding": {
+        "url": "https://github.com/sponsors/firecmsco"
     },
-    "./package.json": "./package.json"
-  },
-  "keywords": [
-    "firebase",
-    "cms",
-    "admin",
-    "admin panel",
-    "firebase panel",
-    "firestore",
-    "headless",
-    "headless cms",
-    "content manager"
-  ],
-  "scripts": {
-    "watch": "vite build --watch",
-    "build": "vite build && tsc --emitDeclarationOnly",
-    "prepublishOnly": "run-s build",
-    "createTag": "PACKAGE_VERSION=$(cat package.json | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]') && git tag v$PACKAGE_VERSION && git push --tags",
-    "test:lint": "eslint \"src/**\" --quiet",
-    "test": "jest",
-    "clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f",
-    "generateIcons": "ts-node --esm src/icons/generateIcons.ts"
-  },
-  "dependencies": {
-    "@date-io/date-fns": "^2.17.0",
-    "@fontsource/ibm-plex-mono": "^5.0.8",
-    "@fontsource/roboto": "^5.0.8",
-    "@hello-pangea/dnd": "^16.3.0",
-    "@material-design-icons/font": "^0.14.13",
-    "@radix-ui/react-checkbox": "^1.0.4",
-    "@radix-ui/react-collapsible": "^1.0.3",
-    "@radix-ui/react-dialog": "^1.0.5",
-    "@radix-ui/react-dropdown-menu": "^2.0.6",
-    "@radix-ui/react-popover": "^1.0.7",
-    "@radix-ui/react-portal": "^1.0.4",
-    "@radix-ui/react-scroll-area": "^1.0.5",
-    "@radix-ui/react-select": "^1.2.2",
-    "@radix-ui/react-switch": "^1.0.3",
-    "@radix-ui/react-tabs": "^1.0.4",
-    "@radix-ui/react-tooltip": "^1.0.7",
-    "cmdk": "^0.2.0",
-    "date-fns": "^2.30.0",
-    "formik": "^2.4.5",
-    "history": "^5.3.0",
-    "js-search": "^2.0.1",
-    "markdown-it": "^13.0.2",
-    "notistack": "^3.0.1",
-    "object-hash": "^3.0.0",
-    "react-datepicker": "^4.21.0",
-    "react-dropzone": "^14.2.3",
-    "react-fast-compare": "^3.2.2",
-    "react-image-file-resizer": "^0.4.8",
-    "react-markdown-editor-lite": "^1.3.4",
-    "react-transition-group": "^4.4.5",
-    "react-use-measure": "^2.1.1",
-    "react-window": "^1.8.9",
-    "tailwind-merge": "^1.14.0",
-    "typeface-rubik": "^1.1.13",
-    "yup": "^0.32.11"
-  },
-  "peerDependencies": {
-    "algoliasearch": "^4.13.0",
-    "firebase": "^10.4.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-router": "^6.2.0",
-    "react-router-dom": "^6.2.0"
-  },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
-  "devDependencies": {
-    "@jest/globals": "^29.7.0",
-    "@testing-library/jest-dom": "^5.17.0",
-    "@testing-library/react": "^14.0.0",
-    "@testing-library/user-event": "^14.5.1",
-    "@types/jest": "^29.5.6",
-    "@types/node": "^20.8.9",
-    "@types/object-hash": "^3.0.5",
-    "@types/react": "^18.2.33",
-    "@types/react-dom": "^18.2.14",
-    "@types/react-measure": "^2.0.10",
-    "@typescript-eslint/eslint-plugin": "^5.62.0",
-    "@typescript-eslint/parser": "^5.62.0",
-    "@vitejs/plugin-react": "^4.1.0",
-    "algoliasearch": "^4.20.0",
-    "cross-env": "^7.0.3",
-    "eslint": "^8.52.0",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-n": "^15.7.0",
-    "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "firebase": "^10.5.2",
-    "jest": "^29.7.0",
-    "npm-run-all": "^4.1.5",
-    "react-router": "^6.17.0",
-    "react-router-dom": "^6.17.0",
-    "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1",
-    "tsd": "^0.28.1",
-    "typescript": "^5.3.0",
-    "vite": "^4.5.0"
-  },
-  "files": [
-    "dist",
-    "src"
-  ],
-  "gitHead": "f0f3ef616f13176166c193f98b8198f7fa53a1d2",
-  "publishConfig": {
-    "access": "public"
-  }
+    "author": "FireCMS",
+    "license": "MIT",
+    "repository": "git@github.com:FireCMSco/firecms.git",
+    "main": "./dist/index.umd.js",
+    "module": "./dist/index.es.js",
+    "types": "./dist/index.d.ts",
+    "source": "src/index.ts",
+    "engines": {
+        "node": ">=14"
+    },
+    "exports": {
+        ".": {
+            "import": "./dist/index.es.js",
+            "require": "./dist/index.umd.js",
+            "types": "./dist/index.d.ts"
+        },
+        "./package.json": "./package.json"
+    },
+    "keywords": [
+        "firebase",
+        "cms",
+        "admin",
+        "admin panel",
+        "firebase panel",
+        "firestore",
+        "headless",
+        "headless cms",
+        "content manager"
+    ],
+    "scripts": {
+        "watch": "vite build --watch",
+        "build": "vite build && tsc --emitDeclarationOnly",
+        "prepublishOnly": "run-s build",
+        "createTag": "PACKAGE_VERSION=$(cat package.json | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]') && git tag v$PACKAGE_VERSION && git push --tags",
+        "test:lint": "eslint \"src/**\" --quiet",
+        "test": "jest",
+        "clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f",
+        "generateIcons": "ts-node --esm src/icons/generateIcons.ts"
+    },
+    "dependencies": {
+        "@date-io/date-fns": "^2.17.0",
+        "@fontsource/ibm-plex-mono": "^5.0.8",
+        "@fontsource/roboto": "^5.0.8",
+        "@hello-pangea/dnd": "^16.3.0",
+        "@material-design-icons/font": "^0.14.13",
+        "@radix-ui/react-checkbox": "^1.0.4",
+        "@radix-ui/react-collapsible": "^1.0.3",
+        "@radix-ui/react-dialog": "^1.0.5",
+        "@radix-ui/react-dropdown-menu": "^2.0.6",
+        "@radix-ui/react-popover": "^1.0.7",
+        "@radix-ui/react-portal": "^1.0.4",
+        "@radix-ui/react-scroll-area": "^1.0.5",
+        "@radix-ui/react-select": "^1.2.2",
+        "@radix-ui/react-switch": "^1.0.3",
+        "@radix-ui/react-tabs": "^1.0.4",
+        "@radix-ui/react-tooltip": "^1.0.7",
+        "cmdk": "^0.2.0",
+        "date-fns": "^2.30.0",
+        "formik": "^2.4.5",
+        "history": "^5.3.0",
+        "js-search": "^2.0.1",
+        "markdown-it": "^13.0.2",
+        "notistack": "^3.0.1",
+        "object-hash": "^3.0.0",
+        "react-datepicker": "^4.21.0",
+        "react-dropzone": "^14.2.3",
+        "react-fast-compare": "^3.2.2",
+        "react-image-file-resizer": "^0.4.8",
+        "react-markdown-editor-lite": "^1.3.4",
+        "react-remove-scroll": "^2.5.6",
+        "react-transition-group": "^4.4.5",
+        "react-use-measure": "^2.1.1",
+        "react-window": "^1.8.9",
+        "tailwind-merge": "^1.14.0",
+        "typeface-rubik": "^1.1.13",
+        "yup": "^0.32.11"
+    },
+    "peerDependencies": {
+        "algoliasearch": "^4.13.0",
+        "firebase": "^10.5.2",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0",
+        "react-router": "^6.2.0",
+        "react-router-dom": "^6.2.0"
+    },
+    "eslintConfig": {
+        "extends": [
+            "react-app",
+            "react-app/jest"
+        ]
+    },
+    "devDependencies": {
+        "@jest/globals": "^29.7.0",
+        "@testing-library/jest-dom": "^5.17.0",
+        "@testing-library/react": "^14.0.0",
+        "@testing-library/user-event": "^14.5.1",
+        "@types/jest": "^29.5.6",
+        "@types/node": "^20.8.9",
+        "@types/object-hash": "^3.0.5",
+        "@types/react": "^18.2.33",
+        "@types/react-dom": "^18.2.14",
+        "@types/react-measure": "^2.0.10",
+        "@typescript-eslint/eslint-plugin": "^5.62.0",
+        "@typescript-eslint/parser": "^5.62.0",
+        "@vitejs/plugin-react": "^4.1.0",
+        "algoliasearch": "^4.20.0",
+        "cross-env": "^7.0.3",
+        "eslint": "^8.52.0",
+        "eslint-config-standard": "^17.1.0",
+        "eslint-plugin-import": "^2.29.0",
+        "eslint-plugin-n": "^15.7.0",
+        "eslint-plugin-promise": "^6.1.1",
+        "eslint-plugin-react": "^7.33.2",
+        "eslint-plugin-react-hooks": "^4.6.0",
+        "firebase": "^10.5.2",
+        "jest": "^29.7.0",
+        "npm-run-all": "^4.1.5",
+        "react-router": "^6.17.0",
+        "react-router-dom": "^6.17.0",
+        "ts-jest": "^29.1.1",
+        "ts-node": "^10.9.1",
+        "tsd": "^0.28.1",
+        "typescript": "^5.3.0",
+        "vite": "^4.5.0"
+    },
+    "files": [
+        "dist",
+        "src"
+    ],
+    "gitHead": "bfe341a3a8e3d2b33d4dc3f48fabc350eccace1b",
+    "publishConfig": {
+        "access": "public"
+    }
 }

package/src/components/EntityCollectionTable/internal/DeleteEntityDialog.tsx

@@ -51,7 +51,7 @@ export function DeleteEntityDialog<M extends Record<string, any>>({
     const resolvedCollection = useMemo(() => resolveCollection<M>({
         collection,
         path,
-        fields: context.fields
+        fields: context.propertyConfigs
     }), [collection, path]);
 
     const handleCancel = useCallback(() => {

package/src/components/EntityCollectionTable/internal/PropertyTableCell.tsx

@@ -160,7 +160,7 @@ export const PropertyTableCell = React.memo<PropertyTableCellProps<any, any>>(
                 .catch((e) => {
                     setError(e);
                 });
-        }, [internalValue, validation]);
+        }, [internalValue, validation, propertyKey, property, entity]);
 
         const updateValue = (newValue: any | null) => {
 
@@ -454,6 +454,7 @@ function areEqual(prevProps: PropertyTableCellProps<any, any>, nextProps: Proper
         prevProps.width === nextProps.width &&
         equal(prevProps.property, nextProps.property) &&
         equal(prevProps.value, nextProps.value) &&
+        equal(prevProps.entity.id, nextProps.entity.id) &&
         equal(prevProps.entity.values, nextProps.entity.values)
         ;
 }

package/src/components/EntityCollectionTable/internal/popup_field/PopupFormField.tsx

@@ -100,7 +100,7 @@ export function PopupFormFieldInternal<M extends Record<string, any>>({
             path,
             values: internalValue,
             entityId,
-            fields: fireCMSContext.fields
+            fields: fireCMSContext.propertyConfigs
         })
         : undefined;
 

package/src/components/EntityCollectionView/EntityCollectionView.tsx

@@ -52,7 +52,7 @@ import { Button, cn, IconButton, Markdown, Popover, TextField, Tooltip, Typograp
 import { Skeleton } from "../../ui/Skeleton";
 import { setIn } from "formik";
 import { getSubcollectionColumnId } from "../EntityCollectionTable/internal/common";
-import { KeyboardTabIcon, SearchIcon } from "../../icons";
+import { AddIcon, KeyboardTabIcon, SearchIcon } from "../../icons";
 import { useColumnIds } from "./useColumnsIds";
 import { PopupFormField } from "../EntityCollectionTable/internal/popup_field/PopupFormField";
 import { GetPropertyForProps } from "../EntityCollectionTable/EntityCollectionTableProps";
@@ -321,7 +321,7 @@ export const EntityCollectionView = React.memo(
         const resolvedCollection = useMemo(() => resolveCollection<M>({
             collection,
             path: fullPath,
-            fields: context.fields
+            fields: context.propertyConfigs
         }), [collection, fullPath]);
 
         const getPropertyFor = useCallback(({
@@ -344,9 +344,9 @@ export const EntityCollectionView = React.memo(
                 propertyValue,
                 values: entity.values,
                 entityId: entity.id,
-                fields: context.fields
+                fields: context.propertyConfigs
             });
-        }, [collection.properties, context.fields, fullPath, resolvedCollection.properties]);
+        }, [collection.properties, context.propertyConfigs, fullPath, resolvedCollection.properties]);
 
         const displayedColumnIds = useColumnIds(resolvedCollection, true);
 
@@ -584,6 +584,7 @@ export const EntityCollectionView = React.memo(
                                 onClick={onNewClick}
                                 className="mt-4"
                             >
+                                <AddIcon/>
                                 Create your first entity
                             </Button>
                         </div>

package/src/components/EntityPreview.tsx

@@ -32,7 +32,7 @@ export function EntityPreview<M extends Record<string, any>>(
         path,
         entityId: entity.id,
         values: entity.values,
-        fields: context.fields
+        fields: context.propertyConfigs
     }), [collection, path, entity]);
 
     const appConfig: FireCMSContext | undefined = useFireCMSContext();

package/src/components/ErrorView.tsx

@@ -27,6 +27,7 @@ export function ErrorView({
                               tooltip
                           }: ErrorViewProps): React.ReactElement {
     const component = error instanceof Error ? error.message : error;
+    console.log("ErrorView", error)
 
     const body = (
         <div

package/src/components/FireCMSAppBar.tsx

@@ -50,7 +50,6 @@ export const FireCMSAppBar = function FireCMSAppBar({
                                                         style,
                                                         user: userProp
                                                     }: FireCMSAppBarProps) {
-
     const navigation = useNavigationContext();
 
     const authController = useAuthController();

package/src/components/HomePage/DefaultHomePage.tsx

@@ -77,6 +77,7 @@ export function DefaultHomePage({
     }
 
     let additionalPluginChildrenStart: React.ReactNode | undefined;
+    let additionalPluginChildrenEnd: React.ReactNode | undefined;
     let additionalPluginSections: React.ReactNode | undefined;
     if (context.plugins) {
         const sectionProps: PluginGenericProps = {
@@ -101,6 +102,13 @@ export function DefaultHomePage({
                     return <div key={`plugin_children_start_${i}`}>{plugin.homePage!.additionalChildrenStart}</div>;
                 })}
         </div>;
+
+        additionalPluginChildrenEnd = <div className={"flex flex-col gap-2"}>
+            {context.plugins.filter(plugin => plugin.homePage?.additionalChildrenEnd)
+                .map((plugin, i) => {
+                    return <div key={`plugin_children_start_${i}`}>{plugin.homePage!.additionalChildrenEnd}</div>;
+                })}
+        </div>;
     }
 
     return (
@@ -178,6 +186,8 @@ export function DefaultHomePage({
 
                 {additionalPluginSections}
 
+                {additionalPluginChildrenEnd}
+
                 {additionalChildrenEnd}
 
             </Container>

package/src/components/ReferenceSelectionInner.tsx

@@ -251,8 +251,8 @@ export function ReferenceSelectionInner<M extends Record<string, any>>(
         collection: collection,
         path: fullPath,
         values: {},
-        fields: context.fields
-    }), [collection, context.fields, fullPath]);
+        fields: context.propertyConfigs
+    }), [collection, context.propertyConfigs, fullPath]);
 
     // eslint-disable-next-line react-hooks/rules-of-hooks
     const displayedColumnIds = useColumnIds(resolvedCollection, false);

package/src/core/FireCMS.tsx

@@ -30,7 +30,6 @@ const DEFAULT_COLLECTION_PATH = "/c";
  * internal contexts and hooks.
  *
  * You only need to use this component if you are building a custom app.
- * In most cases you can just use the {@link FirebaseCMSApp} component.
  *
  * @constructor
  * @group Core
@@ -53,7 +52,7 @@ export function FireCMS<UserType extends User, EC extends EntityCollection>(prop
         baseCollectionPath = DEFAULT_COLLECTION_PATH,
         plugins,
         onAnalyticsEvent,
-        fields,
+        propertyConfigs,
         entityViews,
         components
     } = props;
@@ -74,7 +73,9 @@ export function FireCMS<UserType extends User, EC extends EntityCollection>(prop
     const sideDialogsController = useBuildSideDialogsController();
     const sideEntityController = useBuildSideEntityController(navigation, sideDialogsController);
 
-    const loading = authController.initialLoading || navigation.loading || (plugins?.some(p => p.loading) ?? false);
+    const pluginsLoading = plugins?.some(p => p.loading) ?? false;
+
+    const loading = authController.initialLoading || navigation.loading || pluginsLoading;
 
     const context: Partial<FireCMSContext> = useMemo(() => ({
         entityLinkBuilder,
@@ -83,9 +84,9 @@ export function FireCMS<UserType extends User, EC extends EntityCollection>(prop
         plugins,
         onAnalyticsEvent,
         entityViews: entityViews ?? [],
-        fields: fields ?? {},
+        propertyConfigs: propertyConfigs ?? {},
         components
-    }), [dateTimeFormat, locale, plugins, entityViews, fields, components]);
+    }), [dateTimeFormat, locale, plugins, entityViews, propertyConfigs, components]);
 
     if (navigation.navigationLoadingError) {
         return (

package/src/form/EntityForm.tsx

@@ -157,7 +157,7 @@ function EntityFormInternal<M extends Record<string, any>>({
         collection: inputCollection,
         path,
         values: entity?.values,
-        fields: context.fields
+        fields: context.propertyConfigs
     }), [entity?.values, path]);
 
     const mustSetCustomId: boolean = (status === "new" || status === "copy") &&
@@ -220,7 +220,7 @@ function EntityFormInternal<M extends Record<string, any>>({
         entityId,
         values: internalValues,
         previousValues: initialValues,
-        fields: context.fields
+        fields: context.propertyConfigs
     });
 
     const onIdUpdate = collection.callbacks?.onIdUpdate;
@@ -373,7 +373,7 @@ function EntityFormInternal<M extends Record<string, any>>({
                     collection: resolveCollection({
                         collection,
                         path,
-                        fields: context.fields
+                        fields: context.propertyConfigs
                     }),
                     entityId,
                     path,