@visactor/vtable 1.17.3-alpha.0 → 1.17.3-alpha.1

package/cjs/state/state.js

@@ -388,114 +388,82 @@ class StateManager {
     updateVerticalScrollBar(yRatio) {
         var _a, _b;
         const totalHeight = this.table.getAllRowsHeight(), oldVerticalBarPos = this.scroll.verticalBarPos;
-        let verticalBarPos = Math.ceil(yRatio * (totalHeight - this.table.scenegraph.height));
-        (0, vutils_1.isValid)(verticalBarPos) && !isNaN(verticalBarPos) || (verticalBarPos = 0);
-        const dy = verticalBarPos - this.table.scenegraph.proxy.deltaY - oldVerticalBarPos;
-        if (this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.SCROLL, {
+        this.scroll.verticalBarPos = Math.ceil(yRatio * (totalHeight - this.table.scenegraph.height)), 
+        (0, vutils_1.isValid)(this.scroll.verticalBarPos) && !isNaN(this.scroll.verticalBarPos) || (this.scroll.verticalBarPos = 0), 
+        this.table.scenegraph.setY(-this.scroll.verticalBarPos, 1 === yRatio), this.scroll.verticalBarPos -= this.table.scenegraph.proxy.deltaY, 
+        this.table.scenegraph.proxy.deltaY = 0, this.updateHoverPos(-1, -1), this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.SCROLL, {
             event: void 0,
-            scrollTop: verticalBarPos - this.table.scenegraph.proxy.deltaY,
+            scrollTop: this.scroll.verticalBarPos,
             scrollLeft: this.scroll.horizontalBarPos,
             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: "vertical",
-            scrollRatioY: yRatio,
-            dy: dy
-        }).some((value => !1 === value))) {
-            const yRatio = this.scroll.verticalBarPos / (totalHeight - this.table.scenegraph.height);
-            this.table.scenegraph.component.updateVerticalScrollBarPos(yRatio);
-        } else this.scroll.verticalBarPos = verticalBarPos, this.table.scenegraph.setY(-this.scroll.verticalBarPos, 1 === yRatio), 
-        this.scroll.verticalBarPos -= this.table.scenegraph.proxy.deltaY, this.table.scenegraph.proxy.deltaY = 0, 
-        this.updateHoverPos(-1, -1), oldVerticalBarPos !== this.scroll.verticalBarPos && this.checkVerticalScrollBarEnd();
+            scrollRatioY: yRatio
+        }), oldVerticalBarPos !== this.scroll.verticalBarPos && this.checkVerticalScrollBarEnd();
     }
     updateHorizontalScrollBar(xRatio) {
         var _a, _b;
         const totalWidth = this.table.getAllColsWidth(), oldHorizontalBarPos = this.scroll.horizontalBarPos;
-        let horizontalBarPos = Math.ceil(xRatio * (totalWidth - this.table.scenegraph.width));
-        (0, vutils_1.isValid)(horizontalBarPos) && !isNaN(horizontalBarPos) || (horizontalBarPos = 0);
-        const dx = horizontalBarPos - this.table.scenegraph.proxy.deltaX - oldHorizontalBarPos;
-        if (this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.SCROLL, {
+        this.scroll.horizontalBarPos = Math.ceil(xRatio * (totalWidth - this.table.scenegraph.width)), 
+        (0, vutils_1.isValid)(this.scroll.horizontalBarPos) && !isNaN(this.scroll.horizontalBarPos) || (this.scroll.horizontalBarPos = 0), 
+        this.table.scenegraph.setX(-this.scroll.horizontalBarPos, 1 === xRatio), this.scroll.horizontalBarPos -= this.table.scenegraph.proxy.deltaX, 
+        this.table.scenegraph.proxy.deltaX = 0, this.updateHoverPos(-1, -1), this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.SCROLL, {
             event: void 0,
             scrollTop: this.scroll.verticalBarPos,
-            scrollLeft: horizontalBarPos - this.table.scenegraph.proxy.deltaX,
+            scrollLeft: this.scroll.horizontalBarPos,
             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",
-            scrollRatioX: xRatio,
-            dx: dx
-        }).some((value => !1 === value))) {
-            const xRatio = this.scroll.horizontalBarPos / (totalWidth - this.table.scenegraph.width);
-            this.table.scenegraph.component.updateHorizontalScrollBarPos(xRatio);
-        } else this.scroll.horizontalBarPos = horizontalBarPos, this.table.scenegraph.setX(-this.scroll.horizontalBarPos, 1 === xRatio), 
-        this.scroll.horizontalBarPos -= this.table.scenegraph.proxy.deltaX, this.table.scenegraph.proxy.deltaX = 0, 
-        this.updateHoverPos(-1, -1), oldHorizontalBarPos !== this.scroll.horizontalBarPos && this.checkHorizontalScrollBarEnd();
+            scrollRatioX: xRatio
+        }), oldHorizontalBarPos !== this.scroll.horizontalBarPos && this.checkHorizontalScrollBarEnd();
     }
     setScrollTop(top, event, triggerEvent = !0) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         const totalHeight = this.table.getAllRowsHeight(), sizeTolerance = (null === (_a = this.table.options.customConfig) || void 0 === _a ? void 0 : _a._disableColumnAndRowSizeRound) ? 1 : 0;
         top = Math.max(0, Math.min(top, totalHeight - this.table.scenegraph.height - sizeTolerance)), 
