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

package/dist/index.es.js

@@ -352,6 +352,7 @@ function isPropertyBuilder(propertyOrBuilder) {
 function getDefaultValuesFor(properties) {
   if (!properties) return {};
   return Object.entries(properties).map(([key, property]) => {
+    if (!property) return {};
     const value = getDefaultValueFor(property);
     return value === void 0 ? {} : {
       [key]: value
@@ -362,6 +363,7 @@ function getDefaultValuesFor(properties) {
   }), {});
 }
 function getDefaultValueFor(property) {
+  if (!property) return void 0;
   if (isPropertyBuilder(property)) return void 0;
   if (property.defaultValue || property.defaultValue === null) {
     return property.defaultValue;
@@ -8852,7 +8854,6 @@ const EntityCollectionTable = function EntityCollectionTable2({
   const selectedEntities = (selectionController?.selectedEntities?.length > 0 ? selectionController?.selectedEntities : highlightedEntities)?.filter(Boolean);
   const context = useFireCMSContext();
   const [size, setSize] = React__default.useState(defaultSize ?? "m");
-  const selectedEntityIds = selectedEntities?.map((e) => e.id);
   const updateSize = useCallback((size_0) => {
     if (onSizeChanged) onSizeChanged(size_0);
     setSize(size_0);
@@ -8908,7 +8909,7 @@ const EntityCollectionTable = function EntityCollectionTable2({
       context
     })?.toString() });
     return /* @__PURE__ */ jsx(EntityTableCell, { width, size, value: value_0, selected: false, disabled: true, align: "left", allowScroll: false, showExpandIcon: false, disabledTooltip: "This column can't be edited directly", children: /* @__PURE__ */ jsx(ErrorBoundary, { children: child }) }, `additional_table_cell_${entity_0.id}_${column_0.key}`);
-  }, [size, selectedEntityIds]);
+  }, [size]);
   const collectionColumns = (() => {
     const columnsResult = propertiesToColumns({
       properties,
@@ -8958,14 +8959,14 @@ const EntityCollectionTable = function EntityCollectionTable2({
       } else {
         throw Error("Internal: columns not mapped properly");
       }
-    } catch (e_0) {
-      console.error("Error rendering cell", e_0);
-      return /* @__PURE__ */ jsx(EntityTableCell, { size, width: column_1.width, saved: false, value: null, align: "left", fullHeight: false, disabled: true, children: /* @__PURE__ */ jsx(ErrorView, { error: e_0 }) });
+    } catch (e) {
+      console.error("Error rendering cell", e);
+      return /* @__PURE__ */ jsx(EntityTableCell, { size, width: column_1.width, saved: false, value: null, align: "left", fullHeight: false, disabled: true, children: /* @__PURE__ */ jsx(ErrorView, { error: e }) });
     }
   }, [tableRowActionsBuilder, additionalCellRenderer, propertyCellRenderer, size]);
   return /* @__PURE__ */ jsxs("div", { ref, style, className: cls("h-full w-full flex flex-col bg-white dark:bg-surface-950", className), children: [
     /* @__PURE__ */ jsx(CollectionTableToolbar, { onTextSearch: textSearchEnabled ? onTextSearch : void 0, textSearchLoading, onTextSearchClick: textSearchEnabled ? onTextSearchClick : void 0, size, onSizeChanged: updateSize, title, actionsStart, actions, loading: tableController.dataLoading }),
-    /* @__PURE__ */ jsx(SelectableTable, { columns, size, inlineEditing, cellRenderer, onEntityClick, highlightedRow: useCallback((entity_1) => selectedEntityIds?.includes(entity_1.id) ?? false, [selectedEntityIds]), tableController, onValueChange, onColumnResize, hoverRow, filterable, emptyComponent, endAdornment, AddColumnComponent })
+    /* @__PURE__ */ jsx(SelectableTable, { columns, size, inlineEditing, cellRenderer, onEntityClick, highlightedRow: (entity_1) => Boolean(selectedEntities?.find((e_0) => e_0.id === entity_1.id && e_0.path === entity_1.path)), tableController, onValueChange, onColumnResize, hoverRow, filterable, emptyComponent, endAdornment, AddColumnComponent })
   ] });
 };
 function useDataOrder({
@@ -9160,9 +9161,10 @@ function useSelectionController(onSelectionChange) {
   const toggleEntitySelection = useCallback((entity, newSelectedState) => {
     let newValue;
     if (newSelectedState === void 0) {
-      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) => item.id !== entity.id);
+        newValue = selectedEntities.filter((item) => !(item.id === entity.id && item.path === entity.path));
       } else {
         onSelectionChange?.(entity, true);
         newValue = [...selectedEntities, entity];
@@ -9173,13 +9175,13 @@ function useSelectionController(onSelectionChange) {
         newValue = [...selectedEntities, entity];
       } else {
         onSelectionChange?.(entity, false);
-        newValue = selectedEntities.filter((item_0) => item_0.id !== entity.id);
+        newValue = selectedEntities.filter((item_0) => !(item_0.id === entity.id && item_0.path === entity.path));
       }
     }
     setSelectedEntities(newValue);
   }, [selectedEntities]);
   const isEntitySelected = useCallback((entity_0) => {
-    return selectedEntities.map((e_0) => e_0.id).includes(entity_0.id);
+    return Boolean(selectedEntities.find((e_0) => e_0.id === entity_0.id && e_0.path === entity_0.path));
   }, [selectedEntities]);
   return {
     selectedEntities,
@@ -12389,7 +12391,7 @@ const EntityCollectionView = React__default.memo(function EntityCollectionView2(
     width: width_0,
     frozen
   }) => {
-    const isSelected = usedSelectionController.selectedEntities.map((e_1) => e_1.id).includes(entity_6.id);
+    const isSelected = Boolean(usedSelectionController.selectedEntities.find((e_1) => e_1.id == entity_6.id && e_1.path == entity_6.path));
     const actions_0 = getActionsForEntity({
       entity: entity_6,
       customEntityActions: collection.entityActions
@@ -12873,7 +12875,7 @@ function useApp() {
   return React__default.useContext(AppContext);
 }
 const DefaultAppBar = function DefaultAppBar2(t0) {
-  const $ = c(45);
+  const $ = c(44);
   const {
     title,
     endAdornment,
@@ -12957,58 +12959,57 @@ const DefaultAppBar = function DefaultAppBar2(t0) {
     t5 = $[12];
   }
   let t6;
-  if ($[13] !== drawerOpen || $[14] !== hasDrawer || $[15] !== logo || $[16] !== navigation || $[17] !== title) {
-    t6 = navigation && /* @__PURE__ */ jsx("div", { className: "mr-8 hidden lg:block", children: /* @__PURE__ */ jsx(Link, { className: "visited:text-inherit visited:dark:text-inherit", to: navigation?.basePath ?? "/", children: /* @__PURE__ */ jsxs("div", { className: "flex flex-row gap-4", children: [
+  if ($[13] !== hasDrawer || $[14] !== logo || $[15] !== navigation || $[16] !== title) {
+    t6 = navigation && /* @__PURE__ */ jsx("div", { className: "mr-8 hidden lg:block", children: /* @__PURE__ */ jsx(Link, { className: "visited:text-inherit visited:dark:text-inherit block", to: navigation?.basePath ?? "/", children: /* @__PURE__ */ jsxs("div", { className: "flex flex-row gap-4", children: [
       !hasDrawer && (logo ? /* @__PURE__ */ jsx("img", { src: logo, alt: "Logo", className: cls("w-[32px] h-[32px] object-contain") }) : /* @__PURE__ */ jsx(FireCMSLogo, { width: "32px", height: "32px" })),
-      typeof title === "string" ? /* @__PURE__ */ jsx(Typography, { variant: "subtitle1", noWrap: true, className: cls("transition-all", drawerOpen ? "ml-2" : ""), children: title }) : title
+      typeof title === "string" ? /* @__PURE__ */ jsx(Typography, { variant: "subtitle1", noWrap: true, children: title }) : title
     ] }) }) });
-    $[13] = drawerOpen;
-    $[14] = hasDrawer;
-    $[15] = logo;
-    $[16] = navigation;
-    $[17] = title;
-    $[18] = t6;
+    $[13] = hasDrawer;
+    $[14] = logo;
+    $[15] = navigation;
+    $[16] = title;
+    $[17] = t6;
   } else {
-    t6 = $[18];
+    t6 = $[17];
   }
   let t7;
-  if ($[19] === Symbol.for("react.memo_cache_sentinel")) {
+  if ($[18] === Symbol.for("react.memo_cache_sentinel")) {
     t7 = /* @__PURE__ */ jsx("div", { className: "flex-grow" });
-    $[19] = t7;
+    $[18] = t7;
   } else {
-    t7 = $[19];
+    t7 = $[18];
   }
   let t8;
-  if ($[20] !== endAdornment) {
+  if ($[19] !== endAdornment) {
     t8 = endAdornment && /* @__PURE__ */ jsx(ErrorBoundary, { children: endAdornment });
-    $[20] = endAdornment;
-    $[21] = t8;
+    $[19] = endAdornment;
+    $[20] = t8;
   } else {
-    t8 = $[21];
+    t8 = $[20];
   }
   let t9;
-  if ($[22] !== includeModeToggle || $[23] !== mode || $[24] !== toggleMode) {
+  if ($[21] !== includeModeToggle || $[22] !== mode || $[23] !== toggleMode) {
     t9 = includeModeToggle && /* @__PURE__ */ jsx(IconButton, { color: "inherit", "aria-label": "Open drawer", onClick: toggleMode, size: "large", children: mode === "dark" ? /* @__PURE__ */ jsx(DarkModeIcon, {}) : /* @__PURE__ */ jsx(LightModeIcon, {}) });
-    $[22] = includeModeToggle;
-    $[23] = mode;
-    $[24] = toggleMode;
-    $[25] = t9;
+    $[21] = includeModeToggle;
+    $[22] = mode;
+    $[23] = toggleMode;
+    $[24] = t9;
   } else {
-    t9 = $[25];
+    t9 = $[24];
   }
   let t10;
-  if ($[26] !== user) {
+  if ($[25] !== user) {
     t10 = user && /* @__PURE__ */ jsxs("div", { className: "px-4 py-2 mb-2", children: [
       user.displayName && /* @__PURE__ */ jsx(Typography, { variant: "body1", color: "secondary", children: user.displayName }),
       user.email && /* @__PURE__ */ jsx(Typography, { variant: "body2", color: "secondary", children: user.email })
     ] });
-    $[26] = user;
-    $[27] = t10;
+    $[25] = user;
+    $[26] = t10;
   } else {
-    t10 = $[27];
+    t10 = $[26];
   }
   let t11;
-  if ($[28] !== authController || $[29] !== dropDownActions || $[30] !== navigate) {
+  if ($[27] !== authController || $[28] !== dropDownActions || $[29] !== navigate) {
     t11 = !dropDownActions && /* @__PURE__ */ jsxs(MenuItem, { onClick: async () => {
       await authController.signOut();
       navigate("/");
@@ -13016,30 +13017,30 @@ const DefaultAppBar = function DefaultAppBar2(t0) {
       /* @__PURE__ */ jsx(LogoutIcon, {}),
       "Log Out"
     ] });
-    $[28] = authController;
-    $[29] = dropDownActions;
-    $[30] = navigate;
-    $[31] = t11;
+    $[27] = authController;
+    $[28] = dropDownActions;
+    $[29] = navigate;
+    $[30] = t11;
   } else {
-    t11 = $[31];
+    t11 = $[30];
   }
   let t12;
-  if ($[32] !== avatarComponent || $[33] !== dropDownActions || $[34] !== t10 || $[35] !== t11) {
+  if ($[31] !== avatarComponent || $[32] !== dropDownActions || $[33] !== t10 || $[34] !== t11) {
     t12 = /* @__PURE__ */ jsxs(Menu, { trigger: avatarComponent, children: [
       t10,
       dropDownActions,
       t11
     ] });
-    $[32] = avatarComponent;
-    $[33] = dropDownActions;
-    $[34] = t10;
-    $[35] = t11;
-    $[36] = t12;
+    $[31] = avatarComponent;
+    $[32] = dropDownActions;
+    $[33] = t10;
+    $[34] = t11;
+    $[35] = t12;
   } else {
-    t12 = $[36];
+    t12 = $[35];
   }
   let t13;
-  if ($[37] !== startAdornment || $[38] !== style || $[39] !== t12 || $[40] !== t5 || $[41] !== t6 || $[42] !== t8 || $[43] !== t9) {
+  if ($[36] !== startAdornment || $[37] !== style || $[38] !== t12 || $[39] !== t5 || $[40] !== t6 || $[41] !== t8 || $[42] !== t9) {
     t13 = /* @__PURE__ */ jsxs("div", { style, className: t5, children: [
       t6,
       startAdornment,
@@ -13048,16 +13049,16 @@ const DefaultAppBar = function DefaultAppBar2(t0) {
       t9,
       t12
     ] });
-    $[37] = startAdornment;
-    $[38] = style;
-    $[39] = t12;
-    $[40] = t5;
-    $[41] = t6;
-    $[42] = t8;
-    $[43] = t9;
-    $[44] = t13;
+    $[36] = startAdornment;
+    $[37] = style;
+    $[38] = t12;
+    $[39] = t5;
+    $[40] = t6;
+    $[41] = t8;
+    $[42] = t9;
+    $[43] = t13;
   } else {
-    t13 = $[44];
+    t13 = $[43];
   }
   return t13;
 };
@@ -22372,7 +22373,7 @@ function DrawerLogo(t0) {
   }
   let t3;
   if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
-    t3 = cls("cursor-pointer ml-3 mr-1");
+    t3 = cls("cursor-pointer rounded ml-3 mr-1");
     $[2] = t3;
   } else {
     t3 = $[2];
@@ -22388,7 +22389,7 @@ function DrawerLogo(t0) {
   }
   let t5;
   if ($[6] !== navigation.basePath || $[7] !== t4) {
-    t5 = /* @__PURE__ */ jsx(Tooltip, { title: "Home", sideOffset: 20, side: "right", children: /* @__PURE__ */ jsx(Link, { to: navigation.basePath, children: t4 }) });
+    t5 = /* @__PURE__ */ jsx(Tooltip, { title: "Home", sideOffset: 20, side: "right", children: /* @__PURE__ */ jsx(Link, { className: "block", to: navigation.basePath, children: t4 }) });
     $[6] = navigation.basePath;
     $[7] = t4;
     $[8] = t5;