@visactor/vchart 2.0.22-alpha.3 → 2.0.22

package/build/index.es.js

@@ -60939,7 +60939,7 @@ class VChart {
         this._compiler.updateLayoutTag();
         this._setFontFamilyTheme(this.getTheme('fontFamily'));
         this._initDataSet(this._option.dataSet);
-        this._autoSize = isTrueBrowseEnv ? (_g = (_f = spec.autoFit) !== null && _f !== void 0 ? _f : this._option.autoFit) !== null && _g !== void 0 ? _g : true : false;
+        this._autoSize = isTrueBrowseEnv ? ((_g = (_f = spec.autoFit) !== null && _f !== void 0 ? _f : this._option.autoFit) !== null && _g !== void 0 ? _g : true) : false;
         this._bindResizeEvent();
         this._bindViewEvent();
         this._initChartPlugin();
@@ -61124,7 +61124,7 @@ class VChart {
             (_b = this._compiler) === null || _b === void 0 ? void 0 : _b.setBackground(this._getBackground());
         }
         if (updateResult.reMake) {
-            (_c = this._compiler) === null || _c === void 0 ? void 0 : _c.releaseGrammar();
+            (_c = this._compiler) === null || _c === void 0 ? void 0 : _c.releaseGrammar(true);
             this._userEvents.forEach(e => { var _a; return (_a = this._event) === null || _a === void 0 ? void 0 : _a.on(e.eType, e.query, e.handler); });
         }
         else if (updateResult.reCompile) {
@@ -61589,7 +61589,7 @@ class VChart {
             resize = true;
         }
         const lasAutoSize = this._autoSize;
-        this._autoSize = isTrueBrowser(this._option.mode) ? (_b = (_a = this._spec.autoFit) !== null && _a !== void 0 ? _a : this._option.autoFit) !== null && _b !== void 0 ? _b : true : false;
+        this._autoSize = isTrueBrowser(this._option.mode) ? ((_b = (_a = this._spec.autoFit) !== null && _a !== void 0 ? _a : this._option.autoFit) !== null && _b !== void 0 ? _b : true) : false;
         if (this._autoSize !== lasAutoSize) {
             resize = true;
         }
@@ -61784,9 +61784,10 @@ class VChart {
         (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setLayout(layout);
     }
     reLayout() {
-        var _a;
-        this._chart.resetLayoutItemTag();
-        (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setLayoutTag(true);
+        var _a, _b, _c;
+        (_a = this._chart) === null || _a === void 0 ? void 0 : _a.resetLayoutItemTag();
+        (_b = this._chart) === null || _b === void 0 ? void 0 : _b.setLayoutTag(true, null, false);
+        (_c = this._compiler) === null || _c === void 0 ? void 0 : _c.render();
     }
     getCompiler() {
         return this._compiler;
@@ -62055,8 +62056,9 @@ class VChart {
         ]);
     }
     _reSetRenderState() {
+        var _a, _b;
         this._renderState = RenderStateEnum.render;
-        this.getStage().eventSystem.resumeTriggerEvent();
+        (_b = (_a = this.getStage()) === null || _a === void 0 ? void 0 : _a.eventSystem) === null || _b === void 0 ? void 0 : _b.resumeTriggerEvent();
     }
 }
 VChart.InstanceManager = InstanceManager;
@@ -62174,7 +62176,7 @@ const lookup = (data, opt) => {
     });
 };
 
-const version = "2.0.21";
+const version = "2.0.22";
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();
@@ -73420,13 +73422,20 @@ class BarSeries extends CartesianSeries {
         }
         const xScale = (_b = (_a = this._xAxisHelper) === null || _a === void 0 ? void 0 : _a.getScale) === null || _b === void 0 ? void 0 : _b.call(_a, 0);
         const yScale = (_d = (_c = this._yAxisHelper) === null || _c === void 0 ? void 0 : _c.getScale) === null || _d === void 0 ? void 0 : _d.call(_c, 0);
