@visactor/react-vchart 2.0.23-alpha.7 → 2.0.23-alpha.9

package/build/index.js

@@ -46492,20 +46492,16 @@
       }
       return isArray$1(spec) ? spec.map(s => specTransform(s, special)) : spec;
     }
-    function functionTransform(spec, VChart) {
-      if (!spec) return spec;
-      if (isPlainObject$1(spec)) {
+    function functionTransform(value, registry) {
+      var _a;
+      if (!value) return value;
+      if (isString$1(value)) return null !== (_a = registry.getFunction(value)) && void 0 !== _a ? _a : value;
+      if (isPlainObject$1(value)) {
         const result = {};
-        for (const key in spec) if (Object.prototype.hasOwnProperty.call(spec, key)) {
-          if (isString$1(spec[key]) && VChart.getFunction(spec[key])) {
-            result[key] = VChart.getFunction(spec[key]);
-            continue;
-          }
-          result[key] = functionTransform(spec[key], VChart);
-        }
+        for (const key in value) Object.prototype.hasOwnProperty.call(value, key) && (result[key] = functionTransform(value[key], registry));
         return result;
       }
-      return isArray$1(spec) ? spec.map(s => functionTransform(s, VChart)) : spec;
+      return isArray$1(value) ? value.map(item => functionTransform(item, registry)) : value;
     }
     function transformFunctionAttribute(att, ...args) {
       return isFunction$1(att) ? att(...args) : att;
@@ -47559,11 +47555,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 +47580,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);
@@ -51431,13 +51440,14 @@
           if (this._cachedProcessedTheme[cacheKey]) return this._cachedProcessedTheme[cacheKey];
           let theme = this._currentTheme;
           return keys.forEach((key, index) => {
+            var _a;
             if (1 !== index || "series" !== keys[0] && "component" !== keys[0]) theme = null == theme ? void 0 : theme[key];else {
               const buildInTheme = "series" === keys[0] ? Factory.getSeriesBuiltInTheme(key) : Factory.getComponentBuiltInTheme(key);
               theme = theme ? mergeSpec({}, buildInTheme, theme[key]) : buildInTheme;
             }
             index === keys.length - 1 && isValid$1(theme) && (theme = preprocessTheme({
               [key]: theme
-            }, this._currentTheme.colorScheme, this._currentTheme.token)[key]);
+            }, this._currentTheme.colorScheme, this._currentTheme.token)[key], (null === (_a = this.getFunctionList()) || void 0 === _a ? void 0 : _a.length) && (theme = functionTransform(theme, this)));
           }), this._cachedProcessedTheme[cacheKey] = theme, theme;
         }, removeUndefined(options), this._option = Object.assign(Object.assign({}, this._option), options), (null == options ? void 0 : options.optimize) && (this._option.optimize = Object.assign(Object.assign({}, this._option.optimize), options.optimize)), this._onError = null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError;
         const _k = this._option,
