@visactor/react-vchart 2.0.22-alpha.4 → 2.0.22

package/build/index.js

@@ -51546,7 +51546,7 @@
       }
       _reCompile(updateResult, morphConfig) {
         var _a, _b, _c, _d, _e, _f, _g;
-        if (updateResult.reMake && (this._releaseData(), this._initDataSet(), null === (_a = this._chart) || void 0 === _a || _a.release(), this._chart = null), updateResult.reTransformSpec && (this._chartSpecTransformer = null), updateResult.changeTheme ? (this._setCurrentTheme(), this._setFontFamilyTheme(this.getTheme("fontFamily"))) : updateResult.changeBackground && (null === (_b = this._compiler) || void 0 === _b || _b.setBackground(this._getBackground())), updateResult.reMake ? (null === (_c = this._compiler) || void 0 === _c || _c.releaseGrammar(), this._userEvents.forEach(e => {
+        if (updateResult.reMake && (this._releaseData(), this._initDataSet(), null === (_a = this._chart) || void 0 === _a || _a.release(), this._chart = null), updateResult.reTransformSpec && (this._chartSpecTransformer = null), updateResult.changeTheme ? (this._setCurrentTheme(), this._setFontFamilyTheme(this.getTheme("fontFamily"))) : updateResult.changeBackground && (null === (_b = this._compiler) || void 0 === _b || _b.setBackground(this._getBackground())), updateResult.reMake ? (null === (_c = this._compiler) || void 0 === _c || _c.releaseGrammar(!0), this._userEvents.forEach(e => {
           var _a;
           return null === (_a = this._event) || void 0 === _a ? void 0 : _a.on(e.eType, e.query, e.handler);
         })) : updateResult.reCompile && (null === (_d = this._compiler) || void 0 === _d || _d.clear({
@@ -51954,8 +51954,8 @@
         this._option.layout = layout, null === (_a = this._chart) || void 0 === _a || _a.setLayout(layout);
       }
       reLayout() {
-        var _a;
-        this._chart.resetLayoutItemTag(), null === (_a = this._chart) || void 0 === _a || _a.setLayoutTag(!0);
+        var _a, _b, _c;
+        null === (_a = this._chart) || void 0 === _a || _a.resetLayoutItemTag(), null === (_b = this._chart) || void 0 === _b || _b.setLayoutTag(!0, null, !1), null === (_c = this._compiler) || void 0 === _c || _c.render();
       }
       getCompiler() {
         return this._compiler;
@@ -60128,14 +60128,19 @@
         var _a, _b, _c, _d;
         if (!this._spec.stackCornerRadius) return;
         const xScale = null === (_b = null === (_a = this._xAxisHelper) || void 0 === _a ? void 0 : _a.getScale) || void 0 === _b ? void 0 : _b.call(_a, 0),
-          yScale = null === (_d = null === (_c = this._yAxisHelper) || void 0 === _c ? void 0 : _c.getScale) || void 0 === _d ? void 0 : _d.call(_c, 0);
+          yScale = null === (_d = null === (_c = this._yAxisHelper) || void 0 === _c ? void 0 : _c.getScale) || void 0 === _d ? void 0 : _d.call(_c, 0),
+          isVertical = "vertical" === this.direction;
         this._barMark.setMarkConfig({
           clip: !0,
           clipPath: () => {
+            const usePreCalculatedRect = !!this._shouldDoPreCalculate();
+            usePreCalculatedRect && this._calculateStackRectPosition(isVertical);
             const rectPaths = [];
             return this._forEachStackGroup(node => {
               let min = 1 / 0,
                 max = -1 / 0,
+                rectMin = 1 / 0,
+                rectMax = -1 / 0,
                 hasPercent = !1,
                 minPercent = 1 / 0,
                 maxPercent = -1 / 0;
@@ -60144,7 +60149,12 @@
                   end = datum[STACK_FIELD_END],
                   startPercent = datum[STACK_FIELD_START_PERCENT],
                   endPercent = datum[STACK_FIELD_END_PERCENT];
-                min = Math.min(min, start, end), max = Math.max(max, start, end), isValid$1(startPercent) && isValid$1(endPercent) && (hasPercent = !0, minPercent = Math.min(minPercent, startPercent, endPercent), maxPercent = Math.max(maxPercent, startPercent, endPercent));
+                if (min = Math.min(min, start, end), max = Math.max(max, start, end), usePreCalculatedRect) {
+                  const rectStart = datum[isVertical ? RECT_Y : RECT_X],
+                    rectEnd = datum[isVertical ? RECT_Y1 : RECT_X1];
+                  rectMin = Math.min(rectMin, rectStart, rectEnd), rectMax = Math.max(rectMax, rectStart, rectEnd);
+                }
+                isValid$1(startPercent) && isValid$1(endPercent) && (hasPercent = !0, minPercent = Math.min(minPercent, startPercent, endPercent), maxPercent = Math.max(maxPercent, startPercent, endPercent));
               });
               const mockDatum = Object.assign(Object.assign(Object.assign({}, node.values[0]), {
                   [STACK_FIELD_START]: min,
@@ -60154,13 +60164,13 @@
                   [STACK_FIELD_END_PERCENT]: maxPercent
                 } : void 0),
                 rectAttr = "horizontal" === this.direction ? {
-                  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)
                 };
@@ -60570,7 +60580,7 @@
         }, STATE_VALUE_ENUM.STATE_NORMAL, AttributeLevel.Series));
       }
       handleZoom(e) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         this.getMarksWithoutRoot().forEach(mark => {
           if (!mark) return;
           const graphics = mark.getGraphics();
@@ -60581,8 +60591,14 @@
             newPosition && graphicItem && graphicItem.translateTo(newPosition.x, newPosition.y);
           });
         });
-        const vgrammarLabel = null === (_b = null === (_a = this._labelMark) || void 0 === _a ? void 0 : _a.getComponent()) || void 0 === _b ? void 0 : _b.getProduct();
-        vgrammarLabel && vgrammarLabel.evaluate(null, null);
+        const labelComponent = null === (_a = this._labelMark) || void 0 === _a ? void 0 : _a.getComponent();
+        (null == labelComponent ? void 0 : labelComponent.renderInner) && labelComponent.renderInner();
+        const vgrammarLabel = null === (_b = null == labelComponent ? void 0 : labelComponent.getComponent) || void 0 === _b ? void 0 : _b.call(labelComponent);
+        (null == vgrammarLabel ? void 0 : vgrammarLabel.evaluate) && vgrammarLabel.evaluate(null, null);
+        const labelGroup = null === (_c = null == labelComponent ? void 0 : labelComponent.getProduct) || void 0 === _c ? void 0 : _c.call(labelComponent);
+        labelGroup && (null == e ? void 0 : e.scale) && (null == e ? void 0 : e.scaleCenter) && ((null === (_d = labelGroup.attribute) || void 0 === _d ? void 0 : _d.postMatrix) || labelGroup.setAttributes({
+          postMatrix: new Matrix()
+        }), labelGroup.scale(e.scale, e.scale, e.scaleCenter));
       }
       handlePan(e) {
         this.handleZoom(e);
@@ -61609,7 +61625,7 @@
         super.release(), this._areaCache.clear(), this._nameMap = {}, this._mapViewData = null;
       }
       handleZoom(e) {
-        var _a;
+        var _a, _b, _c, _d;
         const {
           scale: scale,
           scaleCenter: scaleCenter
@@ -61619,11 +61635,17 @@
         pathGroup && (pathGroup.attribute.postMatrix || pathGroup.setAttributes({
           postMatrix: new Matrix()
         }), pathGroup.scale(scale, scale, scaleCenter));
-        const vgrammarLabel = null === (_a = this._labelMark) || void 0 === _a ? void 0 : _a.getComponent();
-        vgrammarLabel && vgrammarLabel.renderInner();
+        const labelComponent = null === (_a = this._labelMark) || void 0 === _a ? void 0 : _a.getComponent();
+        (null == labelComponent ? void 0 : labelComponent.renderInner) && labelComponent.renderInner();
+        const vgrammarLabel = null === (_b = null == labelComponent ? void 0 : labelComponent.getComponent) || void 0 === _b ? void 0 : _b.call(labelComponent);
+        (null == vgrammarLabel ? void 0 : vgrammarLabel.evaluate) && vgrammarLabel.evaluate(null, null);
+        const labelGroup = null === (_c = null == labelComponent ? void 0 : labelComponent.getProduct) || void 0 === _c ? void 0 : _c.call(labelComponent);
+        labelGroup && scale && scaleCenter && ((null === (_d = labelGroup.attribute) || void 0 === _d ? 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: delta
         } = e;
@@ -61632,8 +61654,14 @@
         pathGroup && (pathGroup.attribute.postMatrix || pathGroup.setAttributes({
           postMatrix: new Matrix()
         }), pathGroup.translate(delta[0], delta[1]));
-        const vgrammarLabel = null === (_a = this._labelMark) || void 0 === _a ? void 0 : _a.getComponent();
-        vgrammarLabel && vgrammarLabel.renderInner();
+        const labelComponent = null === (_a = this._labelMark) || void 0 === _a ? void 0 : _a.getComponent();
+        (null == labelComponent ? void 0 : labelComponent.renderInner) && labelComponent.renderInner();
+        const vgrammarLabel = null === (_b = null == labelComponent ? void 0 : labelComponent.getComponent) || void 0 === _b ? void 0 : _b.call(labelComponent);
+        (null == vgrammarLabel ? void 0 : vgrammarLabel.evaluate) && vgrammarLabel.evaluate(null, null);
+        const labelGroup = null === (_c = null == labelComponent ? void 0 : labelComponent.getProduct) || void 0 === _c ? void 0 : _c.call(labelComponent);
+        labelGroup && delta && ((null === (_d = labelGroup.attribute) || void 0 === _d ? void 0 : _d.postMatrix) || labelGroup.setAttributes({
+          postMatrix: new Matrix()
+        }), labelGroup.translate(delta[0], delta[1]));
       }
       getDatumCenter(datum) {
         var _a, _b, _c, _d;
@@ -72730,7 +72758,7 @@
     class SankeySeriesTooltipHelper extends BaseSeriesTooltipHelper {
       constructor() {
         super(...arguments), this._getDimensionData = datum => {
-          if (datum.source) {
+          if (!isNil$1(null == datum ? void 0 : datum.source) && !isNil$1(null == datum ? void 0 : datum.target)) {
             if (isNumber$1(datum.source)) {
               const seriesKeys = this.series.getSeriesKeys();
               return seriesKeys[datum.source] + " => " + seriesKeys[datum.target];
@@ -78108,18 +78136,26 @@
     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 !1;
       }
       _initTheme(spec, chartSpec) {
-        var _a, _b, _c;
         const {
-          spec: newSpec,
-          theme: theme
-        } = super._initTheme(spec, chartSpec);
-        return newSpec.style = mergeSpec({}, this._theme, newSpec.style), newSpec.offset = mergeSpec({}, theme.offset, spec.offset), newSpec.transitionDuration = null !== (_a = spec.transitionDuration) && void 0 !== _a ? _a : theme.transitionDuration, newSpec.trigger = null !== (_b = spec.trigger) && void 0 !== _b ? _b : theme.trigger, newSpec.triggerOff = null !== (_c = spec.triggerOff) && void 0 !== _c ? _c : theme.triggerOff, {
-          spec: newSpec,
+            spec: newSpec,
+            theme: theme
+          } = super._initTheme(spec, chartSpec),
+          themeStyle = mergeSpec({}, ...TOOLTIP_STYLE_THEME_KEYS.map(key => void 0 !== (null == theme ? void 0 : theme[key]) ? {
+            [key]: theme[key]
+          } : void 0), null == theme ? void 0 : theme.style),
+          themeSpec = mergeSpec({}, theme);
+        TOOLTIP_STYLE_THEME_KEYS.forEach(key => {
+          delete themeSpec[key];
+        }), delete themeSpec.style;
+        const mergedSpec = mergeSpec({}, themeSpec, newSpec);
+        return mergedSpec.style = mergeSpec({}, themeStyle, mergedSpec.style), {
+          spec: mergedSpec,
           theme: theme
         };
       }
@@ -89219,7 +89255,7 @@
 
     const VChartSimple = createChart('VChartSimple');
 
-    const version = "2.0.21";
+    const version = "2.0.22";
 
     exports.Area = Area;
     exports.AreaChart = AreaChart;