+        const isVertical = this.direction === "vertical";
         this._barMark.setMarkConfig({
             clip: true,
             clipPath: () => {
+                const usePreCalculatedRect = !!this._shouldDoPreCalculate();
+                if (usePreCalculatedRect) {
+                    this._calculateStackRectPosition(isVertical);
+                }
                 const rectPaths = [];
                 this._forEachStackGroup(node => {
                     let min = Infinity;
                     let max = -Infinity;
+                    let rectMin = Infinity;
+                    let rectMax = -Infinity;
                     let hasPercent = false;
                     let minPercent = Infinity;
                     let maxPercent = -Infinity;
@@ -73437,6 +73446,12 @@ class BarSeries extends CartesianSeries {
                         const endPercent = datum[STACK_FIELD_END_PERCENT];
                         min = Math.min(min, start, end);
                         max = Math.max(max, start, end);
+                        if (usePreCalculatedRect) {
+                            const rectStart = datum[isVertical ? RECT_Y : RECT_X];
+                            const rectEnd = datum[isVertical ? RECT_Y1 : RECT_X1];
+                            rectMin = Math.min(rectMin, rectStart, rectEnd);
+                            rectMax = Math.max(rectMax, rectStart, rectEnd);
+                        }
                         if (isValid$1(startPercent) && isValid$1(endPercent)) {
                             hasPercent = true;
                             minPercent = Math.min(minPercent, startPercent, endPercent);
@@ -73451,14 +73466,14 @@ class BarSeries extends CartesianSeries {
                         : undefined));
                     const rectAttr = this.direction === "horizontal"
                         ? {
-                            x: this._getBarXStart(mockDatum, xScale),
-                            x1: this._getBarXEnd(mockDatum, xScale),
+                            x: usePreCalculatedRect ? rectMin : this._getBarXStart(mockDatum, xScale),
+                            x1: usePreCalculatedRect ? rectMax : this._getBarXEnd(mockDatum, xScale),
                             y: this._getPosition(this.direction, mockDatum),
                             height: this._getBarWidth(this._yAxisHelper)
                         }
                         : {
-                            y: this._getBarYStart(mockDatum, yScale),
-                            y1: this._getBarYEnd(mockDatum, yScale),
+                            y: usePreCalculatedRect ? rectMin : this._getBarYStart(mockDatum, yScale),
+                            y1: usePreCalculatedRect ? rectMax : this._getBarYEnd(mockDatum, yScale),
                             x: this._getPosition(this.direction, mockDatum),
                             width: this._getBarWidth(this._xAxisHelper)
                         };
@@ -74009,7 +74024,7 @@ class ScatterSeries extends CartesianSeries {
         }
     }
     handleZoom(e) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         this.getMarksWithoutRoot().forEach(mark => {
             if (!mark) {
                 return;
@@ -74027,10 +74042,23 @@ class ScatterSeries extends CartesianSeries {
                 }
             });
         });
-        const vgrammarLabel = (_b = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent()) === null || _b === void 0 ? void 0 : _b.getProduct();
-        if (vgrammarLabel) {
+        const labelComponent = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+        if (labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.renderInner) {
+            labelComponent.renderInner();
+        }
+        const vgrammarLabel = (_b = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getComponent) === null || _b === void 0 ? void 0 : _b.call(labelComponent);
+        if (vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.evaluate) {
             vgrammarLabel.evaluate(null, null);
         }
+        const labelGroup = (_c = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getProduct) === null || _c === void 0 ? void 0 : _c.call(labelComponent);
+        if (labelGroup && (e === null || e === void 0 ? void 0 : e.scale) && (e === null || e === void 0 ? void 0 : e.scaleCenter)) {
+            if (!((_d = labelGroup.attribute) === null || _d === void 0 ? void 0 : _d.postMatrix)) {
+                labelGroup.setAttributes({
+                    postMatrix: new Matrix()
+                });
+            }
+            labelGroup.scale(e.scale, e.scale, e.scaleCenter);
+        }
     }
     handlePan(e) {
         this.handleZoom(e);
@@ -75292,7 +75320,7 @@ class MapSeries extends GeoSeries {
         this._mapViewData = null;
     }
     handleZoom(e) {
-        var _a;
+        var _a, _b, _c, _d;
         const { scale, scaleCenter } = e;
         if (scale === 1) {
             return;
@@ -75306,13 +75334,26 @@ class MapSeries extends GeoSeries {
             }
             pathGroup.scale(scale, scale, scaleCenter);
         }
-        const vgrammarLabel = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
-        if (vgrammarLabel) {
-            vgrammarLabel.renderInner();
+        const labelComponent = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+        if (labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.renderInner) {
+            labelComponent.renderInner();
+        }
+        const vgrammarLabel = (_b = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getComponent) === null || _b === void 0 ? void 0 : _b.call(labelComponent);
+        if (vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.evaluate) {
+            vgrammarLabel.evaluate(null, null);
+        }
+        const labelGroup = (_c = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getProduct) === null || _c === void 0 ? void 0 : _c.call(labelComponent);
+        if (labelGroup && scale && scaleCenter) {
+            if (!((_d = labelGroup.attribute) === null || _d === void 0 ? void 0 : _d.postMatrix)) {
+                labelGroup.setAttributes({
+                    postMatrix: new Matrix()
+                });
+            }
+            labelGroup.scale(scale, scale, scaleCenter);
         }
     }
     handlePan(e) {
-        var _a;
+        var _a, _b, _c, _d;
         const { delta } = e;
         if (delta[0] === 0 && delta[1] === 0) {
             return;
@@ -75326,9 +75367,22 @@ class MapSeries extends GeoSeries {
             }
             pathGroup.translate(delta[0], delta[1]);
         }
-        const vgrammarLabel = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
-        if (vgrammarLabel) {
-            vgrammarLabel.renderInner();
+        const labelComponent = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+        if (labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.renderInner) {
+            labelComponent.renderInner();
+        }
+        const vgrammarLabel = (_b = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getComponent) === null || _b === void 0 ? void 0 : _b.call(labelComponent);
+        if (vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.evaluate) {
+            vgrammarLabel.evaluate(null, null);
+        }
+        const labelGroup = (_c = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getProduct) === null || _c === void 0 ? void 0 : _c.call(labelComponent);
+        if (labelGroup && delta) {
+            if (!((_d = labelGroup.attribute) === null || _d === void 0 ? void 0 : _d.postMatrix)) {
+                labelGroup.setAttributes({
+                    postMatrix: new Matrix()
+                });
+            }
+            labelGroup.translate(delta[0], delta[1]);
         }
     }
     getDatumCenter(datum) {
@@ -89376,7 +89430,7 @@ class SankeySeriesTooltipHelper extends BaseSeriesTooltipHelper {
     constructor() {
         super(...arguments);
         this._getDimensionData = (datum) => {
-            if (datum.source) {
+            if (!isNil$1(datum === null || datum === void 0 ? void 0 : datum.source) && !isNil$1(datum === null || datum === void 0 ? void 0 : datum.target)) {
                 if (isNumber$1(datum.source)) {
                     const seriesKeys = this.series.getSeriesKeys();
                     return seriesKeys[datum.source] + ' => ' + seriesKeys[datum.target];
@@ -96603,19 +96657,31 @@ const getMarkInfoList = (datum, region) => {
 const isMarkInfo = (info) => isValid$1(info) && !isArray$1(info);
 const isDimensionInfo = (info) => isValid$1(info) && isArray$1(info);
 
+const TOOLTIP_STYLE_THEME_KEYS = [
+    'panel',
+    'shape',
+    'titleLabel',
+    'keyLabel',
+    'valueLabel',
+    'spaceRow',
+    'maxContentHeight',
+    'align'
+];
 class TooltipSpecTransformer extends BaseComponentSpecTransformer {
     _shouldMergeThemeToSpec() {
         return false;
     }
     _initTheme(spec, chartSpec) {
-        var _a, _b, _c;
         const { spec: newSpec, theme } = super._initTheme(spec, chartSpec);
-        newSpec.style = mergeSpec({}, this._theme, newSpec.style);
-        newSpec.offset = mergeSpec({}, theme.offset, spec.offset);
-        newSpec.transitionDuration = (_a = spec.transitionDuration) !== null && _a !== void 0 ? _a : theme.transitionDuration;
-        newSpec.trigger = (_b = spec.trigger) !== null && _b !== void 0 ? _b : theme.trigger;
-        newSpec.triggerOff = (_c = spec.triggerOff) !== null && _c !== void 0 ? _c : theme.triggerOff;
-        return { spec: newSpec, theme };
+        const themeStyle = mergeSpec({}, ...TOOLTIP_STYLE_THEME_KEYS.map(key => ((theme === null || theme === void 0 ? void 0 : theme[key]) !== undefined ? { [key]: theme[key] } : undefined)), theme === null || theme === void 0 ? void 0 : theme.style);
+        const themeSpec = mergeSpec({}, theme);
+        TOOLTIP_STYLE_THEME_KEYS.forEach(key => {
+            delete themeSpec[key];
+        });
+        delete themeSpec.style;
+        const mergedSpec = mergeSpec({}, themeSpec, newSpec);
+        mergedSpec.style = mergeSpec({}, themeStyle, mergedSpec.style);
+        return { spec: mergedSpec, theme };
     }
     _transformSpecAfterMergingTheme(spec, chartSpec, chartSpecInfo) {
         var _a, _b, _c, _d, _e, _f, _g;

package/build/index.js

@@ -60945,7 +60945,7 @@
             this._compiler.updateLayoutTag();
             this._setFontFamilyTheme(this.getTheme('fontFamily'));
             this._initDataSet(this._option.dataSet);
-            this._autoSize = isTrueBrowseEnv ? (_g = (_f = spec.autoFit) !== null && _f !== void 0 ? _f : this._option.autoFit) !== null && _g !== void 0 ? _g : true : false;
+            this._autoSize = isTrueBrowseEnv ? ((_g = (_f = spec.autoFit) !== null && _f !== void 0 ? _f : this._option.autoFit) !== null && _g !== void 0 ? _g : true) : false;
             this._bindResizeEvent();
             this._bindViewEvent();
             this._initChartPlugin();
@@ -61130,7 +61130,7 @@
                 (_b = this._compiler) === null || _b === void 0 ? void 0 : _b.setBackground(this._getBackground());
             }
             if (updateResult.reMake) {
-                (_c = this._compiler) === null || _c === void 0 ? void 0 : _c.releaseGrammar();
+                (_c = this._compiler) === null || _c === void 0 ? void 0 : _c.releaseGrammar(true);
                 this._userEvents.forEach(e => { var _a; return (_a = this._event) === null || _a === void 0 ? void 0 : _a.on(e.eType, e.query, e.handler); });
             }
             else if (updateResult.reCompile) {
@@ -61595,7 +61595,7 @@
                 resize = true;
             }
             const lasAutoSize = this._autoSize;
-            this._autoSize = isTrueBrowser(this._option.mode) ? (_b = (_a = this._spec.autoFit) !== null && _a !== void 0 ? _a : this._option.autoFit) !== null && _b !== void 0 ? _b : true : false;
+            this._autoSize = isTrueBrowser(this._option.mode) ? ((_b = (_a = this._spec.autoFit) !== null && _a !== void 0 ? _a : this._option.autoFit) !== null && _b !== void 0 ? _b : true) : false;
             if (this._autoSize !== lasAutoSize) {
                 resize = true;
             }
@@ -61790,9 +61790,10 @@
             (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setLayout(layout);
         }
         reLayout() {
-            var _a;
-            this._chart.resetLayoutItemTag();
-            (_a = this._chart) === null || _a === void 0 ? void 0 : _a.setLayoutTag(true);
+            var _a, _b, _c;
+            (_a = this._chart) === null || _a === void 0 ? void 0 : _a.resetLayoutItemTag();
+            (_b = this._chart) === null || _b === void 0 ? void 0 : _b.setLayoutTag(true, null, false);
+            (_c = this._compiler) === null || _c === void 0 ? void 0 : _c.render();
         }
         getCompiler() {
             return this._compiler;
@@ -62061,8 +62062,9 @@
             ]);
         }
         _reSetRenderState() {
+            var _a, _b;
             this._renderState = RenderStateEnum.render;
-            this.getStage().eventSystem.resumeTriggerEvent();
+            (_b = (_a = this.getStage()) === null || _a === void 0 ? void 0 : _a.eventSystem) === null || _b === void 0 ? void 0 : _b.resumeTriggerEvent();
         }
     }
     VChart.InstanceManager = InstanceManager;
@@ -62180,7 +62182,7 @@
         });
     };
 
-    const version = "2.0.21";
+    const version = "2.0.22";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -73426,13 +73428,20 @@
             }
             const xScale = (_b = (_a = this._xAxisHelper) === null || _a === void 0 ? void 0 : _a.getScale) === null || _b === void 0 ? void 0 : _b.call(_a, 0);
             const yScale = (_d = (_c = this._yAxisHelper) === null || _c === void 0 ? void 0 : _c.getScale) === null || _d === void 0 ? void 0 : _d.call(_c, 0);
+            const isVertical = this.direction === "vertical";
             this._barMark.setMarkConfig({
                 clip: true,
                 clipPath: () => {
+                    const usePreCalculatedRect = !!this._shouldDoPreCalculate();
+                    if (usePreCalculatedRect) {
+                        this._calculateStackRectPosition(isVertical);
+                    }
                     const rectPaths = [];
                     this._forEachStackGroup(node => {
                         let min = Infinity;
                         let max = -Infinity;
+                        let rectMin = Infinity;
+                        let rectMax = -Infinity;
                         let hasPercent = false;
                         let minPercent = Infinity;
                         let maxPercent = -Infinity;
@@ -73443,6 +73452,12 @@
                             const endPercent = datum[STACK_FIELD_END_PERCENT];
                             min = Math.min(min, start, end);
                             max = Math.max(max, start, end);
+                            if (usePreCalculatedRect) {
+                                const rectStart = datum[isVertical ? RECT_Y : RECT_X];
+                                const rectEnd = datum[isVertical ? RECT_Y1 : RECT_X1];
+                                rectMin = Math.min(rectMin, rectStart, rectEnd);
+                                rectMax = Math.max(rectMax, rectStart, rectEnd);
+                            }
                             if (isValid$1(startPercent) && isValid$1(endPercent)) {
                                 hasPercent = true;
                                 minPercent = Math.min(minPercent, startPercent, endPercent);
@@ -73457,14 +73472,14 @@
                             : undefined));
                         const rectAttr = this.direction === "horizontal"
                             ? {
-                                x: this._getBarXStart(mockDatum, xScale),
-                                x1: this._getBarXEnd(mockDatum, xScale),
+                                x: usePreCalculatedRect ? rectMin : this._getBarXStart(mockDatum, xScale),
+                                x1: usePreCalculatedRect ? rectMax : this._getBarXEnd(mockDatum, xScale),
                                 y: this._getPosition(this.direction, mockDatum),
                                 height: this._getBarWidth(this._yAxisHelper)
                             }
                             : {
-                                y: this._getBarYStart(mockDatum, yScale),
-                                y1: this._getBarYEnd(mockDatum, yScale),
+                                y: usePreCalculatedRect ? rectMin : this._getBarYStart(mockDatum, yScale),
+                                y1: usePreCalculatedRect ? rectMax : this._getBarYEnd(mockDatum, yScale),
                                 x: this._getPosition(this.direction, mockDatum),
                                 width: this._getBarWidth(this._xAxisHelper)
                             };
@@ -74015,7 +74030,7 @@
             }
         }
         handleZoom(e) {
-            var _a, _b;
+            var _a, _b, _c, _d;
             this.getMarksWithoutRoot().forEach(mark => {
                 if (!mark) {
                     return;
@@ -74033,10 +74048,23 @@
                     }
                 });
             });
-            const vgrammarLabel = (_b = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent()) === null || _b === void 0 ? void 0 : _b.getProduct();
-            if (vgrammarLabel) {
+            const labelComponent = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+            if (labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.renderInner) {
+                labelComponent.renderInner();
+            }
+            const vgrammarLabel = (_b = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getComponent) === null || _b === void 0 ? void 0 : _b.call(labelComponent);
+            if (vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.evaluate) {
                 vgrammarLabel.evaluate(null, null);
             }
+            const labelGroup = (_c = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getProduct) === null || _c === void 0 ? void 0 : _c.call(labelComponent);
+            if (labelGroup && (e === null || e === void 0 ? void 0 : e.scale) && (e === null || e === void 0 ? void 0 : e.scaleCenter)) {
+                if (!((_d = labelGroup.attribute) === null || _d === void 0 ? void 0 : _d.postMatrix)) {
+                    labelGroup.setAttributes({
+                        postMatrix: new Matrix()
+                    });
+                }
+                labelGroup.scale(e.scale, e.scale, e.scaleCenter);
+            }
         }
         handlePan(e) {
             this.handleZoom(e);
@@ -75298,7 +75326,7 @@
             this._mapViewData = null;
         }
         handleZoom(e) {
-            var _a;
+            var _a, _b, _c, _d;
             const { scale, scaleCenter } = e;
             if (scale === 1) {
                 return;
@@ -75312,13 +75340,26 @@
                 }
                 pathGroup.scale(scale, scale, scaleCenter);
             }
-            const vgrammarLabel = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
-            if (vgrammarLabel) {
-                vgrammarLabel.renderInner();
+            const labelComponent = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+            if (labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.renderInner) {
+                labelComponent.renderInner();
+            }
+            const vgrammarLabel = (_b = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getComponent) === null || _b === void 0 ? void 0 : _b.call(labelComponent);
+            if (vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.evaluate) {
+                vgrammarLabel.evaluate(null, null);
+            }
+            const labelGroup = (_c = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getProduct) === null || _c === void 0 ? void 0 : _c.call(labelComponent);
+            if (labelGroup && scale && scaleCenter) {
+                if (!((_d = labelGroup.attribute) === null || _d === void 0 ? void 0 : _d.postMatrix)) {
+                    labelGroup.setAttributes({
+                        postMatrix: new Matrix()
+                    });
+                }
+                labelGroup.scale(scale, scale, scaleCenter);
             }
         }
         handlePan(e) {
-            var _a;
+            var _a, _b, _c, _d;
             const { delta } = e;
             if (delta[0] === 0 && delta[1] === 0) {
                 return;
@@ -75332,9 +75373,22 @@
                 }
                 pathGroup.translate(delta[0], delta[1]);
             }
-            const vgrammarLabel = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
-            if (vgrammarLabel) {
-                vgrammarLabel.renderInner();
+            const labelComponent = (_a = this._labelMark) === null || _a === void 0 ? void 0 : _a.getComponent();
+            if (labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.renderInner) {
+                labelComponent.renderInner();
+            }
+            const vgrammarLabel = (_b = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getComponent) === null || _b === void 0 ? void 0 : _b.call(labelComponent);
+            if (vgrammarLabel === null || vgrammarLabel === void 0 ? void 0 : vgrammarLabel.evaluate) {
+                vgrammarLabel.evaluate(null, null);
+            }
+            const labelGroup = (_c = labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.getProduct) === null || _c === void 0 ? void 0 : _c.call(labelComponent);
+            if (labelGroup && delta) {
+                if (!((_d = labelGroup.attribute) === null || _d === void 0 ? void 0 : _d.postMatrix)) {
+                    labelGroup.setAttributes({
+                        postMatrix: new Matrix()
+                    });
+                }
+                labelGroup.translate(delta[0], delta[1]);
             }
         }
         getDatumCenter(datum) {
@@ -89382,7 +89436,7 @@
         constructor() {
             super(...arguments);
             this._getDimensionData = (datum) => {
-                if (datum.source) {
+                if (!isNil$1(datum === null || datum === void 0 ? void 0 : datum.source) && !isNil$1(datum === null || datum === void 0 ? void 0 : datum.target)) {
                     if (isNumber$1(datum.source)) {
                         const seriesKeys = this.series.getSeriesKeys();
                         return seriesKeys[datum.source] + ' => ' + seriesKeys[datum.target];
@@ -96609,19 +96663,31 @@
     const isMarkInfo = (info) => isValid$1(info) && !isArray$1(info);
     const isDimensionInfo = (info) => isValid$1(info) && isArray$1(info);
 
+    const TOOLTIP_STYLE_THEME_KEYS = [
+        'panel',
+        'shape',
+        'titleLabel',
+        'keyLabel',
+        'valueLabel',
+        'spaceRow',
+        'maxContentHeight',
+        'align'
+    ];
     class TooltipSpecTransformer extends BaseComponentSpecTransformer {
         _shouldMergeThemeToSpec() {
             return false;
         }
         _initTheme(spec, chartSpec) {
-            var _a, _b, _c;
             const { spec: newSpec, theme } = super._initTheme(spec, chartSpec);
-            newSpec.style = mergeSpec({}, this._theme, newSpec.style);
-            newSpec.offset = mergeSpec({}, theme.offset, spec.offset);
-            newSpec.transitionDuration = (_a = spec.transitionDuration) !== null && _a !== void 0 ? _a : theme.transitionDuration;
-            newSpec.trigger = (_b = spec.trigger) !== null && _b !== void 0 ? _b : theme.trigger;
-            newSpec.triggerOff = (_c = spec.triggerOff) !== null && _c !== void 0 ? _c : theme.triggerOff;
-            return { spec: newSpec, theme };
+            const themeStyle = mergeSpec({}, ...TOOLTIP_STYLE_THEME_KEYS.map(key => ((theme === null || theme === void 0 ? void 0 : theme[key]) !== undefined ? { [key]: theme[key] } : undefined)), theme === null || theme === void 0 ? void 0 : theme.style);
+            const themeSpec = mergeSpec({}, theme);
+            TOOLTIP_STYLE_THEME_KEYS.forEach(key => {
+                delete themeSpec[key];
+            });
+            delete themeSpec.style;
+            const mergedSpec = mergeSpec({}, themeSpec, newSpec);
+            mergedSpec.style = mergeSpec({}, themeStyle, mergedSpec.style);
+            return { spec: mergedSpec, theme };
         }
         _transformSpecAfterMergingTheme(spec, chartSpec, chartSpecInfo) {
             var _a, _b, _c, _d, _e, _f, _g;