@visactor/react-vchart 2.0.19 → 2.0.20-alpha.0

package/build/index.js

@@ -49153,6 +49153,9 @@
           });
         });
       }
+      clearAllStateInfo() {
+        this._stateInfoList = [];
+      }
       _isMultiMark() {
         return !this._mark || isMultiDatumMark(this._mark.type);
       }
@@ -50301,6 +50304,9 @@
       runAnimation() {
         this._runStateAnimation(this.getGraphics());
       }
+      clearBeforeReInit() {
+        this.state.clearAllStateInfo(), this.uncommit(), this.stateStyle = {};
+      }
     }
 
     class GroupMark extends BaseMark {
@@ -51483,11 +51489,8 @@
           return (null === (_a = theme.chart) || void 0 === _a ? void 0 : _a[type]) && (theme = mergeTheme({}, theme, theme.chart[type])), theme;
         };
         let currentTheme;
-        if (isEmpty(optionTheme) && isEmpty(specTheme)) currentTheme = getThemeObject(this._currentThemeName), this._currentTheme = processThemeByChartType(chartType, currentTheme);else if (isString$1(optionTheme) && (!specTheme || isString$1(specTheme)) || isString$1(specTheme) && (!optionTheme || isString$1(optionTheme))) {
-          const finalTheme = mergeTheme({}, getThemeObject(this._currentThemeName), getThemeObject(optionTheme), getThemeObject(specTheme));
-          this._currentTheme = processThemeByChartType(chartType, finalTheme);
-        } else {
-          const finalTheme = mergeTheme({}, getThemeObject(this._currentThemeName), getThemeObject(optionTheme), getThemeObject(specTheme));
+        if (isEmpty(optionTheme) && isEmpty(specTheme)) currentTheme = getThemeObject(this._currentThemeName), this._currentTheme = processThemeByChartType(chartType, currentTheme);else {
+          const finalTheme = mergeTheme({}, getThemeObject(isObject$2(specTheme) && specTheme.type ? specTheme.type : isObject$2(optionTheme) && optionTheme.type ? optionTheme.type : this._currentThemeName), getThemeObject(optionTheme), getThemeObject(specTheme));
           this._currentTheme = processThemeByChartType(chartType, finalTheme);
         }
         this._cachedProcessedTheme = null, setPoptipTheme(this.getTheme("component", "poptip")), null === (_c = this._compiler) || void 0 === _c || _c.setBackground(this._getBackground());
@@ -53035,7 +53038,7 @@
         super.reInit(spec);
         const marks = this.getMarksWithoutRoot();
         marks.forEach(mark => {
-          this._spec[mark.name] && this.initMarkStyleWithSpec(mark, this._spec[mark.name]);
+          mark.clearBeforeReInit(), this._spec[mark.name] && this.initMarkStyleWithSpec(mark, this._spec[mark.name]);
         }), this.initMarkStyle(), marks.forEach(mark => {
           mark.commit(!1);
         }), this._updateExtensionMarkSpec(), this._updateSpecData(), this._tooltipHelper && this._tooltipHelper.updateTooltipSpec();
@@ -66986,13 +66989,14 @@
     }
     class CirclePackingLayout {
       constructor(options) {
+        var _a;
         this.options = options;
         const keyOption = null == options ? void 0 : options.nodeKey,
           keyFunc = isFunction$1(keyOption) ? keyOption : keyOption ? field$2(keyOption) : null;
         this._getNodeKey = keyFunc, this._getPadding = isNumber$1(null == options ? void 0 : options.padding) ? node => options.padding : isArray$1(null == options ? void 0 : options.padding) ? node => {
           var _a;
           return null !== (_a = options.padding[node.depth + 1]) && void 0 !== _a ? _a : 0;
-        } : () => 0, this._maxDepth = -1;
+        } : () => 0, this._maxDepth = -1, this._valueField = null !== (_a = null == options ? void 0 : options.valueField) && void 0 !== _a ? _a : "value";
       }
       layout(data, config) {
         var _a;
@@ -67013,7 +67017,7 @@
         };
         if (!data || !data.length) return [];
         const nodes = [],
-          res = calculateNodeValue$1(data, nodes, 0, -1, null, this._getNodeKey);
+          res = calculateNodeValue$1(data, nodes, 0, -1, null, this._getNodeKey, this._valueField);
         this._maxDepth = res.maxDepth;
         const random = randomLCG(),
           root = {
@@ -72231,6 +72235,7 @@
           type: "circlePackingLayout",
           options: () => ({
             nodeKey: this._categoryField,
+            valueField: this._valueField,
             padding: this._layoutPadding,
             includeRoot: !1,
             width: this.getLayoutRect().width || 1,