@helpwave/hightide 0.6.9 → 0.6.10

package/dist/index.js

@@ -13599,17 +13599,20 @@ var import_clsx27 = __toESM(require("clsx"));
 var import_jsx_runtime56 = require("react/jsx-runtime");
 var TableBody = import_react58.default.memo(function TableBodyVisual() {
   const { table, onRowClick, onFillerRowClick, isUsingFillerRows, fillerRowCell, pagination, rows } = useTableDataContext();
-  const pinnedColumnsLeft = table.getState().columnPinning?.left ?? [];
-  const pinnedColumnsRight = table.getState().columnPinning?.right ?? [];
-  let columnOrder = table.getState().columnOrder;
-  columnOrder = [...pinnedColumnsLeft, ...columnOrder.filter((id) => !pinnedColumnsLeft.includes(id) && !pinnedColumnsRight.includes(id)), ...pinnedColumnsRight];
-  const columnVisibility = table.getState().columnVisibility;
-  const columns = columnOrder.map((id) => {
-    const column = table.getColumn(id);
-    if (!column) return null;
-    if (columnVisibility[id] === false) return null;
-    return column;
-  }).filter(Boolean);
+  const state = table.getState();
+  const baseOrder = state.columnOrder?.length ? state.columnOrder : table.getVisibleLeafColumns().map((col) => col.id);
+  const pinnedLeft = state.columnPinning?.left ?? [];
+  const pinnedRight = state.columnPinning?.right ?? [];
+  const columnOrder = [
+    ...pinnedLeft,
+    ...baseOrder.filter(
+      (id) => !pinnedLeft.includes(id) && !pinnedRight.includes(id)
+    ),
+    ...pinnedRight
+  ];
+  const columns = columnOrder.map((id) => table.getColumn(id)).filter(
+    (col) => !!col && state.columnVisibility?.[col.id] !== false
+  );
   return /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)("tbody", { children: [
     rows.map((row) => {
       return /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(