-        top = Math.ceil(top);
-        const oldVerticalBarPos = this.scroll.verticalBarPos, yRatio = top / (totalHeight - this.table.scenegraph.height);
-        if ((oldVerticalBarPos !== top || !0 === (null === (_c = null === (_b = this.table.options) || void 0 === _b ? void 0 : _b.customConfig) || void 0 === _c ? void 0 : _c.scrollEventAlwaysTrigger)) && triggerEvent) {
-            let verticalBarPos = top;
-            (0, vutils_1.isValid)(verticalBarPos) && !isNaN(verticalBarPos) || (verticalBarPos = 0);
-            const dy = verticalBarPos - oldVerticalBarPos;
-            if (this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.SCROLL, {
-                event: null == event ? void 0 : event.nativeEvent,
-                scrollTop: verticalBarPos,
-                scrollLeft: this.scroll.horizontalBarPos,
-                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: "vertical",
-                scrollRatioY: yRatio,
-                dy: dy
-            }).some((value => !1 === value))) {
-                const yRatio = this.scroll.verticalBarPos / (totalHeight - this.table.scenegraph.height);
-                return void this.table.scenegraph.component.updateVerticalScrollBarPos(yRatio);
-            }
-        }
-        (top !== this.scroll.verticalBarPos || this.table.isPivotChart()) && this.updateHoverPos(-1, -1), 
+        ((top = Math.ceil(top)) !== this.scroll.verticalBarPos || this.table.isPivotChart()) && this.updateHoverPos(-1, -1);
+        const oldVerticalBarPos = this.scroll.verticalBarPos;
         this.scroll.verticalBarPos = top, (0, vutils_1.isValid)(this.scroll.verticalBarPos) && !isNaN(this.scroll.verticalBarPos) || (this.scroll.verticalBarPos = 0), 
