@visactor/vchart 1.9.0-alpha.0 → 1.9.0-alpha.1

package/cjs/core/vchart.d.ts

@@ -6,8 +6,8 @@ import type { DimensionIndexOption, IChart, IChartConstructor, IChartSpecInfo }
 import type { IComponentConstructor } from '../component/interface';
 import type { EventCallback, EventParams, EventQuery, EventType } from '../event/interface';
 import type { IParserOptions } from '@visactor/vdataset/es/parser';
-import type { Transform } from '@visactor/vdataset';
-import { DataSet, DataView } from '@visactor/vdataset';
+import type { Transform, DataView } from '@visactor/vdataset';
+import { DataSet } from '@visactor/vdataset';
 import type { Stage } from '@visactor/vrender-core';
 import type { GeoSourceType } from '../typings/geo';
 import type { GeoSourceOption } from '../series/map/geo-source';
@@ -84,8 +84,8 @@ export declare class VChart implements IVChart {
     private _bindResizeEvent;
     private _unBindResizeEvent;
     getCurrentSize(): {
-        width: any;
-        height: any;
+        width: number;
+        height: number;
     };
     private _doResize;
     private _onResize;
@@ -102,12 +102,13 @@ export declare class VChart implements IVChart {
     private _updateAnimateState;
     release(): void;
     updateData(id: StringOrNumber, data: DataView | Datum[] | string, options?: IParserOptions): Promise<IVChart>;
+    private _updateDataById;
     updateDataInBatches(list: {
         id: string;
         data: Datum[];
         options?: IParserOptions;
     }[]): Promise<IVChart>;
-    updateDataSync(id: StringOrNumber, data: DataView | Datum[], options?: IParserOptions): IVChart;
+    updateDataSync(id: StringOrNumber, data: DataView | Datum[] | string, options?: IParserOptions): IVChart;
     updateFullDataSync(data: IDataValues | IDataValues[], reRender?: boolean): IVChart;
     updateFullData(data: IDataValues | IDataValues[], reRender?: boolean): Promise<IVChart>;
     updateSpec(spec: ISpec, forceMerge?: boolean, morphConfig?: IMorphConfig): Promise<IVChart>;
@@ -124,6 +125,9 @@ export declare class VChart implements IVChart {
     } | ((model: IModel) => boolean), spec: unknown, forceMerge?: boolean, morphConfig?: IMorphConfig): IVChart;
     protected _updateModelSpec(model: IModel, spec: unknown, sync?: boolean, forceMerge?: boolean, morphConfig?: IMorphConfig): IVChart | Promise<IVChart>;
     resize(width: number, height: number): Promise<IVChart>;
+    resizeSync(width: number, height: number): IVChart;
+    protected _beforeResize(width: number, height: number): boolean;
+    protected _afterResize(): IVChart;
     updateViewBox(viewBox: IBoundsLike, reRender?: boolean, reLayout?: boolean): IVChart;
     on(eType: EventType, handler: EventCallback<EventParams>): void;
     on(eType: EventType, query: EventQuery, handler: EventCallback<EventParams>): void;

package/cjs/core/vchart.js

@@ -129,12 +129,7 @@ class VChart {
         renderCanvas && (this._canvas = renderCanvas), stage && (this._stage = stage), "node" === mode || this._container || this._canvas || this._stage ? (isTrueBrowseEnv ? (0, 
         env_2.registerBrowserEnv)() : "node" === mode && (0, env_2.registerNodeEnv)(), this._viewBox = this._option.viewBox, 
         this._currentThemeName = theme_manager_1.ThemeManager.getCurrentThemeName(), this._setNewSpec(spec), 
-        this._updateCurrentTheme(), this._currentSize = (0, util_2.calculateChartSize)(this._spec, {
-            container: this._container,
-            canvas: this._canvas,
-            mode: this._option.mode || common_1.RenderModeEnum["desktop-browser"],
-            modeParams: this._option.modeParams
-        }), this._compiler = new compiler_1.Compiler({
+        this._updateCurrentTheme(), this._currentSize = this.getCurrentSize(), this._compiler = new compiler_1.Compiler({
             dom: null !== (_c = this._container) && void 0 !== _c ? _c : "none",
             canvas: renderCanvas
         }, Object.assign(Object.assign({
@@ -173,7 +168,8 @@ class VChart {
             getTheme: () => {
                 var _a;
                 return null !== (_a = this._currentTheme) && void 0 !== _a ? _a : {};
-            }
+            },
+            animation: this._option.animation
         })), this._chartSpecTransformer.transformSpec(this._spec), this._chartPluginApply("onAfterChartSpecTransform", this._spec, actionSource), 
         this._specInfo = null === (_a = this._chartSpecTransformer) || void 0 === _a ? void 0 : _a.transformModelSpec(this._spec), 
         this._chartPluginApply("onAfterModelSpecTransform", this._spec, this._specInfo, actionSource);
@@ -224,7 +220,7 @@ class VChart {
         this._dataSet && (this._dataSet.dataViewMap = {}, this._dataSet = null);
     }
     _bindVGrammarViewEvent() {
-        this._compiler && !this._compiler.isReleased && (this._compiler.getVGrammarView().addEventListener(constant_1.VGRAMMAR_HOOK_EVENT.ALL_ANIMATION_END, (() => {
+        this._compiler && (this._compiler.getVGrammarView().addEventListener(constant_1.VGRAMMAR_HOOK_EVENT.ALL_ANIMATION_END, (() => {
             this._event.emit(constant_1.ChartEvent.animationFinished, {});
         })), this._compiler.getVGrammarView().addEventListener(constant_1.VGRAMMAR_HOOK_EVENT.AFTER_VRENDER_NEXT_RENDER, (() => {
             this._event.emit(constant_1.ChartEvent.renderFinished, {});
@@ -245,19 +241,23 @@ class VChart {
         this._observer = null));
     }
     getCurrentSize() {
-        var _a, _b;
-        const {width: containerWidth, height: containerHeight} = (0, vutils_1.getContainerSize)(this._container, constant_1.DEFAULT_CHART_WIDTH, constant_1.DEFAULT_CHART_HEIGHT);
-        return {
-            width: null !== (_a = this._spec.width) && void 0 !== _a ? _a : containerWidth,
-            height: null !== (_b = this._spec.height) && void 0 !== _b ? _b : containerHeight
-        };
+        var _a, _b, _c, _d;
+        return (0, util_2.calculateChartSize)(this._spec, {
+            container: this._container,
+            canvas: this._canvas,
+            mode: this._option.mode || common_1.RenderModeEnum["desktop-browser"],
+            modeParams: this._option.modeParams
+        }, {
+            width: null !== (_b = null === (_a = this._currentSize) || void 0 === _a ? void 0 : _a.width) && void 0 !== _b ? _b : constant_1.DEFAULT_CHART_WIDTH,
+            height: null !== (_d = null === (_c = this._currentSize) || void 0 === _c ? void 0 : _c.height) && void 0 !== _d ? _d : constant_1.DEFAULT_CHART_HEIGHT
+        });
     }
     _doResize() {
         const {width: width, height: height} = this.getCurrentSize();
         this._currentSize.width === width && this._currentSize.height === height || (this._currentSize = {
             width: width,
             height: height
-        }, this.resize(width, height));
+        }, this.resizeSync(width, height));
     }
     _initDataSet(dataSet) {
         dataSet instanceof vdataset_1.DataSet ? this._dataSet = dataSet : this._dataSet = new vdataset_1.DataSet, 
@@ -276,7 +276,7 @@ class VChart {
         return !!updateSpecResult && (this._reCompile(updateSpecResult), this._beforeRender(option));
     }
     _reCompile(updateResult, morphConfig) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e;
         if (updateResult.reMake) this._releaseData(), this._initDataSet(), this._chartSpecTransformer = null, 
         this._chart.release(), this._chart = null, null === (_a = this._compiler) || void 0 === _a || _a.releaseGrammar(!1 === (null === (_b = this._option) || void 0 === _b ? void 0 : _b.animation) || !1 === (null === (_c = this._spec) || void 0 === _c ? void 0 : _c.animation)), 
         this._userEvents.forEach((e => {
@@ -290,7 +290,7 @@ class VChart {
             vChart: this
         }, {})), updateResult.reSize) {
             const {width: width, height: height} = this.getCurrentSize();
-            this._chart.onResize(width, height, !1), null === (_g = (_f = this._compiler).resize) || void 0 === _g || _g.call(_f, width, height, !1);
+            this._chart.onResize(width, height, !1), this._compiler.resize(width, height, !1);
         }
     }
     _beforeRender(option = {}) {
@@ -333,15 +333,12 @@ class VChart {
     _renderSync(option = {}) {
         var _a;
         const self = this;
-        return this._beforeRender(option) ? (null === (_a = this._compiler) || void 0 === _a || _a.renderSync(option.morphConfig), 
+        return this._beforeRender(option) ? (null === (_a = this._compiler) || void 0 === _a || _a.render(option.morphConfig), 
         this._afterRender(), self) : self;
     }
     _renderAsync(option = {}) {
-        var _a;
         return __awaiter(this, void 0, void 0, (function*() {
-            const self = this;
-            return this._beforeRender(option) ? (yield null === (_a = this._compiler) || void 0 === _a ? void 0 : _a.renderAsync(option.morphConfig), 
-            this._afterRender(), self) : self;
+            return this._renderSync(option);
         }));
     }
     _updateAnimateState() {
@@ -365,51 +362,36 @@ class VChart {
     }
     updateData(id, data, options) {
         return __awaiter(this, void 0, void 0, (function*() {
-            if ((0, util_1.isNil)(this._dataSet)) return this;
-            if (this._chart) return this._chart.updateData(id, data, !0, options), yield this._compiler.renderAsync(), 
-            this;
-            this._spec.data = (0, util_1.array)(this._spec.data);
-            const preDV = this._spec.data.find((dv => dv.name === id || dv.id === id));
-            return preDV ? preDV.id === id ? preDV.values = data : preDV.name === id && preDV.parse(data, options) : (0, 
-            vutils_1.isArray)(data) ? this._spec.data.push({
-                id: id,
-                values: data
-            }) : this._spec.data.push(data), this;
+            return this.updateDataSync(id, data, options);
         }));
     }
+    _updateDataById(id, data, options) {
+        const preDV = this._spec.data.find((dv => dv.name === id || dv.id === id));
+        preDV ? preDV.id === id ? preDV.values = data : preDV.name === id && preDV.parse(data, options) : (0, 
+        vutils_1.isArray)(data) ? this._spec.data.push({
+            id: id,
+            values: data
+        }) : this._spec.data.push(data);
+    }
     updateDataInBatches(list) {
         return __awaiter(this, void 0, void 0, (function*() {
             return this._chart ? (this._chart.updateFullData(list.map((({id: id, data: data, options: options}) => ({
                 id: id,
                 values: data,
                 parser: options
-            })))), this._chart.updateGlobalScaleDomain(), yield this._compiler.renderAsync(), 
-            this) : (list.forEach((({id: id, data: data, options: options}) => {
-                const preDV = this._spec.data.find((dv => dv.name === id));
-                if (preDV) preDV.parse(data, options); else {
-                    const dataView = new vdataset_1.DataView(this._dataSet, {
-                        name: id
-                    });
-                    dataView.parse(data, options), this._spec.data.push(dataView);
-                }
+            })))), this._chart.updateGlobalScaleDomain(), this._compiler.render(), this) : (this._spec.data = (0, 
+            util_1.array)(this._spec.data), list.forEach((({id: id, data: data, options: options}) => {
+                this._updateDataById(id, data, options);
             })), this);
         }));
     }
     updateDataSync(id, data, options) {
-        if ((0, util_1.isNil)(this._dataSet)) return this;
-        if (this._chart) return this._chart.updateData(id, data, !0, options), this._compiler.renderSync(), 
-        this;
-        const preDV = this._spec.data.find((dv => dv.name === id));
-        if (preDV) preDV.parse(data, options); else {
-            const dataView = new vdataset_1.DataView(this._dataSet, {
-                name: id
-            });
-            dataView.parse(data, options), this._spec.data.push(dataView);
-        }
-        return this;
+        return (0, util_1.isNil)(this._dataSet) ? this : this._chart ? (this._chart.updateData(id, data, !0, options), 
+        this._compiler.render(), this) : (this._spec.data = (0, util_1.array)(this._spec.data), 
+        this._updateDataById(id, data, options), this);
     }
     updateFullDataSync(data, reRender = !0) {
-        if (this._chart) return this._chart.updateFullData(data), reRender && this._compiler.renderSync(), 
+        if (this._chart) return this._chart.updateFullData(data), reRender && this._compiler.render(), 
         this;
         return (0, util_1.array)(data).forEach((d => {
             var _a;
@@ -425,19 +407,7 @@ class VChart {
     }
     updateFullData(data, reRender = !0) {
         return __awaiter(this, void 0, void 0, (function*() {
-            if (this._chart) return this._chart.updateFullData(data), reRender && (yield this._compiler.renderAsync()), 
-            this;
-            return (0, util_1.array)(data).forEach((d => {
-                var _a;
-                const {id: id, values: values, parser: parser, fields: fields} = d, preDV = this._spec.data.find((dv => dv.name === id));
-                if (preDV) preDV.setFields((0, vutils_1.cloneDeep)(fields)), preDV.parse(values, (0, 
-                vutils_1.cloneDeep)(parser)); else {
-                    const dataView = (0, initialize_1.dataToDataView)(d, this._dataSet, this._spec.data, {
-                        onError: null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError
-                    });
-                    this._spec.data.push(dataView);
-                }
-            })), this;
+            return this.updateFullDataSync(data, reRender);
         }));
     }
     updateSpec(spec, forceMerge = !1, morphConfig) {
@@ -509,22 +479,32 @@ class VChart {
         });
     }
     resize(width, height) {
-        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, (function*() {
-            if (!this._chart || !this._compiler) return this;
-            const chartCanvasRect = this._chart.getCanvasRect();
-            return chartCanvasRect && chartCanvasRect.width === width && chartCanvasRect.height === height ? this : (this._chartPluginApply("onBeforeResize", width, height), 
-            null === (_b = null === (_a = this._option.performanceHook) || void 0 === _a ? void 0 : _a.beforeResizeWithUpdate) || void 0 === _b || _b.call(_a), 
-            this._chart.onResize(width, height, !1), null === (_d = null === (_c = this._option.performanceHook) || void 0 === _c ? void 0 : _c.afterResizeWithUpdate) || void 0 === _d || _d.call(_c), 
-            yield null === (_f = (_e = this._compiler).resize) || void 0 === _f ? void 0 : _f.call(_e, width, height), 
-            this._isReleased || this._event.emit(constant_1.ChartEvent.afterResize, {
-                chart: this._chart
-            }), this);
+            return this.resizeSync(width, height);
         }));
     }
+    resizeSync(width, height) {
+        var _a, _b;
+        return this._beforeResize(width, height) ? (null === (_b = (_a = this._compiler).resize) || void 0 === _b || _b.call(_a, width, height), 
+        this._afterResize()) : this;
+    }
+    _beforeResize(width, height) {
+        var _a, _b, _c, _d;
+        if (!this._chart || !this._compiler) return !1;
+        const chartCanvasRect = this._chart.getCanvasRect();
+        return (!chartCanvasRect || chartCanvasRect.width !== width || chartCanvasRect.height !== height) && (this._chartPluginApply("onBeforeResize", width, height), 
+        null === (_b = null === (_a = this._option.performanceHook) || void 0 === _a ? void 0 : _a.beforeResizeWithUpdate) || void 0 === _b || _b.call(_a), 
+        this._chart.onResize(width, height, !1), null === (_d = null === (_c = this._option.performanceHook) || void 0 === _c ? void 0 : _c.afterResizeWithUpdate) || void 0 === _d || _d.call(_c), 
+        !0);
+    }
+    _afterResize() {
+        return this._isReleased || this._event.emit(constant_1.ChartEvent.afterResize, {
+            chart: this._chart
+        }), this;
+    }
     updateViewBox(viewBox, reRender = !0, reLayout = !0) {
         return this._chart && this._compiler ? (this._viewBox = viewBox, this._chart.updateViewBox(viewBox, reLayout), 
-        reLayout && (this._compiler.renderSync(), this._chart.onEvaluateEnd()), this._compiler.updateViewBox(viewBox, reRender), 
+        reLayout && (this._compiler.render(), this._chart.onEvaluateEnd()), this._compiler.updateViewBox(viewBox, reRender), 
         this) : this;
     }
     on(eType, query, handler) {
@@ -618,7 +598,7 @@ class VChart {
     }
     _getTooltipComponent() {
         var _a;
-        return null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getAllComponents().find((c => c.type === type_1.ComponentTypeEnum.tooltip));
+        return null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getComponentsByType(type_1.ComponentTypeEnum.tooltip)[0];
     }
     setTooltipHandler(tooltipHandler) {
         var _a, _b;
@@ -652,8 +632,8 @@ class VChart {
     }
     getLegendDataByIndex(index = 0) {
         var _a;
-        const legends = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getAllComponents().filter((c => c.type === type_1.ComponentTypeEnum.discreteLegend));
-        return legends[index] ? legends[index].getLegendData() : [];
+        const legends = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getComponentsByType(type_1.ComponentTypeEnum.discreteLegend);
+        return legends && legends[index] ? legends[index].getLegendData() : [];
     }
     getLegendSelectedDataById(id) {
         var _a;
@@ -662,8 +642,8 @@ class VChart {
     }
     getLegendSelectedDataByIndex(index = 0) {
         var _a;
-        const legends = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getAllComponents().filter((c => c.type === type_1.ComponentTypeEnum.discreteLegend));
-        return legends[index] ? legends[index].getSelectedData() : [];
+        const legends = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getComponentsByType(type_1.ComponentTypeEnum.discreteLegend);
+        return legends && legends[index] ? legends[index].getSelectedData() : [];
     }
     setLegendSelectedDataById(id, selectedData) {
         var _a;
@@ -672,8 +652,8 @@ class VChart {
     }
     setLegendSelectedDataByIndex(index = 0, selectedData) {
         var _a;
-        const legends = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getAllComponents().filter((c => c.type === type_1.ComponentTypeEnum.discreteLegend));
-        legends[index] && legends[index].setSelectedData(selectedData);
+        const legends = null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getComponentsByType(type_1.ComponentTypeEnum.discreteLegend);
+        legends && legends[index] && legends[index].setSelectedData(selectedData);
     }
     getDataURL() {
         var _a;