@visactor/react-vchart 2.1.0-alpha.3 → 2.1.0-alpha.5

package/build/index.js

@@ -55847,11 +55847,13 @@
       }
       renderMarks() {
         var _a;
-        this._hasCommitedMark() && (log(`--- start of renderMarks(${this._count}) ---`), this.clearProgressive(), this._rootMarks.forEach(mark => {
+        let hasCommitedMark = this._hasCommitedMark();
+        const needsLayout = this._layoutState === LayoutState.before;
+        (hasCommitedMark || needsLayout) && (log(`--- start of renderMarks(${this._count}) ---`), this.clearProgressive(), hasCommitedMark && this._rootMarks.forEach(mark => {
           mark.render();
-        }), this._layoutState === LayoutState.before && (this._layoutState = LayoutState.layouting, null === (_a = this._compileChart) || void 0 === _a || _a.onLayout(), this._layoutState = LayoutState.reevaluate, this._hasCommitedMark() && this._rootMarks.forEach(mark => {
+        }), needsLayout && (this._layoutState = LayoutState.layouting, null === (_a = this._compileChart) || void 0 === _a || _a.onLayout(), this._layoutState = LayoutState.reevaluate, hasCommitedMark = this._hasCommitedMark(), hasCommitedMark && this._rootMarks.forEach(mark => {
           mark.render();
-        }), this.handleLayoutEnd()), this.findProgressiveMarks(), this.updateStateAnimation(), this._doRender(!0), this.doPreProgressive(), log(`--- start of renderMarks(${this._count}) ---`), this._count++);
+        }), this.handleLayoutEnd()), hasCommitedMark && (this.findProgressiveMarks(), this.updateStateAnimation()), this._doRender(!0), hasCommitedMark && this.doPreProgressive(), log(`--- start of renderMarks(${this._count}) ---`), this._count++);
       }
       reuseOrMorphing(morphConfig = {}) {
         const {
@@ -64017,17 +64019,15 @@
         }
       }
       _compareSpec(spec, prevSpec) {
+        var _a, _b;
         const result = super._compareSpec(spec, prevSpec);
         if (result.reMake) return result;
         const specChanged = !isEqual(prevSpec, spec);
-        return result.reRender = !0, (null == prevSpec ? void 0 : prevSpec.type) !== (null == spec ? void 0 : spec.type) || (null == prevSpec ? void 0 : prevSpec.visible) !== (null == spec ? void 0 : spec.visible) ? (result.reMake = !0, result) : (result.reMake = ["grid", "subGrid", "tick", "subTick", "label", "domainLine", "title"].some(k => {
-          var _a, _b;
-          return (null === (_a = null == prevSpec ? void 0 : prevSpec[k]) || void 0 === _a ? void 0 : _a.visible) !== (null === (_b = null == spec ? void 0 : spec[k]) || void 0 === _b ? void 0 : _b.visible);
-        }), specChanged && !result.reMake && this._isComponentOnlySpecChange(spec, prevSpec) && (result.effects = Object.assign(Object.assign({}, result.effects), {
+        return result.reRender = !0, (null == prevSpec ? void 0 : prevSpec.type) !== (null == spec ? void 0 : spec.type) || (null == prevSpec ? void 0 : prevSpec.visible) !== (null == spec ? void 0 : spec.visible) ? (result.reMake = !0, result) : !0 !== (null === (_a = null == spec ? void 0 : spec.grid) || void 0 === _a ? void 0 : _a.visible) || !0 === (null === (_b = null == prevSpec ? void 0 : prevSpec.grid) || void 0 === _b ? void 0 : _b.visible) || this._gridMark ? (specChanged && !result.reMake && this._isComponentOnlySpecChange(spec, prevSpec) && (result.effects = Object.assign(Object.assign({}, result.effects), {
           component: !0,
           layout: !0,
           render: !0
-        })), result);
+        })), result) : (result.reMake = !0, result);
       }
       _isComponentOnlySpecChange(spec, prevSpec) {
         return Object.keys(Object.assign(Object.assign({}, prevSpec), spec)).every(key => isEqual(null == prevSpec ? void 0 : prevSpec[key], null == spec ? void 0 : spec[key]) || AXIS_COMPONENT_ONLY_CHANGE_KEYS[key]);
@@ -66320,10 +66320,25 @@
       return t;
     };
     const MARKER_COMPONENT_SPEC_KEYS = {
-      [ComponentTypeEnum.markPoint]: !0,
-      [ComponentTypeEnum.markLine]: !0,
-      [ComponentTypeEnum.markArea]: !0
-    };
+        [ComponentTypeEnum.markPoint]: !0,
+        [ComponentTypeEnum.markLine]: !0,
+        [ComponentTypeEnum.markArea]: !0
+      },
+      MARKER_ADDITION_REMAKE_SPEC_KEYS = {
+        autoRange: !0,
+        regionId: !0,
+        regionIndex: !0,
+        seriesId: !0,
+        seriesIndex: !0,
+        relativeSeriesId: !0,
+        relativeSeriesIndex: !0,
+        startRelativeSeriesId: !0,
+        startRelativeSeriesIndex: !0,
+        endRelativeSeriesId: !0,
+        endRelativeSeriesIndex: !0,
+        specifiedDataSeriesId: !0,
+        specifiedDataSeriesIndex: !0
+      };
     let BaseChart$1 = class BaseChart extends CompilableBase {
       getSpec() {
         return this._spec;
@@ -66399,7 +66414,7 @@
         }, this.getComponentsByKey = key => this._components.filter(c => (c.specKey || c.type) === key), this.getComponentByUserId = userId => {
           const component = this._components.find(s => s.userId === userId);
           if (component) return component;
-        }, this.getComponentsByType = type => this._components.filter(c => c.type === type), this._paddingSpec = normalizeLayoutPaddingSpec(null !== (_a = spec.padding) && void 0 !== _a ? _a : option.getTheme("padding")), this._event = new Event$1(option.eventDispatcher, option.mode), this._dataSet = option.dataSet, this._chartData = new ChartData(this._dataSet), this._modelOption = Object.assign(Object.assign({}, option), {
+        }, this.getComponentsByType = type => this._components.filter(c => c.type === type), this._isMarkerAdditionSpecSafeWithoutRemake = spec => !(!spec || "object" != typeof spec || !1 === spec.visible) && !Object.keys(MARKER_ADDITION_REMAKE_SPEC_KEYS).some(key => !isNil$1(spec[key])), this._paddingSpec = normalizeLayoutPaddingSpec(null !== (_a = spec.padding) && void 0 !== _a ? _a : option.getTheme("padding")), this._event = new Event$1(option.eventDispatcher, option.mode), this._dataSet = option.dataSet, this._chartData = new ChartData(this._dataSet), this._modelOption = Object.assign(Object.assign({}, option), {
           mode: this._option.mode,
           map: this._idMap,
           getChartLayoutRect: () => this._layoutRect,
@@ -66713,7 +66728,7 @@
         return Object.keys(spec).filter(key => !ignoreKeys[key]).sort();
       }
       updateSpec(spec) {
-        var _a;
+        var _a, _b;
         const result = {
           change: !1,
           reMake: !1,
@@ -66729,7 +66744,7 @@
           const key = currentKeys[i],
             currentSpec = this._spec[key],
             nextSpec = spec[key];
-          if (isArray$1(currentSpec) && currentSpec.length !== array(nextSpec).length && !this._canRemoveMarkerComponentsWithoutRemake(key, currentSpec, nextSpec)) return result.reMake = !0, this.setLayoutTag(!0, null, !1), result;
+          if (isArray$1(currentSpec) && currentSpec.length !== array(nextSpec).length && !this._canChangeMarkerComponentsWithoutRemake(key, currentSpec, nextSpec)) return result.reMake = !0, this.setLayoutTag(!0, null, !1), result;
         }
         const oldSpec = this._spec,
           onlyMarkerComponentsRemoved = this._isOnlyMarkerComponentsRemoved(this._spec, spec, currentKeys),
@@ -66740,9 +66755,9 @@
         if (this.updateGlobalScale(result), result.reMake) return this.setLayoutTag(!0, null, !1), result;
         if (this.updateRegionSpec(result), result.reMake) return this.setLayoutTag(!0, null, !1), result;
         const componentUpdateResult = this.updateComponentSpec(result);
-        return result.reMake ? (this.setLayoutTag(!0, null, !1), result) : isUpdateSpecResultLocalOnly(result) ? result : onlyComponentSpecsChanged && !componentUpdateResult.hasNonComponentOnlyUpdate && (isUpdateSpecResultComponentOnly(result) || this._isComponentScaleDomainOnlyUpdate(result)) ? (componentUpdateResult.componentOnlyUpdatedComponents.forEach(component => {
+        return result.reMake ? (this.setLayoutTag(!0, null, !1), result) : (!onlyComponentSpecsChanged && (null === (_a = result.effects) || void 0 === _a ? void 0 : _a.localOnly) && delete result.effects.localOnly, isUpdateSpecResultLocalOnly(result) ? result : onlyComponentSpecsChanged && !componentUpdateResult.hasNonComponentOnlyUpdate && (isUpdateSpecResultComponentOnly(result) || this._isComponentScaleDomainOnlyUpdate(result)) ? (componentUpdateResult.componentOnlyUpdatedComponents.forEach(component => {
           component.reInit(component.getSpec());
-        }), (null === (_a = result.effects) || void 0 === _a ? void 0 : _a.layout) && this.setLayoutTag(!0, null, !1), result) : (this.setLayoutTag(!0, null, !1), this.updateSeriesSpec(result), result.reMake || (this.reInit(), onlySeriesSpecsChanged && this._canSkipChartDataStages(result) || (this.updateDataSpec(), this.updateGlobalScaleDomain())), result);
+        }), (null === (_b = result.effects) || void 0 === _b ? void 0 : _b.layout) && this.setLayoutTag(!0, null, !1), result) : (this.setLayoutTag(!0, null, !1), this.updateSeriesSpec(result), result.reMake || (this.reInit(), onlySeriesSpecsChanged && this._canSkipChartDataStages(result) || (this.updateDataSpec(), this.reDataFlow(), this._reRunStackDataFlow(), this.getAllModels().forEach(model => model.onDataUpdate()))), result));
       }
       updateChartConfig(result, oldSpec) {
         var _a, _b;
@@ -66788,7 +66803,7 @@
               componentResult = c.updateSpec(cmpSpec);
             isUpdateSpecResultComponentOnly(componentResult) || this._isComponentScaleDomainOnlyUpdate(componentResult) ? componentOnlyUpdatedComponents.push(c) : isEqual(previousComponentSpec, cmpSpec) || (hasNonComponentOnlyUpdate = !0), mergeUpdateResult(result, componentResult);
           }
-        });
+        }), result.reMake || this._createMissingMarkerComponentsForSpecs(result, componentCache);
         for (const key in componentCache) if (Object.prototype.hasOwnProperty.call(componentCache, key)) {
           const element = componentCache[key];
           element.componentCount !== element.specCount && (result.reMake = !0);
@@ -66810,6 +66825,12 @@
           hasNonComponentOnlyUpdate: hasNonComponentOnlyUpdate
         };
       }
