@visactor/vchart 2.1.0-alpha.7 → 2.1.0-alpha.9

package/esm/event/event.js

@@ -5,7 +5,8 @@ export class Event {
         return this._composedEventMap;
     }
     constructor(eventDispatcher, mode) {
-        this._composedEventMap = new Map, this._eventDispatcher = eventDispatcher, this._mode = mode;
+        this._composedEventMap = new Map, this._eventHandlerMap = new Map, this._eventDispatcher = eventDispatcher, 
+        this._mode = mode;
     }
     on(eType, query, callback) {
         const handler = "function" == typeof query ? {
@@ -21,16 +22,16 @@ export class Event {
                 eventType: eType,
                 event: composedEvent
             });
-        } else this._eventDispatcher.register(eType, handler);
+        } else this._eventDispatcher.register(eType, handler), this._addEventHandler(eType, handler);
         return this;
     }
     off(eType, query, cb) {
-        var _a, _b;
+        var _a, _b, _c;
         const callback = null != cb ? cb : query;
         if (Factory.getComposedEvent(eType)) if (callback) null === (_a = this._composedEventMap.get(callback)) || void 0 === _a || _a.event.unregister(), 
         this._composedEventMap.delete(callback); else for (const entry of this._composedEventMap.entries()) entry[1].eventType === eType && (null === (_b = this._composedEventMap.get(entry[0])) || void 0 === _b || _b.event.unregister(), 
         this._composedEventMap.delete(entry[0])); else if (callback) {
-            const handler = {
+            const handler = null !== (_c = this._getEventHandler(eType, callback)) && void 0 !== _c ? _c : {
                 callback: callback,
                 query: null,
                 filter: {
@@ -43,8 +44,8 @@ export class Event {
                     userId: null
                 }
             };
-            this._eventDispatcher.unregister(eType, handler);
-        } else this._eventDispatcher.unregister(eType);
+            this._eventDispatcher.unregister(eType, handler), this._removeEventHandler(eType, callback);
+        } else this._eventDispatcher.unregister(eType), this._eventHandlerMap.delete(eType);
         return this;
     }
     emit(eType, params, level) {
@@ -57,7 +58,25 @@ export class Event {
         return this._eventDispatcher.allow(eType), this;
     }
     release() {
-        this._eventDispatcher.clear(), this._composedEventMap.clear();
+        this._eventHandlerMap.forEach(((handlers, eventType) => {
+            handlers.forEach((handler => {
+                this._eventDispatcher.unregister(eventType, handler);
+            }));
+        })), this._eventHandlerMap.clear(), this._composedEventMap.forEach((entry => {
+            entry.event.unregister();
+        })), this._composedEventMap.clear();
+    }
+    _addEventHandler(eventType, handler) {
+        handler.callback && (this._eventHandlerMap.has(eventType) || this._eventHandlerMap.set(eventType, new Map), 
+        this._eventHandlerMap.get(eventType).set(handler.callback, handler));
+    }
+    _getEventHandler(eventType, callback) {
+        var _a;
+        return null === (_a = this._eventHandlerMap.get(eventType)) || void 0 === _a ? void 0 : _a.get(callback);
+    }
+    _removeEventHandler(eventType, callback) {
+        const handlerMap = this._eventHandlerMap.get(eventType);
+        handlerMap && (handlerMap.delete(callback), handlerMap.size || this._eventHandlerMap.delete(eventType));
     }
 }
 //# sourceMappingURL=event.js.map

package/esm/event/event.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/event/event.ts"],"names":[],"mappings":"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","file":"event.js","sourcesContent":["/*eslint no-dupe-class-members: \"off\"*/\n\nimport { Factory } from '../core/factory';\nimport type { RenderMode } from '../typings/spec/common';\nimport type {\n  EventType,\n  EventQuery,\n  EventCallback,\n  EventParamsDefinition,\n  IEvent,\n  IEventDispatcher,\n  IComposedEvent,\n  EventParams,\n  EventHandler,\n  EventBubbleLevel\n} from './interface';\n\nexport class Event implements IEvent {\n  private _eventDispatcher: IEventDispatcher;\n  private _mode: RenderMode;\n\n  private _composedEventMap: Map<EventCallback<EventParams>, { eventType: EventType; event: IComposedEvent }> =\n    new Map();\n  getComposedEventMap() {\n    return this._composedEventMap;\n  }\n\n  constructor(eventDispatcher: IEventDispatcher, mode: RenderMode) {\n    this._eventDispatcher = eventDispatcher;\n    this._mode = mode;\n  }\n\n  on<Evt extends EventType>(eType: Evt, callback: EventCallback<EventParamsDefinition[Evt]>): this;\n  on<Evt extends EventType>(eType: Evt, query: EventQuery, callback: EventCallback<EventParamsDefinition[Evt]>): this;\n  on<Evt extends EventType>(\n    eType: Evt,\n    query: EventQuery | EventCallback<EventParamsDefinition[Evt]>,\n    callback?: EventCallback<EventParamsDefinition[Evt]>\n  ): this {\n    const handler =\n      typeof query === 'function'\n        ? { query: null, callback: query }\n        : {\n            query,\n            callback: callback as EventCallback<EventParamsDefinition[Evt]>\n          };\n\n    const ComposedEventCtor = Factory.getComposedEvent(eType);\n    if (ComposedEventCtor) {\n      const composedEvent = new ComposedEventCtor(this._eventDispatcher, this._mode) as IComposedEvent;\n      composedEvent.register(eType, handler);\n      this._composedEventMap.set(handler.callback as EventCallback<EventParamsDefinition[Evt]>, {\n        eventType: eType,\n        event: composedEvent\n      });\n    } else {\n      this._eventDispatcher.register(eType, handler);\n    }\n\n    return this;\n  }\n\n  off<Evt extends EventType>(eType: Evt, callback?: EventCallback<EventParamsDefinition[Evt]>): this;\n  off<Evt extends EventType>(eType: Evt, query: EventQuery, callback: EventCallback<EventParamsDefinition[Evt]>): this;\n  off<Evt extends EventType>(\n    eType: Evt,\n    query?: EventQuery | EventCallback<EventParamsDefinition[Evt]>,\n    cb?: EventCallback<EventParamsDefinition[Evt]>\n  ): this {\n    const callback = (cb ?? query) as EventCallback<EventParamsDefinition[Evt]>;\n    const ComposedEventCtor = Factory.getComposedEvent(eType);\n\n    if (!!ComposedEventCtor) {\n      if (callback) {\n        this._composedEventMap.get(callback)?.event.unregister();\n        this._composedEventMap.delete(callback);\n      } else {\n        for (const entry of this._composedEventMap.entries()) {\n          if (entry[1].eventType === eType) {\n            this._composedEventMap.get(entry[0])?.event.unregister();\n            this._composedEventMap.delete(entry[0]);\n          }\n        }\n      }\n    } else {\n      if (callback) {\n        const handler: EventHandler<EventParamsDefinition[Evt]> = {\n          callback,\n          query: null,\n          // 卸载事件时无需处理 source 以外的参数\n          filter: {\n            nodeName: null,\n            type: eType,\n            level: null,\n            source: (query as EventQuery).source,\n            markName: null,\n            filter: null,\n            userId: null\n          }\n        };\n        this._eventDispatcher.unregister(eType, handler);\n      } else {\n        this._eventDispatcher.unregister(eType);\n      }\n    }\n    return this;\n  }\n\n  emit<Evt extends EventType>(eType: Evt, params: EventParamsDefinition[Evt], level?: EventBubbleLevel): this {\n    this._eventDispatcher.dispatch(eType, params, level);\n    return this;\n  }\n\n  prevent<Evt extends EventType>(\n    eType: Evt,\n    except?: {\n      handler: EventCallback<EventParamsDefinition[Evt]>;\n      level: EventBubbleLevel;\n    }\n  ): this {\n    this._eventDispatcher.prevent(eType, except);\n    return this;\n  }\n\n  allow<Evt extends EventType>(eType: Evt) {\n    this._eventDispatcher.allow(eType);\n    return this;\n  }\n\n  release(): void {\n    this._eventDispatcher.clear();\n    this._composedEventMap.clear();\n  }\n}\n"]}
+{"version":3,"sources":["../src/event/event.ts"],"names":[],"mappings":"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","file":"event.js","sourcesContent":["/*eslint no-dupe-class-members: \"off\"*/\n\nimport { Factory } from '../core/factory';\nimport type { RenderMode } from '../typings/spec/common';\nimport type {\n  EventType,\n  EventQuery,\n  EventCallback,\n  EventParamsDefinition,\n  IEvent,\n  IEventDispatcher,\n  IComposedEvent,\n  EventParams,\n  EventHandler,\n  EventBubbleLevel\n} from './interface';\n\nexport class Event implements IEvent {\n  private _eventDispatcher: IEventDispatcher;\n  private _mode: RenderMode;\n\n  private _composedEventMap: Map<EventCallback<EventParams>, { eventType: EventType; event: IComposedEvent }> =\n    new Map();\n  private _eventHandlerMap: Map<EventType, Map<EventCallback<EventParams>, EventHandler<EventParams>>> = new Map();\n  getComposedEventMap() {\n    return this._composedEventMap;\n  }\n\n  constructor(eventDispatcher: IEventDispatcher, mode: RenderMode) {\n    this._eventDispatcher = eventDispatcher;\n    this._mode = mode;\n  }\n\n  on<Evt extends EventType>(eType: Evt, callback: EventCallback<EventParamsDefinition[Evt]>): this;\n  on<Evt extends EventType>(eType: Evt, query: EventQuery, callback: EventCallback<EventParamsDefinition[Evt]>): this;\n  on<Evt extends EventType>(\n    eType: Evt,\n    query: EventQuery | EventCallback<EventParamsDefinition[Evt]>,\n    callback?: EventCallback<EventParamsDefinition[Evt]>\n  ): this {\n    const handler: EventHandler<EventParamsDefinition[Evt]> =\n      typeof query === 'function'\n        ? { query: null, callback: query }\n        : {\n            query,\n            callback: callback as EventCallback<EventParamsDefinition[Evt]>\n          };\n\n    const ComposedEventCtor = Factory.getComposedEvent(eType);\n    if (ComposedEventCtor) {\n      const composedEvent = new ComposedEventCtor(this._eventDispatcher, this._mode) as IComposedEvent;\n      composedEvent.register(eType, handler);\n      this._composedEventMap.set(handler.callback as EventCallback<EventParamsDefinition[Evt]>, {\n        eventType: eType,\n        event: composedEvent\n      });\n    } else {\n      this._eventDispatcher.register(eType, handler);\n      this._addEventHandler(eType, handler as unknown as EventHandler<EventParams>);\n    }\n\n    return this;\n  }\n\n  off<Evt extends EventType>(eType: Evt, callback?: EventCallback<EventParamsDefinition[Evt]>): this;\n  off<Evt extends EventType>(eType: Evt, query: EventQuery, callback: EventCallback<EventParamsDefinition[Evt]>): this;\n  off<Evt extends EventType>(\n    eType: Evt,\n    query?: EventQuery | EventCallback<EventParamsDefinition[Evt]>,\n    cb?: EventCallback<EventParamsDefinition[Evt]>\n  ): this {\n    const callback = (cb ?? query) as EventCallback<EventParamsDefinition[Evt]>;\n    const ComposedEventCtor = Factory.getComposedEvent(eType);\n\n    if (!!ComposedEventCtor) {\n      if (callback) {\n        this._composedEventMap.get(callback)?.event.unregister();\n        this._composedEventMap.delete(callback);\n      } else {\n        for (const entry of this._composedEventMap.entries()) {\n          if (entry[1].eventType === eType) {\n            this._composedEventMap.get(entry[0])?.event.unregister();\n            this._composedEventMap.delete(entry[0]);\n          }\n        }\n      }\n    } else {\n      if (callback) {\n        const storedHandler = this._getEventHandler(eType, callback as EventCallback<EventParams>);\n        const handler: EventHandler<EventParamsDefinition[Evt]> = (storedHandler as unknown as EventHandler<\n          EventParamsDefinition[Evt]\n        >) ?? {\n          callback,\n          query: null,\n          // 卸载事件时无需处理 source 以外的参数\n          filter: {\n            nodeName: null,\n            type: eType,\n            level: null,\n            source: (query as EventQuery).source,\n            markName: null,\n            filter: null,\n            userId: null\n          }\n        };\n        this._eventDispatcher.unregister(eType, handler);\n        this._removeEventHandler(eType, callback as EventCallback<EventParams>);\n      } else {\n        this._eventDispatcher.unregister(eType);\n        this._eventHandlerMap.delete(eType);\n      }\n    }\n    return this;\n  }\n\n  emit<Evt extends EventType>(eType: Evt, params: EventParamsDefinition[Evt], level?: EventBubbleLevel): this {\n    this._eventDispatcher.dispatch(eType, params, level);\n    return this;\n  }\n\n  prevent<Evt extends EventType>(\n    eType: Evt,\n    except?: {\n      handler: EventCallback<EventParamsDefinition[Evt]>;\n      level: EventBubbleLevel;\n    }\n  ): this {\n    this._eventDispatcher.prevent(eType, except);\n    return this;\n  }\n\n  allow<Evt extends EventType>(eType: Evt) {\n    this._eventDispatcher.allow(eType);\n    return this;\n  }\n\n  release(): void {\n    this._eventHandlerMap.forEach((handlers, eventType) => {\n      handlers.forEach(handler => {\n        this._eventDispatcher.unregister(eventType, handler);\n      });\n    });\n    this._eventHandlerMap.clear();\n    this._composedEventMap.forEach(entry => {\n      entry.event.unregister();\n    });\n    this._composedEventMap.clear();\n  }\n\n  private _addEventHandler(eventType: EventType, handler: EventHandler<EventParams>) {\n    if (!handler.callback) {\n      return;\n    }\n    if (!this._eventHandlerMap.has(eventType)) {\n      this._eventHandlerMap.set(eventType, new Map());\n    }\n    this._eventHandlerMap.get(eventType).set(handler.callback, handler);\n  }\n\n  private _getEventHandler(eventType: EventType, callback: EventCallback<EventParams>) {\n    return this._eventHandlerMap.get(eventType)?.get(callback);\n  }\n\n  private _removeEventHandler(eventType: EventType, callback: EventCallback<EventParams>) {\n    const handlerMap = this._eventHandlerMap.get(eventType);\n    if (!handlerMap) {\n      return;\n    }\n    handlerMap.delete(callback);\n    if (!handlerMap.size) {\n      this._eventHandlerMap.delete(eventType);\n    }\n  }\n}\n"]}

package/esm/mark/base/base-mark.js

@@ -777,8 +777,7 @@ export class BaseMark extends GrammarItem {
                 const diffAttrs = this._excludeStateControlledDiffAttrs(g, getDiffAttributesOfGraphic(g, finalAttrs));
                 g.context.diffAttrs = diffAttrs, g.context.reusing ? (g.context.lastAttrs = g.attribute, 
                 g.initAttributes(finalAttrs), g.context.reusing = !1) : hasStateAnimation || (hasAnimation ? g.setAttributesAndPreventAnimate(diffAttrs) : g.setAttributes(diffAttrs)), 
-                !(null === (_c = this.renderContext) || void 0 === _c ? void 0 : _c.progressive) && this._product && g.parent !== this._product && this._product.appendChild(g), 
-                hasAnimation && g.setFinalAttributes(finalAttrs);
+                !(null === (_c = this.renderContext) || void 0 === _c ? void 0 : _c.progressive) && this._product && g.parent !== this._product && this._product.appendChild(g);
             } else {
                 const mockGraphic = g;
                 g = this._createGraphic(finalAttrs), hasAnimation && (null === (_a = g.setFinalAttributes) || void 0 === _a || _a.call(g, finalAttrs)),