es-grid-template 1.7.48 → 1.8.0

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

@@ -0,0 +1,336 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _reactTable = require("@tanstack/react-table");
+var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
+var _becoxyIcons = require("becoxy-icons");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _rcMasterUi = require("rc-master-ui");
+var _constant = require("../hook/constant");
+var _utils = require("../hook/utils");
+var _useContext = require("../useContext");
+var _renderFilter = require("./renderFilter");
+var _server = _interopRequireDefault(require("react-dom/server"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+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; }
+// import { useSortable } from "@dnd-kit/sortable"
+
+// import { CSS } from '@dnd-kit/utilities'
+// import type { Virtualizer } from '@tanstack/react-virtual'
+
+// import { ColumnTable } from "../type";
+
+// import { Tooltip } from 'react-tooltip'
+
+const TableHeadGroupCell = props => {
+  const {
+    column,
+    header,
+    getPopupContainer,
+    table,
+    depth,
+    // t,
+    // columnVirtualizer,
+    // rowHeaderVirtualizer,
+    colSpan,
+    rowSpan
+  } = props;
+  const {
+    t,
+    prefix,
+    setSorterChange,
+    setFilterChange,
+    wrapSettings,
+    selectionSettings,
+    setIsSelectionChange,
+    id,
+    locale
+  } = (0, _react.useContext)(_useContext.TableContext);
+  const isPinned = column.getIsPinned();
+  const isLastLeftPinnedColumn = isPinned === 'left' && column.getIsLastColumn('left');
+  const isFirstRightPinnedColumn = isPinned === 'right' && column.getIsFirstColumn('right');
+  const [selectedKeys, setSelectedKeys] = _react.default.useState([]);
+  const [visible, setVisible] = _react.default.useState(false);
+  const {
+    filterIcon
+  } = column.columnDef.meta ?? {};
+
+  // const column = (column.columnDef ?? {}) as ColumnTable
+  // const column = column.columnDef
+
+  const originalColumn = column.columnDef.meta ?? {};
+  const filtered = (column.getFilterValue() ?? []).length > 0;
+  const cellContent = (0, _reactTable.flexRender)(column.columnDef.header, header.getContext());
+  const html = _server.default.renderToStaticMarkup( /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, cellContent));
+  const hasValue = html.trim().length > 0;
+
+  // const filtered = column.getIsFiltered()
+
+  // const { attributes, isDragging, listeners, setNodeRef, transform } =
+  //   useSortable({
+  //     id: column.id,
+  //   })
+
+  const style = {
+    // opacity: isDragging ? 0.8 : 1,
+    // position: 'relative',
+    // transform: CSS.Translate.toString(transform), // translate instead of transform to avoid squishing
+    transition: 'width transform 0.2s ease-in-out',
+    whiteSpace: 'nowrap'
+    // width: column.getSize(),
+    // zIndex: isDragging ? 1 : 0,
+  };
+  const getDropdownTrigger = () => {
+    let iconFilter;
+    if (typeof filterIcon === 'function') {
+      iconFilter = filterIcon(filtered);
+    } else if (filterIcon) {
+      iconFilter = filterIcon;
+    } else {
+      iconFilter = /*#__PURE__*/_react.default.createElement(_becoxyIcons.FilterFill, {
+        style: {
+          color: filtered ? '#E3165B' : '#283046'
+        },
+        fontSize: 12
+      });
+    }
+    return /*#__PURE__*/_react.default.createElement("span", {
+      role: "button",
+      tabIndex: -1,
+      className: (0, _classnames.default)(`${prefix}-trigger`, {
+        active: filtered
+      }),
+      onClick: e => {
+        e.stopPropagation();
+      }
+    }, iconFilter);
+  };
+  const triggerVisible = newVisible => {
+    setVisible(newVisible);
+  };
+  const onVisibleChange = (newVisible, info) => {
+    if (info.source === 'trigger') {
+      if (newVisible) {
+        const filterValue = column.getFilterValue() ?? [];
+        const operatorValue = column.getFilterOperator() ?? (0, _utils.getDefaultOperator)(column?.meta ?? {});
+        setSelectedKeys(filterValue);
+        column.setFilterOperator?.(operatorValue);
+      } else {}
+      triggerVisible(newVisible);
+    }
+  };
+  const doFilter = type => {
+    if (type) {
+      column.setFilterValue(!originalColumn.typeFilter || originalColumn.typeFilter === 'Text' ? selectedKeys.length === 0 ? [''] : selectedKeys : selectedKeys);
+    } else {
+      column.setFilterValue(undefined);
+      setSelectedKeys([]);
+    }
+    setFilterChange(true);
+    triggerVisible(false);
+    setTimeout(() => {
+      setFilterChange(false);
+    }, 10);
+  };
+  const mergedDropdownProps = (0, _utils.extendsObject)({
+    trigger: ['click'],
+    placement: 'bottomRight',
+    // placement: direction === 'rtl' ? 'bottomLeft' : 'bottomRight',
+    children: getDropdownTrigger(),
+    getPopupContainer
+  }, {
+    // ...filterDropdownProps,
+    // rootClassName: classNames(rootClassName, filterDropdownProps.rootClassName),
+    open: visible,
+    onOpenChange: onVisibleChange,
+    destroyPopupOnHide: true,
+    dropdownRender: () => {
+      const type = (0, _utils.getTypeFilter)(originalColumn);
+      const operatorValue = column.getFilterOperator() ?? (0, _utils.getDefaultOperator)(originalColumn);
+      const operatorOptions = ['Checkbox', 'Dropdown', 'DropTree', 'CheckboxDropdown'].includes(type) ? _constant.booleanOperator : !type || type === 'Text' ? _constant.stringOperator : _constant.numberOperator;
+      return /*#__PURE__*/_react.default.createElement("div", {
+        // className='ui-rc-table-filter-dropdown'
+
+        className: (0, _classnames.default)(`${prefix}-grid-filter-dropdown`, {}),
+        style: {}
+      }, /*#__PURE__*/_react.default.createElement("div", {
+        style: {
+          minWidth: 275,
+          padding: '8px'
+        }
+      }, /*#__PURE__*/_react.default.createElement("div", null), column.meta?.showOperator !== false && column.meta?.typeFilter !== 'DateRange' && column.meta?.typeFilter !== 'NumberRange' && /*#__PURE__*/_react.default.createElement("div", {
+        className: 'mb-1'
+      }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Select, {
+        options: (0, _constant.translateOption)(operatorOptions, t),
+        style: {
+          width: '100%',
+          marginBottom: 8
+        },
+        value: operatorValue,
+        onChange: val => {
+          column.setFilterOperator(val);
+        }
+      })), /*#__PURE__*/_react.default.createElement("div", {
+        style: {
+          marginBottom: 8
+        }
+      }, (0, _renderFilter.renderFilter)({
+        column: column,
+        selectedKeys,
+        setSelectedKeys
+        // selectedKeys: (column.getFilterValue() ?? []) as string[],
+        // setSelectedKeys: column.setFilterValue,
+      })), /*#__PURE__*/_react.default.createElement(_antd.Space, {
+        style: {
+          justifyContent: 'end',
+          width: '100%'
+        }
+      }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
+        type: "primary",
+        onClick: () => {
+          // column.setFilterValue(selectedKeys)
+
+          doFilter(true);
+        },
+        size: "small",
+        style: {
+          width: 90
+        }
+      }, t ? t('Filter') : 'Filter'), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+        type: "link",
+        size: "small",
+        onClick: () => {
+          // column.setFilterValue([])
+          // column.setFilterOperator('')
+
+          setSelectedKeys([]);
+          doFilter(false);
+        }
+      }, t ? t('Clear') : 'Clear'))));
+
+      // if (typeof filterDropdownProps?.dropdownRender === 'function') {
+      //   return filterDropdownProps.dropdownRender(dropdownContent);
+      // }
+      // return dropdownContent;
+    }
+  });
+  return /*#__PURE__*/_react.default.createElement("div", {
+    // ref={setNodeRef}
+    className: (0, _classnames.default)(`${prefix}-grid-cell`, {
+      [`${prefix}-grid-cell-ellipsis`]: !wrapSettings || !(wrapSettings && (wrapSettings.wrapMode === 'Both' || wrapSettings.wrapMode === 'Header')),
+      [`${prefix}-grid-cell-wrap`]: wrapSettings && (wrapSettings.wrapMode === 'Both' || wrapSettings.wrapMode === 'Header'),
+      [`${prefix}-grid-cell-fix-left-last`]: isLastLeftPinnedColumn,
+      [`${prefix}-grid-cell-fix-right-first`]: isFirstRightPinnedColumn,
+      [`${prefix}-grid-cell-text-center`]: (originalColumn?.headerTextAlign ?? originalColumn?.textAlign) === 'center',
+      [`${prefix}-grid-cell-text-right`]: (originalColumn?.headerTextAlign ?? originalColumn.textAlign) === 'right'
+    })
+    // colSpan={colSpan}
+    // rowSpan={rowSpan}
+    ,
+
+    key: column.id,
+    style: {
+      // display: 'flex',
+      // width: column.getSize(),
+      minWidth: column.getSize(),
+      flex: 1,
+      gridRow: `${depth + 1} / span ${rowSpan}`,
+      gridColumn: `span ${colSpan}`,
+      // maxWidth: header.getSize(),
+      ...(0, _utils.getCommonPinningStyles)(column),
+      width: 'auto',
+      ...style
+    },
+    "data-tooltip-id": `${id}-tooltip-content`,
+    "data-tooltip-html": !hasValue ? '' : _server.default.renderToStaticMarkup( /*#__PURE__*/_react.default.createElement("div", null, cellContent))
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _classnames.default)('', {
+      [`${prefix}-grid-filter-column`]: column.id !== 'selection_column',
+      [`${prefix}-grid-selection-column`]: column.id === 'selection_column'
+    })
+  }, column.id === 'selection_column' && selectionSettings && selectionSettings.hideSelectAll !== false && selectionSettings.type !== 'single' && selectionSettings.mode !== 'radio' && /*#__PURE__*/_react.default.createElement(_rcMasterUi.Checkbox, {
+    checked: table.getIsAllRowsSelected(),
+    indeterminate: table.getIsSomeRowsSelected(),
+    onChange: e => {
+      setIsSelectionChange({
+        isChange: true,
+        type: 'all',
+        rowData: {}
+      });
+      table.getToggleAllRowsSelectedHandler()(e);
+    }
+  }), column.id !== 'selection_column' && /*#__PURE__*/_react.default.createElement("span", {
+    className: "ui-rc-table-column-title",
+    style: {
+      flex: 1
+    }
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _classnames.default)('', {
+      [`${prefix}-grid-cell-ellipsis`]: !wrapSettings || !(wrapSettings && (wrapSettings.wrapMode === 'Both' || wrapSettings.wrapMode === 'Header')),
+      [`${prefix}-grid-cell-text-wrap`]: wrapSettings && (wrapSettings.wrapMode === 'Both' || wrapSettings.wrapMode === 'Header')
+    })
+  }, cellContent)), !_constant.nonActionColumn.includes(column.id) && column.columns.length < 1 && /*#__PURE__*/_react.default.createElement("span", {
+    className: "ui-rc-header-trigger"
+  }, column.getCanSort() && /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      marginInlineEnd: 6,
+      cursor: 'pointer'
+    },
+    onClick: e => {
+      setSorterChange(true);
+      const toggleSortingHandler = column.getToggleSortingHandler();
+      if (typeof toggleSortingHandler === 'function') {
+        toggleSortingHandler(e);
+      }
+    }
+  }, column.getIsSorted() ? column.getIsSorted() === 'asc' ? /*#__PURE__*/_react.default.createElement(_becoxyIcons.ArrowUp, {
+    fontSize: 15,
+    color: '#000'
+    // data-tooltip-id={`${id}-tooltip-header-trigger`}
+    ,
+    "data-tooltip-id": `${id}-tooltip-content`
+    // data-tooltip-content='Nhấp để sắp xếp giảm dần'
+    ,
+    "data-tooltip-content": locale?.triggerDesc ?? 'Click to sort descending'
+  }) : /*#__PURE__*/_react.default.createElement(_becoxyIcons.ArrowDown, {
+    fontSize: 15,
+    color: '#000',
+    "data-tooltip-id": `${id}-tooltip-content`
+    // data-tooltip-id={`${id}-tooltip-header-trigger`}
+    // data-tooltip-content='Nhấp để hủy sắp xếp'
+    ,
+    "data-tooltip-content": locale?.cancelSort ?? 'Click to cancel sorting'
+  }) : /*#__PURE__*/_react.default.createElement(_becoxyIcons.SortCancel
+  // data-tooltip-id={`${id}-tooltip-header-trigger`}
+  , {
+    "data-tooltip-id": `${id}-tooltip-content`
+    // data-tooltip-content='Nhấp để sắp xếp tăng dần'
+    ,
+    "data-tooltip-content": locale?.triggerAsc ?? 'Click to sort ascending',
+    fontSize: 15,
+    style: {
+      display: 'flex'
+    },
+    className: (0, _classnames.default)(`ui-rc-table-column-sorter-cancel`, {
+      active: true
+    })
+  })), column.getCanFilter() && /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Dropdown, mergedDropdownProps)))), column.getCanResize() && /*#__PURE__*/_react.default.createElement("div", {
+    onDoubleClick: () => column.resetSize(),
+    onMouseDown: header.getResizeHandler(),
+    onTouchStart: header.getResizeHandler(),
+    // onMouseUp: () => {
+    //   requestAnimationFrame(() => {
+    //     columnVirtualizer.measure()
+    //     // rowHeaderVirtualizer.measure()
+    //   })
+    // },
+
+    className: `resizer ${column.getIsResizing() ? 'isResizing' : ''}`
+  }));
+};
+var _default = exports.default = TableHeadGroupCell;

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

