@firecms/core 3.0.0-canary.162 → 3.0.0-canary.164

package/dist/util/entities.d.ts

@@ -3,7 +3,7 @@ export declare function isReadOnly(property: Property<any> | ResolvedProperty<an
 export declare function isHidden(property: Property | ResolvedProperty): boolean;
 export declare function isPropertyBuilder<T extends CMSType, M extends Record<string, any>>(propertyOrBuilder?: PropertyOrBuilder<T, M> | Property<T> | ResolvedProperty<T>): propertyOrBuilder is PropertyBuilder<T, M>;
 export declare function getDefaultValuesFor<M extends Record<string, any>>(properties: PropertiesOrBuilders<M> | ResolvedProperties<M>): Partial<EntityValues<M>>;
-export declare function getDefaultValueFor(property: PropertyOrBuilder): {} | null | undefined;
+export declare function getDefaultValueFor(property?: PropertyOrBuilder): {} | null | undefined;
 export declare function getDefaultValueForDataType(dataType: DataType): {} | null;
 /**
  * Update the automatic values in an entity before save

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@firecms/core",
   "type": "module",
-  "version": "3.0.0-canary.162",
+  "version": "3.0.0-canary.164",
   "description": "Awesome Firebase/Firestore-based headless open-source CMS",
   "funding": {
     "url": "https://github.com/sponsors/firecmsco"
@@ -50,9 +50,9 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@firecms/editor": "^3.0.0-canary.162",
-    "@firecms/formex": "^3.0.0-canary.162",
-    "@firecms/ui": "^3.0.0-canary.162",
+    "@firecms/editor": "^3.0.0-canary.164",
+    "@firecms/formex": "^3.0.0-canary.164",
+    "@firecms/ui": "^3.0.0-canary.164",
     "@hello-pangea/dnd": "^17.0.0",
     "@radix-ui/react-portal": "^1.1.2",
     "clsx": "^2.1.1",
@@ -106,7 +106,7 @@
     "dist",
     "src"
   ],
-  "gitHead": "a1b322b8cdcd05a1598baefce37c89124d96cd79",
+  "gitHead": "9f7019e32346d4917da2e32539ac13244636493f",
   "publishConfig": {
     "access": "public"
   },

package/src/components/EntityCollectionTable/EntityCollectionTable.tsx

@@ -88,8 +88,6 @@ export const EntityCollectionTable = function EntityCollectionTable<M extends Re
 
     const [size, setSize] = React.useState<CollectionSize>(defaultSize ?? "m");
 
-    const selectedEntityIds = selectedEntities?.map(e => e.id);
-
     const updateSize = useCallback((size: CollectionSize) => {
         if (onSizeChanged)
             onSizeChanged(size);
@@ -204,7 +202,7 @@ export const EntityCollectionTable = function EntityCollectionTable<M extends Re
             </EntityTableCell>
         );
 
-    }, [size, selectedEntityIds]);
+    }, [size]);
 
     const collectionColumns: VirtualTableColumn[] = (() => {
         const columnsResult: VirtualTableColumn[] = propertiesToColumns({
@@ -312,7 +310,7 @@ export const EntityCollectionTable = function EntityCollectionTable<M extends Re
                              inlineEditing={inlineEditing}
                              cellRenderer={cellRenderer}
                              onEntityClick={onEntityClick}
-                             highlightedRow={useCallback((entity: Entity<M>) => selectedEntityIds?.includes(entity.id) ?? false, [selectedEntityIds])}
+                             highlightedRow={(entity: Entity<M>) => Boolean(selectedEntities?.find(e => e.id === entity.id && e.path === entity.path))}
                              tableController={tableController}
                              onValueChange={onValueChange}
                              onColumnResize={onColumnResize}

package/src/components/EntityCollectionView/EntityCollectionView.tsx

@@ -482,7 +482,7 @@ export const EntityCollectionView = React.memo(
             frozen?: boolean
         }) => {
 
-            const isSelected = usedSelectionController.selectedEntities.map(e => e.id).includes(entity.id);
+            const isSelected = Boolean(usedSelectionController.selectedEntities.find(e => e.id == entity.id && e.path == entity.path));
 
             const actions = getActionsForEntity({
                 entity,

package/src/components/EntityCollectionView/useSelectionController.tsx

@@ -10,9 +10,10 @@ export function useSelectionController<M extends Record<string, any> = any>(
     const toggleEntitySelection = useCallback((entity: Entity<M>, newSelectedState?: boolean) => {
         let newValue;
         if (newSelectedState === undefined) {
-            if (selectedEntities.map(e => e.id).includes(entity.id)) {
+            const isSelected = Boolean(selectedEntities.find(e => e.id === entity.id && e.path === entity.path));
+            if (isSelected) {
                 onSelectionChange?.(entity, false);
-                newValue = selectedEntities.filter((item: Entity<M>) => item.id !== entity.id);
+                newValue = selectedEntities.filter((item: Entity<M>) => !(item.id === entity.id && item.path === entity.path));
             } else {
                 onSelectionChange?.(entity, true);
                 newValue = [...selectedEntities, entity];
@@ -23,14 +24,14 @@ export function useSelectionController<M extends Record<string, any> = any>(
                 newValue = [...selectedEntities, entity];
             } else {
                 onSelectionChange?.(entity, false);
-                newValue = selectedEntities.filter((item: Entity<M>) => item.id !== entity.id);
+                newValue = selectedEntities.filter((item: Entity<M>) => !(item.id === entity.id && item.path === entity.path));
             }
         }
         setSelectedEntities(newValue);
     }, [selectedEntities]);
 
     const isEntitySelected = useCallback((entity: Entity<M>) => {
-        return selectedEntities.map(e => e.id).includes(entity.id);
+        return Boolean(selectedEntities.find(e => e.id === entity.id && e.path === entity.path));
     }, [selectedEntities]);
 
     return {

package/src/core/DefaultAppBar.tsx

@@ -110,7 +110,7 @@ export const DefaultAppBar = function DefaultAppBar({
 
             {navigation && <div className="mr-8 hidden lg:block">
                 <ReactLink
-                    className="visited:text-inherit visited:dark:text-inherit"
+                    className="visited:text-inherit visited:dark:text-inherit block"
                     to={navigation?.basePath ?? "/"}
                 >
                     <div className={"flex flex-row gap-4"}>
@@ -122,8 +122,7 @@ export const DefaultAppBar = function DefaultAppBar({
 
                         {typeof title === "string"
                             ? <Typography variant="subtitle1"
-                                          noWrap
-                                          className={cls("transition-all", drawerOpen ? "ml-2" : "")}>
+                                          noWrap>
                                 {title}
                             </Typography>
                             : title}

package/src/core/DefaultDrawer.tsx

@@ -164,12 +164,13 @@ export function DrawerLogo({ logo }: {
             transition: "padding 100ms cubic-bezier(0.4, 0, 0.6, 1) 0ms",
             padding: drawerOpen ? "32px 144px 0px 24px" : "72px 12px 0px 12px"
         }}
-        className={cls("cursor-pointer ml-3 mr-1")}>
+        className={cls("cursor-pointer rounded ml-3 mr-1")}>
 
         <Tooltip title={"Home"}
                  sideOffset={20}
                  side="right">
             <Link
+                className={"block"}
                 to={navigation.basePath}>
                 {logo
                     ? <img src={logo}

package/src/util/entities.ts

@@ -40,13 +40,15 @@ export function getDefaultValuesFor<M extends Record<string, any>>(properties: P
     if (!properties) return {};
     return Object.entries(properties)
         .map(([key, property]) => {
+            if (!property) return {};
             const value = getDefaultValueFor(property as PropertyOrBuilder);
             return value === undefined ? {} : { [key]: value };
         })
         .reduce((a, b) => ({ ...a, ...b }), {}) as EntityValues<M>;
 }
 
-export function getDefaultValueFor(property: PropertyOrBuilder) {
+export function getDefaultValueFor(property?: PropertyOrBuilder) {
+    if (!property) return undefined;
     if (isPropertyBuilder(property)) return undefined;
     if (property.defaultValue || property.defaultValue === null) {
         return property.defaultValue;