@visactor/vchart 1.12.0-alpha.4 → 1.12.0-alpha.6

package/esm/core/index.d.ts

@@ -1,7 +1,7 @@
 import { VChart } from './vchart';
 import { Factory } from './factory';
 export { VChart, Factory };
-export declare const version = "1.12.0-alpha.4";
+export declare const version = "1.12.0-alpha.6";
 export type { IVChart } from './interface';
 export type { IStateSpec, StateValueType } from '../compile/mark';
 export * from '../typings/spec/common';

package/esm/core/index.js

@@ -4,7 +4,7 @@ import { Factory } from "./factory";
 
 export { VChart, Factory };
 
-export const version = "1.12.0-alpha.4";
+export const version = "1.12.0-alpha.6";
 
 export * from "../typings/spec/common";
 

package/esm/core/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAG3B,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAMxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAK5B,cAAc,uBAAuB,CAAC;AAGtC,cAAc,oBAAoB,CAAC;AAGnC,cAAc,gBAAgB,CAAC;AAG/B,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC","file":"index.js","sourcesContent":["/**\n * @description The core module of VChart, containing the necessary interfaces for using VChart.\n */\n\nimport { VChart } from './vchart';\nimport { Factory } from './factory';\n\nexport { VChart, Factory };\n\n// export the version\nexport const version = \"1.12.0-alpha.4\";\n\n// export necessary types\nexport type { IVChart } from './interface';\nexport type { IStateSpec, StateValueType } from '../compile/mark';\n\nexport * from '../typings/spec/common';\nexport * from '../event/interface';\nexport * from '../theme/interface';\nexport * from '../constant';\nexport * from './interface';\n\n/**\n * spec\n */\nexport * from '../typings/spec/index';\n\n// tooltip\nexport * from '../typings/tooltip';\n\n// theme\nexport * from '../theme/index';\n\n// vrender\nexport { vglobal } from '@visactor/vrender-core';\n"]}
+{"version":3,"sources":["../src/core/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAG3B,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAMxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAK5B,cAAc,uBAAuB,CAAC;AAGtC,cAAc,oBAAoB,CAAC;AAGnC,cAAc,gBAAgB,CAAC;AAG/B,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC","file":"index.js","sourcesContent":["/**\n * @description The core module of VChart, containing the necessary interfaces for using VChart.\n */\n\nimport { VChart } from './vchart';\nimport { Factory } from './factory';\n\nexport { VChart, Factory };\n\n// export the version\nexport const version = \"1.12.0-alpha.6\";\n\n// export necessary types\nexport type { IVChart } from './interface';\nexport type { IStateSpec, StateValueType } from '../compile/mark';\n\nexport * from '../typings/spec/common';\nexport * from '../event/interface';\nexport * from '../theme/interface';\nexport * from '../constant';\nexport * from './interface';\n\n/**\n * spec\n */\nexport * from '../typings/spec/index';\n\n// tooltip\nexport * from '../typings/tooltip';\n\n// theme\nexport * from '../theme/index';\n\n// vrender\nexport { vglobal } from '@visactor/vrender-core';\n"]}

package/esm/core/vchart.d.ts

@@ -147,6 +147,7 @@ export declare class VChart implements IVChart {
     setCurrentTheme(name: string): Promise<IVChart>;
     setCurrentThemeSync(name: string): IVChart;
     protected _setCurrentTheme(name?: string): IUpdateSpecResult;
+    private _setFontFamilyTheme;
     private _getTooltipComponent;
     setTooltipHandler(tooltipHandler: ITooltipHandler): void;
     getTooltipHandlerByUser(): ITooltipHandler | undefined;

package/esm/core/vchart.js

@@ -68,8 +68,6 @@ import { registerDataSetInstanceParser, registerDataSetInstanceTransform } from
 
 import { dataToDataView } from "../data/initialize";
 
-import { stackSplit } from "../data/transforms/stack-split";
-
 import { copyDataView } from "../data/transforms/copy-data-view";
 
 import { AnimationStateEnum } from "../animation/interface";
@@ -183,7 +181,7 @@ export class VChart {
         return this._dataSet;
     }
     constructor(spec, options) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         this.id = createID(), this._userEvents = [], this._autoSize = !0, this._option = {
             mode: RenderModeEnum["desktop-browser"],
             onError: msg => {
@@ -197,7 +195,7 @@ export class VChart {
         }), 100), this._option = mergeOrigin(this._option, {
             animation: !1 !== spec.animation
         }, options), this._onError = null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError;
-        const _h = this._option, {dom: dom, renderCanvas: renderCanvas, mode: mode, stage: stage, poptip: poptip} = _h, restOptions = __rest(_h, [ "dom", "renderCanvas", "mode", "stage", "poptip" ]), isTrueBrowseEnv = isTrueBrowser(mode);
+        const _g = this._option, {dom: dom, renderCanvas: renderCanvas, mode: mode, stage: stage, poptip: poptip} = _g, restOptions = __rest(_g, [ "dom", "renderCanvas", "mode", "stage", "poptip" ]), isTrueBrowseEnv = isTrueBrowser(mode);
         isTrueBrowseEnv && dom && (this._container = isString(dom) ? null === document || void 0 === document ? void 0 : document.getElementById(dom) : dom), 
         renderCanvas && (this._canvas = renderCanvas), stage && (this._stage = stage), "node" === mode || this._container || this._canvas || this._stage ? (isTrueBrowseEnv ? registerBrowserEnv() : "node" === mode && registerNodeEnv(), 
         this._viewBox = this._option.viewBox, this._currentThemeName = ThemeManager.getCurrentThemeName(), 
@@ -214,11 +212,8 @@ export class VChart {
             onError: this._onError
         })), this._compiler.setSize(this._currentSize.width, this._currentSize.height), 
         this._eventDispatcher = new EventDispatcher(this, this._compiler), this._event = new Event(this._eventDispatcher, mode), 
-        this._compiler.initView(), null === (_d = this.getStage()) || void 0 === _d || _d.setTheme({
-            text: {
-                fontFamily: null === (_e = this._currentTheme) || void 0 === _e ? void 0 : _e.fontFamily
-            }
-        }), this._initDataSet(this._option.dataSet), this._autoSize = !!isTrueBrowseEnv && (null === (_g = null !== (_f = spec.autoFit) && void 0 !== _f ? _f : this._option.autoFit) || void 0 === _g || _g), 
+        this._compiler.initView(), this._setFontFamilyTheme(null === (_d = this._currentTheme) || void 0 === _d ? void 0 : _d.fontFamily), 
+        this._initDataSet(this._option.dataSet), this._autoSize = !!isTrueBrowseEnv && (null === (_f = null !== (_e = spec.autoFit) && void 0 !== _e ? _e : this._option.autoFit) || void 0 === _f || _f), 
         this._bindResizeEvent(), this._bindVGrammarViewEvent(), this._initChartPlugin(), 
         InstanceManager.registerInstance(this)) : null === (_b = this._option) || void 0 === _b || _b.onError("please specify container or renderCanvas!");
     }