@@ -30,7 +30,7 @@ const TableHeadRow = ({
   // const virtualColumns = columnVirtualizer.getVirtualItems()
 
   const columnOrder = table.getState().columnOrder;
-  return /*#__PURE__*/_react.default.createElement("tr", {
+  return /*#__PURE__*/_react.default.createElement("div", {
     key: headerGroup.id
     // ref={el => {
     //   if (el) rowHeaderVirtualizer.measureElement(el)

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

@@ -94,7 +94,8 @@ const getCommonPinningStyles = column => {
     // opacity: isPinned ? 0.5 : 1,
     opacity: 1,
     position: isPinned ? "sticky" : "relative",
-    width: column.getSize(),
+    // width: column.getSize(),
+    width: 'auto',
     zIndex: isPinned ? 2 : 0
     // border: '1px solid #e5e7eb',
     // borderTop: 0,
@@ -265,9 +266,11 @@ const addRowIdArray = inputArray => {
       if (typeof item.children !== "string" && item.children && item.children.length > 0) {
         item.children = addRowIdArray(item.children);
       }
+
+      // return { ...item, rowId: item.rowId ?? item.id ?? newGuid() }
       return {
         ...item,
-        rowId: item.rowId ?? item.id ?? newGuid()
+        rowId: item.id ?? item.rowId ?? newGuid()
       };
     });
   } else {

package/lib/table-component/style.scss

@@ -121,7 +121,7 @@ $fontFamily: "Montserrat", Helvetica, Arial, serif !default;
         white-space: normal;
         // overflow: hidden;
         text-overflow: ellipsis;
-        word-break: keep-all;
+        word-break: break-word;
       }
 
 
@@ -129,7 +129,7 @@ $fontFamily: "Montserrat", Helvetica, Arial, serif !default;
         white-space: normal;
         overflow: hidden;
         text-overflow: ellipsis;
-        word-break: keep-all;
+        word-break: break-word;
       }
 
     }
@@ -176,7 +176,7 @@ $fontFamily: "Montserrat", Helvetica, Arial, serif !default;
           .#{$prefix}-grid-cell-text-wrap {
             white-space: normal;
             // text-overflow: ellipsis;
-            word-break: keep-all;
+            word-break: break-word;
             overflow: hidden;
           }
 
@@ -257,7 +257,7 @@ $fontFamily: "Montserrat", Helvetica, Arial, serif !default;
 
     .#{$prefix}-grid-tbody {
 
-      tr.#{$prefix}-grid-row {
+      .#{$prefix}-grid-row {
         border-bottom: 1px solid lightgray;
       }
 
@@ -266,6 +266,20 @@ $fontFamily: "Montserrat", Helvetica, Arial, serif !default;
         position: absolute;
         width: 100%;
 
+        &:hover {
+          .#{$prefix}-grid-cell:not(.editable) {
+            background-color: $rowHoverBg;
+
+            &.cell-editable, &.#{$prefix}-grid-cell-index, &.#{$prefix}-grid-cell-selection {
+              // background-color: transparent;
+            }
+
+            // &.ui-rc-grid-cell-index {
+            //   background-color: #ffffff;
+            // }
+          }
+        }
+
         &.#{$prefix}-grid-row-selected {
 
           .#{$prefix}-grid-cell {