+      _canChangeMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) {
+        return this._canRemoveMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) || this._canAddMarkerComponentsWithoutRemake(key, currentSpec, nextSpec);
+      }
+      _canAddMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) {
+        return !!(MARKER_COMPONENT_SPEC_KEYS[key] && isArray$1(currentSpec) && isArray$1(nextSpec)) && !(nextSpec.length <= currentSpec.length) && nextSpec.slice(currentSpec.length).every(this._isMarkerAdditionSpecSafeWithoutRemake);
+      }
       _canRemoveMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) {
         return MARKER_COMPONENT_SPEC_KEYS[key] && isArray$1(currentSpec) && currentSpec.length > 0 && isArray$1(nextSpec) && 0 === nextSpec.length;
       }
@@ -66819,7 +66840,7 @@
         return hasMarkerRemoval && onlyMarkerRemoval;
       }
       _isComponentSpecKey(key) {
-        return this._components.some(component => (component.specKey || component.type) === key);
+        return !!MARKER_COMPONENT_SPEC_KEYS[key] || this._components.some(component => (component.specKey || component.type) === key);
       }
       _isOnlyComponentSpecsChanged(currentSpec, nextSpec, specKeys) {
         let hasComponentSpecChange = !1;
@@ -66845,6 +66866,38 @@
         const effects = result.effects;
         return !(!(null == effects ? void 0 : effects.component) || !effects.scaleDomain || result.reMake || result.reCompile || result.reSize || effects.remake || effects.compile || effects.data || effects.series || effects.animation || result.reTransformSpec || result.reAnimate || result.changeTheme || result.changeBackground);
       }
