@ceed/cds 1.40.3-next.3 → 1.40.3-next.4

package/dist/index.cjs

@@ -463,7 +463,7 @@ function useSlotRef(slotProp, ref) {
   return (0, import_react6.useMemo)(() => {
     if (isFunctionForm) {
       return ((ownerState) => {
-        const resolved = slotProp(ownerState);
+        const resolved = slotProp(ownerState) ?? {};
         const merged = mergeRefs(resolved.ref, ref);
         return merged ? { ...resolved, ref: merged } : { ...resolved };
       });
@@ -4005,10 +4005,17 @@ function useDataTableRenderer({
     if (!columnGroupingModel) return columnsProp;
     return reorderColumnsByGroupingModel(columnsProp, columnGroupingModel);
   }, [columnsProp, columnGroupingModel]);
-  const visibleColumns = (0, import_react27.useMemo)(
-    () => reorderedColumns.filter((col) => visibilityModel[col.field] !== false),
+  const visibleColumnIndexes = (0, import_react27.useMemo)(
+    () => reorderedColumns.reduce((acc, col, index) => {
+      if (visibilityModel[col.field] !== false) acc.push(index);
+      return acc;
+    }, []),
     [reorderedColumns, visibilityModel]
   );
+  const visibleColumns = (0, import_react27.useMemo)(
+    () => visibleColumnIndexes.map((index) => reorderedColumns[index]),
+    [visibleColumnIndexes, reorderedColumns]
+  );
   const visibleFieldSet = (0, import_react27.useMemo)(() => new Set(visibleColumns.map((c) => c.field)), [visibleColumns]);
   const tableMinWidth = (0, import_react27.useMemo)(() => {
     const DEFAULT_MIN = 50;
@@ -4028,27 +4035,24 @@ function useDataTableRenderer({
     ),
     [reorderedColumns]
   );
-  const columnIdByColumn = (0, import_react27.useMemo)(() => {
+  const allColumnIds = (0, import_react27.useMemo)(() => {
     const taken = new Set(reorderedColumns.map((column) => String(column.field)));
     const assigned = /* @__PURE__ */ new Set();
-    const ids = /* @__PURE__ */ new Map();
-    reorderedColumns.forEach((column) => {
+    return reorderedColumns.map((column) => {
       const field = String(column.field);
       if (!assigned.has(field)) {
         assigned.add(field);
-        ids.set(column, field);
-        return;
+        return field;
       }
       let n = 2;
       while (taken.has(`${field}__${n}`)) n += 1;
       taken.add(`${field}__${n}`);
-      ids.set(column, `${field}__${n}`);
+      return `${field}__${n}`;
     });
-    return ids;
   }, [reorderedColumns]);
   const columnIds = (0, import_react27.useMemo)(
-    () => visibleColumns.map((column) => columnIdByColumn.get(column) ?? String(column.field)),
-    [visibleColumns, columnIdByColumn]
+    () => visibleColumnIndexes.map((index) => allColumnIds[index]),
+    [visibleColumnIndexes, allColumnIds]
   );
   const visibleColumnsById = (0, import_react27.useMemo)(
     () => Object.fromEntries(

package/dist/index.js

@@ -316,7 +316,7 @@ function useSlotRef(slotProp, ref) {
   return useMemo(() => {
     if (isFunctionForm) {
       return ((ownerState) => {
-        const resolved = slotProp(ownerState);
+        const resolved = slotProp(ownerState) ?? {};
         const merged = mergeRefs(resolved.ref, ref);
         return merged ? { ...resolved, ref: merged } : { ...resolved };
       });
@@ -3890,10 +3890,17 @@ function useDataTableRenderer({
     if (!columnGroupingModel) return columnsProp;
     return reorderColumnsByGroupingModel(columnsProp, columnGroupingModel);
   }, [columnsProp, columnGroupingModel]);
-  const visibleColumns = useMemo11(
-    () => reorderedColumns.filter((col) => visibilityModel[col.field] !== false),
+  const visibleColumnIndexes = useMemo11(
+    () => reorderedColumns.reduce((acc, col, index) => {
+      if (visibilityModel[col.field] !== false) acc.push(index);
+      return acc;
+    }, []),
     [reorderedColumns, visibilityModel]
   );
+  const visibleColumns = useMemo11(
+    () => visibleColumnIndexes.map((index) => reorderedColumns[index]),
+    [visibleColumnIndexes, reorderedColumns]
+  );
   const visibleFieldSet = useMemo11(() => new Set(visibleColumns.map((c) => c.field)), [visibleColumns]);
   const tableMinWidth = useMemo11(() => {
     const DEFAULT_MIN = 50;
@@ -3913,27 +3920,24 @@ function useDataTableRenderer({
     ),
     [reorderedColumns]
   );
-  const columnIdByColumn = useMemo11(() => {
+  const allColumnIds = useMemo11(() => {
     const taken = new Set(reorderedColumns.map((column) => String(column.field)));
     const assigned = /* @__PURE__ */ new Set();
-    const ids = /* @__PURE__ */ new Map();
-    reorderedColumns.forEach((column) => {
+    return reorderedColumns.map((column) => {
       const field = String(column.field);
       if (!assigned.has(field)) {
         assigned.add(field);
-        ids.set(column, field);
-        return;
+        return field;
       }
       let n = 2;
       while (taken.has(`${field}__${n}`)) n += 1;
       taken.add(`${field}__${n}`);
-      ids.set(column, `${field}__${n}`);
+      return `${field}__${n}`;
     });
-    return ids;
   }, [reorderedColumns]);
   const columnIds = useMemo11(
-    () => visibleColumns.map((column) => columnIdByColumn.get(column) ?? String(column.field)),
-    [visibleColumns, columnIdByColumn]
+    () => visibleColumnIndexes.map((index) => allColumnIds[index]),
+    [visibleColumnIndexes, allColumnIds]
   );
   const visibleColumnsById = useMemo11(
     () => Object.fromEntries(