@@ -54397,7 +54407,7 @@
         }), res), []) : null;
       }
       _runPointsEncoder(newStyles, g, attrs = {}) {
-        var _a, _b, _c;
+        var _a, _b;
         const data = g.context.data,
           lineAttrs = [],
           points = [],
@@ -54410,7 +54420,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), {
@@ -57833,7 +57843,7 @@
         this._interaction = new Interaction();
         const series = this.getAllSeries(),
           mergedTriggers = [],
-          mergedTriggersMarks = {};
+          groupedTriggers = [];
         series.forEach(s => {
           const triggers = s.getInteractionTriggers();
           if (triggers && triggers.length) {
@@ -57842,12 +57852,17 @@
               trigger: trigger,
               marks: marks
             }) => {
-              const interactionId = `${regionId}-${trigger.type}`;
-              mergedTriggersMarks[interactionId] ? marks.forEach(m => {
-                mergedTriggersMarks[interactionId].marks.push(m);
-              }) : (mergedTriggersMarks[interactionId] = Object.assign(Object.assign({}, trigger), {
-                marks: marks
-              }), mergedTriggers.push(mergedTriggersMarks[interactionId]));
+              const sameTrigger = groupedTriggers.find(item => item.regionId === regionId && isEqual(item.config, trigger));
+              if (sameTrigger) sameTrigger.trigger.marks.push(...marks);else {
+                const mergedTrigger = Object.assign(Object.assign({}, trigger), {
+                  marks: [...marks]
+                });
+                groupedTriggers.push({
+                  regionId: regionId,
+                  config: Object.assign({}, trigger),
+                  trigger: mergedTrigger
+                }), mergedTriggers.push(mergedTrigger);
+              }
             });
           }
         }), mergedTriggers.forEach(trigger => {
@@ -60322,7 +60337,7 @@
             fieldsY = this._fieldY,
             fieldsX = this._fieldX;
           this._data.setTransform([{
-            type: "dataSampling",
+            type: "sampling",
             size: "horizontal" === this._direction ? height : width,
             factor: this._spec.samplingFactor,
             yfield: "horizontal" === this._direction ? fieldsX[0] : fieldsY[0],
@@ -60567,7 +60582,7 @@
           visible: !0
         }, "normal", AttributeLevel.Series) : this.setMarkStyle(this._symbolMark, {
           visible: this._getInvalidDefined.bind(this)
-        }, "normal", AttributeLevel.Series), this._symbolMark.getProduct() && this._symbolMark.compileEncode(), this._isGeoCoordinateSeries() && (this._updateSymbolGraphicPosition(), this._refreshLabelComponent(!0, !0));
+        }, "normal", AttributeLevel.Series), this._symbolMark.getProduct() && this._symbolMark.compileEncode();
       }
       initLabelMarkStyle(labelMark) {
         labelMark && (this._labelMark = labelMark, this.setMarkStyle(labelMark, {
@@ -60598,22 +60613,6 @@
           postMatrix: new Matrix()
         }), labelGraphic;
       }
-      _isGeoCoordinateSeries() {
-        var _a, _b;
-        return (null === (_b = null === (_a = this.getXAxisHelper()) || void 0 === _a ? void 0 : _a.getAxisType) || void 0 === _b ? void 0 : _b.call(_a)) === ComponentTypeEnum.geoCoordinate;
-      }
-      _refreshLabelComponent(resetPostMatrix = !1, disableAnimation = !1) {
-        var _a, _b;
-        const vgrammarLabel = null === (_a = this._labelMark) || void 0 === _a ? void 0 : _a.getComponent(),
-          labelGraphic = null === (_b = null == vgrammarLabel ? void 0 : vgrammarLabel.getComponent) || void 0 === _b ? void 0 : _b.call(vgrammarLabel);
-        resetPostMatrix && (null == labelGraphic ? void 0 : labelGraphic.attribute.postMatrix) && labelGraphic.setAttributes({
-          postMatrix: new Matrix()
-        }), disableAnimation && (null == labelGraphic ? void 0 : labelGraphic.disableAnimation) && (labelGraphic.disableAnimation(), this._enableLabelAnimationHook || (this._enableLabelAnimationHook = () => {
-          var _a, _b, _c, _d;
-          const currentLabelGraphic = null === (_c = null === (_b = null === (_a = this._labelMark) || void 0 === _a ? void 0 : _a.getComponent()) || void 0 === _b ? void 0 : _b.getComponent) || void 0 === _c ? void 0 : _c.call(_b);
-          null === (_d = null == currentLabelGraphic ? void 0 : currentLabelGraphic.enableAnimation) || void 0 === _d || _d.call(currentLabelGraphic), this.event.off(HOOK_EVENT.AFTER_MARK_RENDER_END, this._enableLabelAnimationHook), this._enableLabelAnimationHook = void 0;
-        }, this.event.on(HOOK_EVENT.AFTER_MARK_RENDER_END, this._enableLabelAnimationHook))), (null == vgrammarLabel ? void 0 : vgrammarLabel.getProduct()) && vgrammarLabel.renderInner();
-      }
       handleZoom(e) {
         const {
           scale: scale,
@@ -60634,12 +60633,14 @@
         labelGraphic && labelGraphic.translate(delta[0], delta[1]);
       }
       onLayoutEnd() {
-        var _a, _b;
+        var _a, _b, _c;
         super.onLayoutEnd(), this._updateSymbolGraphicPosition();
         const labelGraphic = null === (_b = null === (_a = this._labelMark) || void 0 === _a ? void 0 : _a.getComponent()) || void 0 === _b ? void 0 : _b.getComponent();
         (null == labelGraphic ? void 0 : labelGraphic.attribute.postMatrix) && labelGraphic.setAttributes({
           postMatrix: new Matrix()
-        }), this._refreshLabelComponent();
+        });
+        const vgrammarLabel = null === (_c = this._labelMark) || void 0 === _c ? void 0 : _c.getComponent();
+        vgrammarLabel && vgrammarLabel.renderInner();
       }
       getDefaultShapeType() {
         return "circle";
@@ -62513,6 +62514,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;
@@ -62520,12 +62529,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));
@@ -65090,10 +65099,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;
           }
         });
       }
