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

package/dist/index.es.js

@@ -8852,7 +8852,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 +8907,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 +8957,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 +9159,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 +9173,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 +12389,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