@visactor/vgrammar-core 0.14.0-alpha.3 → 0.14.0-alpha.4

package/es/view/View.js

@@ -1,11 +1,9 @@
-import { EventEmitter, debounce, isObject, isString, getContainerSize, Logger, array, isNil } from "@visactor/vutils";
+import { EventEmitter, debounce, isString, getContainerSize, Logger, array, isNil, isArray } from "@visactor/vutils";
 
 import { vglobal } from "@visactor/vrender-core";
 
 import { Data } from "./data";
 
-import { initializeEventConfig, permit, prevent } from "./events";
-
 import Dataflow from "./dataflow";
 
 import { traverseMarkTree } from "../graph/mark-tree";
@@ -16,15 +14,13 @@ import CanvasRenderer from "../graph/canvas-renderer";
 
 import getExtendedEvents from "../graph/util/events-extend";
 
-import { BROWSER, NO_TRAP, SIGNAL_WIDTH, SIGNAL_HEIGHT, SIGNAL_PADDING, SIGNAL_AUTOFIT, SIGNAL_VIEW_WIDTH, SIGNAL_VIEW_HEIGHT, EVENT_SOURCE_VIEW, EVENT_SOURCE_WINDOW, SIGNAL_VIEW_BOX } from "./constants";
+import { BROWSER, SIGNAL_WIDTH, SIGNAL_HEIGHT, SIGNAL_PADDING, SIGNAL_AUTOFIT, SIGNAL_VIEW_WIDTH, SIGNAL_VIEW_HEIGHT, EVENT_SOURCE_VIEW, SIGNAL_VIEW_BOX, ID_PREFIX, NAME_PREFIX, EVENT_SOURCE_WINDOW } from "./constants";
 
 import { Signal } from "./signal";
 
 import { BuiltInSignalID, builtInSignals, normalizeMarkTree, normalizeRunningConfig, normalizePadding } from "../parse/view";
 
-import { parseHandler, parseEventSelector, generateFilterByMark, ID_PREFIX, NAME_PREFIX } from "../parse/event";
-
-import { isGrammar, parseReference } from "../parse/util";
+import { isGrammar } from "../parse/util";
 
 import { configureEnvironment } from "../graph/util/env";
 
@@ -32,16 +28,8 @@ import { GroupMark } from "./group";
 
 import { Mark } from "./mark";
 
-import { defaultDoLayout } from "../graph/layout/layout";
-
-import { GlyphMark } from "./glyph";
-
-import { Morph } from "../graph/animation/morph";
-
 import { RecordedGrammars, RecordedTreeGrammars } from "./grammar-record";
 
-import { ViewAnimate } from "./animate";
-
 import { ComponentEnum, HOOK_EVENT, LayoutState, GrammarMarkType } from "../graph/enums";
 
 import { Text } from "../semantic-marks/text";
@@ -54,6 +42,8 @@ import { Component } from "./component";
 
 import { isMarkType, removeGraphicItem } from "../graph/util/graphic";
 
