@visactor/vchart 1.15.5-alpha.8 → 2.0.0-alpha.0

package/esm/core/vchart.js

@@ -78,7 +78,7 @@ import { Compiler } from "../compile/compiler";
 
 import { getCanvasDataURL, URLToImage } from "../util/image";
 
-import { ChartEvent, VGRAMMAR_HOOK_EVENT } from "../constant/event";
+import { ChartEvent } from "../constant/event";
 
 import { DEFAULT_CHART_HEIGHT, DEFAULT_CHART_WIDTH } from "../constant/base";
 
@@ -96,8 +96,6 @@ import { Layout } from "../layout/base-layout";
 
 import { registerGroupMark } from "../mark/group";
 
-import { View, registerGesturePlugin } from "@visactor/vgrammar-core";
-
 import { VCHART_UTILS } from "./util";
 
 import { ExpressionFunction } from "./expression-function";
@@ -110,10 +108,16 @@ import { darkTheme, registerTheme } from "../theme/builtin";
 
 import { ChartPluginService } from "../plugin/chart/plugin-service";
 
-import { registerElementHighlight as registerHoverInteraction, registerElementSelect as registerSelectInteraction } from "../interaction";
-
 import { getSVGSource } from "../series/pictogram/svg-source";
 
+import { registerGesturePlugin } from "../plugin/other";
+
+import { registerElementHighlight } from "../interaction/triggers/element-highlight";
+
+import { registerElementSelect } from "../interaction/triggers/element-select";
+
+import { registerDimensionHover } from "../interaction/triggers/dimension-hover";
+
 export class VChart {
     static useRegisters(comps) {
         comps.forEach((fn => {
@@ -194,7 +198,7 @@ export class VChart {
         return this._dataSet;
     }
     constructor(spec, options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         this.id = createID(), this._userEvents = [], this._autoSize = !0, this._option = {
             mode: RenderModeEnum["desktop-browser"],
             onError: msg => {
@@ -215,7 +219,7 @@ export class VChart {
             return this._beforeRender(option) ? (null === (_a = this._compiler) || void 0 === _a || _a.render(option.morphConfig), 
             this._afterRender(), self) : self;
         }, this._updateSpec = (spec, forceMerge = !1, userUpdateOptions) => {
-            var _a, _b;
+            var _a;
             const lastSpec = this._spec, result = {
                 changeBackground: !1,
                 reTransformSpec: !1,
@@ -229,7 +233,7 @@ export class VChart {
             isEqual(lastSpec.theme, this._spec.theme) ? isEqual(this._spec.background, lastSpec.background) || (result.reMake = !0, 
             result.changeBackground = !0) : result.changeTheme = !0;
             const reSize = this._shouldChartResize(lastSpec);
-            if (result.reSize = reSize, this._spec.type !== lastSpec.type) return null === (_b = null === (_a = this._compiler) || void 0 === _a ? void 0 : _a.getVGrammarView()) || void 0 === _b || _b.updateLayoutTag(), 
+            if (result.reSize = reSize, this._spec.type !== lastSpec.type) return null === (_a = this._compiler) || void 0 === _a || _a.updateLayoutTag(), 
             result.reMake = !0, result.reTransformSpec = !0, result.change = !0, result.changeTheme = !0, 
             result;
             this._initChartSpec(this._spec, "updateSpec");
@@ -238,7 +242,7 @@ export class VChart {
         }, this._option = mergeOrigin(this._option, {
             animation: !1 !== spec.animation
         }, options), this._onError = null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError;
-        const _j = this._option, {dom: dom, renderCanvas: renderCanvas, mode: mode, stage: stage, poptip: poptip} = _j, restOptions = __rest(_j, [ "dom", "renderCanvas", "mode", "stage", "poptip" ]), isTrueBrowseEnv = isTrueBrowser(mode);
+        const _l = this._option, {dom: dom, renderCanvas: renderCanvas, mode: mode, stage: stage, poptip: poptip} = _l, restOptions = __rest(_l, [ "dom", "renderCanvas", "mode", "stage", "poptip" ]), isTrueBrowseEnv = isTrueBrowser(mode);
         if (isTrueBrowseEnv ? registerBrowserEnv() : "node" === mode && registerNodeEnv(), 
         isTrueBrowseEnv && dom && (this._container = isString(dom) ? vglobal.getElementById(dom) : dom), 
         renderCanvas && (this._canvas = renderCanvas), stage && (this._stage = stage), "node" !== mode && !this._container && !this._canvas && !this._stage) return void (null === (_b = this._option) || void 0 === _b || _b.onError("please specify container or renderCanvas!"));
@@ -246,13 +250,12 @@ export class VChart {
         this._setNewSpec(spec), this._updateCurrentTheme(), this._currentSize = this.getCurrentSize();
         const pluginList = [];
         !1 != !poptip && pluginList.push("poptipForText"), "sankey" === spec.type && pluginList.push("scrollbar");
-        const performanceHook = Object.assign({}, restOptions.performanceHook || {});
-        Object.keys(performanceHook).forEach((hookKey => {
-            restOptions.performanceHook[hookKey] = (...args) => {
-                performanceHook[hookKey](...args, this);
-            };
+        const logger = new Logger(null !== (_c = this._option.logLevel) && void 0 !== _c ? _c : LoggerLevel.Error);
+        Logger.setInstance(logger), (null === (_d = this._option) || void 0 === _d ? void 0 : _d.onError) && logger.addErrorHandler(((...args) => {
+            var _a, _b;
+            null === (_b = null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError) || void 0 === _b || _b.call(_a, ...args);
         })), this._compiler = new Compiler({
-            dom: null !== (_c = this._container) && void 0 !== _c ? _c : "none",
+            dom: null !== (_e = this._container) && void 0 !== _e ? _e : "none",
             canvas: renderCanvas
         }, Object.assign(Object.assign({
             mode: this._option.mode,
@@ -263,10 +266,10 @@ 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(), 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 === (_h = null === (_g = this._option.performanceHook) || void 0 === _g ? void 0 : _g.afterCreateVChart) || void 0 === _h || _h.call(_g, this);
+        this._compiler.initView(), this._compiler.updateLayoutTag(), this._setFontFamilyTheme(null === (_f = this._currentTheme) || void 0 === _f ? void 0 : _f.fontFamily), 
+        this._initDataSet(this._option.dataSet), this._autoSize = !!isTrueBrowseEnv && (null === (_h = null !== (_g = spec.autoFit) && void 0 !== _g ? _g : this._option.autoFit) || void 0 === _h || _h), 
+        this._bindResizeEvent(), this._bindViewEvent(), this._initChartPlugin(), InstanceManager.registerInstance(this), 
+        null === (_k = null === (_j = this._option.performanceHook) || void 0 === _j ? void 0 : _j.afterCreateVChart) || void 0 === _k || _k.call(_j, this);
     }
     _setNewSpec(spec, forceMerge) {
         return !!spec && (isString(spec) && (spec = JSON.parse(spec)), forceMerge && this._originalSpec && (spec = mergeSpec({}, this._originalSpec, spec)), 
@@ -304,20 +307,8 @@ export class VChart {
     _releaseData() {
         this._dataSet && (this._dataSet.dataViewMap = {}, this._dataSet = null);
     }
-    _bindVGrammarViewEvent() {
-        if (!this._compiler) return;
-        const view = this._compiler.getVGrammarView();
-        view.addEventListener(VGRAMMAR_HOOK_EVENT.ALL_ANIMATION_END, (() => {
-            this._event.emit(ChartEvent.animationFinished, {
-                chart: this._chart,
-                vchart: this
-            });
-        })), view.addEventListener(VGRAMMAR_HOOK_EVENT.AFTER_VRENDER_NEXT_RENDER, (() => {
-            this._event.emit(ChartEvent.renderFinished, {
-                chart: this._chart,
-                vchart: this
-            });
-        }));
+    _bindViewEvent() {
+        this._compiler;
     }
     _bindResizeEvent() {
         var _a, _b;
@@ -362,22 +353,21 @@ export class VChart {
         return !!updateSpecResult && (this._reCompile(updateSpecResult), this._beforeRender(option));
     }
     _reCompile(updateResult, morphConfig) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f;
         if (updateResult.reMake && (this._releaseData(), this._initDataSet(), null === (_a = this._chart) || void 0 === _a || _a.release(), 
         this._chart = null), updateResult.reTransformSpec && (this._chartSpecTransformer = null), 
         updateResult.changeTheme ? (this._setCurrentTheme(), this._setFontFamilyTheme(null === (_b = this._currentTheme) || void 0 === _b ? void 0 : _b.fontFamily)) : updateResult.changeBackground && (null === (_c = this._compiler) || void 0 === _c || _c.setBackground(this._getBackground())), 
-        updateResult.reMake) null === (_d = this._compiler) || void 0 === _d || _d.releaseGrammar(!1 === (null === (_e = this._option) || void 0 === _e ? void 0 : _e.animation) || !1 === (null === (_f = this._spec) || void 0 === _f ? void 0 : _f.animation)), 
+        updateResult.reMake) null === (_d = this._compiler) || void 0 === _d || _d.releaseGrammar(), 
         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 === (_g = this._compiler) || void 0 === _g || _g.clear({
+        })), updateResult.reSize && this._doResize(); else if (updateResult.reCompile && (null === (_e = this._compiler) || void 0 === _e || _e.clear({
             chart: this._chart,
             vChart: this
-        }, !1 === (null === (_h = this._option) || void 0 === _h ? void 0 : _h.animation) || !1 === (null === (_j = this._spec) || void 0 === _j ? void 0 : _j.animation)), 
-        null === (_k = this._compiler) || void 0 === _k || _k.compile({
+        }), null === (_f = this._compiler) || void 0 === _f || _f.compile({
             chart: this._chart,
             vChart: this
-        }, {})), updateResult.reSize) {
+        })), updateResult.reSize) {
             const {width: width, height: height} = this.getCurrentSize();
             this._chart.onResize(width, height, !1), this._compiler.resize(width, height, !1);
         }
@@ -390,13 +380,11 @@ export class VChart {
         return transformSpec && this._initChartSpec(this._spec, "render"), this._chartPluginApply("onBeforeInitChart", this._spec, actionSource), 
         null === (_b = null === (_a = this._option.performanceHook) || void 0 === _a ? void 0 : _a.beforeInitializeChart) || void 0 === _b || _b.call(_a, this), 
         this._initChart(this._spec), null === (_d = null === (_c = this._option.performanceHook) || void 0 === _c ? void 0 : _c.afterInitializeChart) || void 0 === _d || _d.call(_c, this), 
-        !(!this._chart || !this._compiler) && (null === (_f = null === (_e = this._option.performanceHook) || void 0 === _e ? void 0 : _e.beforeCompileToVGrammar) || void 0 === _f || _f.call(_e), 
+        !(!this._chart || !this._compiler) && (null === (_f = null === (_e = this._option.performanceHook) || void 0 === _e ? void 0 : _e.beforeCompileToVGrammar) || void 0 === _f || _f.call(_e, this), 
         this._compiler.compile({
             chart: this._chart,
             vChart: this
-        }, {
-            performanceHook: this._option.performanceHook
-        }), null === (_h = null === (_g = this._option.performanceHook) || void 0 === _g ? void 0 : _g.afterCompileToVGrammar) || void 0 === _h || _h.call(_g), 
+        }, option), null === (_h = null === (_g = this._option.performanceHook) || void 0 === _g ? void 0 : _g.afterCompileToVGrammar) || void 0 === _h || _h.call(_g, this), 
         !0);
     }
     _afterRender() {
@@ -562,8 +550,8 @@ export class VChart {
         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), 
+        null === (_b = null === (_a = this._option.performanceHook) || void 0 === _a ? void 0 : _a.beforeResizeWithUpdate) || void 0 === _b || _b.call(_a, this), 
+        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, this), 
         !0);
     }
     _afterResize() {
@@ -823,18 +811,9 @@ export class VChart {
         var _a;
         return null === (_a = this._chart) || void 0 === _a ? void 0 : _a.setDimensionIndex(value, opt);
     }
-    stopAnimation() {
-        var _a, _b, _c;
-        null === (_c = null === (_b = null === (_a = this._compiler) || void 0 === _a ? void 0 : _a.getVGrammarView()) || void 0 === _b ? void 0 : _b.animate) || void 0 === _c || _c.stop();
-    }
-    pauseAnimation() {
-        var _a, _b, _c;
-        null === (_c = null === (_b = null === (_a = this._compiler) || void 0 === _a ? void 0 : _a.getVGrammarView()) || void 0 === _b ? void 0 : _b.animate) || void 0 === _c || _c.pause();
-    }
-    resumeAnimation() {
-        var _a, _b, _c;
-        null === (_c = null === (_b = null === (_a = this._compiler) || void 0 === _a ? void 0 : _a.getVGrammarView()) || void 0 === _b ? void 0 : _b.animate) || void 0 === _c || _c.resume();
-    }
+    stopAnimation() {}
+    pauseAnimation() {}
+    resumeAnimation() {}
     convertDatumToPosition(datum, dataLinkInfo = {}, isRelativeToCanvas = !1, checkInViewData) {
         var _a;
         if (!this._chart) return null;
@@ -938,7 +917,6 @@ export class VChart {
             mode: this._getMode(),
             modeParams: this._option.modeParams,
             getCompiler: () => this._compiler,
-            performanceHook: this._option.performanceHook,
             viewBox: this._viewBox,
             animation: this._option.animation,
             getTheme: () => {
@@ -962,11 +940,11 @@ VChart.InstanceManager = InstanceManager, VChart.ThemeManager = ThemeManager, VC
 
 export const registerVChartCore = () => {
     Factory.registerRegion("region", Region), Factory.registerLayout("base", Layout), 
-    registerGroupMark(), View.useRegisters([ registerGesturePlugin ]), registerHoverInteraction(), 
-    registerSelectInteraction(), registerTheme(darkTheme.name, darkTheme), Logger.getInstance(LoggerLevel.Error);
+    registerGroupMark(), registerGesturePlugin(), registerElementHighlight(), registerElementSelect(), 
+    registerDimensionHover(), registerTheme(darkTheme.name, darkTheme);
 };
 
 Factory.registerRegion("region", Region), Factory.registerLayout("base", Layout), 
-registerGroupMark(), View.useRegisters([ registerGesturePlugin ]), registerHoverInteraction(), 
-registerSelectInteraction(), registerTheme(darkTheme.name, darkTheme), Logger.getInstance(LoggerLevel.Error);
+registerGroupMark(), registerGesturePlugin(), registerElementHighlight(), registerElementSelect(), 
+registerDimensionHover(), registerTheme(darkTheme.name, darkTheme);
 //# sourceMappingURL=vchart.js.map