@visactor/vtable 0.18.3 → 0.18.4

package/cjs/core/BaseTable.d.ts

@@ -174,7 +174,7 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     _makeVisibleCell(col: number, row: number): void;
     render(): void;
     renderAsync(): Promise<void>;
-    _toRelativeRect(absoluteRect: Rect): Rect;
+    _toRelativeRect(absoluteRect: Rect, relativeX?: boolean, relativeY?: boolean): Rect;
     getVisibleRect(): Rect;
     get visibleRowCount(): number;
     getBodyVisibleCellRange(): {

package/cjs/core/BaseTable.js

@@ -45,7 +45,7 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g;
-        if (super(), this.showFrozenIcon = !0, this.showSort = !0, this.version = "0.18.3", 
+        if (super(), this.showFrozenIcon = !0, this.showSort = !0, this.version = "0.18.4", 
         this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, 
         this.throttleInvalidate = (0, util_1.throttle2)(this.render.bind(this), 200), !container && "node" !== options.mode) throw new Error("vtable's container is undefined");
         const {frozenColCount: frozenColCount = 0, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth, widthMode: widthMode = "standard", heightMode: heightMode = "standard", autoFillWidth: autoFillWidth = !1, autoFillHeight: autoFillHeight = !1, keyboardOptions: keyboardOptions, eventOptions: eventOptions, columnResizeMode: columnResizeMode, dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, customRender: customRender, pixelRatio: pixelRatio = pixel_ratio_1.defaultPixelRatio, renderChartAsync: renderChartAsync, renderChartAsyncBatchCount: renderChartAsyncBatchCount, mode: mode, modeParams: modeParams, canvasWidth: canvasWidth, canvasHeight: canvasHeight, overscrollBehavior: overscrollBehavior, limitMinWidth: limitMinWidth} = options;
@@ -456,7 +456,7 @@ class BaseTable extends EventTarget_1.EventTarget {
         isFrozenCell && isFrozenCell.col ? this.isRightFrozenColumn(col, row) ? absoluteLeft = this.tableNoFrameWidth - (null !== (_a = this.getColsWidth(col, this.colCount - 1)) && void 0 !== _a ? _a : 0) : (absoluteLeft = this.getColsWidth(0, col - 1) || 0, 
         absoluteLeft += this.scrollLeft) : absoluteLeft = this.getColsWidth(0, col - 1) || 0;
         const height = this.getRowHeight(row);
-        return isFrozenCell && isFrozenCell.row ? this.isBottomFrozenRow(col, row) ? absoluteLeft = this.tableNoFrameHeight - (null !== (_b = this.getRowsHeight(row, this.rowCount - 1)) && void 0 !== _b ? _b : 0) : (absoluteTop = this.getRowsHeight(0, row - 1), 
+        return isFrozenCell && isFrozenCell.row ? this.isBottomFrozenRow(col, row) ? absoluteTop = this.tableNoFrameHeight - (null !== (_b = this.getRowsHeight(row, this.rowCount - 1)) && void 0 !== _b ? _b : 0) : (absoluteTop = this.getRowsHeight(0, row - 1), 
         absoluteTop += this.scrollTop) : absoluteTop = this.getRowsHeight(0, row - 1), new Rect_1.Rect(Math.round(absoluteLeft), Math.round(absoluteTop), Math.round(width), Math.round(height));
     }
     getMergeCellRect(col, row) {
@@ -464,12 +464,26 @@ class BaseTable extends EventTarget_1.EventTarget {
         return new Rect_1.Rect(Math.round(absoluteLeft), Math.round(absoluteTop), Math.round(width), Math.round(height));
     }
     getCellRelativeRect(col, row) {
-        return this._toRelativeRect(this.getCellRect(col, row));
+        const isFrozenCell = this.isFrozenCell(col, row);
+        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);
     }
     getCellRangeRelativeRect(range) {
-        if (range.start) return this._toRelativeRect(this.getCellsRect(range.start.col, range.start.row, range.end.col, range.end.row));
-        const cellRange = this.getCellRange(range.col, range.row);
-        return this._toRelativeRect(this.getCellsRect(cellRange.start.col, cellRange.start.row, cellRange.end.col, cellRange.end.row));
+        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);
+        }
+        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);
     }
     getVisibleCellRangeRelativeRect(range) {
         let cellRange;
@@ -584,9 +598,9 @@ class BaseTable extends EventTarget_1.EventTarget {
             }), 0);
         }));
     }
-    _toRelativeRect(absoluteRect) {
+    _toRelativeRect(absoluteRect, relativeX = !0, relativeY = !0) {
         const rect = absoluteRect.copy(), visibleRect = this.getVisibleRect();
-        return rect.offsetLeft(this.tableX - visibleRect.left), rect.offsetTop(this.tableY - visibleRect.top), 
+        return rect.offsetLeft(this.tableX - (relativeX ? visibleRect.left : 0)), rect.offsetTop(this.tableY - (relativeY ? visibleRect.top : 0)), 
         rect;
     }
     getVisibleRect() {