@visactor/vtable-calendar 1.26.2 → 1.26.3-alpha.0

package/dist/vtable-calendar.js

@@ -43249,6 +43249,17 @@
       }
     }
 
+    function getBodyHorizontalScrollRange(table) {
+      var _a, _b, _c, _d;
+      const totalWidth = table.getAllColsWidth(),
+        frozenColsWidth = table.getFrozenColsWidth(),
+        rightFrozenColsWidth = table.getRightFrozenColsWidth(),
+        frozenColsContentWidth = null !== (_b = null === (_a = table.getFrozenColsContentWidth) || void 0 === _a ? void 0 : _a.call(table)) && void 0 !== _b ? _b : frozenColsWidth,
+        rightFrozenColsContentWidth = null !== (_d = null === (_c = table.getRightFrozenColsContentWidth) || void 0 === _c ? void 0 : _c.call(table)) && void 0 !== _d ? _d : rightFrozenColsWidth,
+        bodyViewportWidth = table.tableNoFrameWidth - frozenColsWidth - rightFrozenColsWidth,
+        bodyContentWidth = totalWidth - frozenColsContentWidth - rightFrozenColsContentWidth;
+      return Math.max(0, bodyContentWidth - bodyViewportWidth);
+    }
     function getColX(col, table, isRightFrozen) {
       var _a, _b, _c, _d, _e, _f;
       if (isRightFrozen) return Math.min(table.tableNoFrameWidth, table.getAllColsWidth()) - table.getColsWidth(col, table.colCount - 1) + (null !== (_b = null === (_a = table.getRightFrozenColsScrollLeft) || void 0 === _a ? void 0 : _a.call(table)) && void 0 !== _b ? _b : 0);
@@ -43541,17 +43552,18 @@
           rightFrozenColsWidth = this.table.getRightFrozenColsWidth(),
           rightFrozenColsContentWidth = null !== (_m = null === (_l = (_k = this.table).getRightFrozenColsContentWidth) || void 0 === _l ? void 0 : _l.call(_k)) && void 0 !== _m ? _m : rightFrozenColsWidth,
           hoverOn = this.table.theme.scrollStyle.hoverOn,
-          sizeTolerance = (null === (_o = this.table.options.customConfig) || void 0 === _o ? void 0 : _o._disableColumnAndRowSizeRound) ? 1 : 0;
-        if (totalWidth > tableWidth + sizeTolerance) {
-          const y = Math.min(tableHeight, totalHeight),
-            bodyViewportWidth = tableWidth - frozenColsWidth - rightFrozenColsWidth,
-            bodyContentWidth = totalWidth - frozenColsContentWidth - rightFrozenColsContentWidth,
+          sizeTolerance = (null === (_o = this.table.options.customConfig) || void 0 === _o ? void 0 : _o._disableColumnAndRowSizeRound) ? 1 : 0,
+          bodyScrollRange = getBodyHorizontalScrollRange(this.table),
+          y = Math.min(tableHeight, totalHeight);
+        let attrY = 0;
+        attrY = this.table.theme.scrollStyle.barToSide ? this.table.tableNoFrameHeight - (hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.y) + this.table.tableY : y - (hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.y);
+        const ignoreFrozenCols = null !== (_q = null === (_p = this.table.theme.scrollStyle) || void 0 === _p ? void 0 : _p.ignoreFrozenCols) && void 0 !== _q && _q;
+        if (bodyScrollRange > sizeTolerance) {
+          const bodyViewportWidth = tableWidth - frozenColsWidth - rightFrozenColsWidth,
+            bodyContentWidth = bodyViewportWidth + bodyScrollRange,
             rangeEnd = bodyContentWidth > 0 ? Math.max(.05, bodyViewportWidth / bodyContentWidth) : 1;
-          let attrY = 0;
-          attrY = this.table.theme.scrollStyle.barToSide ? this.table.tableNoFrameHeight - (hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.y) + this.table.tableY : y - (hoverOn ? width : -this.table.scenegraph.tableGroup.attribute.y);
           let hScrollBarx = frozenColsWidth + (hoverOn ? 0 : this.table.scenegraph.tableGroup.attribute.x),
             hScrollBarWidth = tableWidth - frozenColsWidth - rightFrozenColsWidth;
-          const ignoreFrozenCols = null !== (_q = null === (_p = this.table.theme.scrollStyle) || void 0 === _p ? void 0 : _p.ignoreFrozenCols) && void 0 !== _q && _q;
           ignoreFrozenCols ? (hScrollBarx = hoverOn ? 0 : this.table.scenegraph.tableGroup.attribute.x, hScrollBarWidth = tableWidth) : (hScrollBarx = frozenColsWidth + (hoverOn ? 0 : this.table.scenegraph.tableGroup.attribute.x), hScrollBarWidth = tableWidth - frozenColsWidth - rightFrozenColsWidth), this.hScrollBar.setAttributes({
             x: hScrollBarx,
             y: attrY,
@@ -43564,61 +43576,51 @@
             x: bounds.x1,
             y: bounds.y1
           }, "always" === horizontalVisible && this.hScrollBar.showAll();
-          const frozenScrollable = this.table.options.scrollFrozenCols && this.table.getFrozenColsOffset() > 0;
-          if (!ignoreFrozenCols && frozenScrollable) {
-            const frozenRangeEnd = Math.max(.05, frozenColsWidth / frozenColsContentWidth),
-              x = hoverOn ? 0 : this.table.scenegraph.tableGroup.attribute.x;
-            this.frozenHScrollBar.setAttributes({
-              x: x,
-              y: attrY,
-              width: frozenColsWidth,
-              range: [0, frozenRangeEnd],
-              visible: "always" === horizontalVisible
-            });
-            const bounds = this.frozenHScrollBar.AABBBounds && this.frozenHScrollBar.globalAABBBounds;
-            this.frozenHScrollBar._viewPosition = {
-              x: bounds.x1,
-              y: bounds.y1
-            }, "always" === horizontalVisible && this.frozenHScrollBar.showAll();
-          } else this.frozenHScrollBar.setAttributes({
-            x: 2 * -this.table.tableNoFrameWidth,
-            y: 2 * -this.table.tableNoFrameHeight,
-            width: 0,
-            visible: !1
-          });
-          const rightFrozenScrollable = this.table.options.scrollRightFrozenCols && this.table.getRightFrozenColsOffset() > 0;
-          if (!ignoreFrozenCols && rightFrozenScrollable) {
-            const rightFrozenRangeEnd = Math.max(.05, rightFrozenColsWidth / rightFrozenColsContentWidth),
-              x = tableWidth - rightFrozenColsWidth + (hoverOn ? 0 : this.table.scenegraph.tableGroup.attribute.x);
-            this.rightFrozenHScrollBar.setAttributes({
-              x: x,
-              y: attrY,
-              width: rightFrozenColsWidth,
-              range: [0, rightFrozenRangeEnd],
-              visible: "always" === horizontalVisible
-            });
-            const bounds = this.rightFrozenHScrollBar.AABBBounds && this.rightFrozenHScrollBar.globalAABBBounds;
-            this.rightFrozenHScrollBar._viewPosition = {
-              x: bounds.x1,
-              y: bounds.y1
-            }, "always" === horizontalVisible && this.rightFrozenHScrollBar.showAll();
-          } else this.rightFrozenHScrollBar.setAttributes({
-            x: 2 * -this.table.tableNoFrameWidth,
-            y: 2 * -this.table.tableNoFrameHeight,
-            width: 0,
-            visible: !1
-          });
         } else this.hScrollBar.setAttributes({
           x: 2 * -this.table.tableNoFrameWidth,
           y: 2 * -this.table.tableNoFrameHeight,
           width: 0,
           visible: !1
-        }), this.frozenHScrollBar.setAttributes({
+        });
+        const frozenScrollable = this.table.options.scrollFrozenCols && this.table.getFrozenColsOffset() > 0;
+        if (!ignoreFrozenCols && frozenScrollable) {
+          const frozenRangeEnd = Math.max(.05, frozenColsWidth / frozenColsContentWidth),
+            x = hoverOn ? 0 : this.table.scenegraph.tableGroup.attribute.x;
+          this.frozenHScrollBar.setAttributes({
+            x: x,
+            y: attrY,
+            width: frozenColsWidth,
+            range: [0, frozenRangeEnd],
+            visible: "always" === horizontalVisible
+          });
+          const bounds = this.frozenHScrollBar.AABBBounds && this.frozenHScrollBar.globalAABBBounds;
+          this.frozenHScrollBar._viewPosition = {
+            x: bounds.x1,
+            y: bounds.y1
+          }, "always" === horizontalVisible && this.frozenHScrollBar.showAll();
+        } else this.frozenHScrollBar.setAttributes({
           x: 2 * -this.table.tableNoFrameWidth,
           y: 2 * -this.table.tableNoFrameHeight,
           width: 0,
           visible: !1
-        }), this.rightFrozenHScrollBar.setAttributes({
+        });
+        const rightFrozenScrollable = this.table.options.scrollRightFrozenCols && this.table.getRightFrozenColsOffset() > 0;
+        if (!ignoreFrozenCols && rightFrozenScrollable) {
+          const rightFrozenRangeEnd = Math.max(.05, rightFrozenColsWidth / rightFrozenColsContentWidth),
+            x = tableWidth - rightFrozenColsWidth + (hoverOn ? 0 : this.table.scenegraph.tableGroup.attribute.x);
+          this.rightFrozenHScrollBar.setAttributes({
+            x: x,
+            y: attrY,
+            width: rightFrozenColsWidth,
+            range: [0, rightFrozenRangeEnd],
+            visible: "always" === horizontalVisible
+          });
+          const bounds = this.rightFrozenHScrollBar.AABBBounds && this.rightFrozenHScrollBar.globalAABBBounds;
+          this.rightFrozenHScrollBar._viewPosition = {
+            x: bounds.x1,
+            y: bounds.y1
+          }, "always" === horizontalVisible && this.rightFrozenHScrollBar.showAll();
+        } else this.rightFrozenHScrollBar.setAttributes({
           x: 2 * -this.table.tableNoFrameWidth,
           y: 2 * -this.table.tableNoFrameHeight,
           width: 0,
@@ -50171,7 +50173,7 @@
       setBodyAndColHeaderX(x) {
         const firstBodyCol = this.bodyGroup.firstChild;
         let lastBodyCol = this.bodyGroup.lastChild;
-        lastBodyCol && "group" !== lastBodyCol.type && (lastBodyCol = lastBodyCol._prev), 0 === x && firstBodyCol && firstBodyCol.col === this.table.frozenColCount && firstBodyCol.attribute.x + x < 0 ? x = -firstBodyCol.attribute.x : lastBodyCol && this.table.tableNoFrameWidth < this.table.getAllColsWidth() && lastBodyCol.col === this.table.colCount - this.table.rightFrozenColCount - 1 && lastBodyCol.attribute.x + lastBodyCol.attribute.width + x < this.table.tableNoFrameWidth - this.table.getFrozenColsWidth() - this.table.getRightFrozenColsWidth() && (x = this.table.tableNoFrameWidth - this.table.getFrozenColsWidth() - this.table.getRightFrozenColsWidth() - lastBodyCol.attribute.x - lastBodyCol.attribute.width), this.table.getFrozenColsWidth() + x !== this.bodyGroup.attribute.x && (this.bodyGroup.setAttribute("x", this.table.getFrozenColsWidth() + x), this.colHeaderGroup.setAttribute("x", this.table.getFrozenColsWidth() + x), this.bodySelectGroup.setAttribute("x", this.bodyGroup.attribute.x), this.colHeaderSelectGroup.setAttribute("x", this.colHeaderGroup.attribute.x), this.rowHeaderSelectGroup.setAttribute("x", this.rowHeaderGroup.attribute.x), this.cornerHeaderSelectGroup.setAttribute("x", this.cornerHeaderGroup.attribute.x), this.table.bottomFrozenRowCount > 0 && (this.bottomFrozenGroup.setAttribute("x", this.table.getFrozenColsWidth() + x), this.bottomFrozenSelectGroup.setAttribute("x", this.bottomFrozenGroup.attribute.x), this.leftBottomCornerSelectGroup.setAttribute("x", this.leftBottomCornerGroup.attribute.x)), this.table.rightFrozenColCount > 0 && (this.rightFrozenSelectGroup.setAttribute("x", this.rightFrozenGroup.attribute.x), this.rightTopCornerSelectGroup.setAttribute("x", this.rightTopCornerGroup.attribute.x)), this.table.rightFrozenColCount > 0 && this.table.bottomFrozenRowCount > 0 && this.rightBottomCornerSelectGroup.setAttribute("x", this.rightBottomCornerGroup.attribute.x), this.updateNextFrame());
+        lastBodyCol && "group" !== lastBodyCol.type && (lastBodyCol = lastBodyCol._prev), 0 === x && firstBodyCol && firstBodyCol.col === this.table.frozenColCount && firstBodyCol.attribute.x + x < 0 ? x = -firstBodyCol.attribute.x : lastBodyCol && this.table.tableNoFrameWidth < this.table.getAllColsWidth() && lastBodyCol.col === this.table.colCount - this.table.rightFrozenColCount - 1 && lastBodyCol.attribute.x + lastBodyCol.attribute.width + x < this.table.tableNoFrameWidth - this.table.getFrozenColsWidth() - this.table.getRightFrozenColsWidth() && (x = this.table.tableNoFrameWidth - this.table.getFrozenColsWidth() - this.table.getRightFrozenColsWidth() - lastBodyCol.attribute.x - lastBodyCol.attribute.width), this.table.options.scrollFrozenCols && x > 0 && (x = 0), this.table.getFrozenColsWidth() + x !== this.bodyGroup.attribute.x && (this.bodyGroup.setAttribute("x", this.table.getFrozenColsWidth() + x), this.colHeaderGroup.setAttribute("x", this.table.getFrozenColsWidth() + x), this.bodySelectGroup.setAttribute("x", this.bodyGroup.attribute.x), this.colHeaderSelectGroup.setAttribute("x", this.colHeaderGroup.attribute.x), this.rowHeaderSelectGroup.setAttribute("x", this.rowHeaderGroup.attribute.x), this.cornerHeaderSelectGroup.setAttribute("x", this.cornerHeaderGroup.attribute.x), this.table.bottomFrozenRowCount > 0 && (this.bottomFrozenGroup.setAttribute("x", this.table.getFrozenColsWidth() + x), this.bottomFrozenSelectGroup.setAttribute("x", this.bottomFrozenGroup.attribute.x), this.leftBottomCornerSelectGroup.setAttribute("x", this.leftBottomCornerGroup.attribute.x)), this.table.rightFrozenColCount > 0 && (this.rightFrozenSelectGroup.setAttribute("x", this.rightFrozenGroup.attribute.x), this.rightTopCornerSelectGroup.setAttribute("x", this.rightTopCornerGroup.attribute.x)), this.table.rightFrozenColCount > 0 && this.table.bottomFrozenRowCount > 0 && this.rightBottomCornerSelectGroup.setAttribute("x", this.rightBottomCornerGroup.attribute.x), this.updateNextFrame());
       }
       afterScenegraphCreated() {
         var _a, _b;
@@ -50218,11 +50220,11 @@
         let rowHeaderWidth = 0;
         this.rowHeaderGroup.forEachChildrenSkipChild(column => {
           rowHeaderWidth += column.attribute.width;
-        }), this.rowHeaderGroup.setAttribute("width", rowHeaderWidth);
+        }), table.options.scrollFrozenCols && (rowHeaderWidth = table.getFrozenColsWidth()), this.rowHeaderGroup.setAttribute("width", rowHeaderWidth);
         let cornerHeaderWidth = 0;
         this.cornerHeaderGroup.forEachChildrenSkipChild(column => {
           cornerHeaderWidth += column.attribute.width;
-        }), this.cornerHeaderGroup.setAttribute("width", cornerHeaderWidth), this.colHeaderGroup.setAttribute("x", this.cornerHeaderGroup.attribute.width), this.rowHeaderGroup.setAttribute("y", this.cornerHeaderGroup.attribute.height), this.bodyGroup.setAttributes({
+        }), 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), this.bodyGroup.setAttributes({
           x: this.rowHeaderGroup.attribute.width,
           y: this.colHeaderGroup.attribute.height
         });
@@ -52401,12 +52403,9 @@
         }), oldVerticalBarPos !== this.scroll.verticalBarPos && this.checkVerticalScrollBarEnd();
       }
       updateHorizontalScrollBar(xRatio) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        const totalWidth = this.table.getAllColsWidth(),
