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

package/build/index.js

@@ -53666,27 +53666,27 @@
         }
         return spec;
     }
-    function functionTransform(spec, VChart) {
-        if (!spec) {
-            return spec;
+    function functionTransform(value, registry) {
+        var _a;
+        if (!value) {
+            return value;
         }
-        if (isPlainObject$1(spec)) {
+        if (isString$1(value)) {
+            return (_a = registry.getFunction(value)) !== null && _a !== void 0 ? _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) {
+                if (Object.prototype.hasOwnProperty.call(value, key)) {
+                    result[key] = functionTransform(value[key], registry);
                 }
             }
             return result;
         }
-        if (isArray$1(spec)) {
-            return spec.map((s) => functionTransform(s, VChart));
+        if (isArray$1(value)) {
+            return value.map(item => functionTransform(item, registry));
         }
-        return spec;
+        return value;
     }
     function transformFunctionAttribute(att, ...args) {
         if (isFunction$1(att)) {
@@ -55404,6 +55404,33 @@
         updateLayoutTag() {
             this._layoutState = LayoutState.before;
         }
+        _isGeoRegionRoamDragEnabled() {
+            var _a, _b;
+            const chartSpec = (_b = (_a = this._compileChart) === null || _a === void 0 ? void 0 : _a.getSpec) === null || _b === void 0 ? void 0 : _b.call(_a);
+            const regions = chartSpec === null || chartSpec === void 0 ? void 0 : chartSpec.region;
+            if (!isArray$1(regions)) {
+                return false;
+            }
+            return regions.some((region) => {
+                var _a;
+                if ((region === null || region === void 0 ? void 0 : region.coordinate) !== 'geo' || !region.roam) {
+                    return false;
+                }
+                if (region.roam === true) {
+                    return true;
+                }
+                return (_a = region.roam.drag) !== null && _a !== void 0 ? _a : true;
+            });
+        }
+        _shouldDisableCanvasTouchAction() {
+            if (!isTrueBrowser(this._option.mode)) {
+                return false;
+            }
+            const supportsTouchEvents = isValid$1(this._option.supportsTouchEvents)
+                ? this._option.supportsTouchEvents
+                : vglobal.supportsTouchEvents;
+            return supportsTouchEvents === false && this._isGeoRegionRoamDragEnabled();
+        }
         _setCanvasStyle() {
             if (!this._stage) {
                 return;
@@ -55414,6 +55441,7 @@
                 const canvas = this.getCanvas();
                 if (canvas) {
                     canvas.style.display = 'block';
+                    canvas.style.touchAction = this._shouldDisableCanvasTouchAction() ? 'none' : '';
                 }
             }
         }
@@ -55432,6 +55460,7 @@
                 this._cachedMarks = null;
             }
             chart.compile();
+            this._setCanvasStyle();
             chart.afterCompile();
         }
         clearNextRender() {
@@ -60870,6 +60899,7 @@
                 }
                 let theme = this._currentTheme;
                 keys.forEach((key, index) => {
+                    var _a;
                     if (index === 1 && (keys[0] === 'series' || keys[0] === 'component')) {
                         const buildInTheme = keys[0] === 'series' ? Factory.getSeriesBuiltInTheme(key) : Factory.getComponentBuiltInTheme(key);
                         theme = theme ? mergeSpec({}, buildInTheme, theme[key]) : buildInTheme;
@@ -60881,6 +60911,9 @@
                         theme = preprocessTheme({
                             [key]: theme
                         }, this._currentTheme.colorScheme, this._currentTheme.token)[key];
+                        if ((_a = this.getFunctionList()) === null || _a === void 0 ? void 0 : _a.length) {
+                            theme = functionTransform(theme, this);
+                        }
                     }
                 });
                 this._cachedProcessedTheme[cacheKey] = theme;
@@ -62185,7 +62218,7 @@
         });
     };
 