-        this.table.scenegraph.setY(-top), this.table.scenegraph.component.updateVerticalScrollBarPos(yRatio), 
-        oldVerticalBarPos !== top && triggerEvent && this.checkVerticalScrollBarEnd();
+        this.table.scenegraph.setY(-top);
+        const yRatio = top / (totalHeight - this.table.scenegraph.height);
+        this.table.scenegraph.component.updateVerticalScrollBarPos(yRatio), oldVerticalBarPos !== top && triggerEvent && (this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.SCROLL, {
+            event: null == event ? void 0 : event.nativeEvent,
+            scrollTop: this.scroll.verticalBarPos,
+            scrollLeft: this.scroll.horizontalBarPos,
+            scrollHeight: null === (_b = this.table.theme.scrollStyle) || void 0 === _b ? void 0 : _b.width,
+            scrollWidth: null === (_c = this.table.theme.scrollStyle) || void 0 === _c ? void 0 : _c.width,
+            viewHeight: this.table.tableNoFrameHeight,
+            viewWidth: this.table.tableNoFrameWidth,
+            scrollDirection: "vertical",
+            scrollRatioY: yRatio
+        }), this.checkVerticalScrollBarEnd());
     }
     setScrollLeft(left, event, triggerEvent = !0) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c;
         this.table.scrollLeft;
         const totalWidth = this.table.getAllColsWidth(), sizeTolerance = (this.table.getFrozenColsWidth(), 
         (null === (_a = this.table.options.customConfig) || void 0 === _a ? void 0 : _a._disableColumnAndRowSizeRound) ? 1 : 0);
         left = Math.max(0, Math.min(left, totalWidth - this.table.scenegraph.width - sizeTolerance)), 
-        left = Math.ceil(left);
-        const oldHorizontalBarPos = this.scroll.horizontalBarPos, xRatio = left / (totalWidth - this.table.scenegraph.width);
-        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;
-            (0, vutils_1.isValid)(horizontalBarPos) && !isNaN(horizontalBarPos) || (horizontalBarPos = 0);
-            const dx = horizontalBarPos - oldHorizontalBarPos;
-            if (this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.SCROLL, {
-                event: null == event ? void 0 : event.nativeEvent,
-                scrollTop: this.scroll.verticalBarPos,
-                scrollLeft: horizontalBarPos,
-                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",
-                scrollRatioX: xRatio,
-                dx: dx
-            }).some((value => !1 === value))) {
-                const xRatio = this.scroll.horizontalBarPos / (totalWidth - this.table.scenegraph.width);
-                return void this.table.scenegraph.component.updateHorizontalScrollBarPos(xRatio);
-            }
-        }
-        left !== this.scroll.horizontalBarPos && this.updateHoverPos(-1, -1), this.scroll.horizontalBarPos = left, 
-        (0, vutils_1.isValid)(this.scroll.horizontalBarPos) && !isNaN(this.scroll.horizontalBarPos) || (this.scroll.horizontalBarPos = 0), 
-        this.table.scenegraph.setX(-left), this.table.scenegraph.component.updateHorizontalScrollBarPos(xRatio), 
-        oldHorizontalBarPos !== left && triggerEvent && this.checkHorizontalScrollBarEnd();
+        (left = Math.ceil(left)) !== this.scroll.horizontalBarPos && this.updateHoverPos(-1, -1);
+        const oldHorizontalBarPos = this.scroll.horizontalBarPos;
+        this.scroll.horizontalBarPos = left, (0, vutils_1.isValid)(this.scroll.horizontalBarPos) && !isNaN(this.scroll.horizontalBarPos) || (this.scroll.horizontalBarPos = 0), 
+        this.table.scenegraph.setX(-left);
+        const xRatio = left / (totalWidth - this.table.scenegraph.width);
+        this.table.scenegraph.component.updateHorizontalScrollBarPos(xRatio), oldHorizontalBarPos !== left && triggerEvent && (this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.SCROLL, {
+            event: null == event ? void 0 : event.nativeEvent,
+            scrollTop: this.scroll.verticalBarPos,
+            scrollLeft: this.scroll.horizontalBarPos,
+            scrollHeight: null === (_b = this.table.theme.scrollStyle) || void 0 === _b ? void 0 : _b.width,
+            scrollWidth: null === (_c = this.table.theme.scrollStyle) || void 0 === _c ? void 0 : _c.width,
+            viewHeight: this.table.tableNoFrameHeight,
+            viewWidth: this.table.tableNoFrameWidth,
+            scrollDirection: "horizontal",
+            scrollRatioX: xRatio
+        }), this.checkHorizontalScrollBarEnd());
     }
     hideVerticalScrollBar() {
         this.table.scenegraph.component.hideVerticalScrollBar();