@visactor/vchart 1.7.5 → 1.8.0-beta.0

package/esm/component/axis/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/axis/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { get } from '@visactor/vutils';\nimport { mergeSpec } from '../../util/spec/merge-spec';\nimport type { IOrientType, IPolarOrientType } from '../../typings';\nimport type { AxisType, ICommonAxisSpec, ILinearAxisSpec } from './interface';\nimport { transformComponentStyle } from '../../util/style';\nimport { isXAxis } from './cartesian/util/common';\nimport type { IModelOption } from '../../model/interface';\nimport { getComponentThemeFromOption } from '../util';\n\nexport const DEFAULT_TITLE_STYLE = {\n  left: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  right: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  radius: {},\n  angle: {}\n};\n\nexport function transformAxisLineStyle(lineCfg: any) {\n  lineCfg = transformComponentStyle(lineCfg);\n  lineCfg.startSymbol = transformComponentStyle(lineCfg.startSymbol);\n  lineCfg.endSymbol = transformComponentStyle(lineCfg.endSymbol);\n\n  return lineCfg;\n}\n\nexport function getAxisLabelOffset(axisSpec: ICommonAxisSpec) {\n  let labelOffset = 0;\n  if (get(axisSpec, 'tick.visible')) {\n    labelOffset += get(axisSpec, 'tick.tickSize');\n  }\n\n  if (get(axisSpec, 'label.visible')) {\n    labelOffset += get(axisSpec, 'label.space');\n  }\n\n  return labelOffset;\n}\n\nexport function getLinearAxisSpecDomain(\n  axisSpec: ILinearAxisSpec,\n  defaultDomain?: {\n    min?: number;\n    max?: number;\n  }\n) {\n  // 兼容策略\n  return {\n    min: axisSpec.min ?? axisSpec.range?.min ?? defaultDomain?.min,\n    max: axisSpec.max ?? axisSpec.range?.max ?? defaultDomain?.max\n  };\n}\n\nexport function isValidCartesianAxis(spec: any) {\n  const orient = spec?.orient;\n  return orient === 'top' || orient === 'bottom' || orient === 'left' || orient === 'right' || orient === 'z';\n}\n\nexport function isValidPolarAxis(spec: any) {\n  const orient = spec?.orient;\n  return orient === 'angle' || orient === 'radius';\n}\n\nexport const getCartesianAxisTheme = (orient: IOrientType, type: AxisType, option: Partial<IModelOption>) => {\n  const axisTypeTheme =\n    (type === 'band'\n      ? getComponentThemeFromOption('axisBand', option)\n      : (['linear', 'log', 'symlog'] as AxisType[]).includes(type)\n      ? getComponentThemeFromOption('axisLinear', option)\n      : {}) ?? {};\n  const axisTheme = isXAxis(orient)\n    ? getComponentThemeFromOption('axisX', option)\n    : getComponentThemeFromOption('axisY', option);\n  return mergeSpec({}, getComponentThemeFromOption('axis', option), axisTypeTheme, axisTheme);\n};\n\nexport const getPolarAxisTheme = (orient: IPolarOrientType, type: AxisType, option: Partial<IModelOption>) => {\n  const axisTypeTheme =\n    (type === 'band'\n      ? getComponentThemeFromOption('axisBand', option)\n      : type === 'linear'\n      ? getComponentThemeFromOption('axisLinear', option)\n      : {}) ?? {};\n  const axisTheme =\n    orient === 'angle'\n      ? getComponentThemeFromOption('axisAngle', option)\n      : getComponentThemeFromOption('axisRadius', option);\n  return mergeSpec({}, getComponentThemeFromOption('axis', option), axisTypeTheme, axisTheme);\n};\n"]}
+{"version":3,"sources":["../src/component/axis/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAGvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAGtD,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,IAAI,EAAE;QACJ,SAAS,EAAE,QAAQ;QACnB,YAAY,EAAE,QAAQ;KACvB;IACD,KAAK,EAAE;QACL,SAAS,EAAE,QAAQ;QACnB,YAAY,EAAE,QAAQ;KACvB;IACD,MAAM,EAAE,EAAE;IACV,KAAK,EAAE,EAAE;CACV,CAAC;AAEF,MAAM,UAAU,sBAAsB,CAAC,OAAY;IACjD,OAAO,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAC3C,OAAO,CAAC,WAAW,GAAG,uBAAuB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACnE,OAAO,CAAC,SAAS,GAAG,uBAAuB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAE/D,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,QAAyB;IAC1D,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,GAAG,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE;QACjC,WAAW,IAAI,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;KAC/C;IAED,IAAI,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,EAAE;QAClC,WAAW,IAAI,GAAG,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;KAC7C;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,QAAyB,EACzB,aAGC;;IAGD,OAAO;QACL,GAAG,EAAE,MAAA,MAAA,QAAQ,CAAC,GAAG,mCAAI,MAAA,QAAQ,CAAC,KAAK,0CAAE,GAAG,mCAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,GAAG;QAC9D,GAAG,EAAE,MAAA,MAAA,QAAQ,CAAC,GAAG,mCAAI,MAAA,QAAQ,CAAC,KAAK,0CAAE,GAAG,mCAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,GAAG;KAC/D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAS;IAC5C,MAAM,MAAM,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC;IAC5B,OAAO,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,GAAG,CAAC;AAC9G,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAS;IACxC,MAAM,MAAM,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAC;IAC5B,OAAO,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,QAAQ,CAAC;AACnD,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,MAAmB,EAAE,IAAc,EAAE,UAAkB,EAAE,EAAE;;IAC/F,MAAM,aAAa,GACjB,MAAA,CAAC,IAAI,KAAK,MAAM;QACd,CAAC,CAAC,2BAA2B,CAAC,UAAU,EAAE,UAAU,CAAC;QACrD,CAAC,CAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC5D,CAAC,CAAC,2BAA2B,CAAC,YAAY,EAAE,UAAU,CAAC;YACvD,CAAC,CAAC,EAAE,CAAC,mCAAI,EAAE,CAAC;IAChB,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;QAC/B,CAAC,CAAC,2BAA2B,CAAC,OAAO,EAAE,UAAU,CAAC;QAClD,CAAC,CAAC,2BAA2B,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACrD,OAAO,SAAS,CAAC,EAAE,EAAE,2BAA2B,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;AAClG,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAwB,EAAE,IAAc,EAAE,UAAkB,EAAE,EAAE;;IAChG,MAAM,aAAa,GACjB,MAAA,CAAC,IAAI,KAAK,MAAM;QACd,CAAC,CAAC,2BAA2B,CAAC,UAAU,EAAE,UAAU,CAAC;QACrD,CAAC,CAAC,IAAI,KAAK,QAAQ;YACnB,CAAC,CAAC,2BAA2B,CAAC,YAAY,EAAE,UAAU,CAAC;YACvD,CAAC,CAAC,EAAE,CAAC,mCAAI,EAAE,CAAC;IAChB,MAAM,SAAS,GACb,MAAM,KAAK,OAAO;QAChB,CAAC,CAAC,2BAA2B,CAAC,WAAW,EAAE,UAAU,CAAC;QACtD,CAAC,CAAC,2BAA2B,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAC5D,OAAO,SAAS,CAAC,EAAE,EAAE,2BAA2B,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;AAClG,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAkB,EAAE,EAAE,CACnD,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,OAAO,CAAC","file":"util.js","sourcesContent":["import { get } from '@visactor/vutils';\nimport { mergeSpec } from '../../util/spec/merge-spec';\nimport type { IOrientType, IPolarOrientType } from '../../typings';\nimport type { AxisType, ICommonAxisSpec, ILinearAxisSpec } from './interface';\nimport { transformComponentStyle } from '../../util/style';\nimport { isXAxis } from './cartesian/util/common';\nimport { getComponentThemeFromOption } from '../util';\nimport type { ITheme } from '../../theme';\n\nexport const DEFAULT_TITLE_STYLE = {\n  left: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  right: {\n    textAlign: 'center',\n    textBaseline: 'bottom'\n  },\n  radius: {},\n  angle: {}\n};\n\nexport function transformAxisLineStyle(lineCfg: any) {\n  lineCfg = transformComponentStyle(lineCfg);\n  lineCfg.startSymbol = transformComponentStyle(lineCfg.startSymbol);\n  lineCfg.endSymbol = transformComponentStyle(lineCfg.endSymbol);\n\n  return lineCfg;\n}\n\nexport function getAxisLabelOffset(axisSpec: ICommonAxisSpec) {\n  let labelOffset = 0;\n  if (get(axisSpec, 'tick.visible')) {\n    labelOffset += get(axisSpec, 'tick.tickSize');\n  }\n\n  if (get(axisSpec, 'label.visible')) {\n    labelOffset += get(axisSpec, 'label.space');\n  }\n\n  return labelOffset;\n}\n\nexport function getLinearAxisSpecDomain(\n  axisSpec: ILinearAxisSpec,\n  defaultDomain?: {\n    min?: number;\n    max?: number;\n  }\n) {\n  // 兼容策略\n  return {\n    min: axisSpec.min ?? axisSpec.range?.min ?? defaultDomain?.min,\n    max: axisSpec.max ?? axisSpec.range?.max ?? defaultDomain?.max\n  };\n}\n\nexport function isValidCartesianAxis(spec: any) {\n  const orient = spec?.orient;\n  return orient === 'top' || orient === 'bottom' || orient === 'left' || orient === 'right' || orient === 'z';\n}\n\nexport function isValidPolarAxis(spec: any) {\n  const orient = spec?.orient;\n  return orient === 'angle' || orient === 'radius';\n}\n\nexport const getCartesianAxisTheme = (orient: IOrientType, type: AxisType, chartTheme: ITheme) => {\n  const axisTypeTheme =\n    (type === 'band'\n      ? getComponentThemeFromOption('axisBand', chartTheme)\n      : (['linear', 'log', 'symlog'] as AxisType[]).includes(type)\n      ? getComponentThemeFromOption('axisLinear', chartTheme)\n      : {}) ?? {};\n  const axisTheme = isXAxis(orient)\n    ? getComponentThemeFromOption('axisX', chartTheme)\n    : getComponentThemeFromOption('axisY', chartTheme);\n  return mergeSpec({}, getComponentThemeFromOption('axis', chartTheme), axisTypeTheme, axisTheme);\n};\n\nexport const getPolarAxisTheme = (orient: IPolarOrientType, type: AxisType, chartTheme: ITheme) => {\n  const axisTypeTheme =\n    (type === 'band'\n      ? getComponentThemeFromOption('axisBand', chartTheme)\n      : type === 'linear'\n      ? getComponentThemeFromOption('axisLinear', chartTheme)\n      : {}) ?? {};\n  const axisTheme =\n    orient === 'angle'\n      ? getComponentThemeFromOption('axisAngle', chartTheme)\n      : getComponentThemeFromOption('axisRadius', chartTheme);\n  return mergeSpec({}, getComponentThemeFromOption('axis', chartTheme), axisTypeTheme, axisTheme);\n};\n\nexport const isDiscreteAxis = (axisType: AxisType) =>\n  axisType === 'band' || axisType === 'ordinal' || axisType === 'point';\n"]}

package/esm/component/base/base-component-transformer.d.ts

@@ -0,0 +1,10 @@
+import { BaseModelSpecTransformer } from '../../model';
+import type { IComponentSpec } from './interface';
+export declare class BaseComponentSpecTransformer<T extends IComponentSpec = IComponentSpec, K = any> extends BaseModelSpecTransformer<T, K> {
+    getTheme(spec: T, chartSpec: any): K;
+    protected _mergeThemeToSpec(spec: T, chartSpec: any): {
+        spec: T;
+        theme: K;
+    };
+    protected _adjustPadding(spec: T): void;
+}

package/esm/component/base/base-component-transformer.js

@@ -0,0 +1,25 @@
+import { BaseModelSpecTransformer } from "../../model";
+
+import { normalizeLayoutPaddingSpec } from "../../util";
+
+import { getComponentThemeFromGlobalTheme } from "./util";
+
+export class BaseComponentSpecTransformer extends BaseModelSpecTransformer {
+    getTheme(spec, chartSpec) {
+        return getComponentThemeFromGlobalTheme(this.type, this._option.getTheme(), spec, chartSpec);
+    }
+    _mergeThemeToSpec(spec, chartSpec) {
+        const {spec: newSpec, theme: theme} = super._mergeThemeToSpec(spec, chartSpec);
+        return this._adjustPadding(newSpec), {
+            spec: newSpec,
+            theme: theme
+        };
+    }
+    _adjustPadding(spec) {
+        const {padding: padding, noOuterPadding: noOuterPadding = !0, orient: orient} = spec;
+        noOuterPadding && padding && orient && (spec.padding = Object.assign(Object.assign({}, normalizeLayoutPaddingSpec(padding)), {
+            [orient]: 0
+        }));
+    }
+}
+//# sourceMappingURL=base-component-transformer.js.map

package/esm/component/base/base-component-transformer.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/component/base/base-component-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAGxD,OAAO,EAAE,gCAAgC,EAAE,MAAM,QAAQ,CAAC;AAE1D,MAAM,OAAO,4BAGX,SAAQ,wBAA8B;IACtC,QAAQ,CAAC,IAAO,EAAE,SAAc;QAC9B,OAAO,gCAAgC,CAAC,IAAI,CAAC,IAAyB,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IACpH,CAAC;IAES,iBAAiB,CAAC,IAAO,EAAE,SAAc;QACjD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1E,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC7B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAClC,CAAC;IAES,cAAc,CAAC,IAAO;QAE9B,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACxD,IAAI,cAAc,IAAI,OAAO,IAAI,MAAM,EAAE;YACvC,IAAI,CAAC,OAAO,mCACP,0BAA0B,CAAC,OAAO,CAAC,KACtC,CAAC,MAAM,CAAC,EAAE,CAAC,GACZ,CAAC;SACH;IACH,CAAC;CACF","file":"base-component-transformer.js","sourcesContent":["import { BaseModelSpecTransformer } from '../../model';\nimport { normalizeLayoutPaddingSpec } from '../../util';\nimport type { ComponentTypeEnum } from '../interface';\nimport type { IComponentSpec } from './interface';\nimport { getComponentThemeFromGlobalTheme } from './util';\n\nexport class BaseComponentSpecTransformer<\n  T extends IComponentSpec = IComponentSpec,\n  K = any\n> extends BaseModelSpecTransformer<T, K> {\n  getTheme(spec: T, chartSpec: any): K {\n    return getComponentThemeFromGlobalTheme(this.type as ComponentTypeEnum, this._option.getTheme(), spec, chartSpec);\n  }\n\n  protected _mergeThemeToSpec(spec: T, chartSpec: any): { spec: T; theme: K } {\n    const { spec: newSpec, theme } = super._mergeThemeToSpec(spec, chartSpec);\n    this._adjustPadding(newSpec);\n    return { spec: newSpec, theme };\n  }\n\n  protected _adjustPadding(spec: T) {\n    // 默认忽略外侧 padding\n    const { padding, noOuterPadding = true, orient } = spec;\n    if (noOuterPadding && padding && orient) {\n      spec.padding = {\n        ...normalizeLayoutPaddingSpec(padding),\n        [orient]: 0\n      };\n    }\n  }\n}\n"]}

package/esm/component/base/base-component.d.ts

@@ -9,10 +9,15 @@ import type { IAnimate } from '../../animation/interface';
 import type { Datum, ILayoutRect } from '../../typings';
 import type { IComponentSpec } from './interface';
 import { LayoutModel } from '../../model/layout-model';
-export declare abstract class BaseComponent<T extends IComponentSpec = IComponentSpec> extends LayoutModel<T> implements IComponent {
+import { BaseComponentSpecTransformer } from './base-component-transformer';
+import type { IModelRenderOption, IModelSpecInfo } from '../../model/interface';
+export declare class BaseComponent<T extends IComponentSpec = IComponentSpec> extends LayoutModel<T> implements IComponent {
+    static transformerConstructor: typeof BaseComponentSpecTransformer;
     name: string;
     readonly modelType: string;
+    readonly transformerConstructor: any;
     pluginService?: IComponentPluginService;
+    static createComponent(specInfo: IModelSpecInfo, options: IComponentOption): IComponent;
     protected _option: IComponentOption;
     protected _regions: IRegion[];
     getRegions(): IRegion[];
@@ -21,18 +26,17 @@ export declare abstract class BaseComponent<T extends IComponentSpec = IComponen
     animate?: IAnimate;
     constructor(spec: T, options: IComponentOption);
     initLayout(): void;
-    abstract changeRegions(regions: IRegion[]): void;
-    protected abstract _getNeedClearVRenderComponents(): IGraphic[];
+    changeRegions(regions: IRegion[]): void;
+    protected _getNeedClearVRenderComponents(): IGraphic[];
+    onRender(ctx: IModelRenderOption): void;
     getVRenderComponents(): IGraphic<Partial<import("@visactor/vrender-core").IGraphicAttribute>>[];
     protected callPlugin(cb: (plugin: IComponentPlugin) => void): void;
     protected eventPos(markEventParams: BaseEventParams): {
         x: number;
         y: number;
     };
-    protected _getTheme(): any;
-    protected _mergeThemeToSpec(): void;
     protected getContainer(): IGroup;
-    _compareSpec(): {
+    _compareSpec(spec: T, prevSpec: T): {
         change: boolean;
         reMake: boolean;
         reRender: boolean;

package/esm/component/base/base-component.js

@@ -1,18 +1,30 @@
+var __rest = this && this.__rest || function(s, e) {
+    var t = {};
+    for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0 && (t[p] = s[p]);
+    if (null != s && "function" == typeof Object.getOwnPropertySymbols) {
+        var i = 0;
+        for (p = Object.getOwnPropertySymbols(s); i < p.length; i++) e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]) && (t[p[i]] = s[p[i]]);
+    }
+    return t;
+};
+
 import { ComponentPluginService } from "../../plugin/components/plugin-service";
 
 import { isEqual } from "@visactor/vutils";
 
-import { getComponentThemeFromGlobalTheme } from "./util";
-
 import { Event_Source_Type } from "../../constant";
 
 import { AnimateManager } from "../../animation/animate-manager";
 
-import { normalizeLayoutPaddingSpec } from "../../util/space";
-
 import { LayoutModel } from "../../model/layout-model";
 
+import { BaseComponentSpecTransformer } from "./base-component-transformer";
+
 export class BaseComponent extends LayoutModel {
+    static createComponent(specInfo, options) {
+        const {spec: spec} = specInfo, others = __rest(specInfo, [ "spec" ]);
+        return new this(spec, Object.assign(Object.assign({}, options), others));
+    }
     getRegions() {
         return this._regions;
     }
@@ -20,7 +32,8 @@ export class BaseComponent extends LayoutModel {
         this.initLayout(), super.created(), this.pluginService = new ComponentPluginService(this);
     }
     constructor(spec, options) {
-        super(spec, options), this.name = "component", this.modelType = "component", this._delegateEvent = (component, event, type, item = null, datum = null) => {
+        super(spec, options), this.name = "component", this.modelType = "component", this.transformerConstructor = BaseComponentSpecTransformer, 
+        this._delegateEvent = (component, event, type, item = null, datum = null) => {
             var _a, _b;
             this.event.emit(type, {
                 model: this,
@@ -38,7 +51,16 @@ export class BaseComponent extends LayoutModel {
     initLayout() {
         var _a;
         super.initLayout(), this._regions = null !== (_a = this._regions) && void 0 !== _a ? _a : this._option.getRegionsInIndex(), 
-        this._layout && (this._layout.layoutBindRegionID = this._regions.map((x => x.id)));
+        this._layout && (this._layout.layoutBindRegionID = this._regions.map((x => null == x ? void 0 : x.id)));
+    }
+    changeRegions(regions) {
+        throw new Error("Method not implemented.");
+    }
+    _getNeedClearVRenderComponents() {
+        throw new Error("Method not implemented.");
+    }
+    onRender(ctx) {
+        throw new Error("Method not implemented.");
     }
     getVRenderComponents() {
         return this._getNeedClearVRenderComponents();
@@ -52,28 +74,15 @@ export class BaseComponent extends LayoutModel {
             y: markEventParams.event.viewY - this.getLayoutStartPoint().y
         };
     }
-    _getTheme() {
-        return getComponentThemeFromGlobalTheme(this._option.type, this._option, this._originalSpec);
-    }
-    _mergeThemeToSpec() {
-        super._mergeThemeToSpec();
-        const {padding: padding, noOuterPadding: noOuterPadding = !0, orient: orient} = this.getSpec();
-        noOuterPadding && padding && orient && (this._spec.padding = Object.assign(Object.assign({}, normalizeLayoutPaddingSpec(padding)), {
-            [orient]: 0
-        }));
-    }
     getContainer() {
         var _a;
         return this._container || (this._container = null === (_a = this._option) || void 0 === _a ? void 0 : _a.globalInstance.getStage().find((node => "root" === node.name), !0)), 
         this._container;
     }
-    _compareSpec() {
-        var _a;
-        const result = super._compareSpec();
-        return result.reMake || (result.reMake = [ "seriesId", "seriesIndex", "regionId", "regionIndex" ].some((k => {
-            var _a;
-            return isEqual(null === (_a = this._originalSpec) || void 0 === _a ? void 0 : _a[k], this.getSpec()[k]);
-        }))), (null === (_a = this._originalSpec) || void 0 === _a ? void 0 : _a.visible) !== this.getSpec().visible && (result.reCompile = !0), 
+    _compareSpec(spec, prevSpec) {
+        const result = super._compareSpec(spec, prevSpec);
+        return result.reMake || (result.reMake = [ "seriesId", "seriesIndex", "regionId", "regionIndex" ].some((k => isEqual(null == prevSpec ? void 0 : prevSpec[k], spec[k])))), 
+        (null == prevSpec ? void 0 : prevSpec.visible) !== spec.visible && (result.reCompile = !0), 
         result;
     }
     release() {
@@ -113,4 +122,6 @@ export class BaseComponent extends LayoutModel {
         };
     }
 }
+
+BaseComponent.transformerConstructor = BaseComponentSpecTransformer;
 //# sourceMappingURL=base-component.js.map

package/esm/component/base/base-component.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/base/base-component.ts"],"names":[],"mappings":"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","file":"base-component.js","sourcesContent":["import type { IGraphic, IGroup, INode } from '@visactor/vrender-core';\nimport type { IRegion } from '../../region/interface';\nimport type { ComponentTypeEnum, IComponent, IComponentOption } from '../interface';\nimport type { BaseEventParams } from '../../event/interface';\nimport { ComponentPluginService } from '../../plugin/components/plugin-service';\nimport type { IComponentPluginService, IComponentPlugin } from '../../plugin/components/interface';\nimport type { IBoundsLike } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isEqual } from '@visactor/vutils';\nimport { getComponentThemeFromGlobalTheme } from './util';\nimport type { IGroupMark } from '@visactor/vgrammar-core';\nimport { Event_Source_Type } from '../../constant';\nimport type { IAnimate } from '../../animation/interface';\nimport { AnimateManager } from '../../animation/animate-manager';\n// import { preprocessSpecOrTheme } from '../../util/spec/preprocess';\nimport type { Datum, ILayoutRect } from '../../typings';\nimport { normalizeLayoutPaddingSpec } from '../../util/space';\nimport type { IComponentSpec } from './interface';\nimport { LayoutModel } from '../../model/layout-model';\n\nexport abstract class BaseComponent<T extends IComponentSpec = IComponentSpec>\n  extends LayoutModel<T>\n  implements IComponent\n{\n  name: string = 'component';\n  readonly modelType: string = 'component';\n  pluginService?: IComponentPluginService;\n  protected declare _option: IComponentOption;\n\n  protected _regions: IRegion[];\n  getRegions() {\n    return this._regions;\n  }\n\n  protected _container: IGroup;\n\n  created() {\n    this.initLayout();\n    super.created();\n    this.pluginService = new ComponentPluginService(this);\n  }\n\n  animate?: IAnimate;\n\n  constructor(spec: T, options: IComponentOption) {\n    super(spec, options);\n    // 创建组件自己的动画管理器\n    if (this._option.animation) {\n      this.animate = new AnimateManager({\n        getCompiler: options.getCompiler\n      });\n    }\n  }\n\n  initLayout(): void {\n    super.initLayout();\n    this._regions = this._regions ?? this._option.getRegionsInIndex();\n    this._layout && (this._layout.layoutBindRegionID = this._regions.map(x => x.id));\n  }\n\n  abstract changeRegions(regions: IRegion[]): void;\n  protected abstract _getNeedClearVRenderComponents(): IGraphic[];\n\n  getVRenderComponents() {\n    return this._getNeedClearVRenderComponents();\n  }\n\n  protected callPlugin(cb: (plugin: IComponentPlugin) => void) {\n    if (this.pluginService) {\n      this.pluginService.getAll().forEach(plugin => cb(plugin));\n    }\n  }\n\n  protected eventPos(markEventParams: BaseEventParams) {\n    return {\n      x: (markEventParams.event as any).viewX - this.getLayoutStartPoint().x,\n      y: (markEventParams.event as any).viewY - this.getLayoutStartPoint().y\n    };\n  }\n\n  protected _getTheme() {\n    return getComponentThemeFromGlobalTheme(this._option.type as ComponentTypeEnum, this._option, this._originalSpec);\n  }\n\n  protected _mergeThemeToSpec() {\n    super._mergeThemeToSpec();\n\n    // 默认忽略外侧 padding\n    const { padding, noOuterPadding = true, orient } = this.getSpec();\n    if (noOuterPadding && padding && orient) {\n      this._spec.padding = {\n        ...normalizeLayoutPaddingSpec(padding),\n        [orient]: 0\n      };\n    }\n  }\n\n  protected getContainer() {\n    if (!this._container) {\n      this._container = this._option?.globalInstance.getStage().find(node => node.name === 'root', true);\n    }\n\n    return this._container;\n  }\n\n  /**\n   * updateSpec\n   */\n  _compareSpec() {\n    const result = super._compareSpec();\n    if (!result.reMake) {\n      result.reMake = ['seriesId', 'seriesIndex', 'regionId', 'regionIndex'].some(k => {\n        return isEqual(this._originalSpec?.[k], this.getSpec()[k]);\n      });\n    }\n    if (this._originalSpec?.visible !== (<any>this.getSpec()).visible) {\n      result.reCompile = true;\n    }\n    return result;\n  }\n\n  release() {\n    super.release();\n    this.clear();\n  }\n\n  clear() {\n    const components = this._getNeedClearVRenderComponents();\n    if (components && components.length) {\n      components.forEach(c => {\n        if (c) {\n          this.getContainer()?.removeChild(c as unknown as INode);\n          c = null;\n        }\n      });\n    }\n    this._container = null;\n    this.pluginService?.disposeAll();\n    this.pluginService = null;\n  }\n\n  compile(): void {\n    this.compileMarks();\n  }\n\n  compileMarks(group?: string | IGroupMark) {\n    this.getMarks().forEach(m => {\n      m.compile({ group });\n      m.getProduct()?.configure({\n        context: {\n          model: this\n        }\n      });\n    });\n  }\n\n  // 代理组件事件\n  protected _delegateEvent = (component: IGraphic, event: any, type: string, item: any = null, datum: Datum = null) => {\n    this.event.emit(\n      type,\n      {\n        model: this,\n        node: component,\n        event,\n        item: item,\n        datum: datum,\n        source: Event_Source_Type.chart,\n        chart: this._option?.globalInstance?.getChart()\n      },\n      'model'\n    );\n  };\n\n  getBoundsInRect(rect: ILayoutRect, fullRect: ILayoutRect): IBoundsLike {\n    return { x1: 0, x2: 0, y1: 0, y2: 0 };\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/base/base-component.ts"],"names":[],"mappings":"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","file":"base-component.js","sourcesContent":["import type { IGraphic, IGroup, INode } from '@visactor/vrender-core';\nimport type { IRegion } from '../../region/interface';\nimport type { IComponent, IComponentOption } from '../interface';\nimport type { BaseEventParams } from '../../event/interface';\nimport { ComponentPluginService } from '../../plugin/components/plugin-service';\nimport type { IComponentPluginService, IComponentPlugin } from '../../plugin/components/interface';\nimport type { IBoundsLike } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isEqual } from '@visactor/vutils';\nimport type { IGroupMark } from '@visactor/vgrammar-core';\nimport { Event_Source_Type } from '../../constant';\nimport type { IAnimate } from '../../animation/interface';\nimport { AnimateManager } from '../../animation/animate-manager';\n// import { preprocessSpecOrTheme } from '../../util/spec/preprocess';\nimport type { Datum, ILayoutRect } from '../../typings';\nimport type { IComponentSpec } from './interface';\nimport { LayoutModel } from '../../model/layout-model';\nimport { BaseComponentSpecTransformer } from './base-component-transformer';\nimport type { IModelRenderOption, IModelSpecInfo } from '../../model/interface';\n\nexport class BaseComponent<T extends IComponentSpec = IComponentSpec> extends LayoutModel<T> implements IComponent {\n  static transformerConstructor = BaseComponentSpecTransformer;\n  name: string = 'component';\n  readonly modelType: string = 'component';\n  readonly transformerConstructor = BaseComponentSpecTransformer as any;\n  pluginService?: IComponentPluginService;\n\n  static createComponent(specInfo: IModelSpecInfo, options: IComponentOption): IComponent {\n    const { spec, ...others } = specInfo;\n    return new this(spec, {\n      ...options,\n      ...others\n    });\n  }\n\n  protected declare _option: IComponentOption;\n\n  protected _regions: IRegion[];\n  getRegions() {\n    return this._regions;\n  }\n\n  protected _container: IGroup;\n\n  created() {\n    this.initLayout();\n    super.created();\n    this.pluginService = new ComponentPluginService(this);\n  }\n\n  animate?: IAnimate;\n\n  constructor(spec: T, options: IComponentOption) {\n    super(spec, options);\n    // 创建组件自己的动画管理器\n    if (this._option.animation) {\n      this.animate = new AnimateManager({\n        getCompiler: options.getCompiler\n      });\n    }\n  }\n\n  initLayout(): void {\n    super.initLayout();\n    this._regions = this._regions ?? this._option.getRegionsInIndex();\n    this._layout && (this._layout.layoutBindRegionID = this._regions.map(x => x?.id));\n  }\n\n  changeRegions(regions: IRegion[]): void {\n    throw new Error('Method not implemented.');\n  }\n  protected _getNeedClearVRenderComponents(): IGraphic[] {\n    throw new Error('Method not implemented.');\n  }\n  onRender(ctx: IModelRenderOption): void {\n    throw new Error('Method not implemented.');\n  }\n\n  getVRenderComponents() {\n    return this._getNeedClearVRenderComponents();\n  }\n\n  protected callPlugin(cb: (plugin: IComponentPlugin) => void) {\n    if (this.pluginService) {\n      this.pluginService.getAll().forEach(plugin => cb(plugin));\n    }\n  }\n\n  protected eventPos(markEventParams: BaseEventParams) {\n    return {\n      x: (markEventParams.event as any).viewX - this.getLayoutStartPoint().x,\n      y: (markEventParams.event as any).viewY - this.getLayoutStartPoint().y\n    };\n  }\n\n  protected getContainer() {\n    if (!this._container) {\n      this._container = this._option?.globalInstance.getStage().find(node => node.name === 'root', true);\n    }\n\n    return this._container;\n  }\n\n  /**\n   * updateSpec\n   */\n  _compareSpec(spec: T, prevSpec: T) {\n    const result = super._compareSpec(spec, prevSpec);\n    if (!result.reMake) {\n      result.reMake = ['seriesId', 'seriesIndex', 'regionId', 'regionIndex'].some(k => {\n        return isEqual(prevSpec?.[k], spec[k]);\n      });\n    }\n    if ((prevSpec as any)?.visible !== (spec as any).visible) {\n      result.reCompile = true;\n    }\n    return result;\n  }\n\n  release() {\n    super.release();\n    this.clear();\n  }\n\n  clear() {\n    const components = this._getNeedClearVRenderComponents();\n    if (components && components.length) {\n      components.forEach(c => {\n        if (c) {\n          this.getContainer()?.removeChild(c as unknown as INode);\n          c = null;\n        }\n      });\n    }\n    this._container = null;\n    this.pluginService?.disposeAll();\n    this.pluginService = null;\n  }\n\n  compile(): void {\n    this.compileMarks();\n  }\n\n  compileMarks(group?: string | IGroupMark) {\n    this.getMarks().forEach(m => {\n      m.compile({ group });\n      m.getProduct()?.configure({\n        context: {\n          model: this\n        }\n      });\n    });\n  }\n\n  // 代理组件事件\n  protected _delegateEvent = (component: IGraphic, event: any, type: string, item: any = null, datum: Datum = null) => {\n    this.event.emit(\n      type,\n      {\n        model: this,\n        node: component,\n        event,\n        item: item,\n        datum: datum,\n        source: Event_Source_Type.chart,\n        chart: this._option?.globalInstance?.getChart()\n      },\n      'model'\n    );\n  };\n\n  getBoundsInRect(rect: ILayoutRect, fullRect: ILayoutRect): IBoundsLike {\n    return { x1: 0, x2: 0, y1: 0, y2: 0 };\n  }\n}\n"]}

package/esm/component/base/index.d.ts

@@ -1 +1,2 @@
 export * from './base-component';
+export * from './base-component-transformer';

package/esm/component/base/index.js

@@ -1,2 +1,4 @@
 export * from "./base-component";
+
+export * from "./base-component-transformer";
 //# sourceMappingURL=index.js.map

package/esm/component/base/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/base/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC","file":"index.js","sourcesContent":["export * from './base-component';\n"]}
+{"version":3,"sources":["../src/component/base/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,8BAA8B,CAAC","file":"index.js","sourcesContent":["export * from './base-component';\nexport * from './base-component-transformer';\n"]}

package/esm/component/base/util.d.ts

@@ -1,3 +1,3 @@
-import type { IModelOption } from '../../model/interface';
+import type { ITheme } from '../../theme';
 import { ComponentTypeEnum } from '../interface/type';
-export declare function getComponentThemeFromGlobalTheme(type: ComponentTypeEnum, option: Partial<IModelOption>, componentSpec: any): any;
+export declare function getComponentThemeFromGlobalTheme(type: ComponentTypeEnum, chartTheme: ITheme, componentSpec: any, chartSpec: any): any;

package/esm/component/base/util.js

@@ -12,51 +12,49 @@ import { getLayout } from "../legend/util";
 
 import { getComponentThemeFromOption } from "../util";
 
-export function getComponentThemeFromGlobalTheme(type, option, componentSpec) {
-    var _a;
-    const chart = null === (_a = option.getChart) || void 0 === _a ? void 0 : _a.call(option);
+export function getComponentThemeFromGlobalTheme(type, chartTheme, componentSpec, chartSpec) {
     switch (type) {
       case ComponentTypeEnum.cartesianBandAxis:
-        return getCartesianAxisTheme(getOrient(componentSpec), "band", option);
+        return getCartesianAxisTheme(getOrient(componentSpec), "band", chartTheme);
 
       case ComponentTypeEnum.cartesianLinearAxis:
-        return getCartesianAxisTheme(getOrient(componentSpec), "linear", option);
+        return getCartesianAxisTheme(getOrient(componentSpec), "linear", chartTheme);
 
       case ComponentTypeEnum.cartesianLogAxis:
-        return getCartesianAxisTheme(getOrient(componentSpec), "log", option);
+        return getCartesianAxisTheme(getOrient(componentSpec), "log", chartTheme);
 
       case ComponentTypeEnum.cartesianSymlogAxis:
-        return getCartesianAxisTheme(getOrient(componentSpec), "symlog", option);
+        return getCartesianAxisTheme(getOrient(componentSpec), "symlog", chartTheme);
 
       case ComponentTypeEnum.cartesianAxis:
       case ComponentTypeEnum.cartesianTimeAxis:
-        return getCartesianAxisTheme(getOrient(componentSpec), void 0, option);
+        return getCartesianAxisTheme(getOrient(componentSpec), void 0, chartTheme);
 
       case ComponentTypeEnum.polarBandAxis:
-        return getPolarAxisTheme(componentSpec.orient, "band", option);
+        return getPolarAxisTheme(componentSpec.orient, "band", chartTheme);
 
       case ComponentTypeEnum.polarLinearAxis:
-        return getPolarAxisTheme(componentSpec.orient, "linear", option);
+        return getPolarAxisTheme(componentSpec.orient, "linear", chartTheme);
 
       case ComponentTypeEnum.polarAxis:
-        return getPolarAxisTheme(componentSpec.orient, void 0, option);
+        return getPolarAxisTheme(componentSpec.orient, void 0, chartTheme);
 
       case ComponentTypeEnum.cartesianCrosshair:
-        return getCartesianCrosshairTheme(option, chart);
+        return getCartesianCrosshairTheme(chartTheme, chartSpec);
 
       case ComponentTypeEnum.polarCrosshair:
-        return getPolarCrosshairTheme(option, chart);
+        return getPolarCrosshairTheme(chartTheme, chartSpec);
 
       case ComponentTypeEnum.colorLegend:
       case ComponentTypeEnum.sizeLegend:
-        return getComponentThemeFromOption(`${type}.${getLayout(componentSpec)}`, option);
+        return getComponentThemeFromOption(`${type}.${getLayout(componentSpec)}`, chartTheme);
 
       case ComponentTypeEnum.dataZoom:
       case ComponentTypeEnum.scrollBar:
-        return getDataFilterTheme(getOrient(componentSpec), type, option);
+        return getDataFilterTheme(getOrient(componentSpec), type, chartTheme);
 
       default:
-        return getComponentThemeFromOption(type, option);
+        return getComponentThemeFromOption(type, chartTheme);
     }
 }
 //# sourceMappingURL=util.js.map

package/esm/component/base/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/base/util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAEtD,MAAM,UAAU,gCAAgC,CAC9C,IAAuB,EACvB,MAA6B,EAC7B,aAAkB;;IAElB,MAAM,KAAK,GAAG,MAAA,MAAM,CAAC,QAAQ,sDAAI,CAAC;IAClC,QAAQ,IAAI,EAAE;QACZ,KAAK,iBAAiB,CAAC,iBAAiB;YACtC,OAAO,qBAAqB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACzE,KAAK,iBAAiB,CAAC,mBAAmB;YACxC,OAAO,qBAAqB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC3E,KAAK,iBAAiB,CAAC,gBAAgB;YACrC,OAAO,qBAAqB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACxE,KAAK,iBAAiB,CAAC,mBAAmB;YACxC,OAAO,qBAAqB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC3E,KAAK,iBAAiB,CAAC,aAAa,CAAC;QACrC,KAAK,iBAAiB,CAAC,iBAAiB;YACtC,OAAO,qBAAqB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC5E,KAAK,iBAAiB,CAAC,aAAa;YAClC,OAAO,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACjE,KAAK,iBAAiB,CAAC,eAAe;YACpC,OAAO,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACnE,KAAK,iBAAiB,CAAC,SAAS;YAC9B,OAAO,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACpE,KAAK,iBAAiB,CAAC,kBAAkB;YACvC,OAAO,0BAA0B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACnD,KAAK,iBAAiB,CAAC,cAAc;YACnC,OAAO,sBAAsB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC/C,KAAK,iBAAiB,CAAC,WAAW,CAAC;QACnC,KAAK,iBAAiB,CAAC,UAAU;YAC/B,OAAO,2BAA2B,CAAC,GAAG,IAAI,IAAI,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACpF,KAAK,iBAAiB,CAAC,QAAQ,CAAC;QAChC,KAAK,iBAAiB,CAAC,SAAS;YAC9B,OAAO,kBAAkB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACpE;YACE,OAAO,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KACpD;AACH,CAAC","file":"util.js","sourcesContent":["import type { IModelOption } from '../../model/interface';\nimport { getOrient } from '../axis/cartesian/util/common';\nimport { getCartesianAxisTheme, getPolarAxisTheme } from '../axis/util';\nimport { getCartesianCrosshairTheme, getPolarCrosshairTheme } from '../crosshair/util';\nimport { getDataFilterTheme } from '../data-zoom/util';\nimport { ComponentTypeEnum } from '../interface/type';\nimport { getLayout } from '../legend/util';\nimport { getComponentThemeFromOption } from '../util';\n\nexport function getComponentThemeFromGlobalTheme(\n  type: ComponentTypeEnum,\n  option: Partial<IModelOption>,\n  componentSpec: any\n) {\n  const chart = option.getChart?.();\n  switch (type) {\n    case ComponentTypeEnum.cartesianBandAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'band', option);\n    case ComponentTypeEnum.cartesianLinearAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'linear', option);\n    case ComponentTypeEnum.cartesianLogAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'log', option);\n    case ComponentTypeEnum.cartesianSymlogAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'symlog', option);\n    case ComponentTypeEnum.cartesianAxis:\n    case ComponentTypeEnum.cartesianTimeAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), undefined, option);\n    case ComponentTypeEnum.polarBandAxis:\n      return getPolarAxisTheme(componentSpec.orient, 'band', option);\n    case ComponentTypeEnum.polarLinearAxis:\n      return getPolarAxisTheme(componentSpec.orient, 'linear', option);\n    case ComponentTypeEnum.polarAxis:\n      return getPolarAxisTheme(componentSpec.orient, undefined, option);\n    case ComponentTypeEnum.cartesianCrosshair:\n      return getCartesianCrosshairTheme(option, chart);\n    case ComponentTypeEnum.polarCrosshair:\n      return getPolarCrosshairTheme(option, chart);\n    case ComponentTypeEnum.colorLegend:\n    case ComponentTypeEnum.sizeLegend:\n      return getComponentThemeFromOption(`${type}.${getLayout(componentSpec)}`, option);\n    case ComponentTypeEnum.dataZoom:\n    case ComponentTypeEnum.scrollBar:\n      return getDataFilterTheme(getOrient(componentSpec), type, option);\n    default:\n      return getComponentThemeFromOption(type, option);\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/base/util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACxE,OAAO,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAEtD,MAAM,UAAU,gCAAgC,CAC9C,IAAuB,EACvB,UAAkB,EAClB,aAAkB,EAClB,SAAc;IAEd,QAAQ,IAAI,EAAE;QACZ,KAAK,iBAAiB,CAAC,iBAAiB;YACtC,OAAO,qBAAqB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QAC7E,KAAK,iBAAiB,CAAC,mBAAmB;YACxC,OAAO,qBAAqB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC/E,KAAK,iBAAiB,CAAC,gBAAgB;YACrC,OAAO,qBAAqB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAC5E,KAAK,iBAAiB,CAAC,mBAAmB;YACxC,OAAO,qBAAqB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC/E,KAAK,iBAAiB,CAAC,aAAa,CAAC;QACrC,KAAK,iBAAiB,CAAC,iBAAiB;YACtC,OAAO,qBAAqB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QAChF,KAAK,iBAAiB,CAAC,aAAa;YAClC,OAAO,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QACrE,KAAK,iBAAiB,CAAC,eAAe;YACpC,OAAO,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QACvE,KAAK,iBAAiB,CAAC,SAAS;YAC9B,OAAO,iBAAiB,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QACxE,KAAK,iBAAiB,CAAC,kBAAkB;YACvC,OAAO,0BAA0B,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAC3D,KAAK,iBAAiB,CAAC,cAAc;YACnC,OAAO,sBAAsB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACvD,KAAK,iBAAiB,CAAC,WAAW,CAAC;QACnC,KAAK,iBAAiB,CAAC,UAAU;YAC/B,OAAO,2BAA2B,CAAC,GAAG,IAAI,IAAI,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;QACxF,KAAK,iBAAiB,CAAC,QAAQ,CAAC;QAChC,KAAK,iBAAiB,CAAC,SAAS;YAC9B,OAAO,kBAAkB,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QACxE;YACE,OAAO,2BAA2B,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;KACxD;AACH,CAAC","file":"util.js","sourcesContent":["import type { ITheme } from '../../theme';\nimport { getOrient } from '../axis/cartesian/util/common';\nimport { getCartesianAxisTheme, getPolarAxisTheme } from '../axis/util';\nimport { getCartesianCrosshairTheme, getPolarCrosshairTheme } from '../crosshair/util';\nimport { getDataFilterTheme } from '../data-zoom/util';\nimport { ComponentTypeEnum } from '../interface/type';\nimport { getLayout } from '../legend/util';\nimport { getComponentThemeFromOption } from '../util';\n\nexport function getComponentThemeFromGlobalTheme(\n  type: ComponentTypeEnum,\n  chartTheme: ITheme,\n  componentSpec: any,\n  chartSpec: any\n) {\n  switch (type) {\n    case ComponentTypeEnum.cartesianBandAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'band', chartTheme);\n    case ComponentTypeEnum.cartesianLinearAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'linear', chartTheme);\n    case ComponentTypeEnum.cartesianLogAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'log', chartTheme);\n    case ComponentTypeEnum.cartesianSymlogAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), 'symlog', chartTheme);\n    case ComponentTypeEnum.cartesianAxis:\n    case ComponentTypeEnum.cartesianTimeAxis:\n      return getCartesianAxisTheme(getOrient(componentSpec), undefined, chartTheme);\n    case ComponentTypeEnum.polarBandAxis:\n      return getPolarAxisTheme(componentSpec.orient, 'band', chartTheme);\n    case ComponentTypeEnum.polarLinearAxis:\n      return getPolarAxisTheme(componentSpec.orient, 'linear', chartTheme);\n    case ComponentTypeEnum.polarAxis:\n      return getPolarAxisTheme(componentSpec.orient, undefined, chartTheme);\n    case ComponentTypeEnum.cartesianCrosshair:\n      return getCartesianCrosshairTheme(chartTheme, chartSpec);\n    case ComponentTypeEnum.polarCrosshair:\n      return getPolarCrosshairTheme(chartTheme, chartSpec);\n    case ComponentTypeEnum.colorLegend:\n    case ComponentTypeEnum.sizeLegend:\n      return getComponentThemeFromOption(`${type}.${getLayout(componentSpec)}`, chartTheme);\n    case ComponentTypeEnum.dataZoom:\n    case ComponentTypeEnum.scrollBar:\n      return getDataFilterTheme(getOrient(componentSpec), type, chartTheme);\n    default:\n      return getComponentThemeFromOption(type, chartTheme);\n  }\n}\n"]}

package/esm/component/brush/brush.d.ts

@@ -1,18 +1,20 @@
 import { BaseComponent } from '../base/base-component';
-import type { IComponentOption } from '../interface';
 import { ComponentTypeEnum } from '../interface/type';
 import { Brush as BrushComponent } from '@visactor/vrender-components';
-import type { IModelRenderOption } from '../../model/interface';
+import type { Maybe } from '@visactor/vutils';
+import type { IModelRenderOption, IModelSpecInfo } from '../../model/interface';
 import type { IRegion } from '../../region/interface';
 import type { IGraphic } from '@visactor/vrender-core';
 import type { ISeries } from '../../series/interface';
 import type { IElement } from '@visactor/vgrammar-core';
 import type { BrushInteractiveRangeAttr, IBrush, IBrushSpec } from './interface';
-export declare class Brush extends BaseComponent<IBrushSpec> implements IBrush {
+export declare class Brush<T extends IBrushSpec = IBrushSpec> extends BaseComponent<T> implements IBrush {
     layoutType: 'none';
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;
     name: string;
+    static specKey: string;
+    specKey: string;
     layoutZIndex: number;
     protected _brushComponents: BrushComponent[];
     protected _relativeRegions: IRegion[];
@@ -39,7 +41,7 @@ export declare class Brush extends BaseComponent<IBrushSpec> implements IBrush {
     private _cacheInteractiveRangeAttrs;
     private _needEnablePickable;
     init(): void;
-    static createComponent(spec: any, options: IComponentOption): Brush[];
+    static getSpecInfo(chartSpec: any): Maybe<IModelSpecInfo[]>;
     created(): void;
     protected _extendDataInBrush(elementsMap: {
         [brushName: string]: {
@@ -52,6 +54,8 @@ export declare class Brush extends BaseComponent<IBrushSpec> implements IBrush {
     protected _getBrushInteractiveAttr(region: IRegion): BrushInteractiveRangeAttr;
     protected _updateBrushComponent(region: IRegion, componentIndex: number): void;
     protected _createBrushComponent(region: IRegion, componentIndex: number): void;
+    private _handleBrushChange;
+    private _emitEvent;
     private _transformBrushedMarkAttr;
     private _reconfigItem;
     private _reconfigLinkedItem;
@@ -64,7 +68,7 @@ export declare class Brush extends BaseComponent<IBrushSpec> implements IBrush {
     onRender(ctx: IModelRenderOption): void;
     changeRegions(regions: IRegion[]): void;
     protected _getNeedClearVRenderComponents(): IGraphic[];
-    _compareSpec(): {
+    _compareSpec(spec: T, prevSpec: T): {
         change: boolean;
         reMake: boolean;
         reRender: boolean;

package/esm/component/brush/brush.js

@@ -4,7 +4,7 @@ import { BaseComponent } from "../base/base-component";
 
 import { ComponentTypeEnum } from "../interface/type";
 
-import { Brush as BrushComponent, IOperateType } from "@visactor/vrender-components";
+import { Brush as BrushComponent, IOperateType as BrushEvent } from "@visactor/vrender-components";
 
 import { array, isNil, polygonIntersectPolygon, isValid } from "@visactor/vutils";
 
@@ -19,10 +19,10 @@ const IN_BRUSH_STATE = "inBrush", OUT_BRUSH_STATE = "outOfBrush";
 export class Brush extends BaseComponent {
     constructor() {
         super(...arguments), this.layoutType = "none", this.type = ComponentTypeEnum.brush, 
-        this.name = ComponentTypeEnum.brush, this.layoutZIndex = LayoutZIndex.Brush, this._linkedSeries = [], 
-        this._itemMap = {}, this._linkedItemMap = {}, this._inBrushElementsMap = {}, this._outOfBrushElementsMap = {}, 
-        this._linkedInBrushElementsMap = {}, this._linkedOutOfBrushElementsMap = {}, this._needInitOutState = !0, 
-        this._cacheInteractiveRangeAttrs = [], this._needEnablePickable = !1;
+        this.name = ComponentTypeEnum.brush, this.specKey = "brush", this.layoutZIndex = LayoutZIndex.Brush, 
+        this._linkedSeries = [], this._itemMap = {}, this._linkedItemMap = {}, this._inBrushElementsMap = {}, 
+        this._outOfBrushElementsMap = {}, this._linkedInBrushElementsMap = {}, this._linkedOutOfBrushElementsMap = {}, 
+        this._needInitOutState = !0, this._cacheInteractiveRangeAttrs = [], this._needEnablePickable = !1;
     }
     init() {
         const inBrushMarkAttr = this._transformBrushedMarkAttr(this._spec.inBrush), outOfBrushMarkAttr = this._transformBrushedMarkAttr(this._spec.outOfBrush);
@@ -33,9 +33,13 @@ export class Brush extends BaseComponent {
             }));
         }));
     }
-    static createComponent(spec, options) {
-        const brushSpec = spec.brush;
-        if (!isNil(brushSpec) && !1 !== brushSpec.visible) return [ new Brush(brushSpec, options) ];
+    static getSpecInfo(chartSpec) {
+        const brushSpec = chartSpec[this.specKey];
+        if (!isNil(brushSpec) && !1 !== brushSpec.visible) return [ {
+            spec: brushSpec,
+            specPath: [ this.specKey ],
+            type: ComponentTypeEnum.brush
+        } ];
     }
     created() {
         super.created(), this.initEvent(), this._bindRegions(), this._bindLinkedSeries(), 
@@ -79,36 +83,46 @@ export class Brush extends BaseComponent {
         this.getContainer().add(brush);
         const {brushMode: brushMode = "single"} = this._spec;
         this._brushComponents.push(brush), this._cacheInteractiveRangeAttrs.push(interactiveAttr), 
-        brush.setUpdateDragMaskCallback((operateParams => {
-            var _a, _b, _c;
-            const {operateType: operateType, operateMask: operateMask} = operateParams;
-            let operateTypeCache = operateType;
-            this._needInitOutState && "single" === brushMode && operateType === IOperateType.drawing && this._initMarkBrushState(componentIndex, "outOfBrush"), 
-            null === (_c = null === (_b = null === (_a = this._option) || void 0 === _a ? void 0 : _a.getChart()) || void 0 === _b ? void 0 : _b.getEvent()) || void 0 === _c || _c.on("click", (p => {
-                p.mark || operateTypeCache !== IOperateType.brushClear || (this._initMarkBrushState(componentIndex, ""), 
-                this._needInitOutState = !0, operateTypeCache = null);
-            })), operateType === IOperateType.drawing && (this._needInitOutState = !1, this._needEnablePickable = !0), 
-            operateType === IOperateType.drawEnd && (this._needInitOutState = !0, this._needEnablePickable = !1), 
-            this._reconfigItem(operateMask, region), this._reconfigLinkedItem(operateMask, region);
-            let eventType = ChartEvent.brushChange;
-            eventType = operateType === IOperateType.drawStart || operateType === IOperateType.moveStart ? ChartEvent.brushStart : operateType === IOperateType.drawEnd || operateType === IOperateType.moveEnd ? ChartEvent.brushEnd : ChartEvent.brushChange, 
-            this.event.emit(eventType, {
-                model: this,
-                value: {
-                    operateType: operateType,
-                    operateRegion: region,
-                    inBrushData: this._extendDataInBrush(this._inBrushElementsMap),
-                    outOfBrushData: this._extendDatumOutOfBrush(this._outOfBrushElementsMap),
-                    linkInBrushData: this._extendDataInBrush(this._linkedInBrushElementsMap),
-                    linkOutOfBrushData: this._extendDatumOutOfBrush(this._linkedOutOfBrushElementsMap),
-                    inBrushElementsMap: this._inBrushElementsMap,
-                    outOfBrushElementsMap: this._outOfBrushElementsMap,
-                    linkedInBrushElementsMap: this._linkedInBrushElementsMap,
-                    linkedOutOfBrushElementsMap: this._linkedOutOfBrushElementsMap
-                }
-            });
+        brush.addEventListener(BrushEvent.drawStart, (e => {
+            this._emitEvent(ChartEvent.brushStart, region);
+        })), brush.addEventListener(BrushEvent.moveStart, (e => {
+            this._emitEvent(ChartEvent.brushStart, region);
+        })), brush.addEventListener(BrushEvent.drawing, (e => {
+            this._needInitOutState && "single" === brushMode && this._initMarkBrushState(componentIndex, "outOfBrush"), 
+            this._needInitOutState = !1, this._needEnablePickable = !0, this._handleBrushChange(ChartEvent.brushChange, region, e);
+        })), brush.addEventListener(BrushEvent.moving, (e => {
+            this._handleBrushChange(ChartEvent.brushChange, region, e);
+        })), brush.addEventListener(BrushEvent.brushClear, (e => {
+            this._initMarkBrushState(componentIndex, ""), this._needInitOutState = !0, this._handleBrushChange(ChartEvent.brushChange, region, e), 
+            this._handleBrushChange(ChartEvent.brushClear, region, e);
+        })), brush.addEventListener(BrushEvent.drawEnd, (e => {
+            this._needInitOutState = !0, this._needEnablePickable = !1, this._handleBrushChange(ChartEvent.brushEnd, region, e);
+        })), brush.addEventListener(BrushEvent.moveEnd, (e => {
+            this._handleBrushChange(ChartEvent.brushEnd, region, e);
         }));
     }
+    _handleBrushChange(eventType, region, e) {
+        const {operateMask: operateMask} = e.detail;
+        this._reconfigItem(operateMask, region), this._reconfigLinkedItem(operateMask, region), 
+        this._emitEvent(eventType, region);
+    }
+    _emitEvent(eventType, region) {
+        this.event.emit(eventType, {
+            model: this,
+            value: {
+                operateType: eventType,
+                operateRegion: region,
+                inBrushData: this._extendDataInBrush(this._inBrushElementsMap),
+                outOfBrushData: this._extendDatumOutOfBrush(this._outOfBrushElementsMap),
+                linkInBrushData: this._extendDataInBrush(this._linkedInBrushElementsMap),
+                linkOutOfBrushData: this._extendDatumOutOfBrush(this._linkedOutOfBrushElementsMap),
+                inBrushElementsMap: this._inBrushElementsMap,
+                outOfBrushElementsMap: this._outOfBrushElementsMap,
+                linkedInBrushElementsMap: this._linkedInBrushElementsMap,
+                linkedOutOfBrushElementsMap: this._linkedOutOfBrushElementsMap
+            }
+        });
+    }
     _transformBrushedMarkAttr(brushedStyle) {
         const styleResult = {};
         return (null == brushedStyle ? void 0 : brushedStyle.symbol) && (styleResult.symbolType = brushedStyle.symbol), 
@@ -165,8 +179,9 @@ export class Brush extends BaseComponent {
         const points = null !== (_c = null === (_b = null == brushMask ? void 0 : brushMask.attribute) || void 0 === _b ? void 0 : _b.points) && void 0 !== _c ? _c : [], {a: a, b: b, c: c, d: d, e: e, f: f} = brushMask.globalTransMatrix, dx = (null == linkedOffset ? void 0 : linkedOffset.dx) || 0, dy = (null == linkedOffset ? void 0 : linkedOffset.dy) || 0, pointsCoord = points.map((p => ({
             x: a * p.x + c * p.y + e + dx,
             y: b * p.x + d * p.y + f + dy
-        }))), x = (brushMask.globalAABBBounds.clone().set(brushMask.globalAABBBounds.x1 + dx, brushMask.globalAABBBounds.y1 + dy, brushMask.globalAABBBounds.x2 + dx, brushMask.globalAABBBounds.y2 + dy), 
-        item.globalTransMatrix.e), y = item.globalTransMatrix.f;
+        })));
+        brushMask.globalAABBBounds.clone().set(brushMask.globalAABBBounds.x1 + dx, brushMask.globalAABBBounds.y1 + dy, brushMask.globalAABBBounds.x2 + dx, brushMask.globalAABBBounds.y2 + dy);
+        const x = item.globalTransMatrix.e, y = item.globalTransMatrix.f;
         let itemBounds = [];
         if ("symbol" === item.type) {
             const {size: itemSize = 0} = null == item ? void 0 : item.attribute, size = array(itemSize)[0];
@@ -185,7 +200,7 @@ export class Brush extends BaseComponent {
             } ], polygonIntersectPolygon(pointsCoord, itemBounds);
         }
         if ("rect" === item.type) {
-            const {width: width = 0, height: height = 0} = null == item ? void 0 : item.attribute;
+            const {x1: x1, x2: x2, y1: y1, y2: y2} = null == item ? void 0 : item.AABBBounds, width = Math.abs(x1 - x2), height = Math.abs(y1 - y2);
             return itemBounds = [ {
                 x: x,
                 y: y
@@ -243,13 +258,12 @@ export class Brush extends BaseComponent {
     _getNeedClearVRenderComponents() {
         return this._brushComponents;
     }
-    _compareSpec() {
+    _compareSpec(spec, prevSpec) {
         this._brushComponents && this._relativeRegions.forEach(((region, index) => {
             this._updateBrushComponent(region, index);
         }));
-        const result = super._compareSpec();
-        return isEqual(this._originalSpec, this._spec) || (result.reRender = !0, result.reMake = !0), 
-        result;
+        const result = super._compareSpec(spec, prevSpec);
+        return isEqual(prevSpec, spec) || (result.reRender = !0, result.reMake = !0), result;
     }
     onLayoutEnd(ctx) {
         var _a;
@@ -269,7 +283,7 @@ export class Brush extends BaseComponent {
     }
 }
 
-Brush.type = ComponentTypeEnum.brush;
+Brush.type = ComponentTypeEnum.brush, Brush.specKey = "brush";
 
 export const registerBrush = () => {
     Factory.registerComponent(Brush.type, Brush);