es-grid-template 1.9.69 → 1.9.71

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" | "display" | "width" | "minWidth" | "position"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position">);
-    onCellHeaderStyles?: Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position">);
+    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" | "display" | "width" | "minWidth" | "position"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position">);
+    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/index.d.ts

@@ -10,8 +10,8 @@ export { default as Select } from './select';
 export type { SelectProps } from './select';
 export { default as DateRangePicker } from './date-range-picker';
 export type { DateRangePickerProps } from './date-range-picker';
-export { default as DatePicker } from './datePicker';
-export type { DatePickerType, DatePickerProps } from './datePicker';
+export { default as DatePicker } from './date-picker';
+export type { DatePickerType, DatePickerProps } from './date-picker';
 export { default as Splitter } from './splitter';
 export type { SplitterProps } from './splitter';
 export { default as Collapse } from './collapse';

package/es/index.js

@@ -4,7 +4,7 @@ export { default as Tabs } from "./tabs";
 export { default as SelectTable } from "./select-table";
 export { default as Select } from "./select";
 export { default as DateRangePicker } from "./date-range-picker";
-export { default as DatePicker } from "./datePicker";
+export { default as DatePicker } from "./date-picker";
 export { default as Splitter } from "./splitter";
 export { default as Collapse } from "./collapse";
 export { default as TableComponent } from "./ali-table";

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