@@ -307,8 +302,7 @@ export class VChart {
     }
     _initDataSet(dataSet) {
         this._dataSet = dataSet instanceof DataSet ? dataSet : new DataSet, registerDataSetInstanceParser(this._dataSet, "dataview", dataViewParser), 
-        registerDataSetInstanceParser(this._dataSet, "array", arrayParser), registerDataSetInstanceTransform(this._dataSet, "stackSplit", stackSplit), 
-        registerDataSetInstanceTransform(this._dataSet, "copyDataView", copyDataView);
+        registerDataSetInstanceParser(this._dataSet, "array", arrayParser), registerDataSetInstanceTransform(this._dataSet, "copyDataView", copyDataView);
         for (const key in Factory.transforms) registerDataSetInstanceTransform(this._dataSet, key, Factory.transforms[key]);
         for (const key in Factory.dataParser) registerDataSetInstanceParser(this._dataSet, key, Factory.dataParser[key]);
     }
@@ -324,11 +318,12 @@ export class VChart {
         var _a, _b, _c, _d, _e, _f;
         if (updateResult.reMake) this._releaseData(), this._initDataSet(), this._chartSpecTransformer = null, 
         null === (_a = this._chart) || void 0 === _a || _a.release(), this._chart = null, 
-        null === (_b = this._compiler) || void 0 === _b || _b.releaseGrammar(!1 === (null === (_c = this._option) || void 0 === _c ? void 0 : _c.animation) || !1 === (null === (_d = this._spec) || void 0 === _d ? void 0 : _d.animation)), 
+        updateResult.changeTheme && this._setCurrentTheme(), null === (_b = this._compiler) || void 0 === _b || _b.releaseGrammar(!1 === (null === (_c = this._option) || void 0 === _c ? void 0 : _c.animation) || !1 === (null === (_d = this._spec) || void 0 === _d ? void 0 : _d.animation)), 
         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.reSize && this._doResize(); else if (updateResult.reCompile && (null === (_e = this._compiler) || void 0 === _e || _e.clear({
+        })), updateResult.reSize && this._doResize(); else if (updateResult.changeTheme && this._setCurrentTheme(), 
+        updateResult.reCompile && (null === (_e = this._compiler) || void 0 === _e || _e.clear({
             chart: this._chart,
             vChart: this
         }, !this._option.animation || !this._spec.animation), null === (_f = this._compiler) || void 0 === _f || _f.compile({
@@ -491,26 +486,22 @@ export class VChart {
     }
     _updateSpec(spec, forceMerge = !1, userUpdateOptions) {
         var _a, _b;
-        const lastSpec = this._spec;
-        if (!this._setNewSpec(spec, forceMerge)) return;
-        isEqual(lastSpec.theme, this._spec.theme) || this._setCurrentTheme();
-        const reSize = this._shouldChartResize(lastSpec);
-        if (null === (_b = null === (_a = this._compiler) || void 0 === _a ? void 0 : _a.getVGrammarView()) || void 0 === _b || _b.updateLayoutTag(), 
-        this._spec.type !== lastSpec.type) return {
-            reTransformSpec: !0,
-            change: !0,
-            reMake: !0,
-            reCompile: !1,
-            reSize: reSize
-        };
-        this._initChartSpec(this._spec, "render");
-        const res = mergeUpdateResult(this._chart.updateSpec(this._spec), {
+        const lastSpec = this._spec, result = {
             reTransformSpec: !1,
-            change: reSize,
+            change: !1,
             reMake: !1,
             reCompile: !1,
-            reSize: reSize
-        });
+            reSize: !1,
+            changeTheme: !1
+        };
+        if (!this._setNewSpec(spec, forceMerge)) return;
+        isEqual(lastSpec.theme, this._spec.theme) || (result.changeTheme = !0);
+        const reSize = this._shouldChartResize(lastSpec);
+        if (result.reSize = reSize, null === (_b = null === (_a = this._compiler) || void 0 === _a ? void 0 : _a.getVGrammarView()) || void 0 === _b || _b.updateLayoutTag(), 
+        this._spec.type !== lastSpec.type) return result.reMake = !0, result.reTransformSpec = !0, 
+        result.change = !0, result;
+        this._initChartSpec(this._spec, "render");
+        const res = mergeUpdateResult(this._chart.updateSpec(this._spec), result);
         return userUpdateOptions ? Object.assign(Object.assign({}, res), userUpdateOptions) : res;
     }
     updateModelSpec(filter, spec, forceMerge = !1, morphConfig) {
@@ -639,19 +630,23 @@ export class VChart {
         return this._currentThemeName;
     }
     setCurrentTheme(name) {
+        var _a;
         return __awaiter(this, void 0, void 0, (function*() {
             if (!ThemeManager.themeExist(name)) return this;
             const result = this._setCurrentTheme(name);
-            return yield this.updateCustomConfigAndRerender(result, !1, {
+            return this._setFontFamilyTheme(null === (_a = this._currentTheme) || void 0 === _a ? void 0 : _a.fontFamily), 
+            yield this.updateCustomConfigAndRerender(result, !1, {
                 transformSpec: !1,
                 actionSource: "setCurrentTheme"
             }), this;
         }));
     }
     setCurrentThemeSync(name) {
+        var _a;
         if (!ThemeManager.themeExist(name)) return this;
         const result = this._setCurrentTheme(name);
-        return this.updateCustomConfigAndRerender(result, !0, {
+        return this._setFontFamilyTheme(null === (_a = this._currentTheme) || void 0 === _a ? void 0 : _a.fontFamily), 
+        this.updateCustomConfigAndRerender(result, !0, {
             transformSpec: !1,
             actionSource: "setCurrentTheme"
         }), this;
@@ -664,6 +659,14 @@ export class VChart {
             reMake: !1
         };
     }
+    _setFontFamilyTheme(fontFamily) {
+        var _a;
+        fontFamily && (null === (_a = this.getStage()) || void 0 === _a || _a.setTheme({
+            text: {
+                fontFamily: fontFamily
+            }
+        }));
+    }
     _getTooltipComponent() {
         var _a;
         return null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getComponentsByType(ComponentTypeEnum.tooltip)[0];