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

package/build/index.js

@@ -47559,11 +47559,24 @@
       updateLayoutTag() {
         this._layoutState = LayoutState.before;
       }
+      _isGeoRegionRoamDragEnabled() {
+        var _a, _b;
+        const chartSpec = null === (_b = null === (_a = this._compileChart) || void 0 === _a ? void 0 : _a.getSpec) || void 0 === _b ? void 0 : _b.call(_a),
+          regions = null == chartSpec ? void 0 : chartSpec.region;
+        return !!isArray$1(regions) && regions.some(region => {
+          var _a;
+          return !("geo" !== (null == region ? void 0 : region.coordinate) || !region.roam) && (!0 === region.roam || null === (_a = region.roam.drag) || void 0 === _a || _a);
+        });
+      }
+      _shouldDisableCanvasTouchAction() {
+        if (!isTrueBrowser(this._option.mode)) return !1;
+        return !1 === (isValid$1(this._option.supportsTouchEvents) ? this._option.supportsTouchEvents : vglobal.supportsTouchEvents) && this._isGeoRegionRoamDragEnabled();
+      }
       _setCanvasStyle() {
         if (this._stage && this._container.dom && !isString$1(this._container.dom)) {
           this._container.dom.style.display = "block", this._container.dom.style.position = "relative";
           const canvas = this.getCanvas();
-          canvas && (canvas.style.display = "block");
+          canvas && (canvas.style.display = "block", canvas.style.touchAction = this._shouldDisableCanvasTouchAction() ? "none" : "");
         }
       }
       compile(ctx, option) {
@@ -47571,7 +47584,7 @@
         const {
           chart: chart
         } = ctx;
-        this._compileChart = chart, this.initView(), this._stage && ("render" !== (null == option ? void 0 : option.actionSource) && this._cachedMarks && (this.reuseOrMorphing(option.morphConfig), this._cachedMarks = null), chart.compile(), chart.afterCompile());
+        this._compileChart = chart, this.initView(), this._stage && ("render" !== (null == option ? void 0 : option.actionSource) && this._cachedMarks && (this.reuseOrMorphing(option.morphConfig), this._cachedMarks = null), chart.compile(), this._setCanvasStyle(), chart.afterCompile());
       }
       clearNextRender() {
         return !!this._nextRafId && (vglobal.getSpecifiedCancelAnimationFrame(10)(this._nextRafId), this._nextRafId = null, !0);
@@ -54397,7 +54410,7 @@
         }), res), []) : null;
       }
       _runPointsEncoder(newStyles, g, attrs = {}) {
-        var _a, _b, _c;
+        var _a, _b;
         const data = g.context.data,
           lineAttrs = [],
           points = [],
@@ -54410,7 +54423,7 @@
             this._isValidPointChannel(attrName) ? points[index][attrName] = newStyles[attrName](datum) : this._segmentStyleKeys.includes(attrName) && !progressive ? lineAttrs[index][attrName] = newStyles[attrName](datum) : 0 !== index || progressive && !isFirstFrame || (commonAttrs[attrName] = newStyles[attrName](datum));
           }), points[index].context = null !== (_a = this._keyGetter(datum)) && void 0 !== _a ? _a : index;
         }), progressive) {
-          const segments = null !== (_c = null === (_b = g.attribute) || void 0 === _b ? void 0 : _b.segments) && void 0 !== _c ? _c : [];
+          const segments = (null === (_b = g.attribute) || void 0 === _b ? void 0 : _b.segments) ? [...g.attribute.segments] : [];
           return segments.push({
             points: points
           }), isFirstFrame ? Object.assign(Object.assign({}, commonAttrs), {
@@ -62504,6 +62517,14 @@
           bandPosition: this._bandPosition
         }));
       }
