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

package/build/index.js

@@ -53841,6 +53841,9 @@
     }
 
     class ColorOrdinalScale extends OrdinalScale {
+      setSpecified(value) {
+        return this._specified = value ? Object.assign({}, value) : {}, this;
+      }
       range(value) {
         return value ? (this._range = value, this._resetRange(), this) : super.range();
       }
@@ -54972,7 +54975,7 @@
         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 ? {
@@ -54989,16 +54992,16 @@
             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: {
@@ -55011,8 +55014,8 @@
               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) {
@@ -55025,7 +55028,24 @@
         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));
       }
     };
 
@@ -59956,10 +59976,7 @@
       }
       _reCompile(updateResult, morphConfig) {
         var _a, _b, _c, _d, _e, _f, _g;
-        if (updateResult.reMake && (this._releaseData(), this._initDataSet(), null === (_a = this._chart) || void 0 === _a || _a.release(!1), this._chart = null), updateResult.reTransformSpec && (this._chartSpecTransformer = null), updateResult.changeTheme ? (this._setCurrentTheme(), this._setFontFamilyTheme(this.getTheme("fontFamily"))) : updateResult.changeBackground && (null === (_b = this._compiler) || void 0 === _b || _b.setBackground(this._getBackground())), updateResult.reMake ? (null === (_c = this._compiler) || void 0 === _c || _c.releaseGrammar(!0), 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.reCompile && (null === (_d = this._compiler) || void 0 === _d || _d.clear({
+        if (updateResult.reMake && (this._releaseData(), this._initDataSet(), null === (_a = this._chart) || void 0 === _a || _a.release(!1), this._chart = null), updateResult.reTransformSpec && (this._chartSpecTransformer = null), updateResult.changeTheme ? (this._setCurrentTheme(), this._setFontFamilyTheme(this.getTheme("fontFamily"))) : updateResult.changeBackground && (null === (_b = this._compiler) || void 0 === _b || _b.setBackground(this._getBackground())), updateResult.reMake ? null === (_c = this._compiler) || void 0 === _c || _c.releaseGrammar(!0) : updateResult.reCompile && (null === (_d = this._compiler) || void 0 === _d || _d.clear({
           chart: this._chart,
           vChart: this
         }), null === (_e = this._compiler) || void 0 === _e || _e.compile({
@@ -66102,7 +66119,15 @@
           const lastSpec = this._spec.find(_s => _s.id === s.id);
           if (!lastSpec.id) return result.reMake = !0, result;
           if (lastSpec.type !== s.type) return result.reMake = !0, result;
-          if (!isEqual(lastSpec.specified, s.specified)) return result.reMake = !0, result;
+          if (!isEqual(lastSpec.specified, s.specified)) {
+            if ("color" !== s.id) return result.reMake = !0, result;
+            const colorScale = scale;
+            if (colorScale.setSpecified) colorScale.setSpecified(s.specified);else {
+              if (!s.specified || !colorScale.specified) return result.reMake = !0, result;
+              colorScale.specified(s.specified);
+            }
+            result.reRender = !0;
+          }
           s.range && !isEqual(s.range, scale.range()) && (scale.range(s.range), result.reRender = !0), isDataDomainSpec(s.domain) ? result.reRender = !0 : isEqual(s.domain, scale.domain()) || (scale.domain(s.domain), result.reRender = !0), this._scaleSpecMap.set(s.id, s);
         }
         return this._spec = spec, result;