@visactor/vchart 1.13.21-alpha.9 → 1.13.22-alpha.0

package/build/index.es.js

@@ -61342,7 +61342,9 @@ let Layout$1 = class Layout {
         };
     }
     layoutItems(_chart, items, chartLayoutRect, chartViewBox) {
+        var _a, _b, _c;
         this._layoutInit(_chart, items, chartLayoutRect, chartViewBox);
+        const secondLayoutLeftRight = (_c = (_b = (_a = _chart === null || _chart === void 0 ? void 0 : _chart.getSpec()) === null || _a === void 0 ? void 0 : _a.layout) === null || _b === void 0 ? void 0 : _b.secondLayoutLeftRight) !== null && _c !== void 0 ? _c : false;
         this._layoutNormalItems(items);
         const layoutTemp = {
             left: this.leftCurrent,
@@ -61351,8 +61353,8 @@ let Layout$1 = class Layout {
             bottom: this.bottomCurrent
         };
         const { regionItems, relativeItems, relativeOverlapItems, allRelatives, overlapItems } = this._groupItems(items);
-        this.layoutRegionItems(regionItems, relativeItems, relativeOverlapItems, overlapItems);
-        this._processAutoIndent(regionItems, relativeItems, relativeOverlapItems, overlapItems, allRelatives, layoutTemp);
+        this.layoutRegionItems(regionItems, relativeItems, relativeOverlapItems, overlapItems, secondLayoutLeftRight);
+        this._processAutoIndent(regionItems, relativeItems, relativeOverlapItems, overlapItems, allRelatives, layoutTemp, secondLayoutLeftRight);
         this.layoutAbsoluteItems(items.filter(x => x.layoutType === 'absolute'));
     }
     _processAutoIndent(regionItems, relativeItems, relativeOverlapItems, overlapItems = {
@@ -61361,7 +61363,7 @@ let Layout$1 = class Layout {
         top: { items: [], rect: { width: 0, height: 0 } },
         bottom: { items: [], rect: { width: 0, height: 0 } },
         z: { items: [], rect: { width: 0, height: 0 } }
-    }, allRelatives, layoutTemp) {
+    }, allRelatives, layoutTemp, secondLayoutLeftRight = false) {
         if (allRelatives.some(i => i.autoIndent)) {
             const { top, bottom, left, right } = this._checkAutoIndent(allRelatives, layoutTemp);
             if (top || bottom || left || right) {
@@ -61369,7 +61371,7 @@ let Layout$1 = class Layout {
                 this.bottomCurrent = layoutTemp.bottom - bottom;
                 this.leftCurrent = layoutTemp.left + left;
                 this.rightCurrent = layoutTemp.right - right;
-                this.layoutRegionItems(regionItems, relativeItems, relativeOverlapItems, overlapItems);
+                this.layoutRegionItems(regionItems, relativeItems, relativeOverlapItems, overlapItems, secondLayoutLeftRight);
             }
         }
     }
@@ -61522,7 +61524,9 @@ let Layout$1 = class Layout {
         top: { items: [], rect: { width: 0, height: 0 } },
         bottom: { items: [], rect: { width: 0, height: 0 } },
         z: { items: [], rect: { width: 0, height: 0 } }
-    }) {
+    }, secondLayoutLeftRight = false) {
+        const leftBeforeLayout = this.leftCurrent;
+        const rightBeforeLayout = this.rightCurrent;
         let regionRelativeTotalWidth = this.rightCurrent - this.leftCurrent;
         let regionRelativeTotalHeight = this.bottomCurrent - this.topCurrent;
         regionRelativeItems
@@ -61541,6 +61545,16 @@ let Layout$1 = class Layout {
         this._layoutRelativeOverlap('top', overlapItems.top);
         this._layoutRelativeOverlap('bottom', overlapItems.bottom);
         regionRelativeTotalHeight = this.bottomCurrent - this.topCurrent;
+        if (secondLayoutLeftRight) {
+            this.leftCurrent = leftBeforeLayout;
+            this.rightCurrent = rightBeforeLayout;
+            regionRelativeItems
+                .filter(x => x.layoutOrient === 'left' || x.layoutOrient === 'right')
+                .forEach(item => {
+                this._layoutRelativeItem(item, this.getItemComputeLayoutRect(item));
+            });
+            regionRelativeTotalWidth = this.rightCurrent - this.leftCurrent;
+        }
         const { regionWidth, regionHeight } = this._layoutRegionItem(regionItems, regionRelativeTotalWidth, regionRelativeTotalHeight);
         regionRelativeItems.concat(regionRelativeOverlapItems).forEach(item => {
             if (['left', 'right'].includes(item.layoutOrient)) {
@@ -64274,7 +64288,7 @@ const registerVChartCore = () => {
 };
 registerVChartCore();
 
-const version = "1.13.21-alpha.9";
+const version = "1.13.22-alpha.0";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();
@@ -104721,8 +104735,10 @@ class ScrollPlugin extends BasePlugin {
         };
         this.onWheel = (e) => {
             var _a, _b;
-            e.preventDefault();
-            e.stopPropagation();
+            if (this._spec.preventDefault !== false) {
+                e.preventDefault();
+                e.stopPropagation();
+            }
             const scrollX = e.deltaX;
             const scrollY = e.deltaY;
             const rootMark = this.getRootMark();

package/build/index.js

@@ -61348,7 +61348,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             };
         }
         layoutItems(_chart, items, chartLayoutRect, chartViewBox) {
+            var _a, _b, _c;
             this._layoutInit(_chart, items, chartLayoutRect, chartViewBox);
+            const secondLayoutLeftRight = (_c = (_b = (_a = _chart === null || _chart === void 0 ? void 0 : _chart.getSpec()) === null || _a === void 0 ? void 0 : _a.layout) === null || _b === void 0 ? void 0 : _b.secondLayoutLeftRight) !== null && _c !== void 0 ? _c : false;
             this._layoutNormalItems(items);
             const layoutTemp = {
                 left: this.leftCurrent,
@@ -61357,8 +61359,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 bottom: this.bottomCurrent
             };
             const { regionItems, relativeItems, relativeOverlapItems, allRelatives, overlapItems } = this._groupItems(items);
-            this.layoutRegionItems(regionItems, relativeItems, relativeOverlapItems, overlapItems);
-            this._processAutoIndent(regionItems, relativeItems, relativeOverlapItems, overlapItems, allRelatives, layoutTemp);
+            this.layoutRegionItems(regionItems, relativeItems, relativeOverlapItems, overlapItems, secondLayoutLeftRight);
+            this._processAutoIndent(regionItems, relativeItems, relativeOverlapItems, overlapItems, allRelatives, layoutTemp, secondLayoutLeftRight);
             this.layoutAbsoluteItems(items.filter(x => x.layoutType === 'absolute'));
         }
         _processAutoIndent(regionItems, relativeItems, relativeOverlapItems, overlapItems = {
@@ -61367,7 +61369,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             top: { items: [], rect: { width: 0, height: 0 } },
             bottom: { items: [], rect: { width: 0, height: 0 } },
             z: { items: [], rect: { width: 0, height: 0 } }
-        }, allRelatives, layoutTemp) {
+        }, allRelatives, layoutTemp, secondLayoutLeftRight = false) {
             if (allRelatives.some(i => i.autoIndent)) {
                 const { top, bottom, left, right } = this._checkAutoIndent(allRelatives, layoutTemp);
                 if (top || bottom || left || right) {
@@ -61375,7 +61377,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     this.bottomCurrent = layoutTemp.bottom - bottom;
                     this.leftCurrent = layoutTemp.left + left;
                     this.rightCurrent = layoutTemp.right - right;
-                    this.layoutRegionItems(regionItems, relativeItems, relativeOverlapItems, overlapItems);
+                    this.layoutRegionItems(regionItems, relativeItems, relativeOverlapItems, overlapItems, secondLayoutLeftRight);
                 }
             }
         }
@@ -61528,7 +61530,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             top: { items: [], rect: { width: 0, height: 0 } },
             bottom: { items: [], rect: { width: 0, height: 0 } },
             z: { items: [], rect: { width: 0, height: 0 } }
-        }) {
+        }, secondLayoutLeftRight = false) {
+            const leftBeforeLayout = this.leftCurrent;
+            const rightBeforeLayout = this.rightCurrent;
             let regionRelativeTotalWidth = this.rightCurrent - this.leftCurrent;
             let regionRelativeTotalHeight = this.bottomCurrent - this.topCurrent;
             regionRelativeItems
@@ -61547,6 +61551,16 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._layoutRelativeOverlap('top', overlapItems.top);
             this._layoutRelativeOverlap('bottom', overlapItems.bottom);
             regionRelativeTotalHeight = this.bottomCurrent - this.topCurrent;
+            if (secondLayoutLeftRight) {
+                this.leftCurrent = leftBeforeLayout;
+                this.rightCurrent = rightBeforeLayout;
+                regionRelativeItems
+                    .filter(x => x.layoutOrient === 'left' || x.layoutOrient === 'right')
+                    .forEach(item => {
+                    this._layoutRelativeItem(item, this.getItemComputeLayoutRect(item));
+                });
+                regionRelativeTotalWidth = this.rightCurrent - this.leftCurrent;
+            }
             const { regionWidth, regionHeight } = this._layoutRegionItem(regionItems, regionRelativeTotalWidth, regionRelativeTotalHeight);
             regionRelativeItems.concat(regionRelativeOverlapItems).forEach(item => {
                 if (['left', 'right'].includes(item.layoutOrient)) {
@@ -64280,7 +64294,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.13.21-alpha.9";
+    const version = "1.13.22-alpha.0";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -104727,8 +104741,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             };
             this.onWheel = (e) => {
                 var _a, _b;
-                e.preventDefault();
-                e.stopPropagation();
+                if (this._spec.preventDefault !== false) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                }
                 const scrollX = e.deltaX;
                 const scrollY = e.deltaY;
                 const rootMark = this.getRootMark();