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

package/build/index.es.js

@@ -60786,29 +60786,38 @@ class Compiler {
     }
     renderMarks() {
         var _a;
-        if (!this._hasCommitedMark()) {
+        let hasCommitedMark = this._hasCommitedMark();
+        const needsLayout = this._layoutState === LayoutState.before;
+        if (!hasCommitedMark && !needsLayout) {
             return;
         }
         log(`--- start of renderMarks(${this._count}) ---`);
         this.clearProgressive();
-        this._rootMarks.forEach(mark => {
-            mark.render();
-        });
-        if (this._layoutState === LayoutState.before) {
+        if (hasCommitedMark) {
+            this._rootMarks.forEach(mark => {
+                mark.render();
+            });
+        }
+        if (needsLayout) {
             this._layoutState = LayoutState.layouting;
             (_a = this._compileChart) === null || _a === void 0 ? void 0 : _a.onLayout();
             this._layoutState = LayoutState.reevaluate;
-            if (this._hasCommitedMark()) {
+            hasCommitedMark = this._hasCommitedMark();
+            if (hasCommitedMark) {
                 this._rootMarks.forEach(mark => {
                     mark.render();
                 });
             }
             this.handleLayoutEnd();
         }
-        this.findProgressiveMarks();
-        this.updateStateAnimation();
+        if (hasCommitedMark) {
+            this.findProgressiveMarks();
+            this.updateStateAnimation();
+        }
         this._doRender(true);
-        this.doPreProgressive();
+        if (hasCommitedMark) {
+            this.doPreProgressive();
+        }
         log(`--- start of renderMarks(${this._count}) ---`);
         this._count++;
     }
@@ -72657,6 +72666,7 @@ class AxisComponent extends BaseComponent {
         }
     }
     _compareSpec(spec, prevSpec) {
+        var _a, _b;
         const result = super._compareSpec(spec, prevSpec);
         if (result.reMake) {
             return result;
@@ -72667,10 +72677,10 @@ class AxisComponent extends BaseComponent {
             result.reMake = true;
             return result;
         }
-        result.reMake = ['grid', 'subGrid', 'tick', 'subTick', 'label', 'domainLine', 'title'].some(k => {
-            var _a, _b;
-            return ((_a = prevSpec === null || prevSpec === void 0 ? void 0 : prevSpec[k]) === null || _a === void 0 ? void 0 : _a.visible) !== ((_b = spec === null || spec === void 0 ? void 0 : spec[k]) === null || _b === void 0 ? void 0 : _b.visible);
-        });
+        if (((_a = spec === null || spec === void 0 ? void 0 : spec.grid) === null || _a === void 0 ? void 0 : _a.visible) === true && ((_b = prevSpec === null || prevSpec === void 0 ? void 0 : prevSpec.grid) === null || _b === void 0 ? void 0 : _b.visible) !== true && !this._gridMark) {
+            result.reMake = true;
+            return result;
+        }
         if (specChanged && !result.reMake && this._isComponentOnlySpecChange(spec, prevSpec)) {
             result.effects = Object.assign(Object.assign({}, result.effects), { component: true, layout: true, render: true });
         }
@@ -75957,6 +75967,21 @@ const MARKER_COMPONENT_SPEC_KEYS = {
     [ComponentTypeEnum.markLine]: true,
     [ComponentTypeEnum.markArea]: true
 };
+const MARKER_ADDITION_REMAKE_SPEC_KEYS = {
+    autoRange: true,
+    regionId: true,
+    regionIndex: true,
+    seriesId: true,
+    seriesIndex: true,
+    relativeSeriesId: true,
+    relativeSeriesIndex: true,
+    startRelativeSeriesId: true,
+    startRelativeSeriesIndex: true,
+    endRelativeSeriesId: true,
+    endRelativeSeriesIndex: true,
+    specifiedDataSeriesId: true,
+    specifiedDataSeriesIndex: true
+};
 class BaseChart extends CompilableBase {
     getSpec() {
         return this._spec;
@@ -76131,6 +76156,12 @@ class BaseChart extends CompilableBase {
         this.getComponentsByType = (type) => {
             return this._components.filter(c => c.type === type);
         };
+        this._isMarkerAdditionSpecSafeWithoutRemake = (spec) => {
+            if (!spec || typeof spec !== 'object' || spec.visible === false) {
+                return false;
+            }
+            return !Object.keys(MARKER_ADDITION_REMAKE_SPEC_KEYS).some(key => !isNil$1(spec[key]));
+        };
         this._paddingSpec = normalizeLayoutPaddingSpec((_a = spec.padding) !== null && _a !== void 0 ? _a : option.getTheme('padding'));
         this._event = new Event$1(option.eventDispatcher, option.mode);
         this._dataSet = option.dataSet;
@@ -76530,7 +76561,7 @@ class BaseChart extends CompilableBase {
             .sort();
     }
     updateSpec(spec) {
-        var _a;
+        var _a, _b;
         const result = {
             change: false,
             reMake: false,
@@ -76556,7 +76587,7 @@ class BaseChart extends CompilableBase {
             const nextSpec = spec[key];
             if (isArray$1(currentSpec) &&
                 currentSpec.length !== array(nextSpec).length &&
-                !this._canRemoveMarkerComponentsWithoutRemake(key, currentSpec, nextSpec)) {
+                !this._canChangeMarkerComponentsWithoutRemake(key, currentSpec, nextSpec)) {
                 result.reMake = true;
                 this.setLayoutTag(true, null, false);
                 return result;
@@ -76591,6 +76622,9 @@ class BaseChart extends CompilableBase {
             this.setLayoutTag(true, null, false);
             return result;
         }
+        if (!onlyComponentSpecsChanged && ((_a = result.effects) === null || _a === void 0 ? void 0 : _a.localOnly)) {
+            delete result.effects.localOnly;
+        }
         if (isUpdateSpecResultLocalOnly(result)) {
             return result;
         }
@@ -76600,7 +76634,7 @@ class BaseChart extends CompilableBase {
             componentUpdateResult.componentOnlyUpdatedComponents.forEach(component => {
                 component.reInit(component.getSpec());
             });
-            if ((_a = result.effects) === null || _a === void 0 ? void 0 : _a.layout) {
+            if ((_b = result.effects) === null || _b === void 0 ? void 0 : _b.layout) {
                 this.setLayoutTag(true, null, false);
             }
             return result;
@@ -76613,7 +76647,9 @@ class BaseChart extends CompilableBase {
         this.reInit();
         if (!onlySeriesSpecsChanged || !this._canSkipChartDataStages(result)) {
             this.updateDataSpec();
-            this.updateGlobalScaleDomain();
+            this.reDataFlow();
+            this._reRunStackDataFlow();
+            this.getAllModels().forEach(model => model.onDataUpdate());
         }
         return result;
     }
@@ -76696,6 +76732,9 @@ class BaseChart extends CompilableBase {
                 mergeUpdateResult(result, componentResult);
             }
         });
+        if (!result.reMake) {
+            this._createMissingMarkerComponentsForSpecs(result, componentCache);
+        }
         for (const key in componentCache) {
             if (Object.prototype.hasOwnProperty.call(componentCache, key)) {
                 const element = componentCache[key];
@@ -76726,6 +76765,19 @@ class BaseChart extends CompilableBase {
             hasNonComponentOnlyUpdate
         };
     }
+    _canChangeMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) {
+        return (this._canRemoveMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) ||
+            this._canAddMarkerComponentsWithoutRemake(key, currentSpec, nextSpec));
+    }
+    _canAddMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) {
+        if (!MARKER_COMPONENT_SPEC_KEYS[key] || !isArray$1(currentSpec) || !isArray$1(nextSpec)) {
+            return false;
+        }
+        if (nextSpec.length <= currentSpec.length) {
+            return false;
+        }
+        return nextSpec.slice(currentSpec.length).every(this._isMarkerAdditionSpecSafeWithoutRemake);
+    }
     _canRemoveMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) {
         return (MARKER_COMPONENT_SPEC_KEYS[key] &&
             isArray$1(currentSpec) &&
@@ -76745,6 +76797,9 @@ class BaseChart extends CompilableBase {
         return hasMarkerRemoval && onlyMarkerRemoval;
     }
     _isComponentSpecKey(key) {
+        if (MARKER_COMPONENT_SPEC_KEYS[key]) {
+            return true;
+        }
         return this._components.some(component => {
             return (component.specKey || component.type) === key;
         });
@@ -76804,6 +76859,57 @@ class BaseChart extends CompilableBase {
             !result.changeTheme &&
             !result.changeBackground);
     }
+    _reRunStackDataFlow() {
+        var _a, _b;
+        if (!this._series.some(series => { var _a; return (_a = series.getStack) === null || _a === void 0 ? void 0 : _a.call(series); })) {
+            return;
+        }
+        (_b = (_a = this._stack) === null || _a === void 0 ? void 0 : _a.stackAll) === null || _b === void 0 ? void 0 : _b.call(_a);
+        this._series.forEach(series => {
+            if (series.getViewDataFilter()) {
+                series.reTransformViewData();
+            }
+        });
+    }
+    _getModelSpecIndex(specInfo) {
+        var _a;
+        const specPath = (_a = specInfo.specPath) !== null && _a !== void 0 ? _a : [];
+        const specIndex = specPath[specPath.length - 1];
+        return typeof specIndex === 'number' ? specIndex : 0;
+    }
+    _hasComponentForSpecInfo(key, specInfo) {
+        const specIndex = this._getModelSpecIndex(specInfo);
+        return this._components.some(component => {
+            return (component.specKey || component.type) === key && component.getSpecIndex() === specIndex;
+        });
+    }
+    _createMissingMarkerComponentsForSpecs(result, componentCache) {
+        var _a;
+        let createdCount = 0;
+        (_a = this._specTransformer) === null || _a === void 0 ? void 0 : _a.forEachComponentInSpec(this._spec, (constructor, specInfo) => {
+            if (result.reMake) {
+                return;
+            }
+            const compSpecKey = constructor.specKey || constructor.type;
+            if (!MARKER_COMPONENT_SPEC_KEYS[compSpecKey] || this._hasComponentForSpecInfo(compSpecKey, specInfo)) {
+                return;
+            }
+            if (!this._isMarkerAdditionSpecSafeWithoutRemake(specInfo.spec)) {
+                result.reMake = true;
+                return;
+            }
+            this._createComponent(constructor, specInfo);
+            if (componentCache[compSpecKey]) {
+                componentCache[compSpecKey].componentCount++;
+            }
+            createdCount++;
+        }, this._option.getSpecInfo());
+        if (!createdCount) {
+            return;
+        }
+        result.change = true;
+        result.effects = Object.assign(Object.assign({}, result.effects), { component: true, layout: true, render: true });
+    }
     _removeMarkerComponentsForEmptySpecs(result) {
         const removedComponents = this._components.filter(component => {
             var _a;

package/build/index.js

@@ -60792,29 +60792,38 @@
         }
         renderMarks() {
             var _a;
-            if (!this._hasCommitedMark()) {
+            let hasCommitedMark = this._hasCommitedMark();
+            const needsLayout = this._layoutState === LayoutState.before;
+            if (!hasCommitedMark && !needsLayout) {
                 return;
             }
             log(`--- start of renderMarks(${this._count}) ---`);
             this.clearProgressive();
-            this._rootMarks.forEach(mark => {
-                mark.render();
-            });
-            if (this._layoutState === LayoutState.before) {
+            if (hasCommitedMark) {
+                this._rootMarks.forEach(mark => {
+                    mark.render();
+                });
+            }
+            if (needsLayout) {
                 this._layoutState = LayoutState.layouting;
                 (_a = this._compileChart) === null || _a === void 0 ? void 0 : _a.onLayout();
                 this._layoutState = LayoutState.reevaluate;
-                if (this._hasCommitedMark()) {
+                hasCommitedMark = this._hasCommitedMark();
+                if (hasCommitedMark) {
                     this._rootMarks.forEach(mark => {
                         mark.render();
                     });
                 }
                 this.handleLayoutEnd();
             }
-            this.findProgressiveMarks();
-            this.updateStateAnimation();
+            if (hasCommitedMark) {
+                this.findProgressiveMarks();
+                this.updateStateAnimation();
+            }
             this._doRender(true);
-            this.doPreProgressive();
+            if (hasCommitedMark) {
+                this.doPreProgressive();
+            }
             log(`--- start of renderMarks(${this._count}) ---`);
             this._count++;
         }
@@ -72663,6 +72672,7 @@
             }
         }
         _compareSpec(spec, prevSpec) {
+            var _a, _b;
             const result = super._compareSpec(spec, prevSpec);
             if (result.reMake) {
                 return result;
@@ -72673,10 +72683,10 @@
                 result.reMake = true;
                 return result;
             }
-            result.reMake = ['grid', 'subGrid', 'tick', 'subTick', 'label', 'domainLine', 'title'].some(k => {
-                var _a, _b;
-                return ((_a = prevSpec === null || prevSpec === void 0 ? void 0 : prevSpec[k]) === null || _a === void 0 ? void 0 : _a.visible) !== ((_b = spec === null || spec === void 0 ? void 0 : spec[k]) === null || _b === void 0 ? void 0 : _b.visible);
-            });
+            if (((_a = spec === null || spec === void 0 ? void 0 : spec.grid) === null || _a === void 0 ? void 0 : _a.visible) === true && ((_b = prevSpec === null || prevSpec === void 0 ? void 0 : prevSpec.grid) === null || _b === void 0 ? void 0 : _b.visible) !== true && !this._gridMark) {
+                result.reMake = true;
+                return result;
+            }
             if (specChanged && !result.reMake && this._isComponentOnlySpecChange(spec, prevSpec)) {
                 result.effects = Object.assign(Object.assign({}, result.effects), { component: true, layout: true, render: true });
             }
@@ -75963,6 +75973,21 @@
         [ComponentTypeEnum.markLine]: true,
         [ComponentTypeEnum.markArea]: true
     };
+    const MARKER_ADDITION_REMAKE_SPEC_KEYS = {
+        autoRange: true,
+        regionId: true,
+        regionIndex: true,
+        seriesId: true,
+        seriesIndex: true,
+        relativeSeriesId: true,
+        relativeSeriesIndex: true,
+        startRelativeSeriesId: true,
+        startRelativeSeriesIndex: true,
+        endRelativeSeriesId: true,
+        endRelativeSeriesIndex: true,
+        specifiedDataSeriesId: true,
+        specifiedDataSeriesIndex: true
+    };
     class BaseChart extends CompilableBase {
         getSpec() {
             return this._spec;
@@ -76137,6 +76162,12 @@
             this.getComponentsByType = (type) => {
                 return this._components.filter(c => c.type === type);
             };
+            this._isMarkerAdditionSpecSafeWithoutRemake = (spec) => {
+                if (!spec || typeof spec !== 'object' || spec.visible === false) {
+                    return false;
+                }
+                return !Object.keys(MARKER_ADDITION_REMAKE_SPEC_KEYS).some(key => !isNil$1(spec[key]));
+            };
             this._paddingSpec = normalizeLayoutPaddingSpec((_a = spec.padding) !== null && _a !== void 0 ? _a : option.getTheme('padding'));
             this._event = new Event$1(option.eventDispatcher, option.mode);
             this._dataSet = option.dataSet;
@@ -76536,7 +76567,7 @@
                 .sort();
         }
         updateSpec(spec) {
-            var _a;
+            var _a, _b;
             const result = {
                 change: false,
                 reMake: false,
@@ -76562,7 +76593,7 @@
                 const nextSpec = spec[key];
                 if (isArray$1(currentSpec) &&
                     currentSpec.length !== array(nextSpec).length &&
-                    !this._canRemoveMarkerComponentsWithoutRemake(key, currentSpec, nextSpec)) {
+                    !this._canChangeMarkerComponentsWithoutRemake(key, currentSpec, nextSpec)) {
                     result.reMake = true;
                     this.setLayoutTag(true, null, false);
                     return result;
@@ -76597,6 +76628,9 @@
                 this.setLayoutTag(true, null, false);
                 return result;
             }
+            if (!onlyComponentSpecsChanged && ((_a = result.effects) === null || _a === void 0 ? void 0 : _a.localOnly)) {
+                delete result.effects.localOnly;
+            }
             if (isUpdateSpecResultLocalOnly(result)) {
                 return result;
             }
@@ -76606,7 +76640,7 @@
                 componentUpdateResult.componentOnlyUpdatedComponents.forEach(component => {
                     component.reInit(component.getSpec());
                 });
-                if ((_a = result.effects) === null || _a === void 0 ? void 0 : _a.layout) {
+                if ((_b = result.effects) === null || _b === void 0 ? void 0 : _b.layout) {
                     this.setLayoutTag(true, null, false);
                 }
                 return result;
@@ -76619,7 +76653,9 @@
             this.reInit();
             if (!onlySeriesSpecsChanged || !this._canSkipChartDataStages(result)) {
                 this.updateDataSpec();
-                this.updateGlobalScaleDomain();
+                this.reDataFlow();
+                this._reRunStackDataFlow();
+                this.getAllModels().forEach(model => model.onDataUpdate());
             }
             return result;
         }
@@ -76702,6 +76738,9 @@
                     mergeUpdateResult(result, componentResult);
                 }
             });
+            if (!result.reMake) {
+                this._createMissingMarkerComponentsForSpecs(result, componentCache);
+            }
             for (const key in componentCache) {
                 if (Object.prototype.hasOwnProperty.call(componentCache, key)) {
                     const element = componentCache[key];
@@ -76732,6 +76771,19 @@
                 hasNonComponentOnlyUpdate
             };
         }
+        _canChangeMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) {
+            return (this._canRemoveMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) ||
+                this._canAddMarkerComponentsWithoutRemake(key, currentSpec, nextSpec));
+        }
+        _canAddMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) {
+            if (!MARKER_COMPONENT_SPEC_KEYS[key] || !isArray$1(currentSpec) || !isArray$1(nextSpec)) {
+                return false;
+            }
+            if (nextSpec.length <= currentSpec.length) {
+                return false;
+            }
+            return nextSpec.slice(currentSpec.length).every(this._isMarkerAdditionSpecSafeWithoutRemake);
+        }
         _canRemoveMarkerComponentsWithoutRemake(key, currentSpec, nextSpec) {
             return (MARKER_COMPONENT_SPEC_KEYS[key] &&
                 isArray$1(currentSpec) &&
@@ -76751,6 +76803,9 @@
             return hasMarkerRemoval && onlyMarkerRemoval;
         }
         _isComponentSpecKey(key) {
+            if (MARKER_COMPONENT_SPEC_KEYS[key]) {
+                return true;
+            }
             return this._components.some(component => {
                 return (component.specKey || component.type) === key;
             });
@@ -76810,6 +76865,57 @@
                 !result.changeTheme &&
                 !result.changeBackground);
         }
+        _reRunStackDataFlow() {
+            var _a, _b;
+            if (!this._series.some(series => { var _a; return (_a = series.getStack) === null || _a === void 0 ? void 0 : _a.call(series); })) {
+                return;
+            }
+            (_b = (_a = this._stack) === null || _a === void 0 ? void 0 : _a.stackAll) === null || _b === void 0 ? void 0 : _b.call(_a);
+            this._series.forEach(series => {
+                if (series.getViewDataFilter()) {
+                    series.reTransformViewData();
+                }
+            });
+        }
+        _getModelSpecIndex(specInfo) {
+            var _a;
+            const specPath = (_a = specInfo.specPath) !== null && _a !== void 0 ? _a : [];
+            const specIndex = specPath[specPath.length - 1];
+            return typeof specIndex === 'number' ? specIndex : 0;
+        }
+        _hasComponentForSpecInfo(key, specInfo) {
+            const specIndex = this._getModelSpecIndex(specInfo);
+            return this._components.some(component => {
+                return (component.specKey || component.type) === key && component.getSpecIndex() === specIndex;
+            });
+        }
+        _createMissingMarkerComponentsForSpecs(result, componentCache) {
+            var _a;
+            let createdCount = 0;
+            (_a = this._specTransformer) === null || _a === void 0 ? void 0 : _a.forEachComponentInSpec(this._spec, (constructor, specInfo) => {
+                if (result.reMake) {
+                    return;
+                }
+                const compSpecKey = constructor.specKey || constructor.type;
+                if (!MARKER_COMPONENT_SPEC_KEYS[compSpecKey] || this._hasComponentForSpecInfo(compSpecKey, specInfo)) {
+                    return;
+                }
+                if (!this._isMarkerAdditionSpecSafeWithoutRemake(specInfo.spec)) {
+                    result.reMake = true;
+                    return;
+                }
+                this._createComponent(constructor, specInfo);
+                if (componentCache[compSpecKey]) {
+                    componentCache[compSpecKey].componentCount++;
+                }
+                createdCount++;
+            }, this._option.getSpecInfo());
+            if (!createdCount) {
+                return;
+            }
+            result.change = true;
+            result.effects = Object.assign(Object.assign({}, result.effects), { component: true, layout: true, render: true });
+        }
         _removeMarkerComponentsForEmptySpecs(result) {
             const removedComponents = this._components.filter(component => {
                 var _a;