+      _reRunStackDataFlow() {
+        var _a, _b;
+        this._series.some(series => {
+          var _a;
+          return null === (_a = series.getStack) || void 0 === _a ? void 0 : _a.call(series);
+        }) && (null === (_b = null === (_a = this._stack) || void 0 === _a ? void 0 : _a.stackAll) || void 0 === _b || _b.call(_a), this._series.forEach(series => {
+          series.getViewDataFilter() && series.reTransformViewData();
+        }));
+      }
+      _getModelSpecIndex(specInfo) {
+        var _a;
+        const specPath = null !== (_a = specInfo.specPath) && void 0 !== _a ? _a : [],
+          specIndex = specPath[specPath.length - 1];
+        return "number" == typeof specIndex ? specIndex : 0;
+      }
+      _hasComponentForSpecInfo(key, specInfo) {
+        const specIndex = this._getModelSpecIndex(specInfo);
+        return this._components.some(component => (component.specKey || component.type) === key && component.getSpecIndex() === specIndex);
+      }
+      _createMissingMarkerComponentsForSpecs(result, componentCache) {
+        var _a;
+        let createdCount = 0;
+        null === (_a = this._specTransformer) || void 0 === _a || _a.forEachComponentInSpec(this._spec, (constructor, specInfo) => {
+          if (result.reMake) return;
+          const compSpecKey = constructor.specKey || constructor.type;
+          MARKER_COMPONENT_SPEC_KEYS[compSpecKey] && !this._hasComponentForSpecInfo(compSpecKey, specInfo) && (this._isMarkerAdditionSpecSafeWithoutRemake(specInfo.spec) ? (this._createComponent(constructor, specInfo), componentCache[compSpecKey] && componentCache[compSpecKey].componentCount++, createdCount++) : result.reMake = !0);
+        }, this._option.getSpecInfo()), createdCount && (result.change = !0, result.effects = Object.assign(Object.assign({}, result.effects), {
+          component: !0,
+          layout: !0,
+          render: !0
+        }));
+      }
       _removeMarkerComponentsForEmptySpecs(result) {
         const removedComponents = this._components.filter(component => {
           var _a;