k-vtable 1.0.33 → 1.0.35

package/es/core/BaseTable.d.ts

@@ -27,6 +27,7 @@ import { PluginManager } from '../plugins/plugin-manager';
 export declare abstract class BaseTable extends EventTarget implements BaseTableAPI {
     internalProps: IBaseTableProtected;
     showFrozenIcon: boolean;
+    _scrollToRowCorrectTimer: ReturnType<typeof setTimeout> | null;
     padding: {
         top: number;
         left: number;
@@ -163,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;
@@ -264,6 +266,7 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
         release: () => void;
     }): void;
     private dispose;
+    clearCorrectTimer(): void;
     release(): void;
     fireListeners<TYPE extends keyof TableEventHandlersEventArgumentMap>(type: TYPE, event: TableEventHandlersEventArgumentMap[TYPE]): TableEventHandlersReturnMap[TYPE][];
     updateOption(options: BaseTableConstructorOptions, updateConfig?: {
@@ -273,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;
@@ -296,6 +305,11 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     endDragSelect(): void;
     startDragSelectRow(rowIndex: number, enableCtrlSelectMode?: boolean, isShift?: boolean, makeSelectCellVisible?: boolean): void;
     dragSelectRow(rowIndex: number, isCtrl?: boolean, makeSelectCellVisible?: boolean): void;
+    changeHeaderPosition(args: {
+        source: CellAddress;
+        target: CellAddress;
+        movingColumnOrRow?: 'column' | 'row';
+    }): boolean;
     abstract isListTable(): boolean;
     abstract isPivotTable(): boolean;
     abstract isPivotChart(): boolean;
@@ -457,6 +471,8 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     disableScroll(): void;
     enableScroll(): void;
     getGroupTitleLevel(col: number, row: number): number | undefined;
+    getTargetScrollTop(row: number): number;
+    private _scheduleScrollToRowCorrect;
     scrollToRow(row: number, animationOption?: ITableAnimationOption | boolean): void;
     scrollToCol(col: number, animationOption?: ITableAnimationOption | boolean): void;
     scrollToCell(cellAddr: {

package/es/core/BaseTable.js

@@ -90,12 +90,22 @@ export class BaseTable extends EventTarget {
     }
     constructor(container, options = {}) {
         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._tableBorderWidth_left = 0, this._tableBorderWidth_right = 0, 
-        this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, this.version = "1.0.33", 
-        this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, 
-        this.throttleInvalidate = throttle2(this.render.bind(this), 200), "node" === 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");
+        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.0.35", this.id = `VTable${Date.now()}`, this.isReleased = !1, 
+        this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), 
+        "undefined" != typeof window) {
+            const g = window;
+            g[this.id] = this;
+            const registry = g.__vtable__ || (g.__vtable__ = {
+                byId: Object.create(null),
+                list: [],
+                last: null
+            });
+            registry.byId[this.id] = this, registry.list.push(this), registry.last = this, g.__vtable_last_id__ = this.id;
+        }
+        if ("node" === 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");
         this.pluginManager = new PluginManager(this, options), this.fireListeners(TABLE_EVENT_TYPE.BEFORE_INIT, {
             options: options,
             container: container
@@ -132,9 +142,13 @@ export class BaseTable extends EventTarget {
         void 0 !== showFrozenIcon && (this.showFrozenIcon = showFrozenIcon), "number" == typeof allowFrozenColCount && allowFrozenColCount <= 0 && (this.showFrozenIcon = !1), 
         this.options.canvas ? ("node" !== Env.mode && (internalProps.element = this.options.canvas.parentElement, 
         internalProps.element.style.position = "relative"), internalProps.focusControl = new FocusInput(this, internalProps.element), 
-        internalProps.canvas = this.options.canvas, internalProps.context = internalProps.canvas.getContext("2d")) : "node" !== Env.mode && (internalProps.element = createRootElement(this.padding), 
+        internalProps.canvas = this.options.canvas, internalProps.context = internalProps.canvas.getContext("2d"), 
+        internalProps.canvas.__vtable__ = this, internalProps.canvas.__vtable_id__ = this.id, 
+        internalProps.element && (internalProps.element.__vtable__ = this, internalProps.element.__vtable_id__ = this.id)) : "node" !== Env.mode && (internalProps.element = createRootElement(this.padding), 
         internalProps.focusControl = new FocusInput(this, internalProps.element), internalProps.canvas = document.createElement("canvas"), 
         internalProps.element.appendChild(internalProps.canvas), internalProps.context = internalProps.canvas.getContext("2d"), 
+        internalProps.canvas.__vtable__ = this, internalProps.canvas.__vtable_id__ = this.id, 
+        internalProps.element.__vtable__ = this, internalProps.element.__vtable_id__ = this.id, 
         (null === (_e = options.customConfig) || void 0 === _e ? void 0 : _e.createReactContainer) && createReactContainer(this)), 
         internalProps.handler = new EventHandler, isNumber(this.options.resizeTime) && (internalProps.handler.resizeTime = this.options.resizeTime), 
         internalProps.pixelRatio = pixelRatio, internalProps.frozenColCount = frozenColCount, 
@@ -301,7 +315,7 @@ export class BaseTable extends 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;
         }
@@ -311,7 +325,7 @@ export class BaseTable extends 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;
         }
@@ -466,6 +480,11 @@ export class BaseTable extends EventTarget {
         const maxFrozenWidth = null !== (_a = this.options.maxFrozenWidth) && void 0 !== _a ? _a : "80%";
         return _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 _toPxWidth(this, maxRightFrozenWidth);
+    }
     _getComputedFrozenColCount(frozenColCount) {
         const maxFrozenWidth = this._getMaxFrozenWidth();
         let computedfrozenColCount = frozenColCount;
@@ -788,22 +807,27 @@ export class BaseTable extends 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;
@@ -905,7 +929,7 @@ export class BaseTable extends EventTarget {
     }
     getVisibleRect() {
         const {scrollTop: scrollTop, scrollLeft: scrollLeft} = this, width = this.tableNoFrameWidth, height = this.tableNoFrameHeight;
-        return new Rect(scrollLeft, scrollTop, width, height);
+        return new 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);
@@ -921,7 +945,7 @@ export class BaseTable extends 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,
@@ -937,14 +961,14 @@ export class BaseTable extends 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;
@@ -990,27 +1014,47 @@ export class BaseTable extends EventTarget {
     dispose() {
         this.release();
     }
+    clearCorrectTimer() {
+        this._scrollToRowCorrectTimer && (clearTimeout(this._scrollToRowCorrectTimer), this._scrollToRowCorrectTimer = null);
+    }
     release() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
-        const internalProps = this.internalProps;
+        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, _0, _1, _2, _3, _4;
+        if ("undefined" != typeof window) {
+            const g = window;
+            (null == g ? void 0 : g[this.id]) === this ? delete g[this.id] : (null == g ? void 0 : g[this.id]) && (g[this.id] = null);
+            const registry = null == g ? void 0 : g.__vtable__;
+            (null === (_a = null == registry ? void 0 : registry.byId) || void 0 === _a ? void 0 : _a[this.id]) === this && delete registry.byId[this.id];
+            const list = null == registry ? void 0 : registry.list;
+            if (Array.isArray(list) && list.length) for (let i = list.length - 1; i >= 0; i--) list[i] === this && list.splice(i, 1);
+            (null == registry ? void 0 : registry.last) === this && (registry.last = Array.isArray(list) && list.length ? list[list.length - 1] : null), 
+            (null == g ? void 0 : g.__vtable_last_id__) === this.id && (g.__vtable_last_id__ = null !== (_c = null === (_b = null == registry ? void 0 : registry.last) || void 0 === _b ? void 0 : _b.id) && void 0 !== _c ? _c : null);
+        }
         if (this.isReleased) return;
-        null === (_b = null === (_a = internalProps.tooltipHandler) || void 0 === _a ? void 0 : _a.release) || void 0 === _b || _b.call(_a), 
-        null === (_d = null === (_c = internalProps.menuHandler) || void 0 === _c ? void 0 : _c.release) || void 0 === _d || _d.call(_c), 
-        null === (_e = super.release) || void 0 === _e || _e.call(this), this.pluginManager.release(), 
-        null === (_g = null === (_f = internalProps.handler) || void 0 === _f ? void 0 : _f.release) || void 0 === _g || _g.call(_f), 
-        this.eventManager.release(), null === (_j = null === (_h = internalProps.focusControl) || void 0 === _h ? void 0 : _h.release) || void 0 === _j || _j.call(_h), 
-        null === (_k = internalProps.legends) || void 0 === _k || _k.forEach((legend => {
+        null === (_f = null === (_e = null === (_d = this.scenegraph) || void 0 === _d ? void 0 : _d.component) || void 0 === _e ? void 0 : _e.vScrollBar) || void 0 === _f || _f.release(), 
+        null === (_j = null === (_h = null === (_g = this.scenegraph) || void 0 === _g ? void 0 : _g.component) || void 0 === _h ? void 0 : _h.hScrollBar) || void 0 === _j || _j.release(), 
+        this.animationManager.clear(), this.animationManager.ticker.release(), null === (_m = null === (_l = null === (_k = this.scenegraph) || void 0 === _k ? void 0 : _k.stage) || void 0 === _l ? void 0 : _l.ticker) || void 0 === _m || _m.release();
+        const internalProps = this.internalProps, canvas = null == internalProps ? void 0 : internalProps.canvas;
+        (null == canvas ? void 0 : canvas.__vtable__) === this && (delete canvas.__vtable__, 
+        delete canvas.__vtable_id__);
+        const element = null == internalProps ? void 0 : internalProps.element;
+        (null == element ? void 0 : element.__vtable__) === this && (delete element.__vtable__, 
+        delete element.__vtable_id__), this.clearCorrectTimer(), null === (_p = null === (_o = internalProps.tooltipHandler) || void 0 === _o ? void 0 : _o.release) || void 0 === _p || _p.call(_o), 
+        null === (_r = null === (_q = internalProps.menuHandler) || void 0 === _q ? void 0 : _q.release) || void 0 === _r || _r.call(_q), 
+        null === (_s = super.release) || void 0 === _s || _s.call(this), this.pluginManager.release(), 
+        null === (_u = null === (_t = internalProps.handler) || void 0 === _t ? void 0 : _t.release) || void 0 === _u || _u.call(_t), 
+        this.eventManager.release(), null === (_w = null === (_v = internalProps.focusControl) || void 0 === _v ? void 0 : _v.release) || void 0 === _w || _w.call(_v), 
+        null === (_x = internalProps.legends) || void 0 === _x || _x.forEach((legend => {
             null == legend || legend.release();
-        })), null === (_l = internalProps.title) || void 0 === _l || _l.release(), internalProps.title = null, 
-        null === (_m = internalProps.emptyTip) || void 0 === _m || _m.release(), internalProps.emptyTip = null, 
+        })), null === (_y = internalProps.title) || void 0 === _y || _y.release(), internalProps.title = null, 
+        null === (_z = internalProps.emptyTip) || void 0 === _z || _z.release(), internalProps.emptyTip = null, 
         internalProps.layoutMap.release(), internalProps.releaseList && (internalProps.releaseList.forEach((releaseObj => {
             var _a;
             return null === (_a = null == releaseObj ? void 0 : releaseObj.release) || void 0 === _a ? void 0 : _a.call(releaseObj);
         })), internalProps.releaseList = null), this.scenegraph.stage.release(), this.scenegraph.proxy.release();
-        const parentElement = null === (_o = internalProps.element) || void 0 === _o ? void 0 : _o.parentElement;
+        const parentElement = null === (_0 = internalProps.element) || void 0 === _0 ? void 0 : _0.parentElement;
         parentElement && !this.options.canvas && parentElement.removeChild(internalProps.element), 
-        null === (_r = null === (_q = null === (_p = this.editorManager) || void 0 === _p ? void 0 : _p.editingEditor) || void 0 === _q ? void 0 : _q.onEnd) || void 0 === _r || _r.call(_q), 
-        this.isReleased = !0, this.scenegraph = null, this.internalProps = null, null === (_s = this.reactCustomLayout) || void 0 === _s || _s.clearCache(), 
+        null === (_3 = null === (_2 = null === (_1 = this.editorManager) || void 0 === _1 ? void 0 : _1.editingEditor) || void 0 === _2 ? void 0 : _2.onEnd) || void 0 === _3 || _3.call(_2), 
+        this.isReleased = !0, this.scenegraph = null, this.internalProps = null, null === (_4 = this.reactCustomLayout) || void 0 === _4 || _4.clearCache(), 
         clearChartRenderQueue();
     }
     fireListeners(type, event) {
@@ -1139,8 +1183,22 @@ export class BaseTable extends 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;
@@ -1150,6 +1208,12 @@ export class BaseTable extends 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);
@@ -1157,6 +1221,14 @@ export class BaseTable extends 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());
@@ -1307,6 +1379,31 @@ export class BaseTable extends EventTarget {
         lastSelectRange && (lastSelectRange.end.row = rowIndex), this.stateManager.updateSelectPos(this.colCount - 1, rowIndex, !1, isCtrl, !1, makeSelectCellVisible, !0), 
         this.stateManager.select.selecting = !1;
     }
+    changeHeaderPosition(args) {
+        var _a, _b, _c, _d, _e;
+        if (!("canMoveHeaderPosition" in this.internalProps.layoutMap) || !0 === (null === (_a = this.options.customConfig) || void 0 === _a ? void 0 : _a.notUpdateInColumnRowMove)) return !1;
+        const prevMoving = this.stateManager.columnMove.movingColumnOrRow;
+        this.stateManager.columnMove.movingColumnOrRow = args.movingColumnOrRow;
+        try {
+            if (!1 === (null === (_c = (_b = this.internalProps.layoutMap).canMoveHeaderPosition) || void 0 === _c ? void 0 : _c.call(_b, args.source, args.target))) return !1;
+            const oldSourceMergeInfo = this.getCellRange(args.source.col, args.source.row), oldTargetMergeInfo = this.getCellRange(args.target.col, args.target.row), moveContext = this._moveHeaderPosition(args.source, args.target);
+            if (!moveContext || moveContext.targetIndex === moveContext.sourceIndex) return !1;
+            this.internalProps.useOneRowHeightFillAll = !1, this.internalProps.layoutMap.clearCellRangeMap();
+            const sourceMergeInfo = this.getCellRange(args.source.col, args.source.row), targetMergeInfo = this.getCellRange(args.target.col, args.target.row), colMin = Math.min(sourceMergeInfo.start.col, targetMergeInfo.start.col, oldSourceMergeInfo.start.col, oldTargetMergeInfo.start.col), colMax = Math.max(sourceMergeInfo.end.col, targetMergeInfo.end.col, oldSourceMergeInfo.end.col, oldTargetMergeInfo.end.col), rowMin = Math.min(sourceMergeInfo.start.row, targetMergeInfo.start.row, oldSourceMergeInfo.start.row, oldTargetMergeInfo.start.row);
+            let rowMax = Math.max(sourceMergeInfo.end.row, targetMergeInfo.end.row, oldSourceMergeInfo.end.row, oldTargetMergeInfo.end.row);
+            if ("row" === moveContext.moveType && "tree" === this.internalProps.layoutMap.rowHierarchyType && (rowMax = moveContext.targetIndex > moveContext.sourceIndex ? rowMax + moveContext.targetSize - 1 : rowMax + moveContext.sourceSize - 1), 
+            this.transpose || !this.isSeriesNumberInBody(args.source.col, args.source.row) && "row" !== args.movingColumnOrRow || (this.changeRecordOrder(moveContext.sourceIndex, moveContext.targetIndex), 
+            this.stateManager.changeCheckboxAndRadioOrder(moveContext.sourceIndex, moveContext.targetIndex)), 
+            "column" === moveContext.moveType) for (let col = colMin; col <= colMax; col++) this._clearColRangeWidthsMap(col); else for (let row = rowMin; row <= rowMax; row++) this._clearRowRangeHeightsMap(row);
+            return this.clearCellStyleCache(), this.isSeriesNumberInBody(args.source.col, args.source.row) || "row" === args.movingColumnOrRow ? this.scenegraph.updateHeaderPosition(this.scenegraph.proxy.colStart, this.scenegraph.proxy.colEnd, this.scenegraph.proxy.rowStart, this.scenegraph.proxy.rowEnd, moveContext.moveType) : "column" === moveContext.moveType ? this.scenegraph.updateHeaderPosition(colMin, colMax, 0, -1, moveContext.moveType) : this.scenegraph.updateHeaderPosition(0, -1, rowMin, rowMax, moveContext.moveType), 
+            "adjustFrozenCount" === this.internalProps.frozenColDragHeaderMode && this.isListTable() && (this.isLeftFrozenColumn(args.target.col) && !this.isLeftFrozenColumn(args.source.col) ? this.frozenColCount += sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1 : this.isLeftFrozenColumn(args.source.col) && !this.isLeftFrozenColumn(args.target.col) && (this.frozenColCount -= sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1), 
+            this.isRightFrozenColumn(args.target.col) && !this.isRightFrozenColumn(args.source.col) ? this.rightFrozenColCount += sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1 : this.isRightFrozenColumn(args.source.col) && !this.isRightFrozenColumn(args.target.col) && (this.rightFrozenColCount -= sourceMergeInfo.end.col - sourceMergeInfo.start.col + 1)), 
+            null === (_e = (_d = this.scenegraph).updateNextFrame) || void 0 === _e || _e.call(_d), 
+            !0;
+        } finally {
+            this.stateManager.columnMove.movingColumnOrRow = prevMoving;
+        }
+    }
     get recordsCount() {
         var _a;
         return null === (_a = this.records) || void 0 === _a ? void 0 : _a.length;
@@ -1381,10 +1478,14 @@ export class BaseTable extends EventTarget {
     }
     getCellType(col, row) {
         let cellType;
-        return this.isSeriesNumberInHeader(col, row) ? this.internalProps.layoutMap.getSeriesNumberHeader(col, row).cellType : (cellType = this.isHeader(col, row) ? this.internalProps.layoutMap.getHeader(col, row).headerType : this.internalProps.layoutMap.getBody(col, row).cellType, 
+        if (this.isSeriesNumberInHeader(col, row)) {
+            const seriesHeaderCellType = this.internalProps.layoutMap.getSeriesNumberHeader(col, row).cellType;
+            return "radio" === seriesHeaderCellType ? "text" : seriesHeaderCellType;
+        }
+        return cellType = this.isHeader(col, row) ? this.internalProps.layoutMap.getHeader(col, row).headerType : this.internalProps.layoutMap.getBody(col, row).cellType, 
         getProp("cellType", {
             cellType: cellType
-        }, col, row, this));
+        }, col, row, this);
     }
     getHeaderField(col, row) {
         return this.internalProps.layoutMap.getHeaderField(col, row);
@@ -1458,7 +1559,7 @@ export class BaseTable extends EventTarget {
     getCustomMerge(col, row) {
         if (this.internalProps.customMergeCell) {
             const customMerge = this.internalProps.customMergeCell(col, row, this);
-            if (customMerge && customMerge.range && (isValid(customMerge.text) || customMerge.customLayout || this.customRender)) {
+            if (customMerge && customMerge.range) {
                 if (customMerge.style) {
                     const styleClass = this.internalProps.bodyHelper.getStyleClass("text"), style = customMerge.style, fullStyle = columnStyleContents.of(style, this.theme.bodyStyle, {
                         col: col,
@@ -2109,12 +2210,33 @@ export class BaseTable extends EventTarget {
         this.eventManager.enableScroll();
     }
     getGroupTitleLevel(col, row) {}
+    getTargetScrollTop(row) {
+        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((() => {
+            this.clearCorrectTimer();
+            const targetScrollTop = this.getTargetScrollTop(row);
+            if (targetScrollTop !== this.scrollTop) {
+                this.scrollTop = targetScrollTop;
+                const correctedTargetScrollTop = this.getTargetScrollTop(row);
+                correctedTargetScrollTop !== this.scrollTop && (this.scrollTop = correctedTargetScrollTop);
+            }
+        }), delay);
+    }
     scrollToRow(row, animationOption) {
-        animationOption ? this.animationManager.scrollTo({
-            row: row
-        }, animationOption) : this.scrollToCell({
-            row: row
-        });
+        var _a;
+        const targetRow = Math.min(Math.max(Math.floor(row), 0), this.rowCount - 1);
+        if (this.clearCorrectTimer(), !animationOption) return this.scrollToCell({
+            row: targetRow
+        }), void this._scheduleScrollToRowCorrect(targetRow);
+        const duration = isBoolean(animationOption) ? 3e3 : null !== (_a = null == animationOption ? void 0 : animationOption.duration) && void 0 !== _a ? _a : 3e3;
+        this.animationManager.scrollTo({
+            row: targetRow
+        }, animationOption), this._scrollToRowCorrectTimer = setTimeout((() => {
+            this.scrollToRow(targetRow, !1);
+        }), duration);
     }
     scrollToCol(col, animationOption) {
         animationOption ? this.animationManager.scrollTo({
@@ -2131,8 +2253,8 @@ export class BaseTable extends EventTarget {
             this.scrollLeft = Math.min(left - frozenWidth, this.getAllColsWidth() - drawRange.width);
         }
         if (isValid(cellAddr.row) && cellAddr.row >= this.frozenRowCount) {
-            const frozenHeight = this.getFrozenRowsHeight(), top = this.getRowsHeight(0, cellAddr.row - 1);
-            this.scrollTop = Math.min(top - frozenHeight, this.getAllRowsHeight() - drawRange.height);
+            const frozenHeight = this.getFrozenRowsHeight(), top = this.rowHeightsMap.getSumInRange(0, cellAddr.row - 1);
+            this.scrollTop = Math.min(top - frozenHeight, this.rowHeightsMap.getSumInRange(0, this.rowCount - 1) - drawRange.height);
         }
         this.render();
     }