@@ -301,7 +301,6 @@ const TableHeadCell2 = props => {
       const allRowsInPage = allRows.map(it => it.original);
       if (table.getIsAllRowsSelected()) {
         const cc = excludeItems(prevSelected, allRowsInPage);
-        console.log(cc);
         setIsSelectionChange({
           isChange: true,
           type: 'all',
@@ -311,7 +310,6 @@ const TableHeadCell2 = props => {
       } else {
         const abc = [...prevSelected, ...allRowsInPage];
         const newSeletedRows = removeDuplicatesByKey(abc, 'rowId');
-        console.log('newSeletedRows', newSeletedRows);
         setIsSelectionChange({
           isChange: true,
           type: 'all',

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

@@ -270,7 +270,7 @@ export const toggleRowSelection = props => {
         isChange: true,
         type: 'rowSelected',
         rowData: row.original,
-        rowsData: selectionSettings?.type === 'single' ? [row] : checkedRows
+        rowsData: selectionSettings?.type === 'single' ? [row.original] : checkedRows
       });
     }
     return;
@@ -278,14 +278,14 @@ export const toggleRowSelection = props => {
   if (row.subRows && row.subRows.length > 0) {
     // click vào row cha
 
-    const allChild = getAllChildren(row);
+    const allChild = getAllChildren(row).map(it => it.original);
     toggleRowAndChildren(row, !row.getIsSelected());
     if (row.getIsSelected()) {
       // đã chọn
 
       // const aaa = isSelectionChange?.rowsData.filter((it) => it.id !== row.id)
 
-      const newRowsSelected = excludeItems(prevSelected, [...allChild, row]);
+      const newRowsSelected = excludeItems(prevSelected, [...allChild, row.original]);
       setIsSelectionChange({
         isChange: true,
         type: 'rowSelected',
@@ -297,9 +297,9 @@ export const toggleRowSelection = props => {
 
       let checkedRows = [];
       if (row.subRows && row.subRows.length > 0) {
-        checkedRows = [...prevSelected, row, ...allChild];
+        checkedRows = [...prevSelected, row.original, ...allChild];
       } else {
-        checkedRows = [...prevSelected, row];
+        checkedRows = [...prevSelected, row.original];
       }
       setIsSelectionChange({
         isChange: true,
@@ -321,11 +321,11 @@ export const toggleRowSelection = props => {
       let newCheckedRows = [];
       if (rowParent) {}
       if (rowParent && countUnselectedChildren(row) === 1) {
-        newCheckedRows = prevSelected.filter(it => it.id !== row.id && it.id !== rowParent.id);
+        newCheckedRows = prevSelected.filter(it => it.rowId !== row.id && it.rowId !== rowParent.id);
       } else {
         // xóa row ra list selected 
         // const newRowsSelected = prevSelected.filter((it) => it.id !== row.id)
-        newCheckedRows = prevSelected.filter(it => it.id !== row.id);
+        newCheckedRows = prevSelected.filter(it => it.rowId !== row.id);
       }
       setIsSelectionChange({
         isChange: true,
@@ -342,18 +342,18 @@ export const toggleRowSelection = props => {
       // nếu có cha và cha chưa được chọn và tất cả con đã chọn => thêm row cha vào 
       if (rowParent && !rowParent.getIsSelected() && countUnselectedChildren(row) === 1) {
         rowParent.toggleSelected(!rowParent.getIsSelected());
-        checkedRows = [...prevSelected, row, rowParent];
+        checkedRows = [...prevSelected, row.original, rowParent.original];
       } else {
         // chỉ thêm vào row hiện tại
 
-        const isInclude = prevSelected.findIndex(it => it.id === cell.row.id);
+        const isInclude = prevSelected.findIndex(it => it.rowId === cell.row.id);
         if (isInclude > -1) {
           // cập nhật data row hiện tại
 
-          prevSelected[isInclude] = row;
+          prevSelected[isInclude] = row.original;
           checkedRows = [...prevSelected];
         } else {
-          checkedRows = [...prevSelected, row];
+          checkedRows = [...prevSelected, row.original];
         }
       }
       setIsSelectionChange({

package/lib/index.d.ts

@@ -10,8 +10,8 @@ export { default as Select } from './select';
 export type { SelectProps } from './select';
 export { default as DateRangePicker } from './date-range-picker';
 export type { DateRangePickerProps } from './date-range-picker';
-export { default as DatePicker } from './datePicker';
-export type { DatePickerType, DatePickerProps } from './datePicker';
+export { default as DatePicker } from './date-picker';
+export type { DatePickerType, DatePickerProps } from './date-picker';
 export { default as Splitter } from './splitter';
 export type { SplitterProps } from './splitter';
 export { default as Collapse } from './collapse';

package/lib/index.js

@@ -70,7 +70,7 @@ var _tabs = _interopRequireDefault(require("./tabs"));
 var _selectTable = _interopRequireDefault(require("./select-table"));
 var _select = _interopRequireDefault(require("./select"));
 var _dateRangePicker = _interopRequireDefault(require("./date-range-picker"));
-var _datePicker = _interopRequireDefault(require("./datePicker"));
+var _datePicker = _interopRequireDefault(require("./date-picker"));
 var _splitter = _interopRequireDefault(require("./splitter"));
 var _collapse = _interopRequireDefault(require("./collapse"));
 var _aliTable = _interopRequireDefault(require("./ali-table"));

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

@@ -309,7 +309,6 @@ const TableHeadCell2 = props => {
       const allRowsInPage = allRows.map(it => it.original);
       if (table.getIsAllRowsSelected()) {
         const cc = (0, _utils.excludeItems)(prevSelected, allRowsInPage);
-        console.log(cc);
         setIsSelectionChange({
           isChange: true,
           type: 'all',
@@ -319,7 +318,6 @@ const TableHeadCell2 = props => {
       } else {
         const abc = [...prevSelected, ...allRowsInPage];
         const newSeletedRows = (0, _utils.removeDuplicatesByKey)(abc, 'rowId');
-        console.log('newSeletedRows', newSeletedRows);
         setIsSelectionChange({
           isChange: true,
           type: 'all',

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

@@ -282,7 +282,7 @@ const toggleRowSelection = props => {
         isChange: true,
         type: 'rowSelected',
         rowData: row.original,
-        rowsData: selectionSettings?.type === 'single' ? [row] : checkedRows
+        rowsData: selectionSettings?.type === 'single' ? [row.original] : checkedRows
       });
     }
     return;
@@ -290,14 +290,14 @@ const toggleRowSelection = props => {
   if (row.subRows && row.subRows.length > 0) {
     // click vào row cha
 
-    const allChild = (0, _utils.getAllChildren)(row);
+    const allChild = (0, _utils.getAllChildren)(row).map(it => it.original);
     (0, _utils.toggleRowAndChildren)(row, !row.getIsSelected());
     if (row.getIsSelected()) {
       // đã chọn
 
       // const aaa = isSelectionChange?.rowsData.filter((it) => it.id !== row.id)
 
-      const newRowsSelected = (0, _utils.excludeItems)(prevSelected, [...allChild, row]);
+      const newRowsSelected = (0, _utils.excludeItems)(prevSelected, [...allChild, row.original]);
       setIsSelectionChange({
         isChange: true,
         type: 'rowSelected',
@@ -309,9 +309,9 @@ const toggleRowSelection = props => {
 
       let checkedRows = [];
       if (row.subRows && row.subRows.length > 0) {
-        checkedRows = [...prevSelected, row, ...allChild];
+        checkedRows = [...prevSelected, row.original, ...allChild];
       } else {
-        checkedRows = [...prevSelected, row];
+        checkedRows = [...prevSelected, row.original];
       }
       setIsSelectionChange({
         isChange: true,
@@ -333,11 +333,11 @@ const toggleRowSelection = props => {
       let newCheckedRows = [];
       if (rowParent) {}
       if (rowParent && (0, _utils.countUnselectedChildren)(row) === 1) {
-        newCheckedRows = prevSelected.filter(it => it.id !== row.id && it.id !== rowParent.id);
+        newCheckedRows = prevSelected.filter(it => it.rowId !== row.id && it.rowId !== rowParent.id);
       } else {
         // xóa row ra list selected 
         // const newRowsSelected = prevSelected.filter((it) => it.id !== row.id)
-        newCheckedRows = prevSelected.filter(it => it.id !== row.id);
+        newCheckedRows = prevSelected.filter(it => it.rowId !== row.id);
       }
       setIsSelectionChange({
         isChange: true,
@@ -354,18 +354,18 @@ const toggleRowSelection = props => {
       // nếu có cha và cha chưa được chọn và tất cả con đã chọn => thêm row cha vào 
       if (rowParent && !rowParent.getIsSelected() && (0, _utils.countUnselectedChildren)(row) === 1) {
         rowParent.toggleSelected(!rowParent.getIsSelected());
-        checkedRows = [...prevSelected, row, rowParent];
+        checkedRows = [...prevSelected, row.original, rowParent.original];
       } else {
         // chỉ thêm vào row hiện tại
 
-        const isInclude = prevSelected.findIndex(it => it.id === cell.row.id);
+        const isInclude = prevSelected.findIndex(it => it.rowId === cell.row.id);
         if (isInclude > -1) {
           // cập nhật data row hiện tại
 
-          prevSelected[isInclude] = row;
+          prevSelected[isInclude] = row.original;
           checkedRows = [...prevSelected];
         } else {
-          checkedRows = [...prevSelected, row];
+          checkedRows = [...prevSelected, row.original];
         }
       }
       setIsSelectionChange({

package/package.json

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