@visactor/vchart 2.0.22-alpha.4 → 2.0.23-alpha.0

package/build/index.es.js

@@ -16065,6 +16065,7 @@ const GRAPHIC_UPDATE_TAG_KEY = ["lineWidth", "scaleX", "scaleY", "angle", "ancho
 const tempConstantXYKey = ["x", "y"],
   tempConstantScaleXYKey = ["scaleX", "scaleY"],
   tempConstantAngleKey = ["angle"],
+  builtinTextureTypes = new Set(["circle", "diamond", "rect", "vertical-line", "horizontal-line", "bias-lr", "bias-rl", "grid", "wave"]),
   point = new Point();
 const NOWORK_ANIMATE_ATTR = {
   strokeSeg: 1,
@@ -16121,7 +16122,7 @@ class Graphic extends Node {
   }
   constructor(params = {}) {
     var _a;
-    super(), this._AABBBounds = new AABBBounds(), this._updateTag = UpdateTag.INIT, this.attribute = params, this.valid = this.isValid(), this.updateAABBBoundsStamp = 0, params.background ? this.loadImage(null !== (_a = params.background.background) && void 0 !== _a ? _a : params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic);
+    super(), this._AABBBounds = new AABBBounds(), this._updateTag = UpdateTag.INIT, this.attribute = params, this.valid = this.isValid(), this.updateAABBBoundsStamp = 0, params.background && this.loadImage(null !== (_a = params.background.background) && void 0 !== _a ? _a : params.background, !0), isExternalTexture(params.texture) && this.loadImage(params.texture, !1), params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic);
   }
   getGraphicService() {
     var _a, _b;
@@ -16310,7 +16311,7 @@ class Graphic extends Node {
     });
   }
   setAttributes(params, forceUpdateTag = !1, context) {
-    params && ((params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params).background ? this.loadImage(params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._setAttributes(params, forceUpdateTag, context));
+    params && ((params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params).background && this.loadImage(params.background, !0), isExternalTexture(params.texture) && this.loadImage(params.texture, !1), params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._setAttributes(params, forceUpdateTag, context));
   }
   _setAttributes(params, forceUpdateTag = !1, context) {
     const keys = Object.keys(params);
@@ -16325,7 +16326,7 @@ class Graphic extends Node {
     const params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate({
       [key]: value
     }, this.attribute, key, context);
-    params ? this._setAttributes(params, forceUpdateTag, context) : isNil$1(null === (_a = this.normalAttrs) || void 0 === _a ? void 0 : _a[key]) ? (this.attribute[key] = value, this.valid = this.isValid(), this.updateShapeAndBoundsTagSetted() || !forceUpdateTag && !this.needUpdateTag(key) ? this.addUpdateBoundTag() : this.addUpdateShapeAndBoundsTag(), this.addUpdatePositionTag(), this.addUpdateLayoutTag(), this.onAttributeUpdate(context)) : this.normalAttrs[key] = value, "background" === key ? this.loadImage(value, !0) : "shadowGraphic" === key && this.setShadowGraphic(value);
+    params ? this._setAttributes(params, forceUpdateTag, context) : isNil$1(null === (_a = this.normalAttrs) || void 0 === _a ? void 0 : _a[key]) ? (this.attribute[key] = value, this.valid = this.isValid(), this.updateShapeAndBoundsTagSetted() || !forceUpdateTag && !this.needUpdateTag(key) ? this.addUpdateBoundTag() : this.addUpdateShapeAndBoundsTag(), this.addUpdatePositionTag(), this.addUpdateLayoutTag(), this.onAttributeUpdate(context)) : this.normalAttrs[key] = value, "background" === key ? this.loadImage(value, !0) : "texture" === key && isExternalTexture(value) ? this.loadImage(value, !1) : "shadowGraphic" === key && this.setShadowGraphic(value);
   }
   needUpdateTags(keys, k = GRAPHIC_UPDATE_TAG_KEY) {
     for (let i = 0; i < k.length; i++) {
@@ -16344,7 +16345,7 @@ class Graphic extends Node {
     const context = {
       type: AttributeUpdateType.INIT
     };
-    params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params, this.attribute = params, params.background ? this.loadImage(params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._updateTag = UpdateTag.INIT, this.valid = this.isValid(), this.onAttributeUpdate(context);
+    params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params, this.attribute = params, params.background && this.loadImage(params.background, !0), isExternalTexture(params.texture) && this.loadImage(params.texture, !1), params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), this._updateTag = UpdateTag.INIT, this.valid = this.isValid(), this.onAttributeUpdate(context);
   }
   translate(x, y) {
     var _a, _b;
@@ -16735,6 +16736,9 @@ class Graphic extends Node {
 function backgroundNotImage(image) {
   return "string" == typeof image ? !(image.startsWith("<svg") || isValidUrl$1(image) || image.includes("/") || isBase64$1(image)) : !(!image.fill && !image.stroke) || !("string" != typeof image.gradient || !Array.isArray(image.stops));
 }
+function isExternalTexture(texture) {
+  return !!texture && ("string" == typeof texture ? !builtinTextureTypes.has(texture) && (texture.startsWith("<svg") || isValidUrl$1(texture) || texture.includes("/") || isBase64$1(texture)) : isObject$2(texture));
+}
 Graphic.userSymbolMap = {}, Graphic.mixin(EventTarget);
 
 var GroupUpdateAABBBoundsMode;
@@ -20386,6 +20390,7 @@ class DefaultBaseClipRenderAfterContribution {
 }
 const defaultBaseClipRenderAfterContribution = new DefaultBaseClipRenderAfterContribution();
 
+const builtinProceduralTextureTypes = new Set(["circle", "diamond", "rect", "vertical-line", "horizontal-line", "bias-lr", "bias-rl", "grid"]);
 function formatRatio(ratio) {
   return ratio <= .5 ? 4 * ratio - 1 : -4 * ratio + 3;
 }
@@ -20499,38 +20504,43 @@ class DefaultBaseTextureRenderContribution {
     texture && this.drawTexture(texture, graphic, context, x, y, graphicAttribute, textureColor, textureSize, texturePadding);
   }
   drawTexture(texture, graphic, context, x, y, graphicAttribute, textureColor, textureSize, texturePadding) {
-    var _a;
+    var _a, _b, _c, _d, _e, _f;
     const {
       textureRatio = graphicAttribute.textureRatio,
       textureOptions = null
     } = graphic.attribute;
-    let pattern = this.textureMap.get(texture);
-    if (!pattern) switch (texture) {
-      case "circle":
-        pattern = this.createCirclePattern(textureSize, texturePadding, textureColor, context);
-        break;
-      case "diamond":
-        pattern = this.createDiamondPattern(textureSize, texturePadding, textureColor, context);
-        break;
-      case "rect":
-        pattern = this.createRectPattern(textureSize, texturePadding, textureColor, context);
-        break;
-      case "vertical-line":
-        pattern = this.createVerticalLinePattern(textureSize, texturePadding, textureColor, context);
-        break;
-      case "horizontal-line":
-        pattern = this.createHorizontalLinePattern(textureSize, texturePadding, textureColor, context);
-        break;
-      case "bias-lr":
-        pattern = this.createBiasLRLinePattern(textureSize, texturePadding, textureColor, context);
-        break;
-      case "bias-rl":
-        pattern = this.createBiasRLLinePattern(textureSize, texturePadding, textureColor, context);
-        break;
-      case "grid":
-        pattern = this.createGridPattern(textureSize, texturePadding, textureColor, context);
+    let pattern = null;
+    const textureRadius = null !== (_a = null == textureOptions ? void 0 : textureOptions.radius) && void 0 !== _a ? _a : 0,
+      patternKey = this.getPatternCacheKey(texture, textureSize, texturePadding, textureColor, context.dpr, textureRadius);
+    if (null !== patternKey && (pattern = this.textureMap.get(patternKey)), !pattern) {
+      if ("string" == typeof texture) switch (texture) {
+        case "circle":
+          pattern = this.createCirclePattern(textureSize, texturePadding, textureColor, context);
+          break;
+        case "diamond":
+          pattern = this.createDiamondPattern(textureSize, texturePadding, textureColor, context);
+          break;
+        case "rect":
+          pattern = this.createRectPattern(textureSize, texturePadding, textureColor, context);
+          break;
+        case "vertical-line":
+          pattern = this.createVerticalLinePattern(textureSize, texturePadding, textureColor, context);
+          break;
+        case "horizontal-line":
+          pattern = this.createHorizontalLinePattern(textureSize, texturePadding, textureColor, context);
+          break;
+        case "bias-lr":
+          pattern = this.createBiasLRLinePattern(textureSize, texturePadding, textureColor, context);
+          break;
+        case "bias-rl":
+          pattern = this.createBiasRLLinePattern(textureSize, texturePadding, textureColor, context);
+          break;
+        case "grid":
+          pattern = this.createGridPattern(textureSize, texturePadding, textureColor, context);
+      }
+      pattern || (pattern = this.createResourcePattern(texture, graphic, context, texturePadding, textureRadius)), pattern && null !== patternKey && this.textureMap.set(patternKey, pattern);
     }
-    if (textureOptions && textureOptions.dynamicTexture) {
+    if ("string" == typeof texture && textureOptions && textureOptions.dynamicTexture) {
       const {
           gridConfig = {},
           useNewCanvas: useNewCanvas
@@ -20575,10 +20585,24 @@ class DefaultBaseTextureRenderContribution {
       for (let i = 0; i < gridRows; i++) for (let j = 0; j < gridColumns; j++) {
         const _x = x + cellSize / 2 + j * cellSize,
           _y = y + cellSize / 2 + i * cellSize;
-        null === (_a = textureOptions.beforeDynamicTexture) || void 0 === _a || _a.call(textureOptions, context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height()), context.beginPath(), !1 === parsedPath.draw(context, Math.min(sizeW - gutterColumn, sizeH - gutterRow), _x, _y, 0) && context.closePath(), context.fillStyle = textureColor, textureOptions.dynamicTexture(context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height());
+        null === (_b = textureOptions.beforeDynamicTexture) || void 0 === _b || _b.call(textureOptions, context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height()), context.beginPath(), !1 === parsedPath.draw(context, Math.min(sizeW - gutterColumn, sizeH - gutterRow), _x, _y, 0) && context.closePath(), context.fillStyle = textureColor, textureOptions.dynamicTexture(context, i, j, gridRows, gridColumns, textureRatio, graphic, b.width(), b.height());
       }
       useNewCanvas && (originalContext.globalAlpha = 1, originalContext.drawImage(newCanvas.nativeCanvas, 0, 0, newCanvas.nativeCanvas.width, newCanvas.nativeCanvas.height, b.x1, b.y1, b.width() * originalContext.dpr, b.height() * originalContext.dpr)), originalContext.restore();
-    } else if (pattern) context.highPerformanceSave(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.fillStyle = pattern, context.fill(), context.highPerformanceRestore();else if ("wave" === texture) {
+    } else if (pattern) {
+      if (pattern.setTransform) {
+        const alignToGraphic = !!(null == textureOptions ? void 0 : textureOptions.alignToGraphic),
+          alignOffsetX = null !== (_c = null == textureOptions ? void 0 : textureOptions.alignOffsetX) && void 0 !== _c ? _c : 0,
+          alignOffsetY = null !== (_d = null == textureOptions ? void 0 : textureOptions.alignOffsetY) && void 0 !== _d ? _d : 0;
+        let translateX = 0,
+          translateY = 0;
+        if (alignToGraphic) {
+          const m = context.currentMatrix;
+          translateX = (null !== (_e = null == m ? void 0 : m.e) && void 0 !== _e ? _e : 0) + x + alignOffsetX, translateY = (null !== (_f = null == m ? void 0 : m.f) && void 0 !== _f ? _f : 0) + y + alignOffsetY;
+        } else (alignOffsetX || alignOffsetY) && (translateX = alignOffsetX, translateY = alignOffsetY);
+        pattern.setTransform(new DOMMatrix([1 / context.dpr, 0, 0, 1 / context.dpr, translateX, translateY]));
+      }
+      context.highPerformanceSave(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.fillStyle = pattern, context.fill(), context.highPerformanceRestore();
+    } else if ("wave" === texture) {
       context.save(), context.setCommonStyle(graphic, graphic.attribute, x, y, graphicAttribute), context.clip();
       const b = graphic.AABBBounds;
       drawWave(context, textureRatio, b.width(), b.height(), Object.assign(Object.assign({}, textureOptions || {}), {
@@ -20586,6 +20610,45 @@ class DefaultBaseTextureRenderContribution {
       }), x + b.x1 - x, y + b.y1 - y), context.restore();
     }
   }
+  getPatternCacheKey(texture, textureSize, texturePadding, textureColor, dpr, textureRadius) {
+    return "string" != typeof texture ? texturePadding > 0 || textureRadius > 0 ? null : texture : "wave" === texture ? null : builtinProceduralTextureTypes.has(texture) ? `builtin:${texture}|size:${textureSize}|padding:${texturePadding}|color:${textureColor}|dpr:${dpr}` : `resource:${texture}|padding:${texturePadding}|radius:${textureRadius}|dpr:${dpr}`;
+  }
+  createResourcePattern(texture, graphic, context, texturePadding, textureRadius) {
+    var _a;
+    const resource = null === (_a = graphic.resources) || void 0 === _a ? void 0 : _a.get(texture),
+      data = "success" === (null == resource ? void 0 : resource.state) ? resource.data : "object" == typeof texture ? texture : null;
+    if (!data) return null;
+    if (texturePadding > 0 || textureRadius > 0) {
+      const w = data.naturalWidth || data.width,
+        h = data.naturalHeight || data.height;
+      if (w > 0 && h > 0) {
+        const tileW = w + 2 * texturePadding,
+          tileH = h + 2 * texturePadding,
+          canvas = canvasAllocate.allocate({
+            width: tileW,
+            height: tileH,
+            dpr: context.dpr
+          }),
+          ctx = canvas.getContext("2d");
+        if (ctx) {
+          if (ctx.inuse = !0, ctx.clearMatrix(), ctx.setTransformForCurrent(!0), ctx.clearRect(0, 0, tileW, tileH), textureRadius > 0) {
+            const r = Math.max(0, Math.min(textureRadius, Math.min(w, h) / 2)),
+              x0 = texturePadding,
+              y0 = texturePadding,
+              x1 = x0 + w,
+              y1 = y0 + h;
+            ctx.beginPath(), ctx.moveTo(x0 + r, y0), ctx.lineTo(x1 - r, y0), ctx.quadraticCurveTo(x1, y0, x1, y0 + r), ctx.lineTo(x1, y1 - r), ctx.quadraticCurveTo(x1, y1, x1 - r, y1), ctx.lineTo(x0 + r, y1), ctx.quadraticCurveTo(x0, y1, x0, y1 - r), ctx.lineTo(x0, y0 + r), ctx.quadraticCurveTo(x0, y0, x0 + r, y0), ctx.closePath(), ctx.clip();
+          }
+          ctx.drawImage(data, texturePadding, texturePadding, w, h);
+          const pattern = context.createPattern(canvas.nativeCanvas, "repeat");
+          return (null == pattern ? void 0 : pattern.setTransform) && pattern.setTransform(new DOMMatrix([1 / context.dpr, 0, 0, 1 / context.dpr, 0, 0])), canvasAllocate.free(canvas), pattern;
+        }
+        canvasAllocate.free(canvas);
+      }
+    }
+    const pattern = context.createPattern(data, "repeat");
+    return (null == pattern ? void 0 : pattern.setTransform) && pattern.setTransform(new DOMMatrix([1 / context.dpr, 0, 0, 1 / context.dpr, 0, 0])), pattern;
+  }
 }
 const defaultBaseTextureRenderContribution = new DefaultBaseTextureRenderContribution();
 
@@ -60939,7 +61002,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 +61187,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 +61652,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 +61847,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;
@@ -73421,13 +73485,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;
@@ -73438,6 +73509,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);
@@ -73452,14 +73529,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)
                         };
@@ -74010,7 +74087,7 @@ class ScatterSeries extends CartesianSeries {
         }
     }
     handleZoom(e) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         this.getMarksWithoutRoot().forEach(mark => {
             if (!mark) {
                 return;
@@ -74028,10 +74105,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);
@@ -75293,7 +75383,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;
@@ -75307,13 +75397,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;
@@ -75327,9 +75430,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) {
@@ -89377,7 +89493,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];
@@ -96604,19 +96720,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;