-          oldHorizontalBarPos = this.scroll.horizontalBarPos,
-          frozenOffset = null !== (_c = null === (_b = (_a = this.table).getFrozenColsOffset) || void 0 === _b ? void 0 : _b.call(_a)) && void 0 !== _c ? _c : 0,
-          rightFrozenOffset = null !== (_f = null === (_e = (_d = this.table).getRightFrozenColsOffset) || void 0 === _e ? void 0 : _e.call(_d)) && void 0 !== _f ? _f : 0,
-          scrollRange = Math.max(0, totalWidth - this.table.scenegraph.width - frozenOffset - rightFrozenOffset);
+        var _a, _b, _c, _d;
+        const oldHorizontalBarPos = this.scroll.horizontalBarPos,
+          scrollRange = getBodyHorizontalScrollRange(this.table);
         let horizontalBarPos = Math.ceil(xRatio * scrollRange);
         isValid$1(horizontalBarPos) && !isNaN(horizontalBarPos) || (horizontalBarPos = 0);
         const dx = horizontalBarPos - this.table.scenegraph.proxy.deltaX - oldHorizontalBarPos;
@@ -52414,8 +52413,8 @@
           event: void 0,
           scrollTop: this.scroll.verticalBarPos,
           scrollLeft: horizontalBarPos - this.table.scenegraph.proxy.deltaX,
