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

package/build/index.es.js

@@ -57796,6 +57796,10 @@ function getColorSchemeBySeries(colorScheme, seriesSpec) {
 }
 
 class ColorOrdinalScale extends OrdinalScale {
+    setSpecified(value) {
+        this._specified = value ? Object.assign({}, value) : {};
+        return this;
+    }
     range(value) {
         if (!value) {
             return super.range();
@@ -59384,6 +59388,7 @@ let Event$1 = class Event {
     }
     constructor(eventDispatcher, mode) {
         this._composedEventMap = new Map();
+        this._eventHandlerMap = new Map();
         this._eventDispatcher = eventDispatcher;
         this._mode = mode;
     }
@@ -59405,11 +59410,12 @@ let Event$1 = class Event {
         }
         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 = (cb !== null && cb !== void 0 ? cb : query);
         const ComposedEventCtor = Factory.getComposedEvent(eType);
         if (!!ComposedEventCtor) {
@@ -59428,7 +59434,8 @@ let Event$1 = class Event {
         }
         else {
             if (callback) {
-                const handler = {
+                const storedHandler = this._getEventHandler(eType, callback);
+                const handler = (_c = storedHandler) !== null && _c !== void 0 ? _c : {
                     callback,
                     query: null,
                     filter: {
@@ -59442,9 +59449,11 @@ let Event$1 = class Event {
                     }
                 };
                 this._eventDispatcher.unregister(eType, handler);
+                this._removeEventHandler(eType, callback);
             }
             else {
                 this._eventDispatcher.unregister(eType);
+                this._eventHandlerMap.delete(eType);
             }
         }
         return this;
@@ -59462,9 +59471,40 @@ let Event$1 = class Event {
         return this;
     }
     release() {
-        this._eventDispatcher.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) {
+        if (!handler.callback) {
+            return;
+        }
+        if (!this._eventHandlerMap.has(eventType)) {
+            this._eventHandlerMap.set(eventType, new Map());
+        }
+        this._eventHandlerMap.get(eventType).set(handler.callback, handler);
+    }
+    _getEventHandler(eventType, callback) {
+        var _a;
+        return (_a = this._eventHandlerMap.get(eventType)) === null || _a === void 0 ? void 0 : _a.get(callback);
+    }
+    _removeEventHandler(eventType, callback) {
+        const handlerMap = this._eventHandlerMap.get(eventType);
+        if (!handlerMap) {
+            return;
+        }
+        handlerMap.delete(callback);
+        if (!handlerMap.size) {
+            this._eventHandlerMap.delete(eventType);
+        }
+    }
 };
 
 var HOOK_EVENT;
@@ -66783,7 +66823,6 @@ class VChart {
         }
         if (updateResult.reMake) {
             (_c = this._compiler) === null || _c === void 0 ? void 0 : _c.releaseGrammar(true);
-            this._userEvents.forEach(e => { var _a; return (_a = this._event) === null || _a === void 0 ? void 0 : _a.on(e.eType, e.query, e.handler); });
         }
         else if (updateResult.reCompile) {
             (_d = this._compiler) === null || _d === void 0 ? void 0 : _d.clear({ chart: this._chart, vChart: this });
@@ -75567,8 +75606,22 @@ class GlobalScale {
                 return result;
             }
             if (!isEqual(lastSpec.specified, s.specified)) {
-                result.reMake = true;
-                return result;
+                if (s.id !== 'color') {
+                    result.reMake = true;
+                    return result;
+                }
+                const colorScale = scale;
+                if (colorScale.setSpecified) {
+                    colorScale.setSpecified(s.specified);
+                }
+                else if (s.specified && colorScale.specified) {
+                    colorScale.specified(s.specified);
+                }
+                else {
+                    result.reMake = true;
+                    return result;
+                }
+                result.reRender = true;
             }
             if (s.range && !isEqual(s.range, scale.range())) {
                 scale.range(s.range);

package/build/index.js

@@ -57802,6 +57802,10 @@
     }
 
     class ColorOrdinalScale extends OrdinalScale {
+        setSpecified(value) {
+            this._specified = value ? Object.assign({}, value) : {};
+            return this;
+        }
         range(value) {
             if (!value) {
                 return super.range();
@@ -59390,6 +59394,7 @@
         }
         constructor(eventDispatcher, mode) {
             this._composedEventMap = new Map();
+            this._eventHandlerMap = new Map();
             this._eventDispatcher = eventDispatcher;
             this._mode = mode;
         }
@@ -59411,11 +59416,12 @@
             }
             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 = (cb !== null && cb !== void 0 ? cb : query);
             const ComposedEventCtor = Factory.getComposedEvent(eType);
             if (!!ComposedEventCtor) {
@@ -59434,7 +59440,8 @@
             }
             else {
                 if (callback) {
-                    const handler = {
+                    const storedHandler = this._getEventHandler(eType, callback);
+                    const handler = (_c = storedHandler) !== null && _c !== void 0 ? _c : {
                         callback,
                         query: null,
                         filter: {
@@ -59448,9 +59455,11 @@
                         }
                     };
                     this._eventDispatcher.unregister(eType, handler);
+                    this._removeEventHandler(eType, callback);
                 }
                 else {
                     this._eventDispatcher.unregister(eType);
+                    this._eventHandlerMap.delete(eType);
                 }
             }
             return this;
@@ -59468,9 +59477,40 @@
             return this;
         }
         release() {
-            this._eventDispatcher.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) {
+            if (!handler.callback) {
+                return;
+            }
+            if (!this._eventHandlerMap.has(eventType)) {
+                this._eventHandlerMap.set(eventType, new Map());
+            }
+            this._eventHandlerMap.get(eventType).set(handler.callback, handler);
+        }
+        _getEventHandler(eventType, callback) {
+            var _a;
+            return (_a = this._eventHandlerMap.get(eventType)) === null || _a === void 0 ? void 0 : _a.get(callback);
+        }
+        _removeEventHandler(eventType, callback) {
+            const handlerMap = this._eventHandlerMap.get(eventType);
+            if (!handlerMap) {
+                return;
+            }
+            handlerMap.delete(callback);
+            if (!handlerMap.size) {
+                this._eventHandlerMap.delete(eventType);
+            }
+        }
     };
 
     var HOOK_EVENT;
@@ -66789,7 +66829,6 @@
             }
             if (updateResult.reMake) {
                 (_c = this._compiler) === null || _c === void 0 ? void 0 : _c.releaseGrammar(true);
-                this._userEvents.forEach(e => { var _a; return (_a = this._event) === null || _a === void 0 ? void 0 : _a.on(e.eType, e.query, e.handler); });
             }
             else if (updateResult.reCompile) {
                 (_d = this._compiler) === null || _d === void 0 ? void 0 : _d.clear({ chart: this._chart, vChart: this });
@@ -75573,8 +75612,22 @@
                     return result;
                 }
                 if (!isEqual(lastSpec.specified, s.specified)) {
-                    result.reMake = true;
-                    return result;
+                    if (s.id !== 'color') {
+                        result.reMake = true;
+                        return result;
+                    }
+                    const colorScale = scale;
+                    if (colorScale.setSpecified) {
+                        colorScale.setSpecified(s.specified);
+                    }
+                    else if (s.specified && colorScale.specified) {
+                        colorScale.specified(s.specified);
+                    }
+                    else {
+                        result.reMake = true;
+                        return result;
+                    }
+                    result.reRender = true;
                 }
                 if (s.range && !isEqual(s.range, scale.range())) {
                     scale.range(s.range);