es-grid-template 1.8.36 → 1.8.37

package/es/table-component/TableContainer.js

@@ -244,7 +244,8 @@ const TableContainer = props => {
       focusedCell,
       setFocusedCell,
       rowClassName,
-      table
+      table,
+      pagination
     }
   }, /*#__PURE__*/React.createElement(TableWrapper, {
     contextMenuItems: contextMenuItems,

package/es/table-component/body/TableBodyCell.js

@@ -23,7 +23,7 @@ const renderCellIndex = props => {
   }
   return /*#__PURE__*/React.createElement("span", {
     className: "ui-rc_cell-content"
-  }, cell.row.index + (pagination ? (pagination.currentPage ?? 1 - 1) * (pagination?.pageSize ?? 0) : 0) + 1);
+  }, cell.row.index + (pagination ? ((pagination.currentPage ?? 1) - 1) * (pagination?.pageSize ?? 0) : 0) + 1);
 };
 const renderCommand = args => {
   const {
@@ -81,7 +81,7 @@ const renderSelection = args => {
     isSelectionChange
   } = args;
   const checked = selectionSettings?.checkStrictly ? row.getIsSelected() : row.getIsSelected() || row.getIsAllSubRowsSelected();
-  const indeterminate = selectionSettings?.type == 'single' || selectionSettings?.checkStrictly ? false : row.getIsSomeSelected() && selectionSettings && selectionSettings.mode === 'checkbox' || row.getIsSomeSelected();
+  const indeterminate = selectionSettings?.type === 'single' || selectionSettings?.checkStrictly ? false : row.getIsSomeSelected() && selectionSettings && selectionSettings.mode === 'checkbox' || row.getIsSomeSelected();
   return /*#__PURE__*/React.createElement("div", {
     style: {}
   }, cell.column.getIndex() === expandIconColumnIndex && isDataTree && /*#__PURE__*/React.createElement("div", {
@@ -209,7 +209,17 @@ const TableBodyCell = props => {
         // maxWidth: cell.column.getSize(),
         ...getCommonPinningStyles(cell.column)
       },
-      onMouseDown: () => {}
+      onClick: e => {
+        if (!selectionSettings || selectionSettings.checkboxOnly !== true) {
+          toggleRowSelection({
+            e,
+            cell,
+            setIsSelectionChange,
+            isSelectionChange,
+            selectionSettings
+          });
+        }
+      }
     }, cell.column.getIndex() === expandIconColumnIndex && isDataTree && /*#__PURE__*/React.createElement("div", {
       className: "ui-rc-table-row-expand-trigger",
       style: {
@@ -457,13 +467,15 @@ const TableBodyCell = props => {
     ,
 
     onClick: e => {
-      toggleRowSelection({
-        e,
-        cell,
-        setIsSelectionChange,
-        isSelectionChange,
-        selectionSettings
-      });
+      if (!selectionSettings || selectionSettings.checkboxOnly !== true) {
+        toggleRowSelection({
+          e,
+          cell,
+          setIsSelectionChange,
+          isSelectionChange,
+          selectionSettings
+        });
+      }
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: classNames('ui-rc_cell-content', {})

package/es/table-component/hook/utils.d.ts

@@ -137,7 +137,7 @@ export declare const convertToObjTrue: (arr: any) => {
 };
 export declare const getDiffent2Array: (a: any[], b: any[]) => any[];
 export declare function findFirst(items: Column<any>[]): Column<any, unknown>;
-export declare function isTreeArray(arr: any[], options?: any): boolean;
+export declare function isTreeArray(arr: any[]): boolean;
 export declare function updateColumnWidthsRecursive(columns: any[], sizing: Record<string, number>): any[];
 export declare function updateWidthsByOther(source: any[], target: any[]): any[];
 export declare function findAllChildrenKeys2<RecordType>(data: readonly RecordType[], rowKey: any, childrenColumnName: string): Key[];

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

@@ -1942,32 +1942,63 @@ export function findFirst(items) {
   if (leftItem) return leftItem;
   return null;
 }
-export function isTreeArray(arr, options) {
+
+// export function isTreeArray(arr: any[]): boolean {
+//   if (!Array.isArray(arr) || arr.length === 0) {
+
+//     return false
+//   }
+
+//   // const requireNonEmpty = options?.requireNonEmptyChildren ?? false
+//   let hasParent = false
+
+//   for (const item of arr) {
+//     if (typeof item !== 'object' || item === null) {
+
+//       return false
+//     }
+
+//     if ('children' in item) {
+//       const children = (item as any).children
+//       if (!Array.isArray(children)) {
+//         // return false;
+//         hasParent =  false
+//       }
+
+//       if (children && children.length > 0) {
+//           hasParent = true
+//         }
+
+//       // if (requireNonEmpty) {
+
+//       //   console.log('requireNonEmpty', requireNonEmpty)
+//       //   if (children.length > 0) {
+//       //     hasParent = true
+//       //   }
+//       // } else {
+
+//       //   hasParent = true
+
+//       // }
+//     }
+//   }
+
+//   return hasParent
+// }
+
+export function isTreeArray(arr) {
   if (!Array.isArray(arr) || arr.length === 0) {
     return false;
   }
-  const requireNonEmpty = options?.requireNonEmptyChildren ?? false;
-  let hasParent = false;
   for (const item of arr) {
-    if (typeof item !== 'object' || item === null) {
+    if (!item) {
       return false;
     }
-    if ('children' in item) {
-      const children = item.children;
-      if (!Array.isArray(children)) {
-        // return false;
-        hasParent = false;
-      }
-      if (requireNonEmpty) {
-        if (children.length > 0) {
-          hasParent = true;
-        }
-      } else {
-        hasParent = true;
-      }
+    if (item.children?.length > 0) {
+      return true;
     }
   }
-  return hasParent;
+  return false;
 }
 export function updateColumnWidthsRecursive(columns, sizing) {
   return columns.map(col => {

package/lib/table-component/TableContainer.js

@@ -254,7 +254,8 @@ const TableContainer = props => {
       focusedCell,
       setFocusedCell,
       rowClassName,
-      table
+      table,
+      pagination
     }
   }, /*#__PURE__*/_react.default.createElement(_TableWrapper.default, {
     contextMenuItems: contextMenuItems,

package/lib/table-component/body/TableBodyCell.js

@@ -30,7 +30,7 @@ const renderCellIndex = props => {
   }
   return /*#__PURE__*/_react.default.createElement("span", {
     className: "ui-rc_cell-content"
-  }, cell.row.index + (pagination ? (pagination.currentPage ?? 1 - 1) * (pagination?.pageSize ?? 0) : 0) + 1);
+  }, cell.row.index + (pagination ? ((pagination.currentPage ?? 1) - 1) * (pagination?.pageSize ?? 0) : 0) + 1);
 };
 const renderCommand = args => {
   const {
@@ -88,7 +88,7 @@ const renderSelection = args => {
     isSelectionChange
   } = args;
   const checked = selectionSettings?.checkStrictly ? row.getIsSelected() : row.getIsSelected() || row.getIsAllSubRowsSelected();
-  const indeterminate = selectionSettings?.type == 'single' || selectionSettings?.checkStrictly ? false : row.getIsSomeSelected() && selectionSettings && selectionSettings.mode === 'checkbox' || row.getIsSomeSelected();
+  const indeterminate = selectionSettings?.type === 'single' || selectionSettings?.checkStrictly ? false : row.getIsSomeSelected() && selectionSettings && selectionSettings.mode === 'checkbox' || row.getIsSomeSelected();
   return /*#__PURE__*/_react.default.createElement("div", {
     style: {}
   }, cell.column.getIndex() === expandIconColumnIndex && isDataTree && /*#__PURE__*/_react.default.createElement("div", {
@@ -216,7 +216,17 @@ const TableBodyCell = props => {
         // maxWidth: cell.column.getSize(),
         ...(0, _utils.getCommonPinningStyles)(cell.column)
       },
-      onMouseDown: () => {}
+      onClick: e => {
+        if (!selectionSettings || selectionSettings.checkboxOnly !== true) {
+          (0, _useColumns.toggleRowSelection)({
+            e,
+            cell,
+            setIsSelectionChange,
+            isSelectionChange,
+            selectionSettings
+          });
+        }
+      }
     }, cell.column.getIndex() === expandIconColumnIndex && isDataTree && /*#__PURE__*/_react.default.createElement("div", {
       className: "ui-rc-table-row-expand-trigger",
       style: {
@@ -464,13 +474,15 @@ const TableBodyCell = props => {
     ,
 
     onClick: e => {
-      (0, _useColumns.toggleRowSelection)({
-        e,
-        cell,
-        setIsSelectionChange,
-        isSelectionChange,
-        selectionSettings
-      });
+      if (!selectionSettings || selectionSettings.checkboxOnly !== true) {
+        (0, _useColumns.toggleRowSelection)({
+          e,
+          cell,
+          setIsSelectionChange,
+          isSelectionChange,
+          selectionSettings
+        });
+      }
     }
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('ui-rc_cell-content', {})

package/lib/table-component/hook/utils.d.ts

@@ -137,7 +137,7 @@ export declare const convertToObjTrue: (arr: any) => {
 };
 export declare const getDiffent2Array: (a: any[], b: any[]) => any[];
 export declare function findFirst(items: Column<any>[]): Column<any, unknown>;
-export declare function isTreeArray(arr: any[], options?: any): boolean;
+export declare function isTreeArray(arr: any[]): boolean;
 export declare function updateColumnWidthsRecursive(columns: any[], sizing: Record<string, number>): any[];
 export declare function updateWidthsByOther(source: any[], target: any[]): any[];
 export declare function findAllChildrenKeys2<RecordType>(data: readonly RecordType[], rowKey: any, childrenColumnName: string): Key[];

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

@@ -2064,32 +2064,63 @@ function findFirst(items) {
   if (leftItem) return leftItem;
   return null;
 }
-function isTreeArray(arr, options) {
+
+// export function isTreeArray(arr: any[]): boolean {
+//   if (!Array.isArray(arr) || arr.length === 0) {
+
+//     return false
+//   }
+
+//   // const requireNonEmpty = options?.requireNonEmptyChildren ?? false
+//   let hasParent = false
+
+//   for (const item of arr) {
+//     if (typeof item !== 'object' || item === null) {
+
+//       return false
+//     }
+
+//     if ('children' in item) {
+//       const children = (item as any).children
+//       if (!Array.isArray(children)) {
+//         // return false;
+//         hasParent =  false
+//       }
+
+//       if (children && children.length > 0) {
+//           hasParent = true
+//         }
+
+//       // if (requireNonEmpty) {
+
+//       //   console.log('requireNonEmpty', requireNonEmpty)
+//       //   if (children.length > 0) {
+//       //     hasParent = true
+//       //   }
+//       // } else {
+
+//       //   hasParent = true
+
+//       // }
+//     }
+//   }
+
+//   return hasParent
+// }
+
+function isTreeArray(arr) {
   if (!Array.isArray(arr) || arr.length === 0) {
     return false;
   }
-  const requireNonEmpty = options?.requireNonEmptyChildren ?? false;
-  let hasParent = false;
   for (const item of arr) {
-    if (typeof item !== 'object' || item === null) {
+    if (!item) {
       return false;
     }
-    if ('children' in item) {
-      const children = item.children;
-      if (!Array.isArray(children)) {
-        // return false;
-        hasParent = false;
-      }
-      if (requireNonEmpty) {
-        if (children.length > 0) {
-          hasParent = true;
-        }
-      } else {
-        hasParent = true;
-      }
+    if (item.children?.length > 0) {
+      return true;
     }
   }
-  return hasParent;
+  return false;
 }
 function updateColumnWidthsRecursive(columns, sizing) {
   return columns.map(col => {

package/package.json

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