-          scrollHeight: null === (_g = this.table.theme.scrollStyle) || void 0 === _g ? void 0 : _g.width,
-          scrollWidth: null === (_h = this.table.theme.scrollStyle) || void 0 === _h ? void 0 : _h.width,
+          scrollHeight: null === (_a = this.table.theme.scrollStyle) || void 0 === _a ? void 0 : _a.width,
+          scrollWidth: null === (_b = this.table.theme.scrollStyle) || void 0 === _b ? void 0 : _b.width,
           viewHeight: this.table.tableNoFrameHeight,
           viewWidth: this.table.tableNoFrameWidth,
           scrollDirection: "horizontal",
@@ -52428,8 +52427,8 @@
           event: void 0,
           scrollTop: this.scroll.verticalBarPos,
           scrollLeft: this.scroll.horizontalBarPos,
-          scrollHeight: null === (_j = this.table.theme.scrollStyle) || void 0 === _j ? void 0 : _j.width,
-          scrollWidth: null === (_k = this.table.theme.scrollStyle) || void 0 === _k ? void 0 : _k.width,
+          scrollHeight: null === (_c = this.table.theme.scrollStyle) || void 0 === _c ? void 0 : _c.width,
+          scrollWidth: null === (_d = this.table.theme.scrollStyle) || void 0 === _d ? void 0 : _d.width,
           viewHeight: this.table.tableNoFrameHeight,
           viewWidth: this.table.tableNoFrameWidth,
           scrollDirection: "horizontal",