+import { ViewDiff } from "../graph/view-diff";
+
 export default class View extends EventEmitter {
     static useRegisters(comps) {
         comps.forEach((fn => {
@@ -154,7 +144,8 @@ export default class View extends EventEmitter {
             break;
 
           case GrammarMarkType.glyph:
-            mark = new GlyphMark(this, null == markOptions ? void 0 : markOptions.glyphType, groupMark);
+            const GlyphMark = Factory.getMark(GrammarMarkType.glyph);
+            GlyphMark && (mark = new GlyphMark(this, null == markOptions ? void 0 : markOptions.glyphType, groupMark));
             break;
 
           case GrammarMarkType.component:
@@ -260,7 +251,7 @@ export default class View extends EventEmitter {
         })), this;
     }
     parseSpec(spec) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (this.emit(HOOK_EVENT.BEFORE_PARSE_VIEW), this._spec = spec, normalizeMarkTree(spec), 
         spec.theme ? this.theme(spec.theme) : this.theme(ThemeManager.getDefaultTheme()), 
         spec.width && this.width(spec.width), spec.height && this.height(spec.height), this.padding(null !== (_b = null !== (_a = spec.padding) && void 0 !== _a ? _a : this._options.padding) && void 0 !== _b ? _b : this._theme.padding), 
@@ -288,11 +279,13 @@ export default class View extends EventEmitter {
         })), spec.marks && spec.marks.length && spec.marks.forEach((mark => {
             this.parseMarkSpec(mark);
         })), spec.events && spec.events.length && spec.events.forEach((eventConfig => {
-            this.event(eventConfig);
+            var _b;
+            null === (_b = this.event) || void 0 === _b || _b.call(this, eventConfig);
         })), spec.interactions && spec.interactions.length && spec.interactions.forEach((interaction => {
             this.interaction(interaction.type, interaction);
-        })), !1 === spec.animation ? this.animate.disable() : this.animate.enable(), this.emit(HOOK_EVENT.AFTER_PARSE_VIEW), 
-        this._needBuildLayoutTree = !0, this._layoutState = LayoutState.before, this;
+        })), !1 === spec.animation ? null === (_g = this.animate) || void 0 === _g || _g.disable() : null === (_h = this.animate) || void 0 === _h || _h.enable(), 
+        this.emit(HOOK_EVENT.AFTER_PARSE_VIEW), this._needBuildLayoutTree = !0, this._layoutState = LayoutState.before, 
+        this;
     }
     updateSpec(spec) {
         return this.removeAllInteractions(), this.removeAllGrammars(), this.parseSpec(spec);
@@ -412,7 +405,7 @@ export default class View extends EventEmitter {
     }
     doLayout() {
         var _a;
-        const doLayout = this._options.doLayout || defaultDoLayout;
+        const doLayout = this._options.doLayout || Factory.getDefaultLayout();
         doLayout && (null === (_a = this._layoutMarks) || void 0 === _a ? void 0 : _a.length) && (this.emit(HOOK_EVENT.BEFORE_DO_LAYOUT), 
         doLayout(this._layoutMarks, this._options, this), this.emit(HOOK_EVENT.AFTER_DO_LAYOUT));
     }
@@ -435,11 +428,11 @@ export default class View extends EventEmitter {
         return this.evaluate(runningConfig), this;
     }
     doRender(immediately) {
-        this.emit(HOOK_EVENT.BEFORE_DO_RENDER), this.renderer && (this._progressiveMarks || this.animate.animate(), 
+        this.emit(HOOK_EVENT.BEFORE_DO_RENDER), this.renderer && (!this._progressiveMarks && this.animate && this.animate.animate(), 
         this.renderer.render(immediately), this.handleRenderEnd()), this.emit(HOOK_EVENT.AFTER_DO_RENDER);
     }
     evaluate(runningConfig) {
-        var _a, _b;
+        var _a, _c;
         const normalizedRunningConfig = normalizeRunningConfig(runningConfig), grammarWillDetach = this._cachedGrammars.size() > 0;
         grammarWillDetach && (this.reuseCachedGrammars(normalizedRunningConfig), this.detachCachedGrammar());
         const hasResize = this._resizeRenderer(), hasUpdate = this._dataflow.hasCommitted();
@@ -448,28 +441,28 @@ export default class View extends EventEmitter {
         this._needBuildLayoutTree = !1), this._layoutState && (this._layoutState = LayoutState.layouting, 
         this.doLayout(), this._dataflow.hasCommitted() && (this._layoutState = LayoutState.reevaluate, 
         this._dataflow.evaluate()), this._layoutState = LayoutState.after, (null === (_a = this._layoutMarks) || void 0 === _a ? void 0 : _a.length) && this.handleLayoutEnd()), 
-        this._layoutState = null, this.findProgressiveMarks(), this._resizeRenderer(), null === (_b = this._willMorphMarks) || void 0 === _b || _b.forEach((morphMarks => {
-            this._morph.morph(morphMarks.prev, morphMarks.next, normalizedRunningConfig);
-        })), this._willMorphMarks = null, this.releaseCachedGrammars(normalizedRunningConfig), 
-        this.doRender(!0), this.doPreProgressive(), this) : this;
+        this._layoutState = null, this.findProgressiveMarks(), this._resizeRenderer(), null === (_c = this.morph) || void 0 === _c || _c.call(this, normalizedRunningConfig), 
+        this.releaseCachedGrammars(normalizedRunningConfig), this.doRender(!0), this.doPreProgressive(), 
+        this) : this;
     }
     reuseCachedGrammars(runningConfig) {
-        if (this._willMorphMarks || (this._willMorphMarks = []), runningConfig.reuse) {
+        if (runningConfig.reuse) {
             const reuseDiffUpdate = diff => {
                 diff.next.reuse(diff.prev), diff.prev.detachAll(), diff.prev.clear(), this._cachedGrammars.unrecord(diff.prev);
             };
-            this._morph.diffGrammar(this._cachedGrammars.getAllSignals(), this.grammars.getAllSignals().filter((signal => !BuiltInSignalID.includes(signal.id())))).update.forEach(reuseDiffUpdate);
-            this._morph.diffGrammar(this._cachedGrammars.getAllData(), this.grammars.getAllData()).update.forEach(reuseDiffUpdate);
-            this._morph.diffGrammar(this._cachedGrammars.getAllScales(), this.grammars.getAllScales()).update.forEach(reuseDiffUpdate);
-            this._morph.diffGrammar(this._cachedGrammars.getAllCoordinates(), this.grammars.getAllCoordinates()).update.forEach(reuseDiffUpdate);
+            this._differ.diffGrammar(this._cachedGrammars.getAllSignals(), this.grammars.getAllSignals().filter((signal => !BuiltInSignalID.includes(signal.id())))).update.forEach(reuseDiffUpdate);
+            this._differ.diffGrammar(this._cachedGrammars.getAllData(), this.grammars.getAllData()).update.forEach(reuseDiffUpdate);
+            this._differ.diffGrammar(this._cachedGrammars.getAllScales(), this.grammars.getAllScales()).update.forEach(reuseDiffUpdate);
+            this._differ.diffGrammar(this._cachedGrammars.getAllCoordinates(), this.grammars.getAllCoordinates()).update.forEach(reuseDiffUpdate);
         }
-        this._morph.diffMark(this._cachedGrammars.getAllMarks(), this.grammars.getAllMarks().filter((mark => "root" !== mark.id())), runningConfig).update.forEach((diff => {
+        this._differ.diffMark(this._cachedGrammars.getAllMarks(), this.grammars.getAllMarks().filter((mark => "root" !== mark.id())), runningConfig).update.forEach((diff => {
+            var _b;
             const matched = 1 === diff.prev.length && 1 === diff.next.length && diff.prev[0].markType === diff.next[0].markType, enableMarkMorphConfig = diff.prev.every((mark => mark.getMorphConfig().morph)) && diff.next.every((mark => mark.getMorphConfig().morph));
             matched && runningConfig.reuse ? (diff.next[0].reuse(diff.prev[0]), diff.prev[0].detachAll(), 
-            diff.prev[0].clear(), this._cachedGrammars.unrecord(diff.prev[0])) : (runningConfig.morph && enableMarkMorphConfig || runningConfig.morphAll) && this._willMorphMarks.push({
+            diff.prev[0].clear(), this._cachedGrammars.unrecord(diff.prev[0])) : (runningConfig.morph && enableMarkMorphConfig || runningConfig.morphAll) && (null === (_b = this.addMorphMarks) || void 0 === _b || _b.call(this, {
                 prev: diff.prev,
                 next: diff.next
-            });
+            }));
         }));
     }
     detachCachedGrammar() {
@@ -487,10 +480,11 @@ export default class View extends EventEmitter {
         }));
         const markNodes = this._cachedGrammars.getAllMarkNodes();
         markNodes.forEach((node => {
-            node.mark.animate.stop(), runningConfig.enableExitAnimation && this.animate.animateAddition(node.mark);
+            var _a;
+            null === (_a = node.mark.animate) || void 0 === _a || _a.stop(), runningConfig.enableExitAnimation && this.animate && this.animate.animateAddition(node.mark);
         }));
         const releaseUp = node => {
-            if (node.mark.view && 0 === node.mark.animate.getAnimatorCount() && (!node.children || 0 === node.children.length)) {
+            if (node.mark.view && (!node.mark.animate || 0 === node.mark.animate.getAnimatorCount()) && (!node.children || 0 === node.children.length)) {
                 node.mark.release();
                 const parent = node.parent;
                 parent && (node.parent.children = node.parent.children.filter((n => n !== node)), 
@@ -499,8 +493,8 @@ export default class View extends EventEmitter {
         };
         markNodes.forEach((node => {
             const mark = node.mark;
-            0 === mark.animate.getAnimatorCount() ? releaseUp(node) : mark.addEventListener("animationEnd", (() => {
-                0 === mark.animate.getAnimatorCount() && releaseUp(node);
+            mark.animate && 0 === mark.animate.getAnimatorCount() ? releaseUp(node) : mark.addEventListener("animationEnd", (() => {
+                mark.animate && 0 === mark.animate.getAnimatorCount() && releaseUp(node);
             }));
         })), this._cachedGrammars.clear();
     }
@@ -568,73 +562,6 @@ export default class View extends EventEmitter {
             height: height
         }), !0);
     }
-    bindEvents(eventSpec) {
-        if (this._eventConfig.disable) return;
-        const {type: evtType, filter: filter, callback: callback, throttle: throttle, debounce: debounce, consume: consume, target: target, dependency: dependency} = eventSpec, eventSelector = parseEventSelector(evtType);
-        if (!eventSelector) return;
-        const {source: source, type: type} = eventSelector, markFilter = generateFilterByMark(eventSelector), validateSignals = (Array.isArray(target) && target.length ? target.map((entry => ({
-            signal: this.getSignalById(entry.target),
-            callback: entry.callback
-        }))) : [ {
-            signal: isString(target) ? this.getSignalById(target) : null,
-            callback: callback
-        } ]).filter((entry => entry.signal || entry.callback)), refs = parseReference(dependency, this), send = parseHandler(((evt, element) => {
-            const needPreventDefault = source === EVENT_SOURCE_VIEW && prevent(this._eventConfig, type) || consume && (void 0 === evt.cancelable || evt.cancelable);
-            source === EVENT_SOURCE_WINDOW && (evt = getExtendedEvents(this, evt, element, type, EVENT_SOURCE_WINDOW));
-            let hasCommitted = !1;
-            if ((!filter || filter(evt)) && (!markFilter || markFilter(element)) && validateSignals.length) {
-                const params = refs.reduce(((params, ref) => (params[ref.id()] = ref.output(), params)), {});
-                validateSignals.forEach((entry => {
-                    if (entry.callback && entry.signal) {
-                        entry.signal.set(entry.callback(evt, params)) && (this.commit(entry.signal), hasCommitted = !0);
-                    } else entry.callback ? entry.callback(evt, params) : (this.commit(entry.signal), 
-                    hasCommitted = !0);
-                }));
-            }
-            needPreventDefault && evt.preventDefault(), consume && evt.stopPropagation(), hasCommitted && this.run();
-        }), {
-            throttle: throttle,
-            debounce: debounce
-        });
-        if (source === EVENT_SOURCE_VIEW) {
-            if (permit(this._eventConfig, EVENT_SOURCE_VIEW, type)) return this.addEventListener(type, send, NO_TRAP), 
-            () => {
-                this.removeEventListener(type, send);
-            };
-        } else if (source === EVENT_SOURCE_WINDOW) return vglobal.addEventListener(type, send), 
-        this._eventListeners.push({
-            type: type,
-            source: vglobal,
-            handler: send
-        }), () => {
-            vglobal.removeEventListener(type, send);
-            const index = this._eventListeners.findIndex((entry => entry.type === type && entry.source === vglobal && entry.handler === send));
-            index >= 0 && this._eventListeners.splice(index, 1);
-        };
-    }
-    event(eventSpec) {
-        if ("between" in eventSpec) {
-            const [starEvent, endEvent] = eventSpec.between, id = `${starEvent.type}-${eventSpec.type}-${endEvent.type}`;
-            let unbindEndEvent;
-            this.bindEvents(Object.assign({}, starEvent, {
-                callback: () => {
-                    if (this._eventCache || (this._eventCache = {}), !this._eventCache[id]) {
-                        const unbindEvent = this.bindEvents(eventSpec);
-                        this._eventCache[id] = unbindEvent;
-                    }
-                    unbindEndEvent || (unbindEndEvent = this.bindEvents(Object.assign({}, endEvent, {
-                        callback: () => {
-                            this._eventCache[id] && (this._eventCache[id](), this._eventCache[id] = null);
-                        }
-                    })));
-                }
-            }));
-        } else "merge" in eventSpec ? eventSpec.merge.forEach((entry => {
-            const singleEvent = Object.assign({}, eventSpec);
-            isString(entry) ? singleEvent.type = entry : isObject(entry) && Object.assign(singleEvent, entry), 
-            singleEvent.debounce = 50, this.bindEvents(singleEvent);
-        })) : this.bindEvents(eventSpec);
-    }
     interaction(type, spec) {
         const interaction = Factory.createInteraction(type, this, spec);
         return interaction && (interaction.bind(), this._boundInteractions || (this._boundInteractions = []), 
@@ -657,6 +584,17 @@ export default class View extends EventEmitter {
             instance.unbind();
         })), this._boundInteractions = null), this;
     }
+    initializeEventConfig(config) {
+        const eventsConfig = Object.assign({
+            defaults: {}
+        }, config), unpack = (obj, keys) => {
+            keys.forEach((k => {
+                isArray(obj[k]) && (obj[k] = obj[k].reduce(((set, key) => (set[key] = !0, set)), {}));
+            }));
+        };
+        return unpack(eventsConfig.defaults, [ "prevent", "allow" ]), unpack(eventsConfig, [ EVENT_SOURCE_VIEW, EVENT_SOURCE_WINDOW ]), 
+        eventsConfig;
+    }
     initEvent() {
         const stage = this.renderer.stage();
         stage && stage.on("*", this.delegateEvent);
@@ -679,15 +617,15 @@ export default class View extends EventEmitter {
         this.renderer = new CanvasRenderer(this), this.renderer.initialize(width, height, this._options, this._eventConfig).background(this._background);
     }
     initialize() {
-        var _a;
+        var _a, _c;
         this.grammars = new RecordedGrammars((grammar => grammar.id()), ((key, grammar) => this.logger.warn(`Grammar id '${key}' has been occupied`, grammar))), 
         this._cachedGrammars = new RecordedTreeGrammars((grammar => grammar.id())), this._options.logger && Logger.setInstance(this._options.logger), 
         this.logger = Logger.getInstance(null !== (_a = this._options.logLevel) && void 0 !== _a ? _a : 0), 
-        this._dataflow = new Dataflow, this.animate = new ViewAnimate(this), this._morph = new Morph, 
-        this._options.hooks && (Object.keys(this._options.hooks).forEach((key => {
+        this._dataflow = new Dataflow, this.animate = null === (_c = this.initAnimate) || void 0 === _c ? void 0 : _c.call(this, this), 
+        this._differ = new ViewDiff, this._options.hooks && (Object.keys(this._options.hooks).forEach((key => {
             this.on(key, this._options.hooks[key]);
         })), this.hooks = this._options.hooks), this.container = null, this.renderer = null, 
-        this._eventListeners = [], this._eventConfig = initializeEventConfig(this._options.eventConfig), 
+        this._eventListeners = [], this._eventConfig = this.initializeEventConfig(this._options.eventConfig), 
         this._theme = this._options.disableTheme ? null : ThemeManager.getDefaultTheme(), 
         this.parseBuiltIn(), configureEnvironment(this._options), this.initializeRenderer(), 
         this._eventConfig.disable || this.initEvent(), this._bindResizeEvent(), this._needBuildLayoutTree = !0, 
@@ -725,13 +663,14 @@ export default class View extends EventEmitter {
         })), this._progressiveMarks = null);
     }
     release() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         this.removeAllInteractions(), this.releaseStageEvent(), this._unBindResizeEvent(), 
         this.clearProgressive(), Factory.unregisterRuntimeTransforms(), Logger.setInstance(null), 
-        this.animate.stop(), this.grammars.release(), this._cachedGrammars.release(), this._dataflow.release(), 
-        this._dataflow = null, null === (_b = null === (_a = this.renderer) || void 0 === _a ? void 0 : _a.release) || void 0 === _b || _b.call(_a), 
+        null === (_a = this.animate) || void 0 === _a || _a.stop(), this.grammars.release(), 
+        this._cachedGrammars.release(), this._dataflow.release(), this._dataflow = null, 
+        null === (_c = null === (_b = this.renderer) || void 0 === _b ? void 0 : _b.release) || void 0 === _c || _c.call(_b), 
         this.renderer = null, this._boundInteractions = null, this.removeAllListeners(), 
-        null === (_c = this._eventListeners) || void 0 === _c || _c.forEach((listener => {
+        null === (_d = this._eventListeners) || void 0 === _d || _d.forEach((listener => {
             listener.source.removeEventListener(listener.type, listener.handler);
         })), this._eventListeners = null;
     }