@@ -65112,10 +65120,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)));
         }
@@ -76156,11 +76161,12 @@
 
     class RadarChartSpecTransformer extends RoseLikeChartSpecTransformer {
       _getDefaultSeriesSpec(spec) {
-        var _a;
-        const series = super._getDefaultSeriesSpec(spec);
+        var _a, _b, _c, _d;
+        const series = super._getDefaultSeriesSpec(spec),
+          areaTheme = null === (_b = (_a = this._option).getTheme) || void 0 === _b ? void 0 : _b.call(_a, "series", "radar", "area");
         return series.line = spec.line, series.point = spec.point, series.stack = spec.stack, series.percent = spec.percent, series.area = mergeSpec({
-          visible: !1
-        }, spec.area), series.seriesMark = null !== (_a = spec.seriesMark) && void 0 !== _a ? _a : "area", series.activePoint = spec.activePoint, series.pointDis = spec.pointDis, series.pointDisMul = spec.pointDisMul, series.markOverlap = spec.markOverlap, series;
+          visible: null !== (_c = null == areaTheme ? void 0 : areaTheme.visible) && void 0 !== _c && _c
+        }, spec.area), series.seriesMark = null !== (_d = spec.seriesMark) && void 0 !== _d ? _d : "area", series.activePoint = spec.activePoint, series.pointDis = spec.pointDis, series.pointDisMul = spec.pointDisMul, series.markOverlap = spec.markOverlap, series;
       }
       transformSpec(spec) {
         var _a;
@@ -77183,7 +77189,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";
@@ -85838,7 +85844,7 @@
           } = this.options,
           statedGraphics = interaction.getStatedGraphics(this),
           g = null != graphic ? graphic : null == statedGraphics ? void 0 : statedGraphics[0];
-        g && statedGraphics.includes(g) && (g.removeState(state), interaction.setStatedGraphics(this, statedGraphics.filter(sg => sg !== g)));
+        g && (null == statedGraphics ? void 0 : statedGraphics.includes(g)) && (g.removeState(state), interaction.setStatedGraphics(this, statedGraphics.filter(sg => sg !== g)));
       }
     }
     ElementActive.type = "element-active", ElementActive.defaultOptions = defaultOptions$3;
@@ -89281,7 +89287,7 @@
 
     const VChartSimple = createChart('VChartSimple');
 
-    const version = "2.0.23-alpha.5";
+    const version = "2.0.23-alpha.8";
 
     exports.Area = Area;
     exports.AreaChart = AreaChart;