@visactor/vchart 1.5.2 → 1.5.3

package/cjs/chart/base-chart.d.ts

@@ -11,7 +11,6 @@ import type { IEvent } from '../event/interface';
 import type { DataView } from '@visactor/vdataset';
 import type { DataSet } from '@visactor/vdataset/es/data-set';
 import { Stack } from './stack';
-import type { ITheme } from '../theme/interface';
 import type { IParserOptions } from '@visactor/vdataset/es/parser';
 import type { IBoundsLike } from '@visactor/vutils';
 import type { IRunningConfig as IMorphConfig, IMark as IVGrammarMark, IView } from '@visactor/vgrammar-core';
@@ -25,7 +24,6 @@ export declare class BaseChart extends CompilableBase implements IChart {
     getSpec(): any;
     setSpec(s: any): void;
     getOption(): IChartOption;
-    protected _theme: ITheme;
     protected _regions: IRegion[];
     protected _series: ISeries[];
     protected _components: IComponent[];
@@ -129,11 +127,10 @@ export declare class BaseChart extends CompilableBase implements IChart {
     protected isValidSeries(seriesType: string): boolean;
     protected _getDefaultSeriesSpec(spec: any): any;
     private _updateLayoutRect;
-    getCurrentTheme(): ITheme;
-    setCurrentTheme(theme: ITheme, reInit?: boolean): void;
+    setCurrentTheme(reInit?: boolean): void;
     protected setRegionTheme(reInit?: boolean): void;
-    protected setComponentTheme(theme: ITheme, reInit?: boolean): void;
-    protected setSeriesTheme(theme: ITheme, reInit?: boolean): void;
+    protected setComponentTheme(reInit?: boolean): void;
+    protected setSeriesTheme(reInit?: boolean): void;
     clear(): void;
     compile(): void;
     afterCompile(): void;
@@ -153,4 +150,5 @@ export declare class BaseChart extends CompilableBase implements IChart {
     protected _disableMarkAnimation(states: string | string[]): void;
     protected _setStateInDatum(stateKey: string, checkReverse: boolean, datum: MaybeArray<Datum> | null, filter?: (series: ISeries, mark: IMark) => boolean, region?: IRegionQuerier): void;
     setDimensionIndex(value: StringOrNumber, opt: DimensionIndexOption): void;
+    getColorScheme(): import("../theme/color-scheme/interface").IThemeColorScheme;
 }

package/cjs/chart/base-chart.js

@@ -30,7 +30,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseChart = void 0;
 
-const data_1 = require("./chart-meta/data"), global_scale_1 = require("../scale/global-scale"), interface_1 = require("../component/interface"), interface_2 = require("../mark/interface"), factory_1 = require("../core/factory"), event_1 = require("../event/event"), util_1 = require("../util"), stack_1 = require("./stack"), base_model_1 = require("../model/base-model"), base_mark_1 = require("../mark/base/base-mark"), base_1 = require("../constant/base"), vutils_1 = require("@visactor/vutils"), util_2 = require("../theme/color-scheme/util"), compilable_base_1 = require("../compile/compilable-base"), interface_3 = require("../compile/mark/interface"), constant_1 = require("../constant"), dimension_1 = require("../event/events/dimension"), util_3 = require("./util"), vscale_1 = require("@visactor/vscale"), initialize_1 = require("../data/initialize");
+const data_1 = require("./chart-meta/data"), global_scale_1 = require("../scale/global-scale"), interface_1 = require("../component/interface"), interface_2 = require("../mark/interface"), factory_1 = require("../core/factory"), event_1 = require("../event/event"), util_1 = require("../util"), stack_1 = require("./stack"), base_model_1 = require("../model/base-model"), base_mark_1 = require("../mark/base/base-mark"), base_1 = require("../constant/base"), vutils_1 = require("@visactor/vutils"), util_2 = require("../theme/color-scheme/util"), compilable_base_1 = require("../compile/compilable-base"), interface_3 = require("../compile/mark/interface"), constant_1 = require("../constant"), dimension_1 = require("../event/events/dimension"), util_3 = require("./util"), vscale_1 = require("@visactor/vscale"), initialize_1 = require("../data/initialize"), util_4 = require("../theme/util"), theme_1 = require("../theme");
 
 class BaseChart extends compilable_base_1.CompilableBase {
     getSpec() {
@@ -63,7 +63,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
         return this._chartData;
     }
     constructor(spec, option) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         super(option), this.type = "chart", this.id = (0, util_1.createID)(), this._regions = [], 
         this._series = [], this._components = [], this._layoutRect = {
             x: 0,
@@ -107,9 +107,9 @@ class BaseChart extends compilable_base_1.CompilableBase {
         this.getComponentByUserId = userId => {
             const component = this._components.find((s => s.userId === userId));
             if (component) return component;
-        }, this._theme = option.getTheme(), this._paddingSpec = (0, util_1.normalizeLayoutPaddingSpec)(null !== (_a = spec.padding) && void 0 !== _a ? _a : null === (_b = this._theme) || void 0 === _b ? void 0 : _b.padding), 
-        this._event = new event_1.Event(option.eventDispatcher, option.mode), this._dataSet = option.dataSet, 
-        this._chartData = new data_1.ChartData(this._dataSet, null === (_c = this._option) || void 0 === _c ? void 0 : _c.onError), 
+        }, this._paddingSpec = (0, util_1.normalizeLayoutPaddingSpec)(null !== (_a = spec.padding) && void 0 !== _a ? _a : (0, 
+        util_4.getThemeFromOption)("padding", this._option)), this._event = new event_1.Event(option.eventDispatcher, option.mode), 
+        this._dataSet = option.dataSet, this._chartData = new data_1.ChartData(this._dataSet, null === (_b = this._option) || void 0 === _b ? void 0 : _b.onError), 
         this._modelOption = Object.assign(Object.assign({}, option), {
             mode: this._option.mode,
             map: this._idMap,
@@ -117,7 +117,7 @@ class BaseChart extends compilable_base_1.CompilableBase {
             getChartViewRect: () => this._viewRect,
             getChart: () => this,
             globalScale: this._globalScale,
-            onError: null === (_d = this._option) || void 0 === _d ? void 0 : _d.onError
+            onError: null === (_c = this._option) || void 0 === _c ? void 0 : _c.onError
         }), this._stack = new stack_1.Stack(this), this._spec = spec;
     }
     created() {
@@ -186,7 +186,6 @@ class BaseChart extends compilable_base_1.CompilableBase {
                 region: region,
                 specIndex: index,
                 specKey: "series",
-                getTheme: () => this._theme,
                 globalScale: this._globalScale,
                 getSeriesData: this._chartData.getSeriesData.bind(this._chartData),
                 sourceDataList: this._chartData.dataList
@@ -206,7 +205,6 @@ class BaseChart extends compilable_base_1.CompilableBase {
             getRegionsInIndex: this.getRegionsInIndex,
             getRegionsInIds: this.getRegionsInIds,
             getRegionsInUserIdOrIndex: this.getRegionsInUserIdOrIndex,
-            getTheme: () => this._theme,
             getAllSeries: this.getAllSeries,
             getSeriesInIndex: this.getSeriesInIndex,
             getSeriesInIds: this.getSeriesInIds,
@@ -267,10 +265,13 @@ class BaseChart extends compilable_base_1.CompilableBase {
         if (this._layoutFunc = this._option.layout, !this._layoutFunc) {
             let use3dLayout = !1;
             (this._spec.zField || this._spec.series && this._spec.series.some((s => s.zField))) && (use3dLayout = !0);
-            const layout = new (factory_1.Factory.getLayoutInKey(null !== (_b = null === (_a = this._spec.layout) || void 0 === _a ? void 0 : _a.type) && void 0 !== _b ? _b : use3dLayout ? "layout3d" : "base"))(this._spec.layout, {
-                onError: null === (_c = this._option) || void 0 === _c ? void 0 : _c.onError
-            });
-            this._layoutFunc = layout.layoutItems.bind(layout);
+            const constructor = factory_1.Factory.getLayoutInKey(null !== (_b = null === (_a = this._spec.layout) || void 0 === _a ? void 0 : _a.type) && void 0 !== _b ? _b : use3dLayout ? "layout3d" : "base");
+            if (constructor) {
+                const layout = new constructor(this._spec.layout, {
+                    onError: null === (_c = this._option) || void 0 === _c ? void 0 : _c.onError
+                });
+                this._layoutFunc = layout.layoutItems.bind(layout);
+            }
         }
     }
     layout(params) {
@@ -349,9 +350,10 @@ class BaseChart extends compilable_base_1.CompilableBase {
         return this._chartData.getSeriesData(id, index);
     }
     _transformSpecScale() {
-        var _a, _b, _c;
+        var _a, _b;
         const scales = null !== (_a = this._spec.scales) && void 0 !== _a ? _a : [];
         let colorScaleSpec = scales.find((s => "color" === s.id));
+        const colorScheme = this.getColorScheme();
         if (!colorScaleSpec && (colorScaleSpec = {
             type: "ordinal",
             id: "color",
@@ -359,23 +361,18 @@ class BaseChart extends compilable_base_1.CompilableBase {
             range: null
         }, scales.push(colorScaleSpec), this._spec.color)) {
             const colorSpec = this._spec.color;
-            if ((0, util_1.isArray)(colorSpec)) colorScaleSpec.range = colorSpec.map((color => {
-                var _a;
-                return (0, util_2.getActualColor)(color, null === (_a = this._theme) || void 0 === _a ? void 0 : _a.colorScheme);
-            })); else {
+            if ((0, util_1.isArray)(colorSpec)) colorScaleSpec.range = colorSpec.map((color => (0, 
+            util_2.getActualColor)(color, colorScheme))); else {
                 const tempSpec = colorSpec;
-                tempSpec.range && (tempSpec.range = tempSpec.range.map((color => {
-                    var _a;
-                    return (0, util_2.getActualColor)(color, null === (_a = this._theme) || void 0 === _a ? void 0 : _a.colorScheme);
-                }))), Object.prototype.hasOwnProperty.call(tempSpec, "type") && (colorScaleSpec.type = tempSpec.type), 
+                tempSpec.range && (tempSpec.range = tempSpec.range.map((color => (0, util_2.getActualColor)(color, colorScheme)))), 
+                Object.prototype.hasOwnProperty.call(tempSpec, "type") && (colorScaleSpec.type = tempSpec.type), 
                 Object.prototype.hasOwnProperty.call(tempSpec, "domain") && (colorScaleSpec.domain = tempSpec.domain), 
                 Object.prototype.hasOwnProperty.call(tempSpec, "range") && (colorScaleSpec.range = tempSpec.range), 
                 Object.prototype.hasOwnProperty.call(tempSpec, "specified") && (colorScaleSpec.specified = tempSpec.specified);
             }
         }
         return (null === (_b = colorScaleSpec.range) || void 0 === _b ? void 0 : _b.length) || (colorScaleSpec.range = (0, 
-        util_2.getDataScheme)(null === (_c = this._theme) || void 0 === _c ? void 0 : _c.colorScheme), 
-        colorScaleSpec.rangeTheme = !0), scales;
+        util_2.getDataScheme)(colorScheme), colorScaleSpec.rangeTheme = !0), scales;
     }
     createGlobalScale() {
         this._globalScale = new global_scale_1.GlobalScale(this._transformSpecScale(), this), 
@@ -394,9 +391,8 @@ class BaseChart extends compilable_base_1.CompilableBase {
         (0, util_3.mergeUpdateResult)(result, this._globalScale.updateSpec(this._transformSpecScale()));
     }
     updateGlobalScaleTheme() {
-        var _a;
-        const colorSpec = this._globalScale.getScaleSpec("color");
-        colorSpec.rangeTheme && (colorSpec.range = (0, util_2.getDataScheme)(null === (_a = this._theme) || void 0 === _a ? void 0 : _a.colorScheme), 
+        const colorSpec = this._globalScale.getScaleSpec("color"), colorScheme = this.getColorScheme();
+        colorSpec.rangeTheme && (colorSpec.range = (0, util_2.getDataScheme)(colorScheme), 
         this._globalScale.getScale("color").range(colorSpec.range));
     }
     updateSpec(spec, morphConfig) {
@@ -420,9 +416,10 @@ class BaseChart extends compilable_base_1.CompilableBase {
         result.reMake || this.updateGlobalScaleDomain(), result)))));
     }
     updateChartConfig(result, oldSpec) {
-        var _a, _b;
-        this._paddingSpec = (0, util_1.normalizeLayoutPaddingSpec)(null !== (_a = this._spec.padding) && void 0 !== _a ? _a : null === (_b = this._theme) || void 0 === _b ? void 0 : _b.padding), 
-        this._updateLayoutRect(this._viewBox), (0, vutils_1.isEqual)(this._spec.background, oldSpec.background) || (result.reMake = !0);
+        var _a;
+        this._paddingSpec = (0, util_1.normalizeLayoutPaddingSpec)(null !== (_a = this._spec.padding) && void 0 !== _a ? _a : (0, 
+        util_4.getThemeFromOption)("padding", this._option)), this._updateLayoutRect(this._viewBox), 
+        (0, vutils_1.isEqual)(this._spec.background, oldSpec.background) || (result.reMake = !0);
     }
     updateDataSpec(result) {
         this._spec.data && this._chartData.updateData(this._spec.data, !1, !0);
@@ -471,7 +468,8 @@ class BaseChart extends compilable_base_1.CompilableBase {
             label: spec.label,
             seriesStyle: spec.seriesStyle,
             animation: spec.animation,
-            animationThreshold: null !== (_a = spec.animationThreshold) && void 0 !== _a ? _a : this._theme.animationThreshold,
+            animationThreshold: null !== (_a = spec.animationThreshold) && void 0 !== _a ? _a : (0, 
+            util_4.getThemeFromOption)("animationThreshold", this._option),
             animationAppear: spec.animationAppear,
             animationDisappear: spec.animationDisappear,
             animationEnter: spec.animationEnter,
@@ -508,26 +506,23 @@ class BaseChart extends compilable_base_1.CompilableBase {
         this._layoutRect.height = viewRect.height - this.padding.top - this.padding.bottom, 
         this._layoutRect.x = this.padding.left, this._layoutRect.y = this.padding.top, this._event.emit(constant_1.ChartEvent.layoutRectUpdate, {});
     }
-    getCurrentTheme() {
-        return this._theme;
-    }
-    setCurrentTheme(theme, reInit = !0) {
-        this._theme = theme, this.setLayoutTag(!0), this.transformSpec(this._spec), this.updateGlobalScaleTheme(), 
-        this.setRegionTheme(reInit), this.setComponentTheme(theme, reInit), this.setSeriesTheme(theme, reInit);
+    setCurrentTheme(reInit = !0) {
+        this.setLayoutTag(!0), this.transformSpec(this._spec), this.updateGlobalScaleTheme(), 
+        this.setRegionTheme(reInit), this.setComponentTheme(reInit), this.setSeriesTheme(reInit);
     }
     setRegionTheme(reInit = !0) {
-        this._regions.forEach((r => {
-            reInit ? r.reInit() : r.setTheme();
-        }));
+        this._regions.forEach((r => __awaiter(this, void 0, void 0, (function*() {
+            yield r.setCurrentTheme(reInit);
+        }))));
     }
-    setComponentTheme(theme, reInit = !0) {
-        this._components.forEach((c => {
-            reInit ? c.setCurrentTheme(theme.component[c.type], !0) : c.setTheme(theme.component[c.type]);
-        }));
+    setComponentTheme(reInit = !0) {
+        this._components.forEach((c => __awaiter(this, void 0, void 0, (function*() {
+            yield c.setCurrentTheme(reInit);
+        }))));
     }
-    setSeriesTheme(theme, reInit = !0) {
+    setSeriesTheme(reInit = !0) {
         this._series.forEach((s => __awaiter(this, void 0, void 0, (function*() {
-            reInit ? yield s.setCurrentTheme(theme.series[s.type], !0) : s.setTheme(theme.series[s.type]);
+            yield s.setCurrentTheme(reInit);
         }))));
     }
     clear() {
@@ -719,6 +714,10 @@ class BaseChart extends compilable_base_1.CompilableBase {
             })));
         }
     }
+    getColorScheme() {
+        var _a, _b, _c;
+        return (null !== (_c = null === (_b = (_a = this._option).getThemeConfig) || void 0 === _b ? void 0 : _b.call(_a).chartLevelTheme) && void 0 !== _c ? _c : theme_1.defaultChartLevelTheme).colorScheme;
+    }
 }
 
 exports.BaseChart = BaseChart;