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

package/build/index.js

@@ -57833,7 +57833,7 @@
         this._interaction = new Interaction();
         const series = this.getAllSeries(),
           mergedTriggers = [],
-          groupedTriggers = [];
+          mergedTriggersMarks = {};
         series.forEach(s => {
           const triggers = s.getInteractionTriggers();
           if (triggers && triggers.length) {
@@ -57842,17 +57842,12 @@
               trigger: trigger,
               marks: marks
             }) => {
-              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);
-              }
+              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]));
             });
           }
         }), mergedTriggers.forEach(trigger => {
@@ -60327,7 +60322,7 @@
             fieldsY = this._fieldY,
             fieldsX = this._fieldX;
           this._data.setTransform([{
-            type: "sampling",
+            type: "dataSampling",
             size: "horizontal" === this._direction ? height : width,
             factor: this._spec.samplingFactor,
             yfield: "horizontal" === this._direction ? fieldsX[0] : fieldsY[0],
@@ -60572,7 +60567,7 @@
           visible: !0
         }, "normal", AttributeLevel.Series) : this.setMarkStyle(this._symbolMark, {
           visible: this._getInvalidDefined.bind(this)
-        }, "normal", AttributeLevel.Series), this._symbolMark.getProduct() && this._symbolMark.compileEncode();
+        }, "normal", AttributeLevel.Series), this._symbolMark.getProduct() && this._symbolMark.compileEncode(), this._isGeoCoordinateSeries() && (this._updateSymbolGraphicPosition(), this._refreshLabelComponent(!0, !0));
       }
       initLabelMarkStyle(labelMark) {
         labelMark && (this._labelMark = labelMark, this.setMarkStyle(labelMark, {
@@ -60603,6 +60598,22 @@
           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,
@@ -60623,14 +60634,12 @@
         labelGraphic && labelGraphic.translate(delta[0], delta[1]);
       }
       onLayoutEnd() {
-        var _a, _b, _c;
+        var _a, _b;
         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()
-        });
-        const vgrammarLabel = null === (_c = this._labelMark) || void 0 === _c ? void 0 : _c.getComponent();
-        vgrammarLabel && vgrammarLabel.renderInner();
+        }), this._refreshLabelComponent();
       }
       getDefaultShapeType() {
         return "circle";
@@ -76147,12 +76156,11 @@
 
     class RadarChartSpecTransformer extends RoseLikeChartSpecTransformer {
       _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");
+        var _a;
+        const series = super._getDefaultSeriesSpec(spec);
         return series.line = spec.line, series.point = spec.point, series.stack = spec.stack, series.percent = spec.percent, series.area = mergeSpec({
-          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;
+          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;
       }
       transformSpec(spec) {
         var _a;
@@ -82123,7 +82131,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 +82141,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 +82158,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 +82172,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 +82202,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,
@@ -85843,7 +85838,7 @@
           } = this.options,
           statedGraphics = interaction.getStatedGraphics(this),
           g = null != graphic ? graphic : null == statedGraphics ? void 0 : statedGraphics[0];
-        g && (null == statedGraphics ? void 0 : statedGraphics.includes(g)) && (g.removeState(state), interaction.setStatedGraphics(this, statedGraphics.filter(sg => sg !== g)));
+        g && statedGraphics.includes(g) && (g.removeState(state), interaction.setStatedGraphics(this, statedGraphics.filter(sg => sg !== g)));
       }
     }
     ElementActive.type = "element-active", ElementActive.defaultOptions = defaultOptions$3;
@@ -89286,7 +89281,7 @@
 
     const VChartSimple = createChart('VChartSimple');
 
-    const version = "2.0.22";
+    const version = "2.0.23-alpha.5";
 
     exports.Area = Area;
     exports.AreaChart = AreaChart;