es-grid-template 1.9.76 → 1.9.77

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

@@ -196,10 +196,10 @@ export declare const fixColumnsLeft: <RecordType>(columns: ColumnTable<RecordTyp
         value: any;
         rowData: RecordType;
     }) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
-    onCellStyles?: Omit<CSSProperties, "left" | "right" | "position" | "display" | "width" | "minWidth"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "position" | "display" | "width" | "minWidth">);
-    onCellHeaderStyles?: Omit<CSSProperties, "left" | "right" | "position" | "display" | "width" | "minWidth"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "position" | "display" | "width" | "minWidth">);
+    onCellStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display">);
+    onCellHeaderStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display">);
     onCell?: (rowData: RecordType, index: number) => import("react").TdHTMLAttributes<HTMLTableCellElement>;
-    onCellFooterStyles?: Omit<CSSProperties, "left" | "right" | "position" | "display" | "width" | "minWidth"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "position" | "display" | "width" | "minWidth">);
+    onCellFooterStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display">);
     getValue?: (row: any, rowIndex: number) => any;
     getCellProps?: (value: any, row: any, rowIndex: number) => import("./../../grid-component/type").CellProps;
     headerCellProps?: import("./../../grid-component/type").CellProps;

package/es/table-component/InternalTable.js

@@ -174,7 +174,7 @@ const InternalTable = props => {
   // );
 
   const mergedSelectedKeys = React.useMemo(() => {
-    return selectedRowKeys ?? defaultSelectedRowKeys ?? [];
+    return selectedRowKeys ?? defaultSelectedRowKeys;
   }, [defaultSelectedRowKeys, selectedRowKeys]);
   const mergedData = React.useMemo(() => {
     return filterDataByColumns(convertData, onFilter ? undefined : filterStates ?? defaultFilter, onSorter ? undefined : sorterStates ?? defaultSorter, mergedFilterKeys, ignoreAccents);

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

@@ -304,7 +304,7 @@ const TableHeadCell2 = props => {
         setIsSelectionChange({
           isChange: true,
           type: 'all',
-          rowData: {},
+          rowData: undefined,
           rowsData: cc
         });
       } else {
@@ -313,7 +313,7 @@ const TableHeadCell2 = props => {
         setIsSelectionChange({
           isChange: true,
           type: 'all',
-          rowData: {},
+          rowData: undefined,
           rowsData: newSeletedRows
         });
       }

package/es/table-component/table/Grid.d.ts

@@ -24,7 +24,7 @@ type Props<T> = Omit<TableProps<T>, 'columns'> & {
     triggerChangeColumns?: (args: any, keys: any, type: string) => void;
     windowSize: any;
     isDataTree: boolean;
-    mergedSelectedKeys: Key[];
+    mergedSelectedKeys: Key[] | undefined;
 };
 declare const Grid: <RecordType extends object>(props: Props<RecordType>) => JSX.Element;
 export default Grid;

package/es/table-component/table/Grid.js

@@ -87,7 +87,7 @@ const Grid = props => {
   const [isSelectionChange, setIsSelectionChange] = React.useState({
     isChange: false,
     type: '',
-    rowData: {},
+    rowData: undefined,
     rowsData: []
   });
   const [sorterChange, setSorterChange] = React.useState(false);
@@ -170,17 +170,22 @@ const Grid = props => {
     // debugTable: true
   });
   React.useEffect(() => {
-    setIsSelectionChange(prev => ({
-      ...prev,
-      isChange: false
-    }));
+    if (!mergedSelectedKeys) {
+      return;
+    }
+    if (selectionSettings?.selectedRowKeys) {
+      setIsSelectionChange(prev => ({
+        ...prev,
+        isChange: false
+      }));
+    }
     if (!isSelectionChange.isChange) {
       if (mergedSelectedKeys.length === 0) {
         setIsSelectionChange(prev => ({
           ...prev,
           rowsData: []
         }));
-        setRowSelection(convertToObjTrue(mergedSelectedKeys));
+        setRowSelection({});
       } else {
         const abc = flattenArray(dataSource);
         const selectedKeySet = new Set(mergedSelectedKeys);
@@ -192,13 +197,14 @@ const Grid = props => {
         }));
       }
     } else {
+      if (selectionSettings?.defaultSelectedRowKeys) {
+        return;
+      }
       if (mergedSelectedKeys.length === 0) {
-        setRowSelection(convertToObjTrue(mergedSelectedKeys));
+        setRowSelection({});
       }
     }
-  }, [mergedSelectedKeys, dataSource, isSelectionChange.isChange]);
-  // }, [mergedSelectedKeys, dataSource])
-
+  }, [mergedSelectedKeys, dataSource, isSelectionChange.isChange, selectionSettings?.defaultSelectedRowKeys, selectionSettings?.selectedRowKeys]);
   React.useEffect(() => {
     if (defaultFilter) {
       const a = revertConvertFilters(defaultFilter);

package/lib/table-component/InternalTable.js

@@ -179,7 +179,7 @@ const InternalTable = props => {
   // );
 
   const mergedSelectedKeys = _react.default.useMemo(() => {
-    return selectedRowKeys ?? defaultSelectedRowKeys ?? [];
+    return selectedRowKeys ?? defaultSelectedRowKeys;
   }, [defaultSelectedRowKeys, selectedRowKeys]);
   const mergedData = _react.default.useMemo(() => {
     return (0, _utils.filterDataByColumns)(convertData, onFilter ? undefined : filterStates ?? defaultFilter, onSorter ? undefined : sorterStates ?? defaultSorter, mergedFilterKeys, ignoreAccents);

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

@@ -312,7 +312,7 @@ const TableHeadCell2 = props => {
         setIsSelectionChange({
           isChange: true,
           type: 'all',
-          rowData: {},
+          rowData: undefined,
           rowsData: cc
         });
       } else {
@@ -321,7 +321,7 @@ const TableHeadCell2 = props => {
         setIsSelectionChange({
           isChange: true,
           type: 'all',
-          rowData: {},
+          rowData: undefined,
           rowsData: newSeletedRows
         });
       }

package/lib/table-component/table/Grid.d.ts

@@ -24,7 +24,7 @@ type Props<T> = Omit<TableProps<T>, 'columns'> & {
     triggerChangeColumns?: (args: any, keys: any, type: string) => void;
     windowSize: any;
     isDataTree: boolean;
-    mergedSelectedKeys: Key[];
+    mergedSelectedKeys: Key[] | undefined;
 };
 declare const Grid: <RecordType extends object>(props: Props<RecordType>) => JSX.Element;
 export default Grid;

package/lib/table-component/table/Grid.js

@@ -92,7 +92,7 @@ const Grid = props => {
   const [isSelectionChange, setIsSelectionChange] = _react.default.useState({
     isChange: false,
     type: '',
-    rowData: {},
+    rowData: undefined,
     rowsData: []
   });
   const [sorterChange, setSorterChange] = _react.default.useState(false);
@@ -175,17 +175,22 @@ const Grid = props => {
     // debugTable: true
   });
   _react.default.useEffect(() => {
-    setIsSelectionChange(prev => ({
-      ...prev,
-      isChange: false
-    }));
+    if (!mergedSelectedKeys) {
+      return;
+    }
+    if (selectionSettings?.selectedRowKeys) {
+      setIsSelectionChange(prev => ({
+        ...prev,
+        isChange: false
+      }));
+    }
     if (!isSelectionChange.isChange) {
       if (mergedSelectedKeys.length === 0) {
         setIsSelectionChange(prev => ({
           ...prev,
           rowsData: []
         }));
-        setRowSelection((0, _utils.convertToObjTrue)(mergedSelectedKeys));
+        setRowSelection({});
       } else {
         const abc = (0, _utils.flattenArray)(dataSource);
         const selectedKeySet = new Set(mergedSelectedKeys);
@@ -197,13 +202,14 @@ const Grid = props => {
         }));
       }
     } else {
+      if (selectionSettings?.defaultSelectedRowKeys) {
+        return;
+      }
       if (mergedSelectedKeys.length === 0) {
-        setRowSelection((0, _utils.convertToObjTrue)(mergedSelectedKeys));
+        setRowSelection({});
       }
     }
-  }, [mergedSelectedKeys, dataSource, isSelectionChange.isChange]);
-  // }, [mergedSelectedKeys, dataSource])
-
+  }, [mergedSelectedKeys, dataSource, isSelectionChange.isChange, selectionSettings?.defaultSelectedRowKeys, selectionSettings?.selectedRowKeys]);
   _react.default.useEffect(() => {
     if (defaultFilter) {
       const a = (0, _utils.revertConvertFilters)(defaultFilter);

package/package.json

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