@visactor/vchart 2.0.23-alpha.6 → 2.0.23-alpha.8

package/build/index.es.js

@@ -55398,6 +55398,33 @@ class Compiler {
     updateLayoutTag() {
         this._layoutState = LayoutState.before;
     }
+    _isGeoRegionRoamDragEnabled() {
+        var _a, _b;
+        const chartSpec = (_b = (_a = this._compileChart) === null || _a === void 0 ? void 0 : _a.getSpec) === null || _b === void 0 ? void 0 : _b.call(_a);
+        const regions = chartSpec === null || chartSpec === void 0 ? void 0 : chartSpec.region;
+        if (!isArray$1(regions)) {
+            return false;
+        }
+        return regions.some((region) => {
+            var _a;
+            if ((region === null || region === void 0 ? void 0 : region.coordinate) !== 'geo' || !region.roam) {
+                return false;
+            }
+            if (region.roam === true) {
+                return true;
+            }
+            return (_a = region.roam.drag) !== null && _a !== void 0 ? _a : true;
+        });
+    }
+    _shouldDisableCanvasTouchAction() {
+        if (!isTrueBrowser(this._option.mode)) {
+            return false;
+        }
+        const supportsTouchEvents = isValid$1(this._option.supportsTouchEvents)
+            ? this._option.supportsTouchEvents
+            : vglobal.supportsTouchEvents;
+        return supportsTouchEvents === false && this._isGeoRegionRoamDragEnabled();
+    }
     _setCanvasStyle() {
         if (!this._stage) {
             return;
@@ -55408,6 +55435,7 @@ class Compiler {
             const canvas = this.getCanvas();
             if (canvas) {
                 canvas.style.display = 'block';
+                canvas.style.touchAction = this._shouldDisableCanvasTouchAction() ? 'none' : '';
             }
         }
     }
@@ -55426,6 +55454,7 @@ class Compiler {
             this._cachedMarks = null;
         }
         chart.compile();
+        this._setCanvasStyle();
         chart.afterCompile();
     }
     clearNextRender() {
@@ -65394,7 +65423,7 @@ class BaseLineMark extends BaseMark {
             : null));
     }
     _runPointsEncoder(newStyles, g, attrs = {}) {
-        var _a, _b, _c;
+        var _a, _b;
         const data = g.context.data;
         const lineAttrs = [];
         const points = [];
@@ -65419,7 +65448,7 @@ class BaseLineMark extends BaseMark {
             points[index].context = (_a = this._keyGetter(datum)) !== null && _a !== void 0 ? _a : index;
         });
         if (progressive) {
-            const segments = (_c = (_b = g.attribute) === null || _b === void 0 ? void 0 : _b.segments) !== null && _c !== void 0 ? _c : [];
+            const segments = ((_b = g.attribute) === null || _b === void 0 ? void 0 : _b.segments) ? [...g.attribute.segments] : [];
             segments.push({
                 points
             });
@@ -76518,6 +76547,17 @@ class WaterfallSeries extends BarSeries {
             bandPosition: this._bandPosition
         }));
     }
+    _isCategoryAxisInverse() {
+        var _a, _b, _c, _e;
+        return this._direction === "horizontal"
+            ? (_b = (_a = this._yAxisHelper) === null || _a === void 0 ? void 0 : _a.isInverse) === null || _b === void 0 ? void 0 : _b.call(_a)
+            : (_e = (_c = this._xAxisHelper) === null || _c === void 0 ? void 0 : _c.isInverse) === null || _e === void 0 ? void 0 : _e.call(_c);
+    }
+    _getLeaderLineCategoryPos(isStart, isDecrease) {
+        const inverse = !!this._isCategoryAxisInverse();
+        const normalPos = isStart ? (isDecrease ? 0 : 1) : isDecrease ? 1 : 0;
+        return inverse ? 1 - normalPos : normalPos;
+    }
     initMarkStyle() {
         super.initMarkStyle();
         const isDecrease = this._spec.calculationMode === 'decrease';
@@ -76531,9 +76571,9 @@ class WaterfallSeries extends BarSeries {
                         if (!datum.lastIndex) {
                             return 0;
                         }
-                        return this.totalPositionY(datum, 'lastIndex', isDecrease ? 0 : 1);
+                        return this.totalPositionY(datum, 'lastIndex', this._getLeaderLineCategoryPos(true, isDecrease));
                     },
-                    y1: (datum) => this.totalPositionY(datum, 'index', isDecrease ? 1 : 0)
+                    y1: (datum) => this.totalPositionY(datum, 'index', this._getLeaderLineCategoryPos(false, isDecrease))
                 }, 'normal', AttributeLevel.Series);
             }
             else {
@@ -76543,9 +76583,9 @@ class WaterfallSeries extends BarSeries {
                         if (!datum.lastIndex) {
                             return 0;
                         }
-                        return this.totalPositionX(datum, 'lastIndex', isDecrease ? 0 : 1);
+                        return this.totalPositionX(datum, 'lastIndex', this._getLeaderLineCategoryPos(true, isDecrease));
                     },
-                    x1: (datum) => this.totalPositionX(datum, 'index', isDecrease ? 1 : 0),
+                    x1: (datum) => this.totalPositionX(datum, 'index', this._getLeaderLineCategoryPos(false, isDecrease)),
                     y: (datum) => this.totalPositionY(datum, 'lastEnd', 0),
                     y1: (datum) => this.totalPositionY(datum, datum.isTotal ? 'end' : 'start', 0)
                 }, 'normal', AttributeLevel.Series);
