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

package/build/index.js

@@ -57833,7 +57833,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 +57842,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 => {
@@ -76142,11 +76147,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;
@@ -82117,7 +82123,7 @@
         };
       }
       _markerLayout() {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const updateAttrs = this._getUpdateMarkerAttrs();
         if ("type-step" === this._spec.type) {
           const startRelativeSeries = this._startRelativeSeries,
@@ -82127,9 +82133,26 @@
               mainSegmentIndex: mainSegmentIndex
             } = this._spec.line || {},
             {
-              connectDirection: connectDirection,
-              expandDistance = 0
+              connectDirection: connectDirection
             } = 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(),
@@ -82144,11 +82167,7 @@
               expandDistanceValue = Number(expandDistance.substring(0, expandDistance.length - 1)) * regionWidth / 100;
             }
           } else expandDistanceValue = expandDistance;
-          const {
-            points: points,
-            limitRect: limitRect
-          } = updateAttrs;
-          if (!points || points.length < 2) return void (null === (_a = this._markerComponent) || void 0 === _a || _a.setAttributes(updateAttrs));
+          if (!points || points.length < 2) return void (null === (_e = this._markerComponent) || void 0 === _e || _e.setAttributes(updateAttrs));
           const joinPoints = getInsertPoints(points[0], points[1], connectDirection, expandDistanceValue);
           let labelPositionAttrs;
           labelPositionAttrs = multiSegment && isValid$1(mainSegmentIndex) ? {
@@ -82158,11 +82177,11 @@
             position: "start",
             autoRotate: !1
           }, getTextOffset(points[0], points[1], connectDirection, expandDistanceValue));
-          const markerComponentAttr = null !== (_c = null === (_b = this._markerComponent) || void 0 === _b ? void 0 : _b.attribute) && void 0 !== _c ? _c : {},
+          const markerComponentAttr = null !== (_g = null === (_f = this._markerComponent) || void 0 === _f ? void 0 : _f.attribute) && void 0 !== _g ? _g : {},
             prevLabelAttrs = array(markerComponentAttr.label),
             updateLabels = array(updateAttrs.label),
             labelsInSpec = array(this._spec.label);
-          null === (_d = this._markerComponent) || void 0 === _d || _d.setAttributes({
+          null === (_h = this._markerComponent) || void 0 === _h || _h.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;
@@ -82188,7 +82207,7 @@
             dx: this._layoutOffsetX,
             dy: this._layoutOffsetY
           });
-        } else null === (_e = this._markerComponent) || void 0 === _e || _e.setAttributes(updateAttrs);
+        } else null === (_j = this._markerComponent) || void 0 === _j || _j.setAttributes(updateAttrs);
       }
       _computeOptions() {
         let options,
@@ -85824,7 +85843,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;