es-grid-template 1.9.53 → 1.9.56

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

@@ -6,11 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _antd = require("antd");
+var _rcMasterUi = require("rc-master-ui");
 var _button = _interopRequireDefault(require("rc-master-ui/es/button"));
 var _becoxyIcons = require("becoxy-icons");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _rcMasterUi = require("rc-master-ui");
 var _utils = require("../hook/utils");
 var _useContext = require("../useContext");
 var _renderFilter = require("./renderFilter");
@@ -213,7 +212,7 @@ const TableHeadCell2 = props => {
         tableLocal,
         prevFilterValue: column.getFilterValue(),
         triggerVisible
-      })), /*#__PURE__*/_react.default.createElement(_antd.Space, {
+      })), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Space, {
         style: {
           justifyContent: 'end',
           width: '100%'

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

@@ -5,10 +5,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _sortable = require("@dnd-kit/sortable");
 var _react = _interopRequireDefault(require("react"));
 var _useContext = require("../useContext");
 var _TableHeadCell = _interopRequireDefault(require("./TableHeadCell"));
+// import { horizontalListSortingStrategy, SortableContext } from '@dnd-kit/sortable'
+
 const TableHeadRow = ({
   table,
   headerGroup,
@@ -18,7 +19,9 @@ const TableHeadRow = ({
     prefix,
     onRowHeaderStyles
   } = _react.default.useContext(_useContext.TableContext);
-  const columnOrder = table.getState().columnOrder;
+
+  // const columnOrder = table.getState().columnOrder
+
   const rowStyles = typeof onRowHeaderStyles === 'function' ? onRowHeaderStyles() : onRowHeaderStyles;
   return /*#__PURE__*/_react.default.createElement("div", {
     key: headerGroup.id
@@ -33,9 +36,6 @@ const TableHeadRow = ({
       ...rowStyles,
       width: '100%'
     }
-  }, /*#__PURE__*/_react.default.createElement(_sortable.SortableContext, {
-    items: columnOrder,
-    strategy: _sortable.horizontalListSortingStrategy
   }, headerGroup.headers.map(header => {
     const columnRelativeDepth = header.depth - header.column.depth;
     if (columnRelativeDepth > 1) {
@@ -54,6 +54,6 @@ const TableHeadRow = ({
       colSpan: header.colSpan,
       rowSpan: rowSpan
     });
-  })));
+  }));
 };
 var _default = exports.default = TableHeadRow;

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

@@ -1,13 +1,13 @@
 import type { Row, Table } from "@tanstack/react-table";
 import type { Column } from "@tanstack/react-table";
 import type { VirtualItem } from "@tanstack/react-virtual";
-import type { AnyObject, ColumnsTable, ColumnTable, EditType, FilterItem, FilterOperator, IColumnType, IFormat, RangeState, Sorter, TypeFilter } from "./../../grid-component/type";
+import type { AnyObject, ColumnsTable, ColumnTable, EditType, FilterItem, FilterOperator, IColumnType, IFormat, RangeState, RowDnd, Sorter, TypeFilter } from "./../../grid-component/type";
 import type { Key } from "react";
 import type { CSSProperties } from "react";
 import dayjs from "dayjs";
 import type { IPositionCell } from "../useContext";
 import type { ColumnDef } from "@tanstack/react-table";
-import type { TreeDataNode } from "antd";
+import type { TreeDataNode } from "rc-master-ui";
 import type { FilterState } from "../../ali-table/interfaces";
 export declare const newGuid: () => any;
 export declare const convertDayjsToDate: (dateString: string, format?: string) => Date;
@@ -136,7 +136,7 @@ export declare const getVisibleColumnKeys: (columns: any[]) => string[];
 export declare const getVisibleColumnKeys1: (columns: any[]) => string[];
 export declare function getVisibleFields(columns: ColumnTable[]): string[];
 export declare function isObjEqual(obj1: any, obj2: any): boolean;
-export declare const sortByType: <T>(arr: ColumnTable<T>[]) => ColumnTable<T>[];
+export declare const sortByType: <T>(arr: ColumnTable<T>[], rowDnd?: RowDnd) => ColumnTable<T>[];
 export declare function convertColumnsToTreeData<T>(columns: ColumnDef<T, any>[], groupColumns?: string[]): TreeDataNode[];
 export declare const updateColumns1: (columns: ColumnTable[], includes: string[]) => ColumnTable[];
 export declare const convertToObj: (arr: any) => {

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

@@ -2370,9 +2370,21 @@ function isObjEqual(obj1, obj2) {
 }
 
 // Sorting function
-const sortByType = arr => {
-  if (arr) {
-    return arr.sort((a, b) => {
+const sortByType = (arr, rowDnd) => {
+  const colDnd = {
+    field: 'drag-handle',
+    width: 50,
+    fixed: 'left',
+    headerText: '',
+    allowFiltering: false,
+    allowResizing: false,
+    allowSortering: false
+  };
+  const cols = rowDnd?.enabled ? [{
+    ...colDnd
+  }, ...arr] : [...arr];
+  if (cols) {
+    return cols.sort((a, b) => {
       if ((a.fixed ?? a.fixedType) === 'left' && (b.fixed ?? b.fixedType) !== 'left') {
         return -1;
       } else if ((a.fixed ?? a.fixedType) !== 'left' && (b.fixed ?? b.fixedType) === 'left') {
@@ -2529,7 +2541,19 @@ function updateColumnWidthsRecursive(columns, sizing) {
     return updated;
   });
 }
-function updateWidthsByOther(source, target) {
+function updateWidthsByOther(source, target
+// rowDnd?: RowDnd
+) {
+  // const columnDnd  = {
+  //   field: 'drag-handle',
+  //   headerText: '',
+  //   fixed: 'left',
+  //   width: 50
+  // }
+
+  // const tg = rowDnd?.enabled ? [{...columnDnd}, ...target] : [...target]
+  // const sour = rowDnd?.enabled ? [{...columnDnd}, ...source] : [...source]
+
   const targetMap = new Map();
 
   // tạo map {field -> width} từ target

package/lib/table-component/style.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.GridStyle = void 0;
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 // const prefix = "ui-rc";
-// const antdPrefix = "ant";
+// const rcUiPrefix = "ant";
 const fontFamily = 'Montserrat, Helvetica, Arial, serif ';
 // const borderRadius = "6px";
 
@@ -55,4 +55,4 @@ const colorDark = '#e6e4f3e6 ';
 const GridStyle = exports.GridStyle = _styledComponents.default.div.withConfig({
   displayName: "GridStyle",
   componentId: "es-grid-template__sc-hdqm5k-0"
-})(["&.", "-grid{color:", ";font-size:", ";background-color:", ";font-family:", ";&.", "-grid-editable{.", "-grid-container{.", "-grid-tbody{.", "-grid-row{background-color:", ";color:", ";&.", "-grid-row-parent{background-color:#ffffff;font-weight:500;}}}}}table{table-layout:fixed;border-collapse:separate;border-spacing:0;}.", "-grid-container{border:1px solid ", ";border-right:0;&::after{position:absolute;top:0px;right:0;z-index:1;height:100%;border-right:1px solid ", ";content:'';pointer-events:none;}.", "-grid-cell{padding:5px 8px;&.", "-grid-cell-text-center{text-align:center;justify-content:center;}&.", "-grid-cell-text-right{justify-content:flex-end;text-align:right;}&.", "-grid-cell-ellipsis{.ui-rc_cell-content{width:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;word-break:keep-all;&.select-cell{padding-right:18px;position:relative;}.caret-down{float:right;position:absolute;right:0;&::before{content:'';display:inline-block;margin-left:4px;vertical-align:middle;width:0;height:0;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #6f7777;}}}}&.", "-grid-cell-wrap{white-space:normal;text-overflow:ellipsis;word-break:break-word;}.", "-grid-header-text-wrap{white-space:normal;overflow:hidden;text-overflow:ellipsis;word-break:break-word;}}.", "-grid-thead{background-color:", ";font-weight:", ";.", "-grid-cell{font-weight:inherit;color:", ";background-color:inherit;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;z-index:3;}.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;z-index:3;touch-action:none;user-select:none;width:5px;}.resizer.isResizing{opacity:1;}}}.", "-grid-tbody{.", "-grid-row{font-weight:", ";background-color:", ";color:", ";&.", "-grid-row-odd{background-color:#f9f8fd;}&.", "-grid-row-even{}&.", "-grid-row-parent{background-color:#f5f5f5;font-weight:500;}}}.", "-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:", ";}}}.ui-rc-toolbar-bottom{border-right:1px solid #e0e0e0;border-left:1px solid #e0e0e0;.be-toolbar-item{.ui-rc-btn{font-size:12px;line-height:1.5}.toolbar-dropdown-button{font-size:12px;.ui-rc-btn.ui-rc-btn-default.ui-rc-btn-variant-outlined.ui-rc-btn-compact-item.ui-rc-btn-compact-first-item{border-color:#28c76f;}.ui-rc-btn.ui-rc-btn-default.ui-rc-btn-variant-outlined.ui-rc-btn-compact-item.ui-rc-btn-compact-last-item{border-color:#28c76f;.ui-rc-btn-icon{color:#28c76f;}}}}}.ui-rc-toolbar-bottom_border-bottom{border-bottom:1px solid #e0e0e0;}.ui-rc-toolbar-bottom{position:relative;padding:.15rem 0.5rem;background-color:#ffffff;.toolbar-button{border-radius:3px;}.ui-rc-btn{border-radius:3px;height:28px;&.ui-rc-btn-compact-item.ui-rc-btn-compact-last-item{border-start-start-radius:0;border-end-start-radius:0;}&.ui-rc-btn-compact-item.ui-rc-btn-compact-first-item{border-start-end-radius:0;border-end-end-radius:0;}}}}"], props => props.$prefix, color, fontSize, BgColor, fontFamily, 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.$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.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, fwHeader, 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, fwBody, props => `${props.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, props => `${props.$theme.color ? props.$theme.color : color}`, 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);
+})(["&.", "-grid{color:", ";font-size:", ";background-color:", ";font-family:", ";&.", "-grid-editable{.", "-grid-container{.", "-grid-tbody{.", "-grid-row{background-color:", ";color:", ";&.", "-grid-row-parent{background-color:#ffffff;font-weight:500;}}}}}table{table-layout:fixed;border-collapse:separate;border-spacing:0;}.", "-grid-container{border:1px solid ", ";border-right:0;&::after{position:absolute;top:0px;right:0;z-index:1;height:100%;border-right:1px solid ", ";content:'';pointer-events:none;}.", "-grid-cell{padding:5px 8px;&.", "-grid-cell-text-center{text-align:center;justify-content:center;}&.", "-grid-cell-text-right{justify-content:flex-end;text-align:right;}&.editable{.ui-rc_cell-content{height:100%}}&.", "-grid-cell-ellipsis{.ui-rc_cell-content{width:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;word-break:keep-all;&.select-cell{padding-right:18px;position:relative;}.caret-down{float:right;position:absolute;right:0;&::before{content:'';display:inline-block;margin-left:4px;vertical-align:middle;width:0;height:0;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #6f7777;}}}}&.", "-grid-cell-wrap{white-space:normal;text-overflow:ellipsis;word-break:break-word;}.", "-grid-header-text-wrap{white-space:normal;overflow:hidden;text-overflow:ellipsis;word-break:break-word;}}.", "-grid-thead{background-color:", ";font-weight:", ";.", "-grid-cell{font-weight:inherit;color:", ";background-color:inherit;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;z-index:3;}.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;z-index:3;touch-action:none;user-select:none;width:5px;}.resizer.isResizing{opacity:1;}}}.", "-grid-tbody{.", "-grid-row{font-weight:", ";background-color:", ";color:", ";&.", "-grid-row-odd{background-color:#f9f8fd;}&.", "-grid-row-even{}&.", "-grid-row-parent{background-color:#f5f5f5;font-weight:500;}}}.", "-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:", ";}}}.ui-rc-toolbar-bottom{border-right:1px solid #e0e0e0;border-left:1px solid #e0e0e0;.be-toolbar-item{.ui-rc-btn{font-size:12px;line-height:1.5}.toolbar-dropdown-button{font-size:12px;.ui-rc-btn.ui-rc-btn-default.ui-rc-btn-variant-outlined.ui-rc-btn-compact-item.ui-rc-btn-compact-first-item{border-color:#28c76f;}.ui-rc-btn.ui-rc-btn-default.ui-rc-btn-variant-outlined.ui-rc-btn-compact-item.ui-rc-btn-compact-last-item{border-color:#28c76f;.ui-rc-btn-icon{color:#28c76f;}}}}}.ui-rc-toolbar-bottom_border-bottom{border-bottom:1px solid #e0e0e0;}.ui-rc-toolbar-bottom{position:relative;padding:.15rem 0.5rem;background-color:#ffffff;.toolbar-button{border-radius:3px;}.ui-rc-btn{border-radius:3px;height:28px;&.ui-rc-btn-compact-item.ui-rc-btn-compact-last-item{border-start-start-radius:0;border-end-start-radius:0;}&.ui-rc-btn-compact-item.ui-rc-btn-compact-first-item{border-start-end-radius:0;border-end-end-radius:0;}}}}"], props => props.$prefix, color, fontSize, BgColor, fontFamily, 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.$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.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, fwHeader, 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, fwBody, props => `${props.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, props => `${props.$theme.color ? props.$theme.color : color}`, 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-component/table/Grid.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _antd = require("antd");
+var _rcMasterUi = require("rc-master-ui");
 var _faker = require("@faker-js/faker");
 var _reactTable = require("@tanstack/react-table");
 var _core = require("@dnd-kit/core");
@@ -282,6 +282,7 @@ const Grid = props => {
       active,
       over
     } = event;
+    //  column dnd
     if (active && over && active.id !== over.id) {
       setColumnOrder(cols => {
         const oldIndex = cols.indexOf(active.id);
@@ -348,7 +349,7 @@ const Grid = props => {
     isFullScreen: isFullScreen,
     setIsFullScreen: setIsFullScreen,
     setIsExpandClick: setIsExpandClick
-  })))), /*#__PURE__*/_react.default.createElement(_antd.Modal, {
+  })))), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Modal, {
     open: isFullScreen,
     footer: null,
     centered: true,

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

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.ColumnsGroup = void 0;
 var _becoxyIcons = require("becoxy-icons");
 var _react = _interopRequireWildcard(require("react"));
-var _antd = require("antd");
 var _rcMasterUi = require("rc-master-ui");
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _hooks = require("../../grid-component/hooks");
@@ -105,7 +104,7 @@ const ColumnsGroup = props => {
       setTempGroup([]);
     }
   };
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Popover, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Popover, {
     placement: 'bottomLeft',
     content: /*#__PURE__*/_react.default.createElement("div", {
       style: {
@@ -213,14 +212,14 @@ const ColumnsGroup = props => {
       filterOption: _hooks.customFilterOption
     }))), /*#__PURE__*/_react.default.createElement(BoxAction, {
       className: 'px-1'
-    }, /*#__PURE__*/_react.default.createElement(_antd.Button
+    }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Button
     // className={classnames('btn-action btn-action-submit', {
     //   // disable: !columns.find((item) => item.visible !== false || item.visible)
     // })}
     , {
       onClick: handleGroup
       // disabled={!columns.find((item) => item.visible !== false || item.visible)}
-    }, t ? t('Thực hiện') : 'Thực hiện'), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    }, t ? t('Thực hiện') : 'Thực hiện'), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Button, {
       className: 'btn-action btn-action-cancel',
       onClick: handleClear
     }, t ? t('Clear') : 'Clear'))),

package/lib/table-virtuoso/header/TableHeadCell.js

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _antd = require("antd");
+var _rcMasterUi = require("rc-master-ui");
 var _becoxyIcons = require("becoxy-icons");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _rcMasterUi = require("rc-master-ui");
 var _utils = require("../hook/utils");
 var _renderFilter = require("./renderFilter");
 var _useContext = require("../useContext");
@@ -160,12 +159,12 @@ const TableHeadCell = props => {
         column: column,
         selectedKeys,
         setSelectedKeys
-      })), /*#__PURE__*/_react.default.createElement(_antd.Space, {
+      })), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Space, {
         style: {
           justifyContent: 'end',
           width: '100%'
         }
-      }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
+      }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Button, {
         type: "primary",
         onClick: () => {
           doFilter(true);
@@ -174,7 +173,7 @@ const TableHeadCell = props => {
         style: {
           width: 90
         }
-      }, t ? t('Filter') : 'Filter'), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+      }, t ? t('Filter') : 'Filter'), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Button, {
         type: "link",
         size: "small",
         onClick: () => {

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

@@ -6,7 +6,7 @@ import type { Key } from "react";
 import type { CSSProperties } from "react";
 import dayjs from "dayjs";
 import type { ColumnDef } from "@tanstack/react-table";
-import type { TreeDataNode } from "antd";
+import type { TreeDataNode } from "rc-master-ui";
 import type { IPositionCell } from "../../table-component/useContext";
 export declare const newGuid: () => any;
 export declare const convertDayjsToDate: (dateString: string, format?: string) => Date;

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _antd = require("antd");
+var _rcMasterUi = require("rc-master-ui");
 var _faker = require("@faker-js/faker");
 var _core = require("@dnd-kit/core");
 var _modifiers = require("@dnd-kit/modifiers");
@@ -208,7 +208,7 @@ const Grid = props => {
     columnSizingInfo: columnSizingInfo,
     isFullScreen: isFullScreen,
     setIsFullScreen: setIsFullScreen
-  })))), /*#__PURE__*/_react.default.createElement(_antd.Modal, {
+  })))), /*#__PURE__*/_react.default.createElement(_rcMasterUi.Modal, {
     open: isFullScreen,
     footer: null,
     centered: true,

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

@@ -121,7 +121,7 @@ const TableContainer = props => {
     if (!toolbarItems) {
       return undefined;
     }
-    return toolbarItems.filter(it => it.position !== 'Bottom' && it.fixedRight !== false);
+    return toolbarItems.filter(it => it.position !== 'Bottom' && it.visible !== false && it.fixedRight !== true);
   }, [toolbarItems]);
   const toolbarItemTopRight = _react.default.useMemo(() => {
     if (!toolbarItems) {

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

@@ -1,7 +1,6 @@
 import React from 'react';
 import type { ColumnDef, Table } from "@tanstack/react-table";
-import type { CommandClick, ContextInfo, PaginationConfig } from '../../grid-component/type';
-import type { ContextMenuItem } from "../..";
+import type { CommandClick, ContextInfo, ContextMenuItem, PaginationConfig } from '../../grid-component/type';
 type Props<T> = {
     tableContainerRef: React.RefObject<HTMLDivElement>;
     table: Table<T>;

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

@@ -19,6 +19,8 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /* eslint-disable @typescript-eslint/no-shadow */
 
+// import type { ContextMenuItem } from 'es-grid-template';
+
 const TableWrapper = props => {
   const {
     table,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-grid-template",
-  "version": "1.9.53",
+  "version": "1.9.56",
   "description": "es-grid-template",
   "keywords": [
     "react",
@@ -55,7 +55,6 @@
     "@types/react-resizable": "3.0.8",
     "@types/styled-components": "5.1.34",
     "@vitest/coverage-v8": "2.0.5",
-    "antd": "5.24.1",
     "antd-style": "3.7.1",
     "becoxy-icons": "^2.1.1",
     "classnames": "2.3.1",
@@ -67,7 +66,7 @@
     "rc-checkbox": "3.5.0",
     "rc-dropdown": "4.2.1",
     "rc-field-form": "2.6.0",
-    "rc-master-ui": "1.1.59",
+    "rc-master-ui": "1.1.63",
     "rc-select": "14.16.3",
     "rc-tooltip": "6.3.0",
     "rc-tree": "5.10.1",