@@ -79898,14 +79938,11 @@ class RoseSeries extends RoseLikeSeries {
                 fill: this.getColorAttribute(),
                 outerRadius: (datum) => valueInScaleRange(this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]), this.radiusAxisHelper.getScale(0)),
                 innerRadius: (datum) => {
-                    var _a;
                     if (!this.getStack()) {
-                        return 0;
+                        return this._computeLayoutRadius() * this._innerRadius;
                     }
                     const stackStart = valueInScaleRange(this.radiusAxisHelper.dataToPosition([datum[this._innerRadiusField[0]]]), this.radiusAxisHelper.getScale(0));
-                    return stackStart <= Number.MIN_VALUE
-                        ? this._computeLayoutRadius() * ((_a = this._spec.innerRadius) !== null && _a !== void 0 ? _a : 0)
-                        : stackStart;
+                    return stackStart <= Number.MIN_VALUE ? this._computeLayoutRadius() * this._innerRadius : stackStart;
                 }
             });
         }
@@ -79931,7 +79968,7 @@ class RoseSeries extends RoseLikeSeries {
         const appearPreset = (_b = (_a = this._spec) === null || _a === void 0 ? void 0 : _a.animationAppear) === null || _b === void 0 ? void 0 : _b.preset;
         if (this._roseMark) {
             const animationParams = {
-                innerRadius: () => { var _a; return this._computeLayoutRadius() * ((_a = this._spec.innerRadius) !== null && _a !== void 0 ? _a : 0); }
+                innerRadius: () => this._computeLayoutRadius() * this._innerRadius
             };
             this._roseMark.setAnimationConfig(animationConfig((_c = Factory.getAnimationInKey('rose')) === null || _c === void 0 ? void 0 : _c(animationParams, appearPreset), userAnimationConfig("rose", this._spec, this._markAttributeContext)));
         }
@@ -95609,6 +95646,7 @@ class BaseLegend extends BaseComponent {
     }
     clear() {
         super.clear();
+        this._legendComponent = null;
         this._cacheAttrs = null;
         this._preSelectedData = null;
     }
@@ -101674,23 +101712,13 @@ class CartesianMarkLine extends BaseMarkLine {
         return { points };
     }
     _markerLayout() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e;
         const updateAttrs = this._getUpdateMarkerAttrs();
         if (this._spec.type === 'type-step') {
             const startRelativeSeries = this._startRelativeSeries;
             const endRelativeSeries = this._endRelativeSeries;
             const { multiSegment, mainSegmentIndex } = this._spec.line || {};
-            const { connectDirection } = this._spec;
-            let { expandDistance = 0 } = this._spec;
-            const { points, limitRect } = updateAttrs;
-            const coordinatePoints = array(points).filter(Boolean);
-            if (isFunction$1(expandDistance)) {
-                const startRegion = (_a = startRelativeSeries === null || startRelativeSeries === void 0 ? void 0 : startRelativeSeries.getRegion) === null || _a === void 0 ? void 0 : _a.call(startRelativeSeries);
-                const endRegion = (_b = endRelativeSeries === null || endRelativeSeries === void 0 ? void 0 : endRelativeSeries.getRegion) === null || _b === void 0 ? void 0 : _b.call(endRelativeSeries);
-                expandDistance = expandDistance(this._markerData, Object.assign(Object.assign({}, this.getMarkAttributeContext()), { region: (_d = (_c = this._relativeSeries) === null || _c === void 0 ? void 0 : _c.getRegion) === null || _d === void 0 ? void 0 : _d.call(_c), startRegion,
-                    endRegion,
-                    coordinatePoints }));
-            }
+            const { connectDirection, expandDistance = 0 } = this._spec;
             let expandDistanceValue;
             if (isPercent(expandDistance)) {
                 const regionStart = startRelativeSeries.getRegion();
@@ -101711,8 +101739,9 @@ class CartesianMarkLine extends BaseMarkLine {
             else {
                 expandDistanceValue = expandDistance;
             }
+            const { points, limitRect } = updateAttrs;
             if (!points || points.length < 2) {
-                (_e = this._markerComponent) === null || _e === void 0 ? void 0 : _e.setAttributes(updateAttrs);
+                (_a = this._markerComponent) === null || _a === void 0 ? void 0 : _a.setAttributes(updateAttrs);
                 return;
             }
             const joinPoints = getInsertPoints(points[0], points[1], connectDirection, expandDistanceValue);
@@ -101726,11 +101755,11 @@ class CartesianMarkLine extends BaseMarkLine {
             else {
                 labelPositionAttrs = Object.assign({ position: 'start', autoRotate: false }, getTextOffset(points[0], points[1], connectDirection, expandDistanceValue));
             }
-            const markerComponentAttr = (_g = (_f = this._markerComponent) === null || _f === void 0 ? void 0 : _f.attribute) !== null && _g !== void 0 ? _g : {};
+            const markerComponentAttr = (_c = (_b = this._markerComponent) === null || _b === void 0 ? void 0 : _b.attribute) !== null && _c !== void 0 ? _c : {};
             const prevLabelAttrs = array(markerComponentAttr.label);
             const updateLabels = array(updateAttrs.label);
             const labelsInSpec = array(this._spec.label);
-            (_h = this._markerComponent) === null || _h === void 0 ? void 0 : _h.setAttributes({
+            (_d = this._markerComponent) === null || _d === void 0 ? void 0 : _d.setAttributes({
                 points: multiSegment
                     ? [
                         [joinPoints[0], joinPoints[1]],
@@ -101770,7 +101799,7 @@ class CartesianMarkLine extends BaseMarkLine {
             });
         }
         else {
-            (_j = this._markerComponent) === null || _j === void 0 ? void 0 : _j.setAttributes(updateAttrs);
+            (_e = this._markerComponent) === null || _e === void 0 ? void 0 : _e.setAttributes(updateAttrs);
         }
     }
     _computeOptions() {

package/build/index.js

@@ -55404,6 +55404,33 @@
         updateLayoutTag() {
             this._layoutState = LayoutState.before;
         }
+        _isGeoRegionRoamDragEnabled() {
+            var _a, _b;
+            const chartSpec = (_b = (_a = this._compileChart) === null || _a === void 0 ? void 0 : _a.getSpec) === null || _b === void 0 ? void 0 : _b.call(_a);
+            const regions = chartSpec === null || chartSpec === void 0 ? void 0 : chartSpec.region;
+            if (!isArray$1(regions)) {
+                return false;
+            }
+            return regions.some((region) => {
+                var _a;
+                if ((region === null || region === void 0 ? void 0 : region.coordinate) !== 'geo' || !region.roam) {
+                    return false;
+                }
+                if (region.roam === true) {
+                    return true;
+                }
+                return (_a = region.roam.drag) !== null && _a !== void 0 ? _a : true;
+            });
+        }
+        _shouldDisableCanvasTouchAction() {
+            if (!isTrueBrowser(this._option.mode)) {
+                return false;
+            }
+            const supportsTouchEvents = isValid$1(this._option.supportsTouchEvents)
+                ? this._option.supportsTouchEvents
+                : vglobal.supportsTouchEvents;
+            return supportsTouchEvents === false && this._isGeoRegionRoamDragEnabled();
+        }
         _setCanvasStyle() {
             if (!this._stage) {
                 return;
@@ -55414,6 +55441,7 @@
                 const canvas = this.getCanvas();
                 if (canvas) {
                     canvas.style.display = 'block';
+                    canvas.style.touchAction = this._shouldDisableCanvasTouchAction() ? 'none' : '';
                 }
             }
         }
@@ -55432,6 +55460,7 @@
                 this._cachedMarks = null;
             }
             chart.compile();
+            this._setCanvasStyle();
             chart.afterCompile();
         }
         clearNextRender() {
@@ -65400,7 +65429,7 @@
                 : null));
         }
         _runPointsEncoder(newStyles, g, attrs = {}) {
-            var _a, _b, _c;
+            var _a, _b;
             const data = g.context.data;
             const lineAttrs = [];
             const points = [];
@@ -65425,7 +65454,7 @@
                 points[index].context = (_a = this._keyGetter(datum)) !== null && _a !== void 0 ? _a : index;
             });
             if (progressive) {
-                const segments = (_c = (_b = g.attribute) === null || _b === void 0 ? void 0 : _b.segments) !== null && _c !== void 0 ? _c : [];
+                const segments = ((_b = g.attribute) === null || _b === void 0 ? void 0 : _b.segments) ? [...g.attribute.segments] : [];
                 segments.push({
                     points
                 });
@@ -76524,6 +76553,17 @@
                 bandPosition: this._bandPosition
             }));
         }
+        _isCategoryAxisInverse() {
+            var _a, _b, _c, _e;
+            return this._direction === "horizontal"
+                ? (_b = (_a = this._yAxisHelper) === null || _a === void 0 ? void 0 : _a.isInverse) === null || _b === void 0 ? void 0 : _b.call(_a)
+                : (_e = (_c = this._xAxisHelper) === null || _c === void 0 ? void 0 : _c.isInverse) === null || _e === void 0 ? void 0 : _e.call(_c);
+        }
+        _getLeaderLineCategoryPos(isStart, isDecrease) {
+            const inverse = !!this._isCategoryAxisInverse();
+            const normalPos = isStart ? (isDecrease ? 0 : 1) : isDecrease ? 1 : 0;
+            return inverse ? 1 - normalPos : normalPos;
+        }
         initMarkStyle() {
             super.initMarkStyle();
             const isDecrease = this._spec.calculationMode === 'decrease';
@@ -76537,9 +76577,9 @@
                             if (!datum.lastIndex) {
                                 return 0;
                             }
-                            return this.totalPositionY(datum, 'lastIndex', isDecrease ? 0 : 1);
+                            return this.totalPositionY(datum, 'lastIndex', this._getLeaderLineCategoryPos(true, isDecrease));
                         },
-                        y1: (datum) => this.totalPositionY(datum, 'index', isDecrease ? 1 : 0)
+                        y1: (datum) => this.totalPositionY(datum, 'index', this._getLeaderLineCategoryPos(false, isDecrease))
                     }, 'normal', exports.AttributeLevel.Series);
                 }
                 else {
@@ -76549,9 +76589,9 @@
                             if (!datum.lastIndex) {
                                 return 0;
                             }
-                            return this.totalPositionX(datum, 'lastIndex', isDecrease ? 0 : 1);
+                            return this.totalPositionX(datum, 'lastIndex', this._getLeaderLineCategoryPos(true, isDecrease));
                         },
-                        x1: (datum) => this.totalPositionX(datum, 'index', isDecrease ? 1 : 0),
+                        x1: (datum) => this.totalPositionX(datum, 'index', this._getLeaderLineCategoryPos(false, isDecrease)),
                         y: (datum) => this.totalPositionY(datum, 'lastEnd', 0),
                         y1: (datum) => this.totalPositionY(datum, datum.isTotal ? 'end' : 'start', 0)
                     }, 'normal', exports.AttributeLevel.Series);
@@ -79904,14 +79944,11 @@
                     fill: this.getColorAttribute(),
                     outerRadius: (datum) => valueInScaleRange(this.radiusAxisHelper.dataToPosition([datum[this._radiusField[0]]]), this.radiusAxisHelper.getScale(0)),
                     innerRadius: (datum) => {
-                        var _a;
                         if (!this.getStack()) {
-                            return 0;
+                            return this._computeLayoutRadius() * this._innerRadius;
                         }
                         const stackStart = valueInScaleRange(this.radiusAxisHelper.dataToPosition([datum[this._innerRadiusField[0]]]), this.radiusAxisHelper.getScale(0));
-                        return stackStart <= Number.MIN_VALUE
-                            ? this._computeLayoutRadius() * ((_a = this._spec.innerRadius) !== null && _a !== void 0 ? _a : 0)
-                            : stackStart;
+                        return stackStart <= Number.MIN_VALUE ? this._computeLayoutRadius() * this._innerRadius : stackStart;
                     }
                 });
             }
@@ -79937,7 +79974,7 @@
             const appearPreset = (_b = (_a = this._spec) === null || _a === void 0 ? void 0 : _a.animationAppear) === null || _b === void 0 ? void 0 : _b.preset;
             if (this._roseMark) {
                 const animationParams = {
-                    innerRadius: () => { var _a; return this._computeLayoutRadius() * ((_a = this._spec.innerRadius) !== null && _a !== void 0 ? _a : 0); }
+                    innerRadius: () => this._computeLayoutRadius() * this._innerRadius
                 };
                 this._roseMark.setAnimationConfig(animationConfig((_c = Factory.getAnimationInKey('rose')) === null || _c === void 0 ? void 0 : _c(animationParams, appearPreset), userAnimationConfig("rose", this._spec, this._markAttributeContext)));
             }
@@ -95615,6 +95652,7 @@
         }
         clear() {
             super.clear();
+            this._legendComponent = null;
             this._cacheAttrs = null;
             this._preSelectedData = null;
         }
@@ -101680,23 +101718,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return { points };
         }
         _markerLayout() {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            var _a, _b, _c, _d, _e;
             const updateAttrs = this._getUpdateMarkerAttrs();
             if (this._spec.type === 'type-step') {
                 const startRelativeSeries = this._startRelativeSeries;
                 const endRelativeSeries = this._endRelativeSeries;
                 const { multiSegment, mainSegmentIndex } = this._spec.line || {};
-                const { connectDirection } = this._spec;
-                let { expandDistance = 0 } = this._spec;
-                const { points, limitRect } = updateAttrs;
-                const coordinatePoints = array(points).filter(Boolean);
-                if (isFunction$1(expandDistance)) {
-                    const startRegion = (_a = startRelativeSeries === null || startRelativeSeries === void 0 ? void 0 : startRelativeSeries.getRegion) === null || _a === void 0 ? void 0 : _a.call(startRelativeSeries);
-                    const endRegion = (_b = endRelativeSeries === null || endRelativeSeries === void 0 ? void 0 : endRelativeSeries.getRegion) === null || _b === void 0 ? void 0 : _b.call(endRelativeSeries);
-                    expandDistance = expandDistance(this._markerData, Object.assign(Object.assign({}, this.getMarkAttributeContext()), { region: (_d = (_c = this._relativeSeries) === null || _c === void 0 ? void 0 : _c.getRegion) === null || _d === void 0 ? void 0 : _d.call(_c), startRegion,
-                        endRegion,
-                        coordinatePoints }));
-                }
+                const { connectDirection, expandDistance = 0 } = this._spec;
                 let expandDistanceValue;
                 if (isPercent(expandDistance)) {
                     const regionStart = startRelativeSeries.getRegion();
@@ -101717,8 +101745,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 else {
                     expandDistanceValue = expandDistance;
                 }
+                const { points, limitRect } = updateAttrs;
                 if (!points || points.length < 2) {
-                    (_e = this._markerComponent) === null || _e === void 0 ? void 0 : _e.setAttributes(updateAttrs);
+                    (_a = this._markerComponent) === null || _a === void 0 ? void 0 : _a.setAttributes(updateAttrs);
                     return;
                 }
                 const joinPoints = getInsertPoints(points[0], points[1], connectDirection, expandDistanceValue);
@@ -101732,11 +101761,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 else {
                     labelPositionAttrs = Object.assign({ position: 'start', autoRotate: false }, getTextOffset(points[0], points[1], connectDirection, expandDistanceValue));
                 }
-                const markerComponentAttr = (_g = (_f = this._markerComponent) === null || _f === void 0 ? void 0 : _f.attribute) !== null && _g !== void 0 ? _g : {};
+                const markerComponentAttr = (_c = (_b = this._markerComponent) === null || _b === void 0 ? void 0 : _b.attribute) !== null && _c !== void 0 ? _c : {};
                 const prevLabelAttrs = array(markerComponentAttr.label);
                 const updateLabels = array(updateAttrs.label);
                 const labelsInSpec = array(this._spec.label);
-                (_h = this._markerComponent) === null || _h === void 0 ? void 0 : _h.setAttributes({
+                (_d = this._markerComponent) === null || _d === void 0 ? void 0 : _d.setAttributes({
                     points: multiSegment
                         ? [
                             [joinPoints[0], joinPoints[1]],
@@ -101776,7 +101805,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 });
             }
             else {
-                (_j = this._markerComponent) === null || _j === void 0 ? void 0 : _j.setAttributes(updateAttrs);
+                (_e = this._markerComponent) === null || _e === void 0 ? void 0 : _e.setAttributes(updateAttrs);
             }
         }
         _computeOptions() {