@visactor/vtable 1.26.2 → 1.26.3

package/cjs/vrender.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qEAA0D;AAC1D,kCAAgC;AAChC,yDAAwH;AACxH,yDAqBgC;AAIhC,IAAI,QAAQ,GAAG,KAAK,CAAC;AACrB,SAAgB,kBAAkB;IAChC,IAAI,QAAQ,EAAE;QACZ,OAAO;KACR;IACD,QAAQ,GAAG,IAAI,CAAC;IAEhB,IAAA,+BAAgB,GAAE,CAAC;IAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;QAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;KAC3B;SAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;QACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;KACxB;IACD,IAAA,0BAAW,GAAE,CAAC;IAGd,IAAA,6BAAc,GAAE,CAAC;IAEjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IAIf,IAAA,2BAAY,GAAE,CAAC;IAEf,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,uCAAwB,GAAE,CAAC;IAE3B,IAAA,+BAAU,GAAE,CAAC;IAEb,IAAA,uCAAwB,GAAE,CAAC;AAC7B,CAAC;AAnCD,gDAmCC;AAOD,yDAAuC;AACvC,yDAAuC;AACvC,+DAA6C;AAC7C,4DAA0C","file":"vrender.js","sourcesContent":["import { loadPoptip } from '@visactor/vrender-components';\nimport '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule, registerFlexLayoutPlugin } from '@visactor/vrender-core';\nimport {\n  loadBrowserEnv,\n  loadNodeEnv,\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\n// export const version = \"1.26.2\";\n\nlet registed = false;\nexport function registerForVrender() {\n  if (registed) {\n    return;\n  }\n  registed = true;\n  // 注册内置组件\n  preLoadAllModule();\n\n  if (isBrowserEnv()) {\n    loadBrowserEnv(container);\n  } else if (isNodeEnv()) {\n    loadNodeEnv(container);\n  }\n  registerArc();\n  // registerArc3d();\n  // registerArea();\n  registerCircle();\n  // registerGlyph();\n  registerGroup();\n  registerImage();\n  registerLine();\n  // registerPath();\n  // registerPolygon();\n  // registerPyramid3d();\n  registerRect();\n  // registerRect3d();\n  registerRichtext();\n  registerShadowRoot();\n  registerSymbol();\n  registerText();\n  registerFlexLayoutPlugin();\n  // registerWrapText();\n  loadPoptip();\n\n  registerFlexLayoutPlugin();\n}\n\nexport type { Direction } from '@visactor/vrender-core';\nexport type { State } from '@visactor/vrender-components';\n// export { GroupFadeIn } from '@visactor/vrender-core';\n// export { GroupFadeOut } from '@visactor/vrender-core';\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-components';\nexport * from '@visactor/vrender-animate';\n"]}
+{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qEAA0D;AAC1D,kCAAgC;AAChC,yDAAwH;AACxH,yDAqBgC;AAIhC,IAAI,QAAQ,GAAG,KAAK,CAAC;AACrB,SAAgB,kBAAkB;IAChC,IAAI,QAAQ,EAAE;QACZ,OAAO;KACR;IACD,QAAQ,GAAG,IAAI,CAAC;IAEhB,IAAA,+BAAgB,GAAE,CAAC;IAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;QAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;KAC3B;SAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;QACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;KACxB;IACD,IAAA,0BAAW,GAAE,CAAC;IAGd,IAAA,6BAAc,GAAE,CAAC;IAEjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IAIf,IAAA,2BAAY,GAAE,CAAC;IAEf,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,uCAAwB,GAAE,CAAC;IAE3B,IAAA,+BAAU,GAAE,CAAC;IAEb,IAAA,uCAAwB,GAAE,CAAC;AAC7B,CAAC;AAnCD,gDAmCC;AAOD,yDAAuC;AACvC,yDAAuC;AACvC,+DAA6C;AAC7C,4DAA0C","file":"vrender.js","sourcesContent":["import { loadPoptip } from '@visactor/vrender-components';\nimport '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule, registerFlexLayoutPlugin } from '@visactor/vrender-core';\nimport {\n  loadBrowserEnv,\n  loadNodeEnv,\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\n// export const version = \"1.26.3\";\n\nlet registed = false;\nexport function registerForVrender() {\n  if (registed) {\n    return;\n  }\n  registed = true;\n  // 注册内置组件\n  preLoadAllModule();\n\n  if (isBrowserEnv()) {\n    loadBrowserEnv(container);\n  } else if (isNodeEnv()) {\n    loadNodeEnv(container);\n  }\n  registerArc();\n  // registerArc3d();\n  // registerArea();\n  registerCircle();\n  // registerGlyph();\n  registerGroup();\n  registerImage();\n  registerLine();\n  // registerPath();\n  // registerPolygon();\n  // registerPyramid3d();\n  registerRect();\n  // registerRect3d();\n  registerRichtext();\n  registerShadowRoot();\n  registerSymbol();\n  registerText();\n  registerFlexLayoutPlugin();\n  // registerWrapText();\n  loadPoptip();\n\n  registerFlexLayoutPlugin();\n}\n\nexport type { Direction } from '@visactor/vrender-core';\nexport type { State } from '@visactor/vrender-components';\n// export { GroupFadeIn } from '@visactor/vrender-core';\n// export { GroupFadeOut } from '@visactor/vrender-core';\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-components';\nexport * from '@visactor/vrender-animate';\n"]}

package/dist/vtable.js

@@ -41965,26 +41965,53 @@
         return parse$2(font);
     }
 
