@visactor/vtable 1.24.0-alpha.0 → 1.25.0

package/cjs/core/BaseTable.d.ts

@@ -164,6 +164,7 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     set heightAdaptiveMode(heightAdaptiveMode: HeightAdaptiveModeDef);
     _colWidthDefineToPxWidth(width: string | number): number;
     _getMaxFrozenWidth(): number;
+    _getMaxRightFrozenWidth(): number;
     _getComputedFrozenColCount(frozenColCount: number): number;
     private _getColWidthLimits;
     _adjustColWidth(col: number, orgWidth: number): number;
@@ -275,8 +276,14 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     renderWithRecreateCells(): void;
     getFrozenRowsHeight(): number;
     getFrozenColsWidth(): number;
+    getFrozenColsContentWidth(): number;
+    getFrozenColsOffset(): number;
+    getFrozenColsScrollLeft(): number;
     getBottomFrozenRowsHeight(): number;
     getRightFrozenColsWidth(): number;
+    getRightFrozenColsContentWidth(): number;
+    getRightFrozenColsOffset(): number;
+    getRightFrozenColsScrollLeft(): number;
     getDrawRange(): Rect;
     _getMouseAbstractPoint(evt: TouchEvent | MouseEvent | undefined): {
         x: number;

package/cjs/core/BaseTable.js

@@ -45,7 +45,7 @@ class BaseTable extends EventTarget_1.EventTarget {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
         if (super(), this.showFrozenIcon = !0, this._scrollToRowCorrectTimer = null, this._tableBorderWidth_left = 0, 
         this._tableBorderWidth_right = 0, this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, 
-        this.version = "1.24.0-alpha.0", this.id = `VTable${Date.now()}`, this.isReleased = !1, 
+        this.version = "1.25.0", this.id = `VTable${Date.now()}`, this.isReleased = !1, 
         this._chartEventMap = {}, this.throttleInvalidate = (0, util_1.throttle2)(this.render.bind(this), 200), 
         "node" === env_1.Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, 
         container = container.container ? container.container : null), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
@@ -255,7 +255,7 @@ class BaseTable extends EventTarget_1.EventTarget {
         frozenColCount >= this.colCount && (frozenColCount = 0), this.internalProps.frozenColCount = frozenColCount, 
         this.options.frozenColCount = frozenColCount;
         const maxFrozenWidth = this._getMaxFrozenWidth();
-        if (this.getColsWidth(0, frozenColCount - 1) > maxFrozenWidth) if (this.internalProps.unfreezeAllOnExceedsMaxWidth) this.internalProps.frozenColCount = 0; else {
+        if (!this.options.scrollFrozenCols && this.getColsWidth(0, frozenColCount - 1) > maxFrozenWidth) if (this.internalProps.unfreezeAllOnExceedsMaxWidth) this.internalProps.frozenColCount = 0; else {
             const computedFrozenColCount = this._getComputedFrozenColCount(frozenColCount);
             this.internalProps.frozenColCount = computedFrozenColCount;
         }
@@ -265,7 +265,7 @@ class BaseTable extends EventTarget_1.EventTarget {
         frozenColCount >= this.colCount && (frozenColCount = 0), this.internalProps.frozenColCount = frozenColCount, 
         this.options.frozenColCount = frozenColCount;
         const maxFrozenWidth = this._getMaxFrozenWidth();
-        if (this.getColsWidth(0, frozenColCount - 1) > maxFrozenWidth) if (this.internalProps.unfreezeAllOnExceedsMaxWidth) this.internalProps.frozenColCount = 0; else {
+        if (!this.options.scrollFrozenCols && this.getColsWidth(0, frozenColCount - 1) > maxFrozenWidth) if (this.internalProps.unfreezeAllOnExceedsMaxWidth) this.internalProps.frozenColCount = 0; else {
             const computedFrozenColCount = this._getComputedFrozenColCount(frozenColCount);
             this.internalProps.frozenColCount = computedFrozenColCount;
         }
@@ -420,6 +420,11 @@ class BaseTable extends EventTarget_1.EventTarget {
         const maxFrozenWidth = null !== (_a = this.options.maxFrozenWidth) && void 0 !== _a ? _a : "80%";
         return (0, tableHelper_1._toPxWidth)(this, maxFrozenWidth);
     }
+    _getMaxRightFrozenWidth() {
+        var _a, _b;
+        const maxRightFrozenWidth = null !== (_b = null !== (_a = this.options.maxRightFrozenWidth) && void 0 !== _a ? _a : this.options.maxFrozenWidth) && void 0 !== _b ? _b : "80%";
+        return (0, tableHelper_1._toPxWidth)(this, maxRightFrozenWidth);
+    }
     _getComputedFrozenColCount(frozenColCount) {
         const maxFrozenWidth = this._getMaxFrozenWidth();
         let computedfrozenColCount = frozenColCount;
@@ -744,22 +749,27 @@ class BaseTable extends EventTarget_1.EventTarget {
         let relativeX = !0, relativeY = !0;
         (null == isFrozenCell ? void 0 : isFrozenCell.col) && (null == isFrozenCell ? void 0 : isFrozenCell.row) ? (relativeX = !1, 
         relativeY = !1) : (null == isFrozenCell ? void 0 : isFrozenCell.col) ? relativeX = !1 : (null == isFrozenCell ? void 0 : isFrozenCell.row) && (relativeY = !1);
-        const cellRect = this.getCellRect(col, row);
-        return this._toRelativeRect(cellRect, relativeX, relativeY);
+        const cellRect = this.getCellRect(col, row), rect = this._toRelativeRect(cellRect, relativeX, relativeY);
+        return (null == isFrozenCell ? void 0 : isFrozenCell.col) && !this.isRightFrozenColumn(col, row) && rect.offsetLeft(-this.getFrozenColsScrollLeft()), 
+        rect;
     }
     getCellRangeRelativeRect(range) {
         if (range.start) {
             const isFrozenCell = this.isFrozenCell(range.start.col, range.start.row);
             let relativeX = !0, relativeY = !0;
-            return (null == isFrozenCell ? void 0 : isFrozenCell.col) && (null == isFrozenCell ? void 0 : isFrozenCell.row) ? (relativeX = !1, 
-            relativeY = !1) : (null == isFrozenCell ? void 0 : isFrozenCell.col) ? relativeX = !1 : (null == isFrozenCell ? void 0 : isFrozenCell.row) && (relativeY = !1), 
-            this._toRelativeRect(this.getCellsRect(range.start.col, range.start.row, range.end.col, range.end.row), relativeX, relativeY);
+            (null == isFrozenCell ? void 0 : isFrozenCell.col) && (null == isFrozenCell ? void 0 : isFrozenCell.row) ? (relativeX = !1, 
+            relativeY = !1) : (null == isFrozenCell ? void 0 : isFrozenCell.col) ? relativeX = !1 : (null == isFrozenCell ? void 0 : isFrozenCell.row) && (relativeY = !1);
+            const rect = this._toRelativeRect(this.getCellsRect(range.start.col, range.start.row, range.end.col, range.end.row), relativeX, relativeY);
+            return (null == isFrozenCell ? void 0 : isFrozenCell.col) && !this.isRightFrozenColumn(range.start.col, range.start.row) && rect.offsetLeft(-this.getFrozenColsScrollLeft()), 
+            rect;
         }
         const cellRange = this.getCellRange(range.col, range.row), isFrozenCell = this.isFrozenCell(range.col, range.row);
         let relativeX = !0, relativeY = !0;
-        return (null == isFrozenCell ? void 0 : isFrozenCell.col) && (null == isFrozenCell ? void 0 : isFrozenCell.row) ? (relativeX = !1, 
-        relativeY = !1) : (null == isFrozenCell ? void 0 : isFrozenCell.col) ? relativeX = !1 : (null == isFrozenCell ? void 0 : isFrozenCell.row) && (relativeY = !1), 
-        this._toRelativeRect(this.getCellsRect(cellRange.start.col, cellRange.start.row, cellRange.end.col, cellRange.end.row), relativeX, relativeY);
+        (null == isFrozenCell ? void 0 : isFrozenCell.col) && (null == isFrozenCell ? void 0 : isFrozenCell.row) ? (relativeX = !1, 
+        relativeY = !1) : (null == isFrozenCell ? void 0 : isFrozenCell.col) ? relativeX = !1 : (null == isFrozenCell ? void 0 : isFrozenCell.row) && (relativeY = !1);
+        const rect = this._toRelativeRect(this.getCellsRect(cellRange.start.col, cellRange.start.row, cellRange.end.col, cellRange.end.row), relativeX, relativeY);
+        return (null == isFrozenCell ? void 0 : isFrozenCell.col) && !this.isRightFrozenColumn(range.col, range.row) && rect.offsetLeft(-this.getFrozenColsScrollLeft()), 
+        rect;
     }
     getVisibleCellRangeRelativeRect(range) {
         let cellRange;
@@ -861,7 +871,7 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     getVisibleRect() {
         const {scrollTop: scrollTop, scrollLeft: scrollLeft} = this, width = this.tableNoFrameWidth, height = this.tableNoFrameHeight;
-        return new Rect_1.Rect(scrollLeft, scrollTop, width, height);
+        return new Rect_1.Rect(scrollLeft + this.getFrozenColsOffset(), scrollTop, width, height);
     }
     get visibleRowCount() {
         const {frozenRowCount: frozenRowCount} = this, visibleRect = this.getVisibleRect(), visibleTop = frozenRowCount > 0 ? visibleRect.top + this.getRowsHeight(0, frozenRowCount - 1) : visibleRect.top, initRow = this.getTargetRowAt(visibleTop);
@@ -877,7 +887,7 @@ class BaseTable extends EventTarget_1.EventTarget {
         return count;
     }
     getBodyVisibleCellRange() {
-        const {scrollTop: scrollTop, scrollLeft: scrollLeft} = this, frozenRowsHeight = this.getFrozenRowsHeight(), frozenColsWidth = this.getFrozenColsWidth(), bottomFrozenRowsHeight = this.getBottomFrozenRowsHeight(), rightFrozenColsWidth = this.getRightFrozenColsWidth(), {row: rowStart} = this.getRowAt(scrollTop + frozenRowsHeight + 1), {col: colStart} = this.getColAt(scrollLeft + frozenColsWidth + 1), rowEnd = this.getAllRowsHeight() > this.tableNoFrameHeight ? this.getRowAt(scrollTop + this.tableNoFrameHeight - 1 - bottomFrozenRowsHeight).row : this.rowCount - 1, colEnd = this.getAllColsWidth() > this.tableNoFrameWidth ? this.getColAt(scrollLeft + this.tableNoFrameWidth - 1 - rightFrozenColsWidth).col : this.colCount - 1;
+        const {scrollTop: scrollTop, scrollLeft: scrollLeft} = this, frozenRowsHeight = this.getFrozenRowsHeight(), frozenColsContentWidth = this.getFrozenColsContentWidth(), frozenColsOffset = this.getFrozenColsOffset(), bottomFrozenRowsHeight = this.getBottomFrozenRowsHeight(), rightFrozenColsWidth = this.getRightFrozenColsWidth(), {row: rowStart} = this.getRowAt(scrollTop + frozenRowsHeight + 1), {col: colStart} = this.getColAt(scrollLeft + frozenColsContentWidth + 1), rowEnd = this.getAllRowsHeight() > this.tableNoFrameHeight ? this.getRowAt(scrollTop + this.tableNoFrameHeight - 1 - bottomFrozenRowsHeight).row : this.rowCount - 1, colEnd = this.getAllColsWidth() > this.tableNoFrameWidth ? this.getColAt(scrollLeft + frozenColsOffset + this.tableNoFrameWidth - 1 - rightFrozenColsWidth).col : this.colCount - 1;
         return colEnd < 0 || rowEnd < 0 ? null : {
             rowStart: rowStart,
             colStart: colStart,
@@ -893,14 +903,14 @@ class BaseTable extends EventTarget_1.EventTarget {
         };
     }
     getBodyVisibleColRange(start_deltaX = 0, end_deltaX = 0) {
-        const {scrollLeft: scrollLeft} = this, frozenColsWidth = this.getFrozenColsWidth(), rightFrozenColsWidth = this.getRightFrozenColsWidth(), {col: colStart} = this.getColAt(scrollLeft + frozenColsWidth + 1 + start_deltaX), colEnd = this.getAllColsWidth() > this.tableNoFrameWidth ? this.getColAt(scrollLeft + this.tableNoFrameWidth - 1 - rightFrozenColsWidth + end_deltaX).col : this.colCount - 1;
+        const {scrollLeft: scrollLeft} = this, frozenColsContentWidth = this.getFrozenColsContentWidth(), frozenColsOffset = this.getFrozenColsOffset(), rightFrozenColsWidth = this.getRightFrozenColsWidth(), {col: colStart} = this.getColAt(scrollLeft + frozenColsContentWidth + 1 + start_deltaX), colEnd = this.getAllColsWidth() > this.tableNoFrameWidth ? this.getColAt(scrollLeft + frozenColsOffset + this.tableNoFrameWidth - 1 - rightFrozenColsWidth + end_deltaX).col : this.colCount - 1;
         return colEnd < 0 ? null : {
             colStart: colStart,
             colEnd: colEnd
         };
     }
     get visibleColCount() {
-        const {frozenColCount: frozenColCount} = this, visibleRect = this.getVisibleRect(), visibleLeft = frozenColCount > 0 ? visibleRect.left + this.getColsWidth(0, frozenColCount - 1) : visibleRect.left, initCol = this.getTargetColAt(visibleLeft);
+        const {frozenColCount: frozenColCount} = this, visibleRect = this.getVisibleRect(), visibleLeft = frozenColCount > 0 ? visibleRect.left + this.getFrozenColsWidth() : visibleRect.left, initCol = this.getTargetColAt(visibleLeft);
         if (!initCol) return 0;
         const startCol = Math.max(initCol.left >= visibleLeft ? initCol.col : initCol.col + 1, frozenColCount);
         let absoluteLeft = this.getColsWidth(0, startCol - 1), count = 0;
@@ -1102,8 +1112,22 @@ class BaseTable extends EventTarget_1.EventTarget {
         return this.getRowsHeight(0, this.frozenRowCount - 1);
     }
     getFrozenColsWidth() {
+        const contentWidth = this.getFrozenColsContentWidth();
+        if (!this.options.scrollFrozenCols) return contentWidth;
+        const maxFrozenWidth = this._getMaxFrozenWidth();
+        return Math.min(contentWidth, maxFrozenWidth);
+    }
+    getFrozenColsContentWidth() {
         return this.getColsWidth(0, this.frozenColCount - 1);
     }
+    getFrozenColsOffset() {
+        const contentWidth = this.getFrozenColsContentWidth(), viewportWidth = this.getFrozenColsWidth();
+        return Math.max(0, contentWidth - viewportWidth);
+    }
+    getFrozenColsScrollLeft() {
+        var _a;
+        return null !== (_a = this.stateManager.scroll.frozenHorizontalBarPos) && void 0 !== _a ? _a : 0;
+    }
     getBottomFrozenRowsHeight() {
         if (this.bottomFrozenRowCount > 0) {
             let height = 0;
@@ -1113,6 +1137,12 @@ class BaseTable extends EventTarget_1.EventTarget {
         return 0;
     }
     getRightFrozenColsWidth() {
+        const contentWidth = this.getRightFrozenColsContentWidth();
+        if (!this.options.scrollRightFrozenCols) return contentWidth;
+        const maxRightFrozenWidth = this._getMaxRightFrozenWidth();
+        return Math.min(contentWidth, maxRightFrozenWidth);
+    }
+    getRightFrozenColsContentWidth() {
         if (this.rightFrozenColCount > 0) {
             let width = 0;
             for (let col = this.colCount - this.rightFrozenColCount; col <= this.colCount - 1; col++) width += this.getColWidth(col);
@@ -1120,6 +1150,14 @@ class BaseTable extends EventTarget_1.EventTarget {
         }
         return 0;
     }
+    getRightFrozenColsOffset() {
+        const contentWidth = this.getRightFrozenColsContentWidth(), viewportWidth = this.getRightFrozenColsWidth();
+        return Math.max(0, contentWidth - viewportWidth);
+    }
+    getRightFrozenColsScrollLeft() {
+        var _a;
+        return null !== (_a = this.stateManager.scroll.rightFrozenHorizontalBarPos) && void 0 !== _a ? _a : 0;
+    }
     getDrawRange() {
         var _a, _b;
         const width = (null === (_a = this.containerFit) || void 0 === _a ? void 0 : _a.width) ? this.tableNoFrameWidth : Math.min(this.tableNoFrameWidth, this.getAllColsWidth()), height = (null === (_b = this.containerFit) || void 0 === _b ? void 0 : _b.height) ? this.tableNoFrameHeight : Math.min(this.tableNoFrameHeight, this.getAllRowsHeight());
@@ -2104,8 +2142,8 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     getGroupTitleLevel(col, row) {}
     getTargetScrollTop(row) {
-        const drawRange = this.getDrawRange(), frozenHeight = this.getFrozenRowsHeight(), rowsHeight = Math.ceil(this.rowHeightsMap.getSumInRange(0, row - 1)), allRowsHeight = this.getAllRowsHeight();
-        return Math.max(0, Math.min(rowsHeight - frozenHeight, allRowsHeight - drawRange.height));
+        const drawRange = this.getDrawRange(), frozenHeight = this.getFrozenRowsHeight();
+        return Math.max(0, Math.min(this.getRowsHeight(0, row - 1) - frozenHeight, this.getAllRowsHeight() - drawRange.height));
     }
     _scheduleScrollToRowCorrect(row, delay = 0) {
         this._scrollToRowCorrectTimer = setTimeout((() => {