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

package/build/index.es.js

@@ -62179,7 +62179,7 @@ const lookup = (data, opt) => {
     });
 };
 
-const version = "2.0.22";
+const version = "2.0.23-alpha.5";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();
@@ -70221,24 +70221,21 @@ class BaseChart extends CompilableBase {
         this._interaction = new Interaction();
         const series = this.getAllSeries();
         const mergedTriggers = [];
-        const groupedTriggers = [];
+        const mergedTriggersMarks = {};
         series.forEach(s => {
             const triggers = s.getInteractionTriggers();
             if (triggers && triggers.length) {
                 const regionId = s.getRegion().id;
                 triggers.forEach(({ trigger, marks }) => {
-                    const sameTrigger = groupedTriggers.find(item => item.regionId === regionId && isEqual(item.config, trigger));
-                    if (sameTrigger) {
-                        sameTrigger.trigger.marks.push(...marks);
+                    const interactionId = `${regionId}-${trigger.type}`;
+                    if (mergedTriggersMarks[interactionId]) {
+                        marks.forEach(m => {
+                            mergedTriggersMarks[interactionId].marks.push(m);
+                        });
                     }
                     else {
-                        const mergedTrigger = Object.assign(Object.assign({}, trigger), { marks: [...marks] });
-                        groupedTriggers.push({
-                            regionId,
-                            config: Object.assign({}, trigger),
-                            trigger: mergedTrigger
-                        });
-                        mergedTriggers.push(mergedTrigger);
+                        mergedTriggersMarks[interactionId] = Object.assign(Object.assign({}, trigger), { marks });
+                        mergedTriggers.push(mergedTriggersMarks[interactionId]);
                     }
                 });
             }
@@ -73679,7 +73676,7 @@ class BarSeries extends CartesianSeries {
             const fieldsX = this._fieldX;
             this._data.setTransform([
                 {
-                    type: 'sampling',
+                    type: 'dataSampling',
                     size: this._direction === "horizontal" ? height : width,
                     factor: this._spec.samplingFactor,
                     yfield: this._direction === "horizontal" ? fieldsX[0] : fieldsY[0],
@@ -74010,6 +74007,10 @@ class ScatterSeries extends CartesianSeries {
         if (this._symbolMark.getProduct()) {
             this._symbolMark.compileEncode();
         }
+        if (this._isGeoCoordinateSeries()) {
+            this._updateSymbolGraphicPosition();
+            this._refreshLabelComponent(true, true);
+        }
     }
     initLabelMarkStyle(labelMark) {
         if (!labelMark) {
@@ -74057,6 +74058,38 @@ class ScatterSeries extends CartesianSeries {
         }
         return labelGraphic;
     }
+    _isGeoCoordinateSeries() {
+        var _a, _b;
+        return ((_b = (_a = this.getXAxisHelper()) === null || _a === void 0 ? void 0 : _a.getAxisType) === null || _b === void 0 ? void 0 : _b.call(_a)) === ComponentTypeEnum.geoCoordinate;
+    }
+    _refreshLabelComponent(resetPostMatrix = false, disableAnimation = false) {
+        var _a, _b;
+        const vgrammarLabel = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+        const labelGraphic = (_b = vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.getComponent) === null || _b === void 0 ? void 0 : _b.call(vgrammarLabel);
+        if (resetPostMatrix) {
+            if (labelGraphic === null || labelGraphic === void 0 ? void 0 : labelGraphic.attribute.postMatrix) {
+                labelGraphic.setAttributes({
+                    postMatrix: new Matrix()
+                });
+            }
+        }
+        if (disableAnimation && (labelGraphic === null || labelGraphic === void 0 ? void 0 : labelGraphic.disableAnimation)) {
+            labelGraphic.disableAnimation();
+            if (!this._enableLabelAnimationHook) {
+                this._enableLabelAnimationHook = () => {
+                    var _a, _b, _c, _d;
+                    const currentLabelGraphic = (_c = (_b = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent()) === null || _b === void 0 ? void 0 : _b.getComponent) === null || _c === void 0 ? void 0 : _c.call(_b);
+                    (_d = currentLabelGraphic === null || currentLabelGraphic === void 0 ? void 0 : currentLabelGraphic.enableAnimation) === null || _d === void 0 ? void 0 : _d.call(currentLabelGraphic);
+                    this.event.off(HOOK_EVENT.AFTER_MARK_RENDER_END, this._enableLabelAnimationHook);
+                    this._enableLabelAnimationHook = undefined;
+                };
+                this.event.on(HOOK_EVENT.AFTER_MARK_RENDER_END, this._enableLabelAnimationHook);
+            }
+        }
+        if (vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.getProduct()) {
+            vgrammarLabel.renderInner();
+        }
+    }
     handleZoom(e) {
         const { scale, scaleCenter } = e;
         if (scale === 1) {
@@ -74080,7 +74113,7 @@ class ScatterSeries extends CartesianSeries {
         }
     }
     onLayoutEnd() {
-        var _a, _b, _c;
+        var _a, _b;
         super.onLayoutEnd();
         this._updateSymbolGraphicPosition();
         const labelGraphic = (_b = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent()) === null || _b === void 0 ? void 0 : _b.getComponent();
@@ -74089,10 +74122,7 @@ class ScatterSeries extends CartesianSeries {
                 postMatrix: new Matrix()
             });
         }
-        const vgrammarLabel = (_c = this._labelMark) === null || _c === void 0 ? void 0 : _c.getComponent();
-        if (vgrammarLabel) {
-            vgrammarLabel.renderInner();
-        }
+        this._refreshLabelComponent();
     }
     getDefaultShapeType() {
         return 'circle';
@@ -93839,17 +93869,16 @@ const registerRoseChart = () => {
 
 class RadarChartSpecTransformer extends RoseLikeChartSpecTransformer {
     _getDefaultSeriesSpec(spec) {
-        var _a, _b, _c, _d;
+        var _a;
         const series = super._getDefaultSeriesSpec(spec);
-        const areaTheme = (_b = (_a = this._option).getTheme) === null || _b === void 0 ? void 0 : _b.call(_a, 'series', 'radar', 'area');
         series.line = spec.line;
         series.point = spec.point;
         series.stack = spec.stack;
         series.percent = spec.percent;
         series.area = mergeSpec({
-            visible: (_c = areaTheme === null || areaTheme === void 0 ? void 0 : areaTheme.visible) !== null && _c !== void 0 ? _c : false
+            visible: false
         }, spec.area);
-        series.seriesMark = (_d = spec.seriesMark) !== null && _d !== void 0 ? _d : 'area';
+        series.seriesMark = (_a = spec.seriesMark) !== null && _a !== void 0 ? _a : 'area';
         series.activePoint = spec.activePoint;
         series.pointDis = spec.pointDis;
         series.pointDisMul = spec.pointDisMul;
@@ -101674,23 +101703,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 +101730,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 +101746,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 +101790,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() {
@@ -106359,7 +106379,7 @@ class ElementActive extends BaseTrigger {
         const { interaction, state } = this.options;
         const statedGraphics = interaction.getStatedGraphics(this);
         const g = graphic !== null && graphic !== void 0 ? graphic : statedGraphics === null || statedGraphics === void 0 ? void 0 : statedGraphics[0];
-        if (g && (statedGraphics === null || statedGraphics === void 0 ? void 0 : statedGraphics.includes(g))) {
+        if (g && statedGraphics.includes(g)) {
             g.removeState(state);
             interaction.setStatedGraphics(this, statedGraphics.filter(sg => sg !== g));
         }

package/build/index.js

@@ -62185,7 +62185,7 @@
         });
     };
 
-    const version = "2.0.22";
+    const version = "2.0.23-alpha.5";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -70227,24 +70227,21 @@
             this._interaction = new Interaction();
             const series = this.getAllSeries();
             const mergedTriggers = [];
-            const groupedTriggers = [];
+            const mergedTriggersMarks = {};
             series.forEach(s => {
                 const triggers = s.getInteractionTriggers();
                 if (triggers && triggers.length) {
                     const regionId = s.getRegion().id;
                     triggers.forEach(({ trigger, marks }) => {
-                        const sameTrigger = groupedTriggers.find(item => item.regionId === regionId && isEqual(item.config, trigger));
-                        if (sameTrigger) {
-                            sameTrigger.trigger.marks.push(...marks);
+                        const interactionId = `${regionId}-${trigger.type}`;
+                        if (mergedTriggersMarks[interactionId]) {
+                            marks.forEach(m => {
+                                mergedTriggersMarks[interactionId].marks.push(m);
+                            });
                         }
                         else {
-                            const mergedTrigger = Object.assign(Object.assign({}, trigger), { marks: [...marks] });
-                            groupedTriggers.push({
-                                regionId,
-                                config: Object.assign({}, trigger),
-                                trigger: mergedTrigger
-                            });
-                            mergedTriggers.push(mergedTrigger);
+                            mergedTriggersMarks[interactionId] = Object.assign(Object.assign({}, trigger), { marks });
+                            mergedTriggers.push(mergedTriggersMarks[interactionId]);
                         }
                     });
                 }
@@ -73685,7 +73682,7 @@
                 const fieldsX = this._fieldX;
                 this._data.setTransform([
                     {
-                        type: 'sampling',
+                        type: 'dataSampling',
                         size: this._direction === "horizontal" ? height : width,
                         factor: this._spec.samplingFactor,
                         yfield: this._direction === "horizontal" ? fieldsX[0] : fieldsY[0],
@@ -74016,6 +74013,10 @@
             if (this._symbolMark.getProduct()) {
                 this._symbolMark.compileEncode();
             }
+            if (this._isGeoCoordinateSeries()) {
+                this._updateSymbolGraphicPosition();
+                this._refreshLabelComponent(true, true);
+            }
         }
         initLabelMarkStyle(labelMark) {
             if (!labelMark) {
@@ -74063,6 +74064,38 @@
             }
             return labelGraphic;
         }
+        _isGeoCoordinateSeries() {
+            var _a, _b;
+            return ((_b = (_a = this.getXAxisHelper()) === null || _a === void 0 ? void 0 : _a.getAxisType) === null || _b === void 0 ? void 0 : _b.call(_a)) === ComponentTypeEnum.geoCoordinate;
+        }
+        _refreshLabelComponent(resetPostMatrix = false, disableAnimation = false) {
+            var _a, _b;
+            const vgrammarLabel = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+            const labelGraphic = (_b = vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.getComponent) === null || _b === void 0 ? void 0 : _b.call(vgrammarLabel);
+            if (resetPostMatrix) {
+                if (labelGraphic === null || labelGraphic === void 0 ? void 0 : labelGraphic.attribute.postMatrix) {
+                    labelGraphic.setAttributes({
+                        postMatrix: new Matrix()
+                    });
+                }
+            }
+            if (disableAnimation && (labelGraphic === null || labelGraphic === void 0 ? void 0 : labelGraphic.disableAnimation)) {
+                labelGraphic.disableAnimation();
+                if (!this._enableLabelAnimationHook) {
+                    this._enableLabelAnimationHook = () => {
+                        var _a, _b, _c, _d;
+                        const currentLabelGraphic = (_c = (_b = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent()) === null || _b === void 0 ? void 0 : _b.getComponent) === null || _c === void 0 ? void 0 : _c.call(_b);
+                        (_d = currentLabelGraphic === null || currentLabelGraphic === void 0 ? void 0 : currentLabelGraphic.enableAnimation) === null || _d === void 0 ? void 0 : _d.call(currentLabelGraphic);
+                        this.event.off(HOOK_EVENT.AFTER_MARK_RENDER_END, this._enableLabelAnimationHook);
+                        this._enableLabelAnimationHook = undefined;
+                    };
+                    this.event.on(HOOK_EVENT.AFTER_MARK_RENDER_END, this._enableLabelAnimationHook);
+                }
+            }
+            if (vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.getProduct()) {
+                vgrammarLabel.renderInner();
+            }
+        }
         handleZoom(e) {
             const { scale, scaleCenter } = e;
             if (scale === 1) {
@@ -74086,7 +74119,7 @@
             }
         }
         onLayoutEnd() {
-            var _a, _b, _c;
+            var _a, _b;
             super.onLayoutEnd();
             this._updateSymbolGraphicPosition();
             const labelGraphic = (_b = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent()) === null || _b === void 0 ? void 0 : _b.getComponent();
@@ -74095,10 +74128,7 @@
                     postMatrix: new Matrix()
                 });
             }
-            const vgrammarLabel = (_c = this._labelMark) === null || _c === void 0 ? void 0 : _c.getComponent();
-            if (vgrammarLabel) {
-                vgrammarLabel.renderInner();
-            }
+            this._refreshLabelComponent();
         }
         getDefaultShapeType() {
             return 'circle';
@@ -93845,17 +93875,16 @@
 
     class RadarChartSpecTransformer extends RoseLikeChartSpecTransformer {
         _getDefaultSeriesSpec(spec) {
-            var _a, _b, _c, _d;
+            var _a;
             const series = super._getDefaultSeriesSpec(spec);
-            const areaTheme = (_b = (_a = this._option).getTheme) === null || _b === void 0 ? void 0 : _b.call(_a, 'series', 'radar', 'area');
             series.line = spec.line;
             series.point = spec.point;
             series.stack = spec.stack;
             series.percent = spec.percent;
             series.area = mergeSpec({
-                visible: (_c = areaTheme === null || areaTheme === void 0 ? void 0 : areaTheme.visible) !== null && _c !== void 0 ? _c : false
+                visible: false
             }, spec.area);
-            series.seriesMark = (_d = spec.seriesMark) !== null && _d !== void 0 ? _d : 'area';
+            series.seriesMark = (_a = spec.seriesMark) !== null && _a !== void 0 ? _a : 'area';
             series.activePoint = spec.activePoint;
             series.pointDis = spec.pointDis;
             series.pointDisMul = spec.pointDisMul;
@@ -101680,23 +101709,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 +101736,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 +101752,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 +101796,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() {
@@ -106365,7 +106385,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             const { interaction, state } = this.options;
             const statedGraphics = interaction.getStatedGraphics(this);
             const g = graphic !== null && graphic !== void 0 ? graphic : statedGraphics === null || statedGraphics === void 0 ? void 0 : statedGraphics[0];
-            if (g && (statedGraphics === null || statedGraphics === void 0 ? void 0 : statedGraphics.includes(g))) {
+            if (g && statedGraphics.includes(g)) {
                 g.removeState(state);
                 interaction.setStatedGraphics(this, statedGraphics.filter(sg => sg !== g));
             }