-    function getQuadProps(paddingOrigin) {
-        if (isNumber$3(paddingOrigin) || isString$2(paddingOrigin) || isArray$5(paddingOrigin)) {
-            let padding = parsePadding(paddingOrigin);
-            if (typeof padding === 'number' || typeof padding === 'string') {
-                padding = [padding, padding, padding, padding];
-            }
-            else if (Array.isArray(padding)) {
-                padding = padding.slice(0);
-            }
-            return padding;
+    function normalizeQuadArray(values) {
+        if (values.length === 0) {
+            return [0, 0, 0, 0];
+        }
+        if (values.length === 1) {
+            return [values[0], values[0], values[0], values[0]];
+        }
+        if (values.length === 2) {
+            return [values[0], values[1], values[0], values[1]];
+        }
+        if (values.length === 3) {
+            return [values[0], values[1], values[2], values[1]];
         }
-        else if (paddingOrigin &&
-            (isFinite(paddingOrigin.bottom) ||
-                isFinite(paddingOrigin.left) ||
-                isFinite(paddingOrigin.right) ||
-                isFinite(paddingOrigin.top))) {
+        return [values[0], values[1], values[2], values[3]];
+    }
+    function parseStringQuad(padding) {
+        const tokens = padding.trim().split(/\s+/);
+        const values = tokens.map(token => Number.parseFloat(token)).filter(value => Number.isFinite(value));
+        if (values.length === tokens.length && values.length > 0) {
+            return normalizeQuadArray(values);
+        }
+        return [padding, padding, padding, padding];
+    }
+    function normalizePaddingObject(paddingOrigin) {
+        if (Number.isFinite(paddingOrigin.bottom) ||
+            Number.isFinite(paddingOrigin.left) ||
+            Number.isFinite(paddingOrigin.right) ||
+            Number.isFinite(paddingOrigin.top)) {
             return [paddingOrigin.top ?? 0, paddingOrigin.right ?? 0, paddingOrigin.bottom ?? 0, paddingOrigin.left ?? 0];
         }
         return [0, 0, 0, 0];
     }
+    function getQuadProps(paddingOrigin) {
+        if (Array.isArray(paddingOrigin)) {
+            return normalizeQuadArray(paddingOrigin.slice(0, 4));
+        }
+        if (typeof paddingOrigin === 'number' && Number.isFinite(paddingOrigin)) {
+            return [paddingOrigin, paddingOrigin, paddingOrigin, paddingOrigin];
+        }
+        if (typeof paddingOrigin === 'string') {
+            return parseStringQuad(paddingOrigin);
+        }
+        if (paddingOrigin && typeof paddingOrigin === 'object') {
+            return normalizePaddingObject(paddingOrigin);
+        }
+        return [0, 0, 0, 0];
+    }
 
     const TYPE_PAREN = 0;
     const TYPE_UNIT = 1;
@@ -43506,7 +43533,7 @@
                 col: range?.start.col ?? col,
                 row: range?.start.row ?? row,
                 dataValue: table.getCellOriginValue(col, row),
-                value: table.getCellValue(col, row) || '',
+                value: table.getCellValue(col, row),
                 rect: {
                     left: 0,
                     top: 0,
@@ -43542,7 +43569,7 @@
                 col,
                 row,
                 dataValue: table.getCellOriginValue(col, row),
-                value: table.getCellValue(col, row) || '',
+                value: table.getCellValue(col, row),
                 rect: {
                     left: 0,
                     top: 0,
@@ -46985,7 +47012,7 @@
                 col: cellRange?.start.col ?? col,
                 row: cellRange?.start.row ?? row,
                 dataValue: table.getCellOriginValue(col, row),
-                value: table.getCellValue(col, row) || '',
+                value: table.getCellValue(col, row),
                 rect: getCellRect$1(col, row, table),
                 table,
                 originCol: col,
@@ -48343,6 +48370,16 @@
         }
     }
 
+    function getBodyHorizontalScrollRange(table) {
+        const totalWidth = table.getAllColsWidth();
+        const frozenColsWidth = table.getFrozenColsWidth();
+        const rightFrozenColsWidth = table.getRightFrozenColsWidth();
+        const frozenColsContentWidth = table.getFrozenColsContentWidth?.() ?? frozenColsWidth;
+        const rightFrozenColsContentWidth = table.getRightFrozenColsContentWidth?.() ?? rightFrozenColsWidth;
+        const bodyViewportWidth = table.tableNoFrameWidth - frozenColsWidth - rightFrozenColsWidth;
+        const bodyContentWidth = totalWidth - frozenColsContentWidth - rightFrozenColsContentWidth;
+        return Math.max(0, bodyContentWidth - bodyViewportWidth);
+    }
     function getColX(col, table, isRightFrozen) {
         if (isRightFrozen) {
             return (Math.min(table.tableNoFrameWidth, table.getAllColsWidth()) -
@@ -48699,24 +48736,25 @@
             const rightFrozenColsContentWidth = this.table.getRightFrozenColsContentWidth?.() ?? rightFrozenColsWidth;
             const hoverOn = this.table.theme.scrollStyle.hoverOn;
             const sizeTolerance = this.table.options.customConfig?._disableColumnAndRowSizeRound ? 1 : 0;
-            if (totalWidth > tableWidth + sizeTolerance) {
-                const y = Math.min(tableHeight, totalHeight);
+            const bodyScrollRange = getBodyHorizontalScrollRange(this.table);
+            const y = Math.min(tableHeight, totalHeight);
+            let attrY = 0;
+            if (this.table.theme.scrollStyle.barToSide) {
+                attrY =
+                    this.table.tableNoFrameHeight -
+                        (hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.y) +
+                        this.table.tableY;
+            }
+            else {
+                attrY = y - (hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.y);
+            }
+            const ignoreFrozenCols = this.table.theme.scrollStyle?.ignoreFrozenCols ?? false;
+            if (bodyScrollRange > sizeTolerance) {
                 const bodyViewportWidth = tableWidth - frozenColsWidth - rightFrozenColsWidth;
-                const bodyContentWidth = totalWidth - frozenColsContentWidth - rightFrozenColsContentWidth;
+                const bodyContentWidth = bodyViewportWidth + bodyScrollRange;
                 const rangeEnd = bodyContentWidth > 0 ? Math.max(0.05, bodyViewportWidth / bodyContentWidth) : 1;
-                let attrY = 0;
-                if (this.table.theme.scrollStyle.barToSide) {
-                    attrY =
-                        this.table.tableNoFrameHeight -
-                            (hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.y) +
-                            this.table.tableY;
-                }
-                else {
-                    attrY = y - (hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.y);
-                }
                 let hScrollBarx = frozenColsWidth + (!hoverOn ? this.table.scenegraph.tableGroup.attribute.x : 0);
                 let hScrollBarWidth = tableWidth - frozenColsWidth - rightFrozenColsWidth;
-                const ignoreFrozenCols = this.table.theme.scrollStyle?.ignoreFrozenCols ?? false;
                 if (ignoreFrozenCols) {
                     hScrollBarx = !hoverOn ? this.table.scenegraph.tableGroup.attribute.x : 0;
                     hScrollBarWidth = tableWidth;
@@ -48740,62 +48778,6 @@
                 if (horizontalVisible === 'always') {
                     this.hScrollBar.showAll();
                 }
-                const frozenScrollable = this.table.options.scrollFrozenCols && this.table.getFrozenColsOffset() > 0;
-                if (!ignoreFrozenCols && frozenScrollable) {
-                    const frozenRangeEnd = Math.max(0.05, frozenColsWidth / frozenColsContentWidth);
-                    const x = !hoverOn ? this.table.scenegraph.tableGroup.attribute.x : 0;
-                    this.frozenHScrollBar.setAttributes({
-                        x,
-                        y: attrY,
-                        width: frozenColsWidth,
-                        range: [0, frozenRangeEnd],
-                        visible: horizontalVisible === 'always'
-                    });
-                    const bounds = this.frozenHScrollBar.AABBBounds && this.frozenHScrollBar.globalAABBBounds;
-                    this.frozenHScrollBar._viewPosition = {
-                        x: bounds.x1,
-                        y: bounds.y1
-                    };
-                    if (horizontalVisible === 'always') {
-                        this.frozenHScrollBar.showAll();
-                    }
-                }
-                else {
-                    this.frozenHScrollBar.setAttributes({
-                        x: -this.table.tableNoFrameWidth * 2,
-                        y: -this.table.tableNoFrameHeight * 2,
-                        width: 0,
-                        visible: false
-                    });
-                }
-                const rightFrozenScrollable = this.table.options.scrollRightFrozenCols && this.table.getRightFrozenColsOffset() > 0;
-                if (!ignoreFrozenCols && rightFrozenScrollable) {
-                    const rightFrozenRangeEnd = Math.max(0.05, rightFrozenColsWidth / rightFrozenColsContentWidth);
-                    const x = tableWidth - rightFrozenColsWidth + (!hoverOn ? this.table.scenegraph.tableGroup.attribute.x : 0);
-                    this.rightFrozenHScrollBar.setAttributes({
-                        x,
-                        y: attrY,
-                        width: rightFrozenColsWidth,
-                        range: [0, rightFrozenRangeEnd],
-                        visible: horizontalVisible === 'always'
-                    });
-                    const bounds = this.rightFrozenHScrollBar.AABBBounds && this.rightFrozenHScrollBar.globalAABBBounds;
-                    this.rightFrozenHScrollBar._viewPosition = {
-                        x: bounds.x1,
-                        y: bounds.y1
-                    };
-                    if (horizontalVisible === 'always') {
-                        this.rightFrozenHScrollBar.showAll();
-                    }
-                }
-                else {
-                    this.rightFrozenHScrollBar.setAttributes({
-                        x: -this.table.tableNoFrameWidth * 2,
-                        y: -this.table.tableNoFrameHeight * 2,
-                        width: 0,
-                        visible: false
-                    });
-                }
             }
             else {
                 this.hScrollBar.setAttributes({
@@ -48804,12 +48786,56 @@
                     width: 0,
                     visible: false
                 });
+            }
+            const frozenScrollable = this.table.options.scrollFrozenCols && this.table.getFrozenColsOffset() > 0;
+            if (!ignoreFrozenCols && frozenScrollable) {
+                const frozenRangeEnd = Math.max(0.05, frozenColsWidth / frozenColsContentWidth);
+                const x = !hoverOn ? this.table.scenegraph.tableGroup.attribute.x : 0;
+                this.frozenHScrollBar.setAttributes({
+                    x,
+                    y: attrY,
+                    width: frozenColsWidth,
+                    range: [0, frozenRangeEnd],
+                    visible: horizontalVisible === 'always'
+                });
+                const bounds = this.frozenHScrollBar.AABBBounds && this.frozenHScrollBar.globalAABBBounds;
+                this.frozenHScrollBar._viewPosition = {
+                    x: bounds.x1,
+                    y: bounds.y1
+                };
+                if (horizontalVisible === 'always') {
+                    this.frozenHScrollBar.showAll();
+                }
+            }
+            else {
                 this.frozenHScrollBar.setAttributes({
                     x: -this.table.tableNoFrameWidth * 2,
                     y: -this.table.tableNoFrameHeight * 2,
                     width: 0,
                     visible: false
                 });
+            }
+            const rightFrozenScrollable = this.table.options.scrollRightFrozenCols && this.table.getRightFrozenColsOffset() > 0;
+            if (!ignoreFrozenCols && rightFrozenScrollable) {
+                const rightFrozenRangeEnd = Math.max(0.05, rightFrozenColsWidth / rightFrozenColsContentWidth);
+                const x = tableWidth - rightFrozenColsWidth + (!hoverOn ? this.table.scenegraph.tableGroup.attribute.x : 0);
+                this.rightFrozenHScrollBar.setAttributes({
+                    x,
+                    y: attrY,
+                    width: rightFrozenColsWidth,
+                    range: [0, rightFrozenRangeEnd],
+                    visible: horizontalVisible === 'always'
+                });
+                const bounds = this.rightFrozenHScrollBar.AABBBounds && this.rightFrozenHScrollBar.globalAABBBounds;
+                this.rightFrozenHScrollBar._viewPosition = {
+                    x: bounds.x1,
+                    y: bounds.y1
+                };
+                if (horizontalVisible === 'always') {
+                    this.rightFrozenHScrollBar.showAll();
+                }
+            }
+            else {
                 this.rightFrozenHScrollBar.setAttributes({
                     x: -this.table.tableNoFrameWidth * 2,
                     y: -this.table.tableNoFrameHeight * 2,
@@ -53541,7 +53567,7 @@
                 col: cellRange?.start.col ?? col,
                 row: cellRange?.start.row ?? row,
                 dataValue: table.getCellOriginValue(col, row),
-                value: table.getCellValue(col, row) || '',
+                value: table.getCellValue(col, row),
                 rect: getCellRect(col, row, table),
                 table,
                 originCol: col,
@@ -57300,7 +57326,9 @@
                 const headerColGroup = scene.getColGroup(col, true);
                 insertBefore(rightTopCornerGroup, headerColGroup, rightTopCornerGroup.firstChild);
                 const bottomColGroup = scene.getColGroupInBottom(col);
-                insertBefore(rightBottomCornerGroup, bottomColGroup, rightBottomCornerGroup.firstChild);
+                if (bottomColGroup) {
+                    insertBefore(rightBottomCornerGroup, bottomColGroup, rightBottomCornerGroup.firstChild);
+                }
             }
             let x = 0;
             rightFrozenGroup.forEachChildren((columnGroup) => {
@@ -57327,9 +57355,11 @@
                 headerColGroup.setAttribute('x', colHeaderGroup.lastChild.attribute.x + table.getColWidth(colHeaderGroup.lastChild.col));
                 colHeaderGroup.appendChild(headerColGroup);
                 const bottomColGroup = scene.getColGroupInRightBottomCorner(col);
-                bottomColGroup.setAttribute('x', bottomFrozenGroup.lastChild.attribute.x +
-                    table.getColWidth(bottomFrozenGroup.lastChild.col));
-                bottomFrozenGroup.appendChild(bottomColGroup);
+                if (bottomColGroup) {
+                    const lastBottomColGroup = bottomFrozenGroup.lastChild;
+                    bottomColGroup.setAttribute('x', lastBottomColGroup ? lastBottomColGroup.attribute.x + table.getColWidth(lastBottomColGroup.col) : 0);
+                    bottomFrozenGroup.appendChild(bottomColGroup);
+                }
             }
             let x = 0;
             rightFrozenGroup.forEachChildren((columnGroup) => {
@@ -59886,6 +59916,9 @@
                         lastBodyCol.attribute.x -
                         lastBodyCol.attribute.width;
             }
+            if (this.table.options.scrollFrozenCols && x > 0) {
+                x = 0;
+            }
             if (this.table.getFrozenColsWidth() + x === this.bodyGroup.attribute.x) {
                 return;
             }
@@ -59999,11 +60032,17 @@
             this.rowHeaderGroup.forEachChildrenSkipChild((column) => {
                 rowHeaderWidth += column.attribute.width;
             });
+            if (table.options.scrollFrozenCols) {
+                rowHeaderWidth = table.getFrozenColsWidth();
+            }
             this.rowHeaderGroup.setAttribute('width', rowHeaderWidth);
             let cornerHeaderWidth = 0;
             this.cornerHeaderGroup.forEachChildrenSkipChild((column) => {
                 cornerHeaderWidth += column.attribute.width;
             });
+            if (table.options.scrollFrozenCols) {
+                cornerHeaderWidth = table.getFrozenColsWidth();
+            }
             this.cornerHeaderGroup.setAttribute('width', cornerHeaderWidth);
             this.colHeaderGroup.setAttribute('x', this.cornerHeaderGroup.attribute.width);
             this.rowHeaderGroup.setAttribute('y', this.cornerHeaderGroup.attribute.height);
@@ -63741,11 +63780,8 @@
             }
         }
         updateHorizontalScrollBar(xRatio) {
-            const totalWidth = this.table.getAllColsWidth();
             const oldHorizontalBarPos = this.scroll.horizontalBarPos;
-            const frozenOffset = this.table.getFrozenColsOffset?.() ?? 0;
-            const rightFrozenOffset = this.table.getRightFrozenColsOffset?.() ?? 0;
-            const scrollRange = Math.max(0, totalWidth - this.table.scenegraph.width - frozenOffset - rightFrozenOffset);
+            const scrollRange = getBodyHorizontalScrollRange(this.table);
             let horizontalBarPos = Math.ceil(xRatio * scrollRange);
             if (!isValid$1(horizontalBarPos) || isNaN(horizontalBarPos)) {
                 horizontalBarPos = 0;
@@ -63855,10 +63891,7 @@
                 return;
             }
             this.table.scrollLeft;
-            const totalWidth = this.table.getAllColsWidth();
-            const frozenOffset = this.table.getFrozenColsOffset?.() ?? 0;
-            const rightFrozenOffset = this.table.getRightFrozenColsOffset?.() ?? 0;
-            const scrollRange = Math.max(0, totalWidth - this.table.scenegraph.width - frozenOffset - rightFrozenOffset);
+            const scrollRange = getBodyHorizontalScrollRange(this.table);
             const sizeTolerance = this.table.options.customConfig?._disableColumnAndRowSizeRound ? 1 : 0;
             left = Math.max(0, Math.min(left, scrollRange - sizeTolerance));
             left = Math.ceil(left);
@@ -65133,15 +65166,19 @@
             if (e.button !== 0) {
                 return;
             }
+            const endedResizeCol = stateManager.isResizeCol();
+            const endedResizeRow = stateManager.isResizeRow();
+            const endedMoveCol = stateManager.isMoveCol();
+            const shouldSkipClickCell = endedResizeCol || endedResizeRow;
             if (stateManager.interactionState === 'grabing') {
                 stateManager.updateInteractionState(InteractionState.default);
-                if (stateManager.isResizeCol()) {
+                if (endedResizeCol) {
                     endResizeCol(table);
                 }
-                else if (stateManager.isResizeRow()) {
+                else if (endedResizeRow) {
                     endResizeRow(table);
                 }
-                else if (stateManager.isMoveCol()) {
+                else if (endedMoveCol) {
                     const endMoveColSuccess = table.stateManager.endMoveCol();
                     fireMoveColEventListeners(table, endMoveColSuccess, e.nativeEvent);
                 }
@@ -65171,7 +65208,7 @@
             else if (stateManager.interactionState === InteractionState.scrolling) {
                 stateManager.updateInteractionState(InteractionState.default);
             }
-            if (!table.eventManager.isDraging) {
+            if (!table.eventManager.isDraging && !shouldSkipClickCell) {
                 const eventArgsSet = getEventArgsSet(e);
                 if (!eventManager.isTouchMove &&
                     e.button === 0 &&
@@ -72022,7 +72059,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.26.2";
+        version = "1.26.3";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -75436,18 +75473,21 @@
             }, delay);
         }
         scrollToRow(row, animationOption) {
-            const targetRow = Math.min(Math.max(Math.floor(row), 0), this.rowCount - 1);
+            const targetRow = Math.min(Math.max(row, 0), this.rowCount - 1);
+            const targetRowInt = Math.floor(targetRow);
             this.clearCorrectTimer();
             if (!animationOption) {
-                this.scrollToCell({ row: targetRow });
-                this._scheduleScrollToRowCorrect(targetRow);
+                this.scrollToCell({ row: targetRowInt });
+                this._scheduleScrollToRowCorrect(targetRowInt);
                 return;
             }
             const duration = !isBoolean$2(animationOption) ? animationOption?.duration ?? 3000 : 3000;
             this.animationManager.scrollTo({ row: targetRow }, animationOption);
-            this._scrollToRowCorrectTimer = setTimeout(() => {
-                this.scrollToRow(targetRow, false);
-            }, duration);
+            if (targetRowInt === targetRow) {
+                this._scrollToRowCorrectTimer = setTimeout(() => {
+                    this.scrollToRow(targetRowInt, false);
+                }, duration);
+            }
         }
         scrollToCol(col, animationOption) {
             if (!animationOption) {
@@ -94143,6 +94183,7 @@
             const getMaxScrollTop = () => Math.max(0, this.getAllRowsHeight() - (this.scenegraph?.height ?? this.tableNoFrameHeight) - sizeTolerance);
             const oldMaxScrollTop = getMaxScrollTop();
             const isScrollToBottom = oldMaxScrollTop > 0 && this.scrollTop >= oldMaxScrollTop - 1;
+            const oldScrollTop = this.scrollTop;
             const visibleStartRow = this.getBodyVisibleRowRange().rowStart;
             this.internalProps._oldRowCount = this.rowCount;
             this.internalProps._oldColCount = this.colCount;
@@ -94159,6 +94200,9 @@
                 }
             }
             const isChangeRowTree = this.internalProps.layoutMap.isRowHeader(col, row);
+            const oldHierarchyState = isChangeRowTree ? this.getHierarchyState(col, row) : undefined;
+            const shouldKeepBottomAfterToggle = isScrollToBottom && oldHierarchyState === 'expand';
+            const shouldKeepScrollAfterToggle = isChangeRowTree && !shouldKeepBottomAfterToggle;
             const result = isChangeRowTree
                 ? this.internalProps.layoutMap.toggleHierarchyState(col, row)
                 : this.internalProps.layoutMap.toggleHierarchyStateForColumnTree(col, row);
@@ -94180,16 +94224,26 @@
                 this.clearCellStyleCache();
                 this.scenegraph.createSceneGraph();
                 this.scrollToRow(visibleStartRow);
-                if (isScrollToBottom) {
+                if (shouldKeepBottomAfterToggle) {
                     this.clearCorrectTimer();
                     this.setScrollTop(Number.MAX_SAFE_INTEGER);
                 }
+                else if (shouldKeepScrollAfterToggle) {
+                    this.clearCorrectTimer();
+                    this.setScrollTop(oldScrollTop);
+                }
             }
             this.reactCustomLayout?.updateAllCustomCell();
-            if (isScrollToBottom) {
+            if (shouldKeepBottomAfterToggle) {
                 this.clearCorrectTimer();
                 this.setScrollTop(Number.MAX_SAFE_INTEGER);
             }
+            else if (shouldKeepScrollAfterToggle &&
+                this.rowHierarchyType !== 'grid-tree' &&
+                this.columnHierarchyType !== 'grid-tree') {
+                this.clearCorrectTimer();
+                this.setScrollTop(oldScrollTop);
+            }
             if (checkHasChart) {
                 if (this.autoFillWidth && !notFillWidth) {
                     notFillWidth = this.getAllColsWidth() <= this.tableNoFrameWidth;
@@ -96669,7 +96723,7 @@
     }
 
     registerForVrender();
-    const version = "1.26.2";
+    const version = "1.26.3";
     function getIcons() {
         return get$2();
     }