-    const version = "2.0.23-alpha.5";
+    const version = "2.0.23-alpha.8";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -65400,7 +65433,7 @@
                 : null));
         }
         _runPointsEncoder(newStyles, g, attrs = {}) {
-            var _a, _b, _c;
+            var _a, _b;
             const data = g.context.data;
             const lineAttrs = [];
             const points = [];
@@ -65425,7 +65458,7 @@
                 points[index].context = (_a = this._keyGetter(datum)) !== null && _a !== void 0 ? _a : index;
             });
             if (progressive) {
-                const segments = (_c = (_b = g.attribute) === null || _b === void 0 ? void 0 : _b.segments) !== null && _c !== void 0 ? _c : [];
+                const segments = ((_b = g.attribute) === null || _b === void 0 ? void 0 : _b.segments) ? [...g.attribute.segments] : [];
                 segments.push({
                     points
                 });
@@ -70227,21 +70260,24 @@
             this._interaction = new Interaction();
             const series = this.getAllSeries();
             const mergedTriggers = [];
-            const mergedTriggersMarks = {};
+            const groupedTriggers = [];
             series.forEach(s => {
                 const triggers = s.getInteractionTriggers();
                 if (triggers && triggers.length) {
                     const regionId = s.getRegion().id;
                     triggers.forEach(({ trigger, marks }) => {
-                        const interactionId = `${regionId}-${trigger.type}`;
-                        if (mergedTriggersMarks[interactionId]) {
-                            marks.forEach(m => {
-                                mergedTriggersMarks[interactionId].marks.push(m);
-                            });
+                        const sameTrigger = groupedTriggers.find(item => item.regionId === regionId && isEqual(item.config, trigger));
+                        if (sameTrigger) {
+                            sameTrigger.trigger.marks.push(...marks);
                         }
                         else {
-                            mergedTriggersMarks[interactionId] = Object.assign(Object.assign({}, trigger), { marks });
-                            mergedTriggers.push(mergedTriggersMarks[interactionId]);
+                            const mergedTrigger = Object.assign(Object.assign({}, trigger), { marks: [...marks] });
+                            groupedTriggers.push({
+                                regionId,
+                                config: Object.assign({}, trigger),
+                                trigger: mergedTrigger
+                            });
+                            mergedTriggers.push(mergedTrigger);
                         }
                     });
                 }
@@ -73682,7 +73718,7 @@
                 const fieldsX = this._fieldX;
                 this._data.setTransform([
                     {
-                        type: 'dataSampling',
+                        type: 'sampling',
                         size: this._direction === "horizontal" ? height : width,
                         factor: this._spec.samplingFactor,
                         yfield: this._direction === "horizontal" ? fieldsX[0] : fieldsY[0],
@@ -74013,10 +74049,6 @@
             if (this._symbolMark.getProduct()) {
                 this._symbolMark.compileEncode();
             }
-            if (this._isGeoCoordinateSeries()) {
-                this._updateSymbolGraphicPosition();
-                this._refreshLabelComponent(true, true);
-            }
         }
         initLabelMarkStyle(labelMark) {
             if (!labelMark) {
@@ -74064,38 +74096,6 @@
             }
             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) {
@@ -74119,7 +74119,7 @@
             }
         }
         onLayoutEnd() {
-            var _a, _b;
+            var _a, _b, _c;
             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();
@@ -74128,7 +74128,10 @@
                     postMatrix: new Matrix()
                 });
             }
-            this._refreshLabelComponent();
+            const vgrammarLabel = (_c = this._labelMark) === null || _c === void 0 ? void 0 : _c.getComponent();
+            if (vgrammarLabel) {
+                vgrammarLabel.renderInner();
+            }
         }
         getDefaultShapeType() {
             return 'circle';
@@ -76554,6 +76557,17 @@
                 bandPosition: this._bandPosition
             }));
         }
+        _isCategoryAxisInverse() {
+            var _a, _b, _c, _e;
+            return this._direction === "horizontal"
+                ? (_b = (_a = this._yAxisHelper) === null || _a === void 0 ? void 0 : _a.isInverse) === null || _b === void 0 ? void 0 : _b.call(_a)
+                : (_e = (_c = this._xAxisHelper) === null || _c === void 0 ? void 0 : _c.isInverse) === null || _e === void 0 ? void 0 : _e.call(_c);
+        }
+        _getLeaderLineCategoryPos(isStart, isDecrease) {
+            const inverse = !!this._isCategoryAxisInverse();
+            const normalPos = isStart ? (isDecrease ? 0 : 1) : isDecrease ? 1 : 0;
+            return inverse ? 1 - normalPos : normalPos;
+        }
         initMarkStyle() {
             super.initMarkStyle();
             const isDecrease = this._spec.calculationMode === 'decrease';
@@ -76567,9 +76581,9 @@
                             if (!datum.lastIndex) {
                                 return 0;
                             }
-                            return this.totalPositionY(datum, 'lastIndex', isDecrease ? 0 : 1);
+                            return this.totalPositionY(datum, 'lastIndex', this._getLeaderLineCategoryPos(true, isDecrease));
                         },
