@ceed/cds 1.40.3-next.2 → 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 };
       });
@@ -3926,6 +3926,7 @@ function useColumnWidths(columnsById) {
         entries.forEach((entry) => {
           const columnId = entry.target.dataset.hdsColumnId;
           const w = Math.round(entry.target.getBoundingClientRect().width);
+          if (w === 0) return;
           if (next[columnId] !== w) {
             next[columnId] = w;
             changed = true;
@@ -3940,7 +3941,8 @@ function useColumnWidths(columnsById) {
       if (el) {
         el.dataset.hdsColumnId = columnId;
         el.dataset.field = String(def.field);
-        measured[columnId] = Math.round(el.getBoundingClientRect().width);
+        const w = Math.round(el.getBoundingClientRect().width);
+        if (w > 0) measured[columnId] = w;
         roRef.current.observe(el);
       }
     });
@@ -4003,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;
@@ -4026,22 +4035,25 @@ function useDataTableRenderer({
     ),
     [reorderedColumns]
   );
-  const columnIds = (0, import_react27.useMemo)(() => {
-    const taken = new Set(visibleColumns.map((column) => String(column.field)));
-    const ids = [];
-    visibleColumns.forEach((column) => {
+  const allColumnIds = (0, import_react27.useMemo)(() => {
+    const taken = new Set(reorderedColumns.map((column) => String(column.field)));
+    const assigned = /* @__PURE__ */ new Set();
+    return reorderedColumns.map((column) => {
       const field = String(column.field);
-      if (!ids.includes(field)) {
-        ids.push(field);
-        return;
+      if (!assigned.has(field)) {
+        assigned.add(field);
+        return field;
       }
       let n = 2;
       while (taken.has(`${field}__${n}`)) n += 1;
       taken.add(`${field}__${n}`);
-      ids.push(`${field}__${n}`);
+      return `${field}__${n}`;
     });
-    return ids;
-  }, [visibleColumns]);
+  }, [reorderedColumns]);
+  const columnIds = (0, import_react27.useMemo)(
+    () => visibleColumnIndexes.map((index) => allColumnIds[index]),
+    [visibleColumnIndexes, allColumnIds]
+  );
   const visibleColumnsById = (0, import_react27.useMemo)(
     () => Object.fromEntries(
       visibleColumns.map((column, index) => [

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 };
       });
@@ -3811,6 +3811,7 @@ function useColumnWidths(columnsById) {
         entries.forEach((entry) => {
           const columnId = entry.target.dataset.hdsColumnId;
           const w = Math.round(entry.target.getBoundingClientRect().width);
+          if (w === 0) return;
           if (next[columnId] !== w) {
             next[columnId] = w;
             changed = true;
@@ -3825,7 +3826,8 @@ function useColumnWidths(columnsById) {
       if (el) {
         el.dataset.hdsColumnId = columnId;
         el.dataset.field = String(def.field);
-        measured[columnId] = Math.round(el.getBoundingClientRect().width);
+        const w = Math.round(el.getBoundingClientRect().width);
+        if (w > 0) measured[columnId] = w;
         roRef.current.observe(el);
       }
     });
@@ -3888,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;
@@ -3911,22 +3920,25 @@ function useDataTableRenderer({
     ),
     [reorderedColumns]
   );
-  const columnIds = useMemo11(() => {
-    const taken = new Set(visibleColumns.map((column) => String(column.field)));
-    const ids = [];
-    visibleColumns.forEach((column) => {
+  const allColumnIds = useMemo11(() => {
+    const taken = new Set(reorderedColumns.map((column) => String(column.field)));
+    const assigned = /* @__PURE__ */ new Set();
+    return reorderedColumns.map((column) => {
       const field = String(column.field);
-      if (!ids.includes(field)) {
-        ids.push(field);
-        return;
+      if (!assigned.has(field)) {
+        assigned.add(field);
+        return field;
       }
       let n = 2;
       while (taken.has(`${field}__${n}`)) n += 1;
       taken.add(`${field}__${n}`);
-      ids.push(`${field}__${n}`);
+      return `${field}__${n}`;
     });
-    return ids;
-  }, [visibleColumns]);
+  }, [reorderedColumns]);
+  const columnIds = useMemo11(
+    () => visibleColumnIndexes.map((index) => allColumnIds[index]),
+    [visibleColumnIndexes, allColumnIds]
+  );
   const visibleColumnsById = useMemo11(
     () => Object.fromEntries(
       visibleColumns.map((column, index) => [