@visactor/vchart 1.13.22-alpha.2 → 1.13.22-alpha.4

package/build/index.es.js

@@ -64288,7 +64288,7 @@ const registerVChartCore = () => {
 };
 registerVChartCore();
 
-const version = "1.13.22-alpha.2";
+const version = "1.13.22-alpha.4";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();
@@ -104735,10 +104735,6 @@ class ScrollPlugin extends BasePlugin {
         };
         this.onWheel = (e) => {
             var _a, _b;
-            if (this._spec.preventDefault !== false) {
-                e.preventDefault();
-                e.stopPropagation();
-            }
             const scrollX = e.deltaX;
             const scrollY = e.deltaY;
             const rootMark = this.getRootMark();
@@ -104748,6 +104744,7 @@ class ScrollPlugin extends BasePlugin {
             const { percent: yPercent, y } = (_a = this._computeFinalScrollY(rootMark.attribute.y - scrollY)) !== null && _a !== void 0 ? _a : {};
             const { percent: xPercent, x } = (_b = this._computeFinalScrollX(rootMark.attribute.x - scrollX)) !== null && _b !== void 0 ? _b : {};
             const eventResult = {};
+            const isScroll = isValidNumber$1(x) || isValidNumber$1(y);
             if (isValidNumber$1(x)) {
                 this._updateScrollX(rootMark, x, xPercent);
                 eventResult.x = x;
@@ -104756,6 +104753,12 @@ class ScrollPlugin extends BasePlugin {
                 this._updateScrollY(rootMark, y, yPercent);
                 eventResult.y = y;
             }
+            if (isScroll) {
+                if (this._spec.preventDefault !== false) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                }
+            }
             this._event.emit('chartScroll', eventResult);
         };
     }
@@ -104812,6 +104815,7 @@ class ScrollPlugin extends BasePlugin {
     }
     _computeFinalScrollY(y) {
         var _a;
+        y = Math.max(this._scrollLimit.y.min, Math.min(y, this._scrollLimit.y.max));
         if (this._lastScrollY === y) {
             return null;
         }
@@ -104819,15 +104823,15 @@ class ScrollPlugin extends BasePlugin {
         if (((_a = this._spec.y) === null || _a === void 0 ? void 0 : _a.enable) === false) {
             return null;
         }
-        const finalY = Math.max(this._scrollLimit.y.min, Math.min(y, this._scrollLimit.y.max));
-        const percent = Math.abs(finalY / this._scrollLimit.y.size);
+        const percent = Math.abs(y / this._scrollLimit.y.size);
         return {
-            y: finalY,
+            y,
             percent
         };
     }
     _computeFinalScrollX(x) {
         var _a;
+        x = Math.max(this._scrollLimit.x.min, Math.min(x, this._scrollLimit.x.max));
         if (this._lastScrollX === x) {
             return null;
         }
@@ -104835,10 +104839,9 @@ class ScrollPlugin extends BasePlugin {
         if (((_a = this._spec.x) === null || _a === void 0 ? void 0 : _a.enable) === false) {
             return null;
         }
-        const finalX = Math.max(this._scrollLimit.x.min, Math.min(x, this._scrollLimit.x.max));
-        const percent = Math.abs(finalX / this._scrollLimit.x.size);
+        const percent = Math.abs(x / this._scrollLimit.x.size);
         return {
-            x: finalX,
+            x,
             percent
         };
     }

package/build/index.js

@@ -64294,7 +64294,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.13.22-alpha.2";
+    const version = "1.13.22-alpha.4";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -104741,10 +104741,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             };
             this.onWheel = (e) => {
                 var _a, _b;
-                if (this._spec.preventDefault !== false) {
-                    e.preventDefault();
-                    e.stopPropagation();
-                }
                 const scrollX = e.deltaX;
                 const scrollY = e.deltaY;
                 const rootMark = this.getRootMark();
@@ -104754,6 +104750,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 const { percent: yPercent, y } = (_a = this._computeFinalScrollY(rootMark.attribute.y - scrollY)) !== null && _a !== void 0 ? _a : {};
                 const { percent: xPercent, x } = (_b = this._computeFinalScrollX(rootMark.attribute.x - scrollX)) !== null && _b !== void 0 ? _b : {};
                 const eventResult = {};
+                const isScroll = isValidNumber$1(x) || isValidNumber$1(y);
                 if (isValidNumber$1(x)) {
                     this._updateScrollX(rootMark, x, xPercent);
                     eventResult.x = x;
@@ -104762,6 +104759,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     this._updateScrollY(rootMark, y, yPercent);
                     eventResult.y = y;
                 }
+                if (isScroll) {
+                    if (this._spec.preventDefault !== false) {
+                        e.preventDefault();
+                        e.stopPropagation();
+                    }
+                }
                 this._event.emit('chartScroll', eventResult);
             };
         }
@@ -104818,6 +104821,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         }
         _computeFinalScrollY(y) {
             var _a;
+            y = Math.max(this._scrollLimit.y.min, Math.min(y, this._scrollLimit.y.max));
             if (this._lastScrollY === y) {
                 return null;
             }
@@ -104825,15 +104829,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             if (((_a = this._spec.y) === null || _a === void 0 ? void 0 : _a.enable) === false) {
                 return null;
             }
-            const finalY = Math.max(this._scrollLimit.y.min, Math.min(y, this._scrollLimit.y.max));
-            const percent = Math.abs(finalY / this._scrollLimit.y.size);
+            const percent = Math.abs(y / this._scrollLimit.y.size);
             return {
-                y: finalY,
+                y,
                 percent
             };
         }
         _computeFinalScrollX(x) {
             var _a;
+            x = Math.max(this._scrollLimit.x.min, Math.min(x, this._scrollLimit.x.max));
             if (this._lastScrollX === x) {
                 return null;
             }
@@ -104841,10 +104845,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             if (((_a = this._spec.x) === null || _a === void 0 ? void 0 : _a.enable) === false) {
                 return null;
             }
-            const finalX = Math.max(this._scrollLimit.x.min, Math.min(x, this._scrollLimit.x.max));
-            const percent = Math.abs(finalX / this._scrollLimit.x.size);
+            const percent = Math.abs(x / this._scrollLimit.x.size);
             return {
-                x: finalX,
+                x,
                 percent
             };
         }