@@ -274,6 +288,14 @@ $fontFamily: "Montserrat", Helvetica, Arial, serif !default;
 
         }
 
+        &.#{$prefix}-grid-row-focus {
+
+          .#{$prefix}-grid-cell {
+            background-color: $rowHoverBg;
+          }
+
+        }
+
       }
 
       .#{$prefix}-grid-cell {

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

@@ -143,18 +143,16 @@ const Grid = props => {
 
     // debugTable: true
   });
-
-  // React.useEffect(() => {
-  //   if (columnHidden) {
-  //     const abb = table.getVisibleLeafColumns()?.[0]
-
-  //     if (abb && Object.keys(columnSizingInfo).length === 0
-  //     ) {
-  //       setColumnSizing({ "#": abb.getSize() })
-  //     }
-  //   }
-
-  // }, [columnHidden, columnSizingInfo])
+  _react.default.useEffect(() => {
+    if (columnHidden) {
+      const abb = table.getVisibleLeafColumns()?.[0];
+      if (abb && Object.keys(columnSizingInfo).length === 0) {
+        setColumnSizing({
+          "#": abb.getSize()
+        });
+      }
+    }
+  }, [columnHidden, columnSizingInfo]);
 
   // React.useEffect(() => {
   //   if (columnSizingInfo.isResizingColumn === false) {
@@ -169,12 +167,12 @@ const Grid = props => {
 
   _react.default.useEffect(() => {
     // if (!manualUpdate) {
-    if (Object.keys(rowSelection) !== Object.keys(mergedSelectedKeys)) {
+    if (Object.keys(rowSelection) !== Object.keys(mergedSelectedKeys) && !isSelectionChange.isChange) {
       setRowSelection((0, _utils.convertToObjTrue)(mergedSelectedKeys));
     }
 
     // }
-  }, [mergedSelectedKeys]);
+  }, [mergedSelectedKeys, isSelectionChange]);
   _react.default.useEffect(() => {
     if (isSelectionChange.isChange) {
       // setManualUpdate(true)
@@ -188,12 +186,14 @@ const Grid = props => {
         rowData: isSelectionChange.rowData,
         selected: rs
       });
-      setIsSelectionChange(prev => ({
-        ...prev,
-        isChange: false
-      }));
+
+      // setIsSelectionChange((prev) => ({
+      //   ...prev,
+      //   isChange: false
+
+      // }))
     }
-  }, [isSelectionChange, rowSelected, rowSelection, table]);
+  }, [isSelectionChange, rowSelection, table.getState().rowSelection]);
   _react.default.useEffect(() => {
     if (sorterChange) {
       const aa = table.getState().sorting;

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

@@ -198,7 +198,7 @@ const TableWrapper = props => {
     // onScroll={infiniteScroll ? handleScroll : undefined}
     ,
     onScroll: handleScroll
-  }, /*#__PURE__*/_react.default.createElement("table", {
+  }, /*#__PURE__*/_react.default.createElement("div", {
     style: {
       display: 'grid',
       minWidth: table.getTotalSize()

package/package.json

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