@@ -52481,18 +52480,15 @@
         }), oldVerticalBarPos !== top && triggerEvent && this.checkVerticalScrollBarEnd();
       }
       setScrollLeft(left, event, triggerEvent = !0) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (!this.table || !this.table.scenegraph) return;
         this.table.scrollLeft;
-        const totalWidth = this.table.getAllColsWidth(),
-          frozenOffset = null !== (_c = null === (_b = (_a = this.table).getFrozenColsOffset) || void 0 === _b ? void 0 : _b.call(_a)) && void 0 !== _c ? _c : 0,
-          rightFrozenOffset = null !== (_f = null === (_e = (_d = this.table).getRightFrozenColsOffset) || void 0 === _e ? void 0 : _e.call(_d)) && void 0 !== _f ? _f : 0,
-          scrollRange = Math.max(0, totalWidth - this.table.scenegraph.width - frozenOffset - rightFrozenOffset),
-          sizeTolerance = (null === (_g = this.table.options.customConfig) || void 0 === _g ? void 0 : _g._disableColumnAndRowSizeRound) ? 1 : 0;
+        const scrollRange = getBodyHorizontalScrollRange(this.table),
+          sizeTolerance = (null === (_a = this.table.options.customConfig) || void 0 === _a ? void 0 : _a._disableColumnAndRowSizeRound) ? 1 : 0;
         left = Math.max(0, Math.min(left, scrollRange - sizeTolerance)), left = Math.ceil(left);
         const oldHorizontalBarPos = this.scroll.horizontalBarPos,
           xRatio = scrollRange ? left / scrollRange : 0;
