es-grid-template 1.8.71 → 1.8.73

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

@@ -59,7 +59,9 @@ exports.sortByType = exports.shouldInclude = exports.removeVietnameseTones = voi
 exports.sortData = sortData;
 exports.sumSize = void 0;
 exports.toggleRowAndChildren = toggleRowAndChildren;
-exports.updateArrayByKey = exports.unFlattenData = void 0;
+exports.unFlattenData = void 0;
+exports.unGroupData = unGroupData;
+exports.updateArrayByKey = void 0;
 exports.updateColumnWidthsRecursive = updateColumnWidthsRecursive;
 exports.updateColumnsByGroup = exports.updateColumns1 = void 0;
 exports.updateOrInsert = updateOrInsert;
@@ -354,6 +356,35 @@ function groupArrayByColumns(arr, columns) {
     return arr;
   }
 }
+function unGroupData(groupedArray, originData) {
+  const result = [];
+  function traverse(arr) {
+    arr.forEach(item => {
+      if (item.children && item.children.length > 0) {
+        traverse(item.children);
+      } else {
+        // Đây là data item, không phải group item
+        result.push(item);
+      }
+    });
+  }
+  traverse(groupedArray);
+
+  // Tạo map từ id đến index trong originData
+  const indexMap = new Map();
+  originData.forEach((item, index) => {
+    const id = item.id ?? item.rowId;
+    indexMap.set(id, index);
+  });
+
+  // Sort result theo thứ tự trong originData
+  result.sort((a, b) => {
+    const aIndex = indexMap.get(a.id ?? a.rowId) ?? -1;
+    const bIndex = indexMap.get(b.id ?? b.rowId) ?? -1;
+    return aIndex - bIndex;
+  });
+  return result;
+}
 const flatColumns2 = columns => {
   return columns.reduce((list, column) => {
     const subColumns = column.children;

package/lib/table-virtuoso/style.js

@@ -9,6 +9,8 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 const color = "#000000de";
 const BgColor = "#ffffff";
 const rowSelectedBg = "#FEF2EF";
+const cellSelectedBg = "#F3F8FF";
+const borderSelectedColor = "#0550C5";
 const tableBorderColor = "#e0e0e0";
 const tableBorderColorDark = "#44485E";
 const BgColorDark = "#343e59";
@@ -16,4 +18,4 @@ const colorDark = "#e6e4f3e6";
 const GridStyle = exports.GridStyle = _styledComponents.default.div.withConfig({
   displayName: "GridStyle",
   componentId: "es-grid-template__sc-rs980s-0"
-})(["&.", "-grid{color:", ";font-size:13px;background-color:", ";table{table-layout:fixed;border-collapse:separate;border-spacing:0;}.", "-grid-container{border:1px solid ", ";.", "-grid-thead{&:has(.resizer.isResizing){.", "-grid-cell{touch-action:none;user-select:none;}}.", "-grid-cell{background-color:#ffffff;&:has(.resizer.isResizing){touch-action:none;user-select:none;}.resizer{cursor:col-resize;height:100%;position:absolute;right:0;top:0;touch-action:none;user-select:none;width:5px;}}}tbody{.", "-grid-row{&.", "-grid-row-parent{.", "-grid-cell{font-weight:600;background-color:#f5f5f5;}}}}.", "-grid-tfoot{z-index:3 !important;.ui-rc-grid-footer-row{.ui-rc-grid-cell{border-top:1px solid ", ";border-bottom:1px solid ", ";}}}.", "-grid-cell{padding:7px 8px;.class-content:has(*){background:lightblue;}.class-content:not(:has(*)){background:lightgreen;}&.", "-grid-cell-text-center{text-align:center;justify-content:center;}&.", "-grid-cell-text-righ{text-align:right;justify-content:flex-end;}}.", "-grid-cell:not(:has(*)){&.", "-grid-cell-text-center{text-align:center;justify-content:center;}&.", "-grid-cell-text-right{text-align:right;justify-content:flex-end;}&.", "-grid-cell-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;word-break:keep-all;}}}&.", "-grid-light{.", "-grid-container{.", "-grid-thead{z-index:3 !important;background-color:", ";font-weight:500;.", "-grid-cell{font-weight:inherit;color:", ";background-color:#ffffff;border-inline-end:1px solid ", ";border-bottom:1px solid ", ";&.ui-rc-grid-cell-ellipsis{.ui-rc-table-column-title,.", "-grid-cell-ellipsis{width:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;word-break:keep-all;}}&.ui-rc-grid-cell-wrap{.ui-rc-table-column-title,.", "-grid-cell-text-wrap{white-space:normal;word-break:break-word;overflow:hidden;}}&:hover{.ui-rc-header-trigger{.ui-rc-table-column-sorter-cancel{opacity:1;}}}.", "-grid-filter-column{display:flex;justify-content:space-between;width:100%;align-items:center;position:relative;}.ui-rc-header-trigger{padding-left:6px;display:flex;align-items:center;.ui-rc-table-column-sorter-cancel{opacity:0;}}.resizer{cursor:col-resize;height:100%;position:absolute;right:0;top:0;touch-action:none;user-select:none;width:5px;}.resizer.isResizing{opacity:1;}}}.", "-grid-tbody{.", "-grid-row{background-color:", ";color:", ";}}tbody{background-color:", ";color:", ";.", "-grid-row{&.ui-rc-grid-row-selected{.", "-grid-cell{background-color:", ";}}}.", "-grid-cell{outline:none;background-color:#ffffff;border-inline-end:1px solid ", ";border-bottom:1px solid ", ";&.ui-rc-grid-cell-selected{background-color:#33335d !important;}&.disable{background-color:#272A2F;}}}.", "-grid-tfoot{.", "-grid-footer-row{border-bottom-width:1px;border-bottom-color:", ";border-bottom-style:solid;border-top-width:1px;border-top-color:", ";border-top-style:solid;background-color:#fafafa;}.", "-grid-cell{background-color:inherit;border-inline-end:1px solid ", ";}}}}&.", "-grid-dark{background-color:", ";color:", ";.", "-grid-container{border-color:", ";&::after{border-right-color:", ";}}}}"], props => props.$prefix, color, BgColor, props => props.$prefix, tableBorderColor, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, tableBorderColor, tableBorderColor, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => `${props.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, props => props.$prefix, props => `${props.$theme.color ? props.$theme.color : color}`, tableBorderColor, tableBorderColor, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => `${props.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, props => `${props.$theme.color ? props.$theme.color : color}`, props => `${props.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, props => `${props.$theme.color ? props.$theme.color : color}`, props => props.$prefix, props => props.$prefix, rowSelectedBg, props => props.$prefix, tableBorderColor, tableBorderColor, props => props.$prefix, props => props.$prefix, tableBorderColor, tableBorderColor, props => props.$prefix, tableBorderColor, props => props.$prefix, BgColorDark, colorDark, props => props.$prefix, tableBorderColorDark, tableBorderColorDark);
+})(["&.", "-grid{color:", ";font-size:13px;background-color:", ";table{table-layout:fixed;border-collapse:separate;border-spacing:0;}.", "-grid-container{border:1px solid ", ";.", "-grid-thead{&:has(.resizer.isResizing){.", "-grid-cell{touch-action:none;user-select:none;}}.", "-grid-cell{background-color:#ffffff;&:has(.resizer.isResizing){touch-action:none;user-select:none;}.resizer{cursor:col-resize;height:100%;position:absolute;right:0;top:0;touch-action:none;user-select:none;width:5px;}}}tbody{.", "-grid-row{&.", "-grid-row-parent{.", "-grid-cell{font-weight:600;background-color:#f5f5f5;}}}}.", "-grid-tfoot{z-index:3 !important;.ui-rc-grid-footer-row{.ui-rc-grid-cell{border-top:1px solid ", ";border-bottom:1px solid ", ";}}}.", "-grid-cell{padding:7px 8px;.class-content:has(*){background:lightblue;}.class-content:not(:has(*)){background:lightgreen;}&.", "-grid-cell-text-center{text-align:center;justify-content:center;}&.", "-grid-cell-text-righ{text-align:right;justify-content:flex-end;}}.", "-grid-cell:not(:has(*)){&.", "-grid-cell-text-center{text-align:center;justify-content:center;}&.", "-grid-cell-text-right{text-align:right;justify-content:flex-end;}&.", "-grid-cell-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;word-break:keep-all;}}}&.", "-grid-light{.", "-grid-container{.", "-grid-thead{z-index:3 !important;background-color:", ";font-weight:500;.", "-grid-cell{font-weight:inherit;color:", ";background-color:#ffffff;border-inline-end:1px solid ", ";border-bottom:1px solid ", ";&.ui-rc-grid-cell-ellipsis{.ui-rc-table-column-title,.", "-grid-cell-ellipsis{width:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;word-break:keep-all;}}&.ui-rc-grid-cell-wrap{.ui-rc-table-column-title,.", "-grid-cell-text-wrap{white-space:normal;word-break:break-word;overflow:hidden;}}&:hover{.ui-rc-header-trigger{.ui-rc-table-column-sorter-cancel{opacity:1;}}}.", "-grid-filter-column{display:flex;justify-content:space-between;width:100%;align-items:center;position:relative;}.ui-rc-header-trigger{padding-left:6px;display:flex;align-items:center;.ui-rc-table-column-sorter-cancel{opacity:0;}}.resizer{cursor:col-resize;height:100%;position:absolute;right:0;top:0;touch-action:none;user-select:none;width:5px;}.resizer.isResizing{opacity:1;}}}.", "-grid-tbody{.", "-grid-row{background-color:", ";color:", ";}}tbody{background-color:", ";color:", ";.", "-grid-row{&.ui-rc-grid-row-selected{.", "-grid-cell{background-color:", ";}}}.", "-grid-cell{outline:none;background-color:#ffffff;border-inline-end:1px solid ", ";border-bottom:1px solid ", ";&.ui-rc-grid-cell-selected{background-color:", " !important;}&.disable{background-color:#f0f0f0;}&.cell-editable{user-select:none;&.cell-border-top{&::after{content:\"\";position:absolute;top:0px;left:0;height:1px;width:100%;border-top:1px solid ", ";pointer-events:none;z-index:1;}}&.cell-border-bottom{border-bottom:1px solid ", ";}&.cell-border-left{&::before{content:\"\";position:absolute;top:0;left:0;height:102%;width:1px;border-left:1px solid ", ";pointer-events:none;z-index:1;}}&.cell-border-right{border-inline-end:1px solid ", ";}&.cell-paste-border-top{&::after{content:\"\";position:absolute;top:0px;left:0;height:1px;width:100%;border-top:1px dashed #949494;pointer-events:none;z-index:1;}&.ui-rc-grid-cell-fix-left-last{&::after{left:-100%;}}&.ui-rc-grid-cell-fix-right-first{&::after{left:100%;}}}&.cell-paste-border-bottom{border-bottom:1px dashed #949494;}&.cell-paste-border-left{&::before{content:\"\";position:absolute;top:0;left:0;height:102%;width:1px;border-left:1px dashed #949494;pointer-events:none;z-index:1;}}&.cell-paste-border-right{border-inline-end:1px dashed #949494;}.dragging-point{width:6px;height:6px;position:absolute;cursor:crosshair;right:0px;bottom:0px;&.hidden{display:none;}.dot-point{position:absolute;width:6px;height:6px;border-radius:0px;background-color:", ";bottom:0;right:0;}}}&.cell-editing{padding:0;&:focus-visible{outline:none;}.ant-form-item,.ant-row.ant-form-item-row,.ant-col.ant-form-item-control,.ant-form-item-control-input,.ant-form-item-control-input-content,.ant-input{height:100% !important;&:focus-visible{outline:none;}}textarea.ant-input{line-height:1.8;height:36px !important;min-height:36px !important;}input.be-cell-editing,.ant-picker,.ui-rc-select-selector,.ui-rc-table-select-selector{padding-inline:7px;}.", "-checkbox-wrapper{.", "-checkbox{background-color:red;}.", "-checkbox-input{&:focus-visible{outline:none;}}}.ant-input,.ant-picker{border-radius:0;}.ant-color-picker-trigger{height:100%;border-radius:0;.ant-color-picker-color-block{height:100%;width:100%;}}.", "-table-select-single .", "-table-select-selector,.", "-select-single .", "-select-selector,.ui-rc-table-select-selector{border-radius:0 !important;}.", "-table-select-single:not(.", "-table-select-customize-input){.", "-table-select-selector{.", "-table-select-selection-search-input{height:auto;}}}}}}.", "-grid-tfoot{.", "-grid-footer-row{border-bottom-width:1px;border-bottom-color:", ";border-bottom-style:solid;border-top-width:1px;border-top-color:", ";border-top-style:solid;background-color:#fafafa;}.", "-grid-cell{background-color:inherit;border-inline-end:1px solid ", ";}}}}&.", "-grid-dark{background-color:", ";color:", ";.", "-grid-container{border-color:", ";&::after{border-right-color:", ";}}}}"], props => props.$prefix, color, BgColor, props => props.$prefix, tableBorderColor, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, tableBorderColor, tableBorderColor, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => `${props.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, props => props.$prefix, props => `${props.$theme.color ? props.$theme.color : color}`, tableBorderColor, tableBorderColor, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => `${props.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, props => `${props.$theme.color ? props.$theme.color : color}`, props => `${props.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, props => `${props.$theme.color ? props.$theme.color : color}`, props => props.$prefix, props => props.$prefix, rowSelectedBg, props => props.$prefix, tableBorderColor, tableBorderColor, cellSelectedBg, borderSelectedColor, borderSelectedColor, borderSelectedColor, borderSelectedColor, borderSelectedColor, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, tableBorderColor, tableBorderColor, props => props.$prefix, tableBorderColor, props => props.$prefix, BgColorDark, colorDark, props => props.$prefix, tableBorderColorDark, tableBorderColorDark);

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

@@ -182,7 +182,7 @@ const Grid = props => {
     t: t,
     windowSize: windowSize,
     table: table,
-    editAble: editAble,
+    editAble: false,
     dataSource: dataSource,
     originData: originData,
     prefix: prefix,
@@ -252,7 +252,7 @@ const Grid = props => {
     id: _faker.faker.string.alpha(20),
     t: t,
     table: table,
-    editAble: editAble,
+    editAble: false,
     dataSource: dataSource,
     originData: originData,
     prefix: prefix,

package/lib/table-virtuoso/table/TableWrapper.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import type { ColumnDef, Table } from "@tanstack/react-table";
-import type { CommandClick } from '../../grid-component/type';
+import type { CommandClick, ContextInfo, PaginationConfig } from '../../grid-component/type';
+import type { ContextMenuItem } from "../..";
 type Props<T> = {
     tableContainerRef: React.RefObject<HTMLDivElement>;
     table: Table<T>;
@@ -14,9 +15,14 @@ type Props<T> = {
     loading?: boolean;
     commandClick?: (args: Omit<CommandClick<T>, 'rows'>) => void;
     editAble?: boolean;
+    contextMenuItems?: ContextMenuItem[];
     showEmptyText?: boolean;
     contextMenuClick?: any;
+    contextMenuOpen?: (args: Omit<ContextInfo<T>, 'item'>) => void;
+    contextMenuHidden?: string[] | ((args?: Omit<ContextInfo<T>, 'item' | 'event'>) => string[]);
     next?: () => void;
+    pagination?: false | PaginationConfig;
+    infiniteScroll?: boolean;
 };
 declare const TableWrapper: <RecordType extends object>(props: Props<RecordType>) => React.JSX.Element;
 export default TableWrapper;

package/lib/table-virtuoso/table/TableWrapper.js

@@ -29,10 +29,13 @@ const TableWrapper = props => {
     table,
     height,
     id,
-    commandClick
+    commandClick,
+    editAble
   } = props;
   const {
-    prefix
+    prefix,
+    editingKey,
+    rowEditable
   } = (0, _react.useContext)(_useContext.TableContext); //onRowHeaderStyles
 
   // ref cho scroll container
@@ -79,22 +82,38 @@ const TableWrapper = props => {
       TableHead: props => /*#__PURE__*/_react.default.createElement("thead", (0, _extends2.default)({}, props, {
         className: `${prefix}-grid-thead`
       })),
+      //  TableBody: (props) => (
+      //   <tbody {...props} className={`${prefix}-grid-tbody1`} />
+      // ),
+
       TableFoot: props => /*#__PURE__*/_react.default.createElement("tfoot", (0, _extends2.default)({}, props, {
         className: `${prefix}-grid-tfoot`
       })),
       TableRow: props => {
+        const {
+          item,
+          ...rest
+        } = props;
         const index = props["data-index"];
         const rowheight = props["data-known-size"];
         const row = rows[index];
+        const isEditing = row.id === editingKey;
+        const isRowEditable = rowEditable ? rowEditable(row.original) : true;
         return /*#__PURE__*/_react.default.createElement(_TableBodyRow.default, (0, _extends2.default)({
           tableId: id,
           row: row,
           table: table,
           commandClick: commandClick,
-          rowheight: rowheight
-        }, props));
+          rowheight: editAble ? 37 : rowheight,
+          isEditing: isEditing,
+          isRowEditable: isRowEditable,
+          editAble: editAble
+        }, rest));
       }
-    }
+    },
+    defaultItemHeight: 37,
+    fixedItemHeight: 37,
+    itemSize: () => 37
 
     // overscan={{
     //   main: 10,

package/lib/table-virtuoso/useContext.d.ts

@@ -1,11 +1,11 @@
 import type { Dispatch, SetStateAction } from 'react';
-import type { ColumnTable, ExpandableConfig, IFormat, IGroupSetting, IWrapSettings, Locale, PaginationConfig, RangeState, RecordDoubleClickEventArgs, RowClassName, SelectionSettings } from "../grid-component/type";
+import type { ColumnTable, ExpandableConfig, IFormat, IGroupSetting, IWrapSettings, Locale, PaginationConfig, RangeState, RecordDoubleClickEventArgs, RowClassName, SelectionSettings, SourceFilter } from "../grid-component/type";
 import type { SubmitHandler } from "react-hook-form";
 import type { ExpandedState, Row, Table } from '@tanstack/react-table';
 export type IPositionCell = {
     rowId: string;
     colId: string;
-} | undefined;
+};
 export interface IContext<T> {
     t?: any;
     prefix: string;
@@ -48,6 +48,7 @@ export interface IContext<T> {
     reset?: any;
     setValue?: any;
     handleCellChange?: (args: ContextCellChange) => void;
+    handleCellChangeAndAddRow?: (args: ContextCellChange) => void;
     editingKey?: string;
     setEditingKey?: Dispatch<SetStateAction<string>>;
     rangeState?: RangeState;
@@ -68,6 +69,7 @@ export interface IContext<T> {
     setIsPasting?: Dispatch<SetStateAction<boolean>>;
     focusedCell?: IPositionCell;
     setFocusedCell?: Dispatch<SetStateAction<IPositionCell | undefined>>;
+    cellActive?: any;
     triggerPaste?: (pastedRows: T[], pastedColumnsArray: string[], newData: T[], copyRows: T[]) => void;
     handleDeleteContent?: () => void;
     handleAddMulti?: (item: any, n: number, id?: string) => void;
@@ -82,12 +84,13 @@ export interface IContext<T> {
     onRowHeaderStyles?: Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'> | (() => Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'>);
     onRowFooterStyles?: Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'> | (() => Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'>);
     groupSetting?: IGroupSetting;
+    dataSourceFilter?: SourceFilter[];
 }
 export declare const TableContext: import("react").Context<IContext<any>>;
 export type ContextCellChange = {
     key: string;
     record: any;
-    field: string | undefined;
+    field: string;
     option: any;
     indexRow: number;
     indexCol: number;

package/lib/table-virtuoso/useContext.js

@@ -24,4 +24,22 @@ const TableContext = exports.TableContext = /*#__PURE__*/(0, _react.createContex
   setFilterChange: () => {},
   setExpanded: () => {},
   handleCellClick: () => {}
+
+  // startCellRef: { current: undefined } as React.MutableRefObject<IPositionCell | undefined>,
+  // endCellRef: { current: undefined } as React.MutableRefObject<IPositionCell | undefined>,
+  // focusedCellRef: { current: undefined } as React.MutableRefObject<IPositionCell | undefined>,
+  // isSelectingRef: { current: false } as React.MutableRefObject<boolean>,
+
+  // rangeStateRef: {
+  //   current: {
+  //     startRowIndex: undefined,
+  //     endRowIndex: undefined,
+  //     startColIndex: undefined,
+  //     endColIndex: undefined,
+  //     rowIds: [],
+  //     colIds: [],
+  //     colRange: [],
+  //     rowRange: []
+  //   }
+  // } as React.MutableRefObject<RangeState>
 });

package/package.json

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