es-grid-template 1.8.40 → 1.8.42

package/es/table-component/header/TableHead.js

@@ -5,6 +5,16 @@ import TableHeadCell2 from "./TableHeadCell2";
 import TableHeadGroupCell from "./TableHeadGroupCell";
 // import { getCommonPinningStyles } from '../hook/utils'
 
+// const getVisibleChildCount = <T,>(column: Column<T>): number => {
+//   if (!column.columns?.length) return 0;
+
+//   return column.columns.reduce((count: number, col: Column<T>) => {
+//     const selfCount =  col.getIsVisible() ? 1 : 0;
+//     const childrenCount = getVisibleChildCount(col);
+//     return count + selfCount + (childrenCount ? childrenCount - 1 : childrenCount);
+//   }, 0);
+// }
+
 const TableHead = ({
   columnVirtualizer,
   table
@@ -18,6 +28,7 @@ const TableHead = ({
   } = useContext(TableContext);
   const headerGroups = table.getFlatHeaders();
   const leafColumns = table.getVisibleFlatColumns();
+  // const leafColumns11 = table.getIsAllColumnsVisible();
   const headerDepth = table.getHeaderGroups().length;
   return /*#__PURE__*/React.createElement("div", {
     className: `${prefix}-grid-thead`,
@@ -32,10 +43,13 @@ const TableHead = ({
     }
   }, leafColumns.map(column => {
     const depth = column.depth ?? 0;
-    // const colSpan = col.getLeafColumns().length || 1;
-    const colSpan = column.columns.length || 1;
+
+    // const colSpan = column.columns.length || 1;
+    const colSpan = column.getFlatColumns().filter(col => col.getIsVisible() && col.columns.length < 2).length;
+    // const colSpan = getVisibleChildCount(column);
+
     const rowSpan = column.columns?.length > 0 ? 1 : headerDepth - depth;
-    const header = headerGroups.find(it => it.id === column.id || it.column.id === column.id && it.subHeaders.length >= 2);
+    const header = headerGroups.find(it => it.id === column.id || it.column.id === column.id && it.subHeaders.length > 0);
     // const groupHeader = headerGroups.find((it) => it.column.id === column.id && it.subHeaders.length >= 2)
 
     if (header?.subHeaders && header.subHeaders.length >= 2) {

package/es/table-component/hook/utils.js

@@ -1680,13 +1680,30 @@ export const convertFilters = filters => {
   });
   return result;
 };
+
+// export function getInvisibleColumns(columns: ColumnTable[]): Record<string, boolean> {
+//   const result: Record<string, boolean> = {};
+//   for (const col of columns) {
+//     if (col.visible === false || col.hidden) {
+//       result[col.field ?? ''] = false;
+//     }
+//   }
+//   return result;
+// }
+
 export function getInvisibleColumns(columns) {
   const result = {};
-  for (const col of columns) {
-    if (col.visible === false || col.hidden) {
-      result[col.field ?? ''] = false;
+  function traverse(cols) {
+    for (const col of cols) {
+      if (col.visible === false) {
+        result[col.field ?? ''] = false;
+      }
+      if (col.children && col.children.length > 0) {
+        traverse(col.children);
+      }
     }
   }
+  traverse(columns);
   return result;
 }
 export const getAllVisibleKeys = columns => {

package/lib/table-component/header/TableHead.js

@@ -15,6 +15,16 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 
 // import { getCommonPinningStyles } from '../hook/utils'
 
+// const getVisibleChildCount = <T,>(column: Column<T>): number => {
+//   if (!column.columns?.length) return 0;
+
+//   return column.columns.reduce((count: number, col: Column<T>) => {
+//     const selfCount =  col.getIsVisible() ? 1 : 0;
+//     const childrenCount = getVisibleChildCount(col);
+//     return count + selfCount + (childrenCount ? childrenCount - 1 : childrenCount);
+//   }, 0);
+// }
+
 const TableHead = ({
   columnVirtualizer,
   table
@@ -28,6 +38,7 @@ const TableHead = ({
   } = (0, _react.useContext)(_useContext.TableContext);
   const headerGroups = table.getFlatHeaders();
   const leafColumns = table.getVisibleFlatColumns();
+  // const leafColumns11 = table.getIsAllColumnsVisible();
   const headerDepth = table.getHeaderGroups().length;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: `${prefix}-grid-thead`,
@@ -42,10 +53,13 @@ const TableHead = ({
     }
   }, leafColumns.map(column => {
     const depth = column.depth ?? 0;
-    // const colSpan = col.getLeafColumns().length || 1;
-    const colSpan = column.columns.length || 1;
+
+    // const colSpan = column.columns.length || 1;
+    const colSpan = column.getFlatColumns().filter(col => col.getIsVisible() && col.columns.length < 2).length;
+    // const colSpan = getVisibleChildCount(column);
+
     const rowSpan = column.columns?.length > 0 ? 1 : headerDepth - depth;
-    const header = headerGroups.find(it => it.id === column.id || it.column.id === column.id && it.subHeaders.length >= 2);
+    const header = headerGroups.find(it => it.id === column.id || it.column.id === column.id && it.subHeaders.length > 0);
     // const groupHeader = headerGroups.find((it) => it.column.id === column.id && it.subHeaders.length >= 2)
 
     if (header?.subHeaders && header.subHeaders.length >= 2) {

package/lib/table-component/hook/utils.js

@@ -1793,14 +1793,30 @@ const convertFilters = filters => {
   });
   return result;
 };
+
+// export function getInvisibleColumns(columns: ColumnTable[]): Record<string, boolean> {
+//   const result: Record<string, boolean> = {};
+//   for (const col of columns) {
+//     if (col.visible === false || col.hidden) {
+//       result[col.field ?? ''] = false;
+//     }
+//   }
+//   return result;
+// }
 exports.convertFilters = convertFilters;
 function getInvisibleColumns(columns) {
   const result = {};
-  for (const col of columns) {
-    if (col.visible === false || col.hidden) {
-      result[col.field ?? ''] = false;
+  function traverse(cols) {
+    for (const col of cols) {
+      if (col.visible === false) {
+        result[col.field ?? ''] = false;
+      }
+      if (col.children && col.children.length > 0) {
+        traverse(col.children);
+      }
     }
   }
+  traverse(columns);
   return result;
 }
 const getAllVisibleKeys = columns => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-grid-template",
-  "version": "1.8.40",
+  "version": "1.8.42",
   "description": "es-grid-template",
   "keywords": [
     "react",