-        if ((oldHorizontalBarPos !== left || !0 === (null === (_j = null === (_h = this.table.options) || void 0 === _h ? void 0 : _h.customConfig) || void 0 === _j ? void 0 : _j.scrollEventAlwaysTrigger)) && triggerEvent) {
+        if ((oldHorizontalBarPos !== left || !0 === (null === (_c = null === (_b = this.table.options) || void 0 === _b ? void 0 : _b.customConfig) || void 0 === _c ? void 0 : _c.scrollEventAlwaysTrigger)) && triggerEvent) {
           let horizontalBarPos = left;
           isValid$1(horizontalBarPos) && !isNaN(horizontalBarPos) || (horizontalBarPos = 0);
           const dx = horizontalBarPos - oldHorizontalBarPos;
@@ -52500,8 +52496,8 @@
             event: null == event ? void 0 : event.nativeEvent,
             scrollTop: this.scroll.verticalBarPos,
             scrollLeft: horizontalBarPos,
-            scrollHeight: null === (_k = this.table.theme.scrollStyle) || void 0 === _k ? void 0 : _k.width,
-            scrollWidth: null === (_l = this.table.theme.scrollStyle) || void 0 === _l ? void 0 : _l.width,
+            scrollHeight: null === (_d = this.table.theme.scrollStyle) || void 0 === _d ? void 0 : _d.width,
+            scrollWidth: null === (_e = this.table.theme.scrollStyle) || void 0 === _e ? void 0 : _e.width,
             viewHeight: this.table.tableNoFrameHeight,
             viewWidth: this.table.tableNoFrameWidth,
             scrollDirection: "horizontal",
@@ -52518,8 +52514,8 @@
           event: null == event ? void 0 : event.nativeEvent,
           scrollTop: this.scroll.verticalBarPos,
           scrollLeft: this.scroll.horizontalBarPos,
-          scrollHeight: null === (_m = this.table.theme.scrollStyle) || void 0 === _m ? void 0 : _m.width,
-          scrollWidth: null === (_o = this.table.theme.scrollStyle) || void 0 === _o ? void 0 : _o.width,
+          scrollHeight: null === (_f = this.table.theme.scrollStyle) || void 0 === _f ? void 0 : _f.width,
+          scrollWidth: null === (_g = this.table.theme.scrollStyle) || void 0 === _g ? void 0 : _g.width,
           viewHeight: this.table.tableNoFrameHeight,
           viewWidth: this.table.tableNoFrameWidth,
           scrollDirection: "horizontal",