-                        y1: (datum) => this.totalPositionY(datum, 'index', isDecrease ? 1 : 0)
+                        y1: (datum) => this.totalPositionY(datum, 'index', this._getLeaderLineCategoryPos(false, isDecrease))
                     }, 'normal', exports.AttributeLevel.Series);
                 }
                 else {
@@ -76579,9 +76593,9 @@
                             if (!datum.lastIndex) {
                                 return 0;
                             }
-                            return this.totalPositionX(datum, 'lastIndex', isDecrease ? 0 : 1);
+                            return this.totalPositionX(datum, 'lastIndex', this._getLeaderLineCategoryPos(true, isDecrease));
                         },
-                        x1: (datum) => this.totalPositionX(datum, 'index', isDecrease ? 1 : 0),
+                        x1: (datum) => this.totalPositionX(datum, 'index', this._getLeaderLineCategoryPos(false, isDecrease)),
                         y: (datum) => this.totalPositionY(datum, 'lastEnd', 0),
                         y1: (datum) => this.totalPositionY(datum, datum.isTotal ? 'end' : 'start', 0)
                     }, 'normal', exports.AttributeLevel.Series);
@@ -79934,14 +79948,11 @@
                     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;
+                            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() * ((_a = this._spec.innerRadius) !== null && _a !== void 0 ? _a : 0)
-                            : stackStart;
+                        return stackStart <= Number.MIN_VALUE ? this._computeLayoutRadius() * this._innerRadius : stackStart;
                     }
                 });
             }
@@ -79967,7 +79978,7 @@
             const appearPreset = (_b = (_a = this._spec) === null || _a === void 0 ? void 0 : _a.animationAppear) === null || _b === void 0 ? void 0 : _b.preset;
             if (this._roseMark) {
                 const animationParams = {
-                    innerRadius: () => { var _a; return this._computeLayoutRadius() * ((_a = this._spec.innerRadius) !== null && _a !== void 0 ? _a : 0); }
+                    innerRadius: () => this._computeLayoutRadius() * this._innerRadius
                 };
                 this._roseMark.setAnimationConfig(animationConfig((_c = Factory.getAnimationInKey('rose')) === null || _c === void 0 ? void 0 : _c(animationParams, appearPreset), userAnimationConfig("rose", this._spec, this._markAttributeContext)));
             }
@@ -93875,16 +93886,17 @@
 
     class RadarChartSpecTransformer extends RoseLikeChartSpecTransformer {
         _getDefaultSeriesSpec(spec) {
-            var _a;
+            var _a, _b, _c, _d;
             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: false
+                visible: (_c = areaTheme === null || areaTheme === void 0 ? void 0 : areaTheme.visible) !== null && _c !== void 0 ? _c : false
             }, spec.area);
-            series.seriesMark = (_a = spec.seriesMark) !== null && _a !== void 0 ? _a : 'area';
+            series.seriesMark = (_d = spec.seriesMark) !== null && _d !== void 0 ? _d : 'area';
             series.activePoint = spec.activePoint;
             series.pointDis = spec.pointDis;
             series.pointDisMul = spec.pointDisMul;
@@ -95644,6 +95656,7 @@
         }
         clear() {
             super.clear();
+            this._legendComponent = null;
             this._cacheAttrs = null;
             this._preSelectedData = null;
         }
@@ -106385,7 +106398,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.includes(g)) {
+            if (g && (statedGraphics === null || statedGraphics === void 0 ? void 0 : statedGraphics.includes(g))) {
                 g.removeState(state);
                 interaction.setStatedGraphics(this, statedGraphics.filter(sg => sg !== g));
             }