@visactor/vtable 1.26.2 → 1.26.3-alpha.0

package/cjs/themes/ARCO.js

@@ -111,4 +111,4 @@ Object.defineProperty(exports, "__esModule", {
         fontFamily: "Arial,sans-serif"
     }
 };
-//# sourceMappingURL=ARCO.js.map
+//# sourceMappingURL=ARCO.js.map

package/cjs/themes/BRIGHT.js

@@ -68,4 +68,4 @@ Object.defineProperty(exports, "__esModule", {
         fontFamily: "Arial,sans-serif"
     }
 };
-//# sourceMappingURL=BRIGHT.js.map
+//# sourceMappingURL=BRIGHT.js.map

package/dist/vtable.js

@@ -48343,6 +48343,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 +48709,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 +48751,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 +48759,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,
@@ -59886,6 +59885,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 +60001,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 +63749,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 +63860,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);