+      _isCategoryAxisInverse() {
+        var _a, _b, _c, _e;
+        return "horizontal" === this._direction ? null === (_b = null === (_a = this._yAxisHelper) || void 0 === _a ? void 0 : _a.isInverse) || void 0 === _b ? void 0 : _b.call(_a) : null === (_e = null === (_c = this._xAxisHelper) || void 0 === _c ? void 0 : _c.isInverse) || void 0 === _e ? void 0 : _e.call(_c);
+      }
+      _getLeaderLineCategoryPos(isStart, isDecrease) {
+        const normalPos = isStart ? isDecrease ? 0 : 1 : isDecrease ? 1 : 0;
+        return !!this._isCategoryAxisInverse() ? 1 - normalPos : normalPos;
+      }
       initMarkStyle() {
         super.initMarkStyle();
         const isDecrease = "decrease" === this._spec.calculationMode;
@@ -62511,12 +62532,12 @@
           visible: datum => this.isVisibleLeaderLine(datum),
           x: datum => this.totalPositionX(datum, "lastEnd", 0),
           x1: datum => this.totalPositionX(datum, datum.isTotal ? "end" : "start", 0),
-          y: datum => datum.lastIndex ? this.totalPositionY(datum, "lastIndex", isDecrease ? 0 : 1) : 0,
-          y1: datum => this.totalPositionY(datum, "index", isDecrease ? 1 : 0)
+          y: datum => datum.lastIndex ? this.totalPositionY(datum, "lastIndex", this._getLeaderLineCategoryPos(!0, isDecrease)) : 0,
+          y1: datum => this.totalPositionY(datum, "index", this._getLeaderLineCategoryPos(!1, isDecrease))
         }, "normal", AttributeLevel.Series) : this.setMarkStyle(this._leaderLineMark, {
           visible: datum => this.isVisibleLeaderLine(datum),
-          x: datum => datum.lastIndex ? this.totalPositionX(datum, "lastIndex", isDecrease ? 0 : 1) : 0,
-          x1: datum => this.totalPositionX(datum, "index", isDecrease ? 1 : 0),
+          x: datum => datum.lastIndex ? this.totalPositionX(datum, "lastIndex", this._getLeaderLineCategoryPos(!0, isDecrease)) : 0,
+          x1: datum => this.totalPositionX(datum, "index", this._getLeaderLineCategoryPos(!1, isDecrease)),
           y: datum => this.totalPositionY(datum, "lastEnd", 0),
           y1: datum => this.totalPositionY(datum, datum.isTotal ? "end" : "start", 0)
         }, "normal", AttributeLevel.Series));
@@ -65081,10 +65102,9 @@
           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;
+            if (!this.getStack()) 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() * (null !== (_a = this._spec.innerRadius) && void 0 !== _a ? _a : 0) : stackStart;
+            return stackStart <= Number.MIN_VALUE ? this._computeLayoutRadius() * this._innerRadius : stackStart;
           }
         });
       }
@@ -65103,10 +65123,7 @@
         const appearPreset = null === (_b = null === (_a = this._spec) || void 0 === _a ? void 0 : _a.animationAppear) || void 0 === _b ? void 0 : _b.preset;
         if (this._roseMark) {
           const animationParams = {
-            innerRadius: () => {
-              var _a;
-              return this._computeLayoutRadius() * (null !== (_a = this._spec.innerRadius) && void 0 !== _a ? _a : 0);
-            }
+            innerRadius: () => this._computeLayoutRadius() * this._innerRadius
           };
           this._roseMark.setAnimationConfig(animationConfig(null === (_c = Factory.getAnimationInKey("rose")) || void 0 === _c ? void 0 : _c(animationParams, appearPreset), userAnimationConfig("rose", this._spec, this._markAttributeContext)));
         }
@@ -77175,7 +77192,7 @@
         return [this._legendComponent];
       }
       clear() {
-        super.clear(), this._cacheAttrs = null, this._preSelectedData = null;
+        super.clear(), this._legendComponent = null, this._cacheAttrs = null, this._preSelectedData = null;
       }
     }
     BaseLegend.specKey = "legends";
@@ -82123,7 +82140,7 @@
         };
       }
       _markerLayout() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e;
         const updateAttrs = this._getUpdateMarkerAttrs();
         if ("type-step" === this._spec.type) {
           const startRelativeSeries = this._startRelativeSeries,
@@ -82133,26 +82150,9 @@
               mainSegmentIndex: mainSegmentIndex
             } = this._spec.line || {},
             {
-              connectDirection: connectDirection
+              connectDirection: connectDirection,
+              expandDistance = 0
             } = this._spec;
-          let {
-            expandDistance = 0
-          } = this._spec;
-          const {
-              points: points,
-              limitRect: limitRect
-            } = updateAttrs,
-            coordinatePoints = array(points).filter(Boolean);
-          if (isFunction$1(expandDistance)) {
-            const startRegion = null === (_a = null == startRelativeSeries ? void 0 : startRelativeSeries.getRegion) || void 0 === _a ? void 0 : _a.call(startRelativeSeries),
-              endRegion = null === (_b = null == endRelativeSeries ? void 0 : endRelativeSeries.getRegion) || void 0 === _b ? void 0 : _b.call(endRelativeSeries);
-            expandDistance = expandDistance(this._markerData, Object.assign(Object.assign({}, this.getMarkAttributeContext()), {
-              region: null === (_d = null === (_c = this._relativeSeries) || void 0 === _c ? void 0 : _c.getRegion) || void 0 === _d ? void 0 : _d.call(_c),
-              startRegion: startRegion,
-              endRegion: endRegion,
-              coordinatePoints: coordinatePoints
-            }));
-          }
           let expandDistanceValue;
           if (isPercent(expandDistance)) {
             const regionStart = startRelativeSeries.getRegion(),
@@ -82167,7 +82167,11 @@
               expandDistanceValue = Number(expandDistance.substring(0, expandDistance.length - 1)) * regionWidth / 100;
             }
           } else expandDistanceValue = expandDistance;
-          if (!points || points.length < 2) return void (null === (_e = this._markerComponent) || void 0 === _e || _e.setAttributes(updateAttrs));
+          const {
+            points: points,
+            limitRect: limitRect
+          } = updateAttrs;
+          if (!points || points.length < 2) return void (null === (_a = this._markerComponent) || void 0 === _a || _a.setAttributes(updateAttrs));
           const joinPoints = getInsertPoints(points[0], points[1], connectDirection, expandDistanceValue);
           let labelPositionAttrs;
           labelPositionAttrs = multiSegment && isValid$1(mainSegmentIndex) ? {
@@ -82177,11 +82181,11 @@
             position: "start",
             autoRotate: !1
           }, getTextOffset(points[0], points[1], connectDirection, expandDistanceValue));
-          const markerComponentAttr = null !== (_g = null === (_f = this._markerComponent) || void 0 === _f ? void 0 : _f.attribute) && void 0 !== _g ? _g : {},
+          const markerComponentAttr = null !== (_c = null === (_b = this._markerComponent) || void 0 === _b ? void 0 : _b.attribute) && void 0 !== _c ? _c : {},
             prevLabelAttrs = array(markerComponentAttr.label),
             updateLabels = array(updateAttrs.label),
             labelsInSpec = array(this._spec.label);
-          null === (_h = this._markerComponent) || void 0 === _h || _h.setAttributes({
+          null === (_d = this._markerComponent) || void 0 === _d || _d.setAttributes({
             points: multiSegment ? [[joinPoints[0], joinPoints[1]], [joinPoints[1], joinPoints[2]], [joinPoints[2], joinPoints[3]]] : joinPoints,
             label: updateLabels.map((labelItem, index) => {
               var _a, _b, _c, _d;
@@ -82207,7 +82211,7 @@
             dx: this._layoutOffsetX,
             dy: this._layoutOffsetY
           });
-        } else null === (_j = this._markerComponent) || void 0 === _j || _j.setAttributes(updateAttrs);
+        } else null === (_e = this._markerComponent) || void 0 === _e || _e.setAttributes(updateAttrs);
       }
       _computeOptions() {
         let options,