es-grid-template 1.9.26 → 1.9.28

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
+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");
@@ -211,7 +212,7 @@ const TableHeadCell2 = props => {
           justifyContent: 'end',
           width: '100%'
         }
-      }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
+      }, /*#__PURE__*/_react.default.createElement(_button.default, {
         type: "primary",
         onClick: () => {
           // column.setFilterValue(selectedKeys)
@@ -222,7 +223,7 @@ const TableHeadCell2 = props => {
         style: {
           width: 90
         }
-      }, t ? t('Filter') : 'Filter'), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+      }, t ? t('Filter') : 'Filter'), /*#__PURE__*/_react.default.createElement(_button.default, {
         type: "link",
         size: "small",
         onClick: () => {

package/lib/table-component/style.js

@@ -8,19 +8,22 @@ exports.GridStyle = void 0;
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 // const prefix = "ui-rc";
 // const antdPrefix = "ant";
-// const fontFamily = "Montserrat, Helvetica, Arial, serif ";
+const fontFamily = 'Montserrat, Helvetica, Arial, serif ';
 // const borderRadius = "6px";
 
 // const boxShadowColor = "rgba(220, 0, 0, 0.09)";
-const color = "#000000de";
-const BgColor = "#ffffff ";
+const color = '#000000';
+const fontSize = '12px';
+const fwBody = '500';
+const fwHeader = '600';
+const BgColor = '#ffffff ';
 
 // const primary = "#eb4619";
 
 // const rowHoverBg = "#FBDED6";
 // const rowSelectedBg = "#FEF2EF";
 
-const tableBorderColor = "#e0e0e0";
+const tableBorderColor = '#e0e0e0';
 
 // const borderSelectedColor = "#0550C5";
 // const cellSelectedBg = "#F3F8FF";
@@ -30,7 +33,7 @@ const tableBorderColor = "#e0e0e0";
 // 404071
 
 // dark
-const tableBorderColorDark = "#44485E";
+const tableBorderColorDark = '#44485E';
 
 // const rowHoverBgDark = "#404071 ";
 
@@ -41,8 +44,8 @@ const tableBorderColorDark = "#44485E";
 
 // const bodyColorDark = "#343e59";
 
-const BgColorDark = "#343e59 ";
-const colorDark = "#e6e4f3e6 ";
+const BgColorDark = '#343e59 ';
+const colorDark = '#e6e4f3e6 ';
 
 // const cellSelectedBgDark = " #F3F8FF ";
 // const cellIndexFocusBgDark = "#E6EFFD ";
@@ -52,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:13px;background-color:", ";&.", "-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-tbody{.", "-grid-row{background-color:", ";color:", ";&.", "-grid-row-odd{background-color:#F9F8FD;}&.", "-grid-row-even{}&.", "-grid-row-parent{background-color:#f5f5f5;font-weight:500;}}}}&.", "-grid-light{.", "-grid-container{.", "-grid-thead{background-color:", ";font-weight:500;.", "-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{}}.", "-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, 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.$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, 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.$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;}&.", "-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:", ";}}}}"], 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/style.scss

@@ -9,10 +9,12 @@ $primary: #eb4619 !default;
 $rowHoverBg: #FBDED6 !default;
 $rowSelectedBg: #FEF2EF !default;
 $tableBorderColor: #e0e0e0 !default;
-$border-selected-color: #0550C5 !default;
+$border-selected-color: #e63706 !default;
 $body-color: #ffffff !default;
-$cell-selected-bg: #F3F8FF !default;
-$cell-index-selected-bg: #1869E6 !default;
+// $cell-selected-bg: #F3F8FF !default;
+$cell-selected-bg: #fcf5f2 !default;
+// $cell-index-selected-bg: #1869E6 !default;
+$cell-index-selected-bg: #eb4619 !default;
 $cell-index-focus-bg: #E6EFFD !default;
 
 // 404071
@@ -33,233 +35,53 @@ $cell-selected-bg-Dark: #F3F8FF !default;
 $cell-index-focus-bg-Dark: #E6EFFD !default;
 
 
-
-
-
 * {
   box-sizing: border-box;
 }
 
+.rs-picker-daterange-panel {
+  --rs-input-focus-border: #eb4619;
+  --rs-btn-link-text: #f0552b;
+  --rs-btn-link-hover-text: #eb4619;
+  --rs-btn-primary-bg: #e47253;
+  --rs-text-active: #eb4619;
+  --rs-listbox-option-hover-text: #eb4619;
+  --rs-bg-active: #f06842;
+  --rs-calendar-cell-selected-hover-bg: #eb4619;
+  --rs-btn-primary-hover-bg: #eb4619;
+  --rs-calendar-range-bg: #faf2ef;
+  --rs-listbox-option-hover-bg: #faf2ef;
 
-.#{$prefix}-grid {
+}
 
-  // border: 1px solid $tableBorderColor;
+.ui-rc-picker-now {
+  --bs-link-color-rgb: 235, 70, 25;
+}
 
-  color: #000000de;
-  background-color: #ffffff;
+.ui-rc-pagination-options {
+  .ui-rc-select-selection-item {
+    font-size: 12px;
+  }
+}
+
+.#{$prefix}-grid {
 
-  font-size: 14px;
   .toolbar-icon {
     cursor: pointer;
+
     &:focus {
       outline: none;
     }
   }
 
   table {
-    // border-collapse: collapse;
     border-collapse: separate;
     border-spacing: 0;
     table-layout: fixed;
-    // border: 1px solid $tableBorderColor;
   }
 
   .#{$prefix}-grid-container {
 
-    // border: 1px solid $tableBorderColor;
-    // border-right: 0;
-    // font-size: 13px;
-
-    // &::after {
-    //   content: "";
-    //   position: absolute;
-    //   top: 0px;
-    //   right: 0;
-    //   height: 100%;
-    //   border-right: 1px solid $tableBorderColor;
-    //   pointer-events: none;
-    //   z-index: 1;
-    // }
-
-    .#{$prefix}-grid-cell {
-
-      padding: 7px 8px;
-
-      &.#{$prefix}-grid-cell-text-center {
-        text-align: center;
-        justify-content: center;
-
-      }
-
-      &.#{$prefix}-grid-cell-text-right {
-        justify-content: flex-end;
-        text-align: right;
-
-      }
-
-      &.#{$prefix}-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;
-            }
-          }
-
-        }
-
-      }
-
-      &.#{$prefix}-grid-cell-wrap {
-        white-space: normal;
-        // overflow: hidden;
-        text-overflow: ellipsis;
-        word-break: break-word;
-      }
-
-      .#{$prefix}-grid-header-text-wrap {
-        white-space: normal;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        word-break: break-word;
-      }
-
-    }
-
-    .#{$prefix}-grid-thead {
-      background-color: #ffffff;
-      // background-color: inherit;
-       font-weight: 500;
-
-      .#{$prefix}-grid-cell {
-        font-weight: inherit;
-        color: #000000E0;
-
-        background-color: inherit;
-        border-inline-end: 1px solid $tableBorderColor;
-        border-bottom: 1px solid $tableBorderColor;
-
-        &.ui-rc-grid-cell-ellipsis {
-
-          .ui-rc-table-column-title,
-          .#{$prefix}-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,
-          .#{$prefix}-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;
-
-            }
-
-          }
-        }
-
-
-        .#{$prefix}-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 {
-
-          /* background: rgba(0, 0, 0, 0.5); */
-          cursor: col-resize;
-          height: 100%;
-          position: absolute;
-          right: 0;
-          top: 0;
-          z-index: 3;
-          touch-action: none;
-          user-select: none;
-          width: 5px;
-
-          // &::before {
-          //   content: '';
-          //   border-left: 2px solid blue;
-          // }
-        }
-
-        .resizer.isResizing {
-          // &::before {
-          //   content: '';
-          //   // border-left: 2px solid gray;
-          //   border-left: 2px solid rgb(70, 115, 228);
-          //   position: absolute;
-          //   // height: 50%;
-          //   height: 100%;
-          //   // top: 25%
-          // }
-
-          // background: blue;
-          opacity: 1;
-        }
-
-
-
-
-      }
-
-    }
 
     .#{$prefix}-grid-tbody {
 
@@ -271,8 +93,6 @@ $cell-index-focus-bg-Dark: #E6EFFD !default;
         display: flex;
         position: absolute;
         width: 100%;
-        // background-color: #ffffff;
-        // background-color: inherit;
 
         &:hover {
           .#{$prefix}-grid-cell:not(.editable) {
@@ -317,7 +137,7 @@ $cell-index-focus-bg-Dark: #E6EFFD !default;
 
         &.#{$prefix}-grid-cell-text-wrap {
           .ui-rc_cell-content {
-             word-break: break-word;
+            word-break: break-word;
           }
 
         }
@@ -655,7 +475,7 @@ $cell-index-focus-bg-Dark: #E6EFFD !default;
 
 
           &.cell-border-top {
-          
+
             &.ui-rc-grid-cell-fix-left-last {
               &::after {
                 left: -100%;
@@ -807,15 +627,20 @@ $cell-index-focus-bg-Dark: #E6EFFD !default;
     border-left: 1px solid #e0e0e0;
 
     .be-toolbar-item {
+      .ui-rc-btn {
+        font-size: 12px;
+      }
+
       .toolbar-dropdown-button {
-        .ant-btn.ant-btn-default.ant-btn-variant-outlined.ant-btn-compact-item.ant-btn-compact-first-item {
+        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;
         }
 
-        .ant-btn.ant-btn-default.ant-btn-variant-outlined.ant-btn-compact-item.ant-btn-compact-last-item {
+        .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;
 
-          .ant-btn-icon {
+          .ui-rc-btn-icon {
             color: #28c76f;
           }
         }
@@ -896,24 +721,7 @@ $cell-index-focus-bg-Dark: #E6EFFD !default;
 .#{$prefix}-grid {
 
   .#{$prefix}-pagination {
-    // &::before {
-    //   content: "";
-    //   position: absolute;
-    //   border-left: 1px solid $tableBorderColor;
-    //   height: 55px;
-    //   bottom: 0;
-    //   left: 0;
-    // }
 
-    // &::after {
-    //   content: "";
-    //   position: absolute;
-    //   border-left: 1px solid $tableBorderColor;
-    //   height: 55px;
-    //   bottom: 0;
-    //   visibility: visible;
-    //   right: 0;
-    // }
 
     &.top-pagination {
       border: none;
@@ -925,7 +733,7 @@ $cell-index-focus-bg-Dark: #E6EFFD !default;
       }
     }
 
-    padding: 10px;
+    padding: 5px;
 
     border-bottom: 1px solid $tableBorderColor;
     border-inline: 1px solid $tableBorderColor;

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

@@ -388,7 +388,8 @@ const Grid = props => {
     },
     className: (0, _classnames.default)(`${prefix}-grid ${tableClassNames}`, {
       [`${prefix}-grid-light`]: !theme || theme.theme === 'light',
-      [`${prefix}-grid-dark`]: theme?.theme === 'dark'
+      [`${prefix}-grid-dark`]: theme?.theme === 'dark',
+      [`table-striped`]: true
     }),
     style: {
       // minHeight: minHeight ?? undefined,

package/lib/table-virtuoso/body/TableBodyCell.js

@@ -356,7 +356,7 @@ const TableBodyCell = props => {
       // display: 'flex',
       width: cell.column.getSize(),
       minWidth: cell.column.getSize(),
-      minHeight: 36,
+      minHeight: 32,
       ...(0, _utils.getCommonPinningStyles)(cell.column)
     },
     onMouseEnter: e => {
@@ -410,6 +410,9 @@ const TableBodyCell = props => {
       }
     },
     onClick: e => {
+      if (e.detail === 2) {
+        return;
+      }
       const selection = window.getSelection();
       const text = selection ? selection.toString() : "";
       if (text.length > 0 || enableClick === false) {} else {

package/lib/table-virtuoso/body/TableBodyRow.js

@@ -122,7 +122,7 @@ const TableBodyRow = ({
         rowData: row.original,
         value: cellValue
       }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, headertext, headertext ? ': ' : '', " ", cellContent);
-      return /*#__PURE__*/_react.default.createElement(_TableBodyCell.default, (0, _extends2.default)({
+      return /*#__PURE__*/_react.default.createElement(_TableBodyCell.default, (0, _extends2.default)({}, otherCellAttributes, {
         table: table,
         tableId: tableId,
         key: cell.id,
@@ -131,8 +131,7 @@ const TableBodyRow = ({
         virtualRow: virtualRow,
         isEditing: false,
         colSpan: colSpanGroup ?? 1,
-        rowSpan: 1
-      }, otherCellAttributes, {
+        rowSpan: 1,
         groupValue: groupValue
       }));
     }
@@ -156,7 +155,7 @@ const TableBodyRow = ({
       const childrenData = row.subRows.map(it => it.original);
       const sumValue = (0, _hooks.sumByField)(childrenData, cell.column.id);
       const sumValueFormat = (0, _reactNumericComponent.numericFormatter)(sumValue.toString(), numericFormatProps);
-      return /*#__PURE__*/_react.default.createElement(_TableBodyCellRowGroup.default, (0, _extends2.default)({
+      return /*#__PURE__*/_react.default.createElement(_TableBodyCellRowGroup.default, (0, _extends2.default)({}, otherCellAttributes, {
         table: table,
         tableId: tableId,
         key: cell.id,
@@ -167,9 +166,9 @@ const TableBodyRow = ({
         colSpan: onCellColSpan ?? 1,
         rowSpan: onCellRowSpan ?? 1,
         sumValue: sumValueFormat
-      }, otherCellAttributes));
+      }));
     }
-    return /*#__PURE__*/_react.default.createElement(_TableBodyCell.default, (0, _extends2.default)({
+    return /*#__PURE__*/_react.default.createElement(_TableBodyCell.default, (0, _extends2.default)({}, otherCellAttributes, {
       table: table,
       tableId: tableId,
       key: cell.id,
@@ -179,7 +178,7 @@ const TableBodyRow = ({
       isEditing: false,
       colSpan: onCellColSpan ?? 1,
       rowSpan: onCellRowSpan ?? 1
-    }, otherCellAttributes));
+    }));
   }));
 };
 var _default = exports.default = TableBodyRow;

package/lib/table-virtuoso/style.js

@@ -18,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 ", ";font-weight:500;}}}.", "-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);
+})(["&.", "-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 ", ";font-weight:500;}}}.", "-grid-cell{padding:5px 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/TableWrapper.js

@@ -134,7 +134,9 @@ const TableWrapper = props => {
     }
   }, /*#__PURE__*/_react.default.createElement(_reactVirtuoso.TableVirtuoso, {
     data: table.getRowModel().rows,
-    totalCount: rows.length,
+    totalCount: rows.length
+    // isScrolling={}
+    ,
     components: {
       Table: ({
         style,

package/package.json

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