@visactor/vchart 1.10.2-alpha.4 → 1.10.2

package/build/index.js

@@ -27681,6 +27681,9 @@
       constructor(view, options) {
         this.references = new Map(), this.view = view, this.depend(null == options ? void 0 : options.dependency);
       }
+      getStartState() {
+        return null;
+      }
       depend(grammar) {
         this.references.clear(), array(grammar).map(grammar => isString$1(grammar) ? this.view.getGrammarById(grammar) : grammar).filter(ref => !isNil$3(ref)).forEach(ref => {
           var _a;
@@ -27733,6 +27736,9 @@
           handler: this.handleReset
         }];
       }
+      getStartState() {
+        return this.options.state;
+      }
       start(element) {
         element && this._marks && this._marks.includes(element.mark) && element.addState(this.options.state);
       }
@@ -27779,6 +27785,9 @@
           this.reset(e.element);
         }, this.options = Object.assign({}, ElementSelect.defaultOptions, options), this._marks = view.getMarksBySelector(this.options.selector), this._stateMarks = groupMarksByState(this._marks, [this.options.state, this.options.reverseState]);
       }
+      getStartState() {
+        return this.options.state;
+      }
       getEvents() {
         const triggerOff = this.options.triggerOff,
           trigger = this.options.trigger,
@@ -27824,6 +27833,9 @@
           this.reset(e.element);
         }, this.options = Object.assign({}, ElementHighlight.defaultOptions, options), this._marks = view.getMarksBySelector(this.options.selector), this._stateMarks = groupMarksByState(this._marks, [this.options.highlightState, this.options.blurState]);
       }
+      getStartState() {
+        return this.options.highlightState;
+      }
       getEvents() {
         const triggerOff = this.options.triggerOff,
           events = [{
@@ -27880,6 +27892,9 @@
           e.element && this._marks && this._marks.includes(e.element.mark) && this.clearPrevElements();
         }, this.options = Object.assign({}, ElementHighlightByKey.defaultOptions, options), this._marks = view.getMarksBySelector(this.options.selector);
       }
+      getStartState() {
+        return this.options.highlightState;
+      }
       getEvents() {
         return [{
           type: this.options.trigger,
@@ -27934,6 +27949,9 @@
           this.reset(e.element);
         }, this.options = Object.assign({}, ElementHighlightByGroup.defaultOptions, options), this._marks = view.getMarksBySelector(this.options.selector);
       }
+      getStartState() {
+        return this.options.highlightState;
+      }
       getEvents() {
         return [{
           type: this.options.trigger,
@@ -43363,6 +43381,9 @@
           handler: this.handleReset
         }];
       }
+      getStartState() {
+        return this.options.state;
+      }
       start(element) {
         const itemKey = element;
         if (isNil$3(itemKey)) return;
@@ -43395,6 +43416,9 @@
           this.reset();
         }, this.options = Object.assign({}, ElementHighlightByLegend.defaultOptions, options), this._marks = view.getMarksBySelector(this.options.selector);
       }
+      getStartState() {
+        return this.options.highlightState;
+      }
       getEvents() {
         return [{
           type: LegendEvent.legendItemHover,
@@ -43438,6 +43462,9 @@
           (this.options.shouldReset ? this.options.shouldReset(e) : this._filterByName(e)) && this.reset();
         }, this.options = Object.assign({}, ElementHighlightByName.defaultOptions, options), this._marks = view.getMarksBySelector(this.options.selector);
       }
+      getStartState() {
+        return this.options.highlightState;
+      }
       getEvents() {
         return [{
           type: this.options.trigger,
@@ -54405,11 +54432,29 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 };
                 this.dispatch(listenerParams.type, params);
             };
+            this._onDelegateInteractionEvent = (listenerParams) => {
+                const chart = this.globalInstance.getChart();
+                const event = listenerParams.event;
+                let items = null;
+                if (event.elements) {
+                    items = event.elements;
+                }
+                const params = {
+                    event: listenerParams.event,
+                    chart,
+                    items,
+                    datums: items &&
+                        items.map(item => {
+                            return item.getDatum();
+                        })
+                };
+                this.dispatch(listenerParams.type, params);
+            };
             this.globalInstance = vchart;
             this._compiler = compiler;
         }
         register(eType, handler) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             this._parseQuery(handler);
             const bubbles = this.getEventBubble(((_a = handler.filter) === null || _a === void 0 ? void 0 : _a.source) || exports.Event_Source_Type.chart);
             const listeners = this.getEventListeners(((_b = handler.filter) === null || _b === void 0 ? void 0 : _b.source) || exports.Event_Source_Type.chart);
@@ -54423,6 +54468,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 this._compiler.addEventListener((_d = handler.filter) === null || _d === void 0 ? void 0 : _d.source, eType, callback);
                 listeners.set(eType, callback);
             }
+            else if (this._isInteractionEvent(eType) && !listeners.has(eType)) {
+                const callback = this._onDelegateInteractionEvent.bind(this);
+                this._compiler.addEventListener((_e = handler.filter) === null || _e === void 0 ? void 0 : _e.source, eType, callback);
+                listeners.set(eType, callback);
+            }
             return this;
         }
         unregister(eType, handler) {
@@ -54651,6 +54701,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         _isValidEvent(eType) {
             return BASE_EVENTS.includes(eType) || Object.values(exports.VGRAMMAR_HOOK_EVENT).includes(eType);
         }
+        _isInteractionEvent(eType) {
+            let interactionType;
+            return (eType &&
+                ((interactionType = eType.split(':')[0]), interactionType) &&
+                Factory$1.hasInteraction(interactionType));
+        }
     }
 
     function registerDataSetInstanceTransform(dataSet, name, transform) {
@@ -55018,7 +55074,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     if (this._compileChart) {
                         const region = this._compileChart.getRegionsInIds([regionCombindInteractions[key].regionId])[0];
                         if (region) {
-                            region.interaction.addVgrammarInteraction(regionCombindInteractions[key].vchartState, interaction);
+                            region.interaction.addVgrammarInteraction(interaction.getStartState(), interaction);
                         }
                     }
                 });
@@ -55627,6 +55683,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this._disableTriggerEvent = false;
         }
         addVgrammarInteraction(state, i) {
+            if (!state) {
+                return;
+            }
             if (!this._vgrammarInteractions.get(state)) {
                 !this._vgrammarInteractions.set(state, [i]);
             }
@@ -58222,15 +58281,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this.state.compileState(this._product, this._stateSort);
         }
         compileAnimation() {
-            var _a, _b;
+            var _a, _b, _c, _d;
             if (this._animationConfig) {
                 let stateSignal;
                 if (this.type === 'component') {
                     stateSignal = (_a = this.model.animate) === null || _a === void 0 ? void 0 : _a.getAnimationStateSignalName();
                 }
                 else {
-                    const region = this.model.getRegion();
-                    stateSignal = (_b = region.animate) === null || _b === void 0 ? void 0 : _b.getAnimationStateSignalName();
+                    const region = (_c = (_b = this.model).getRegion) === null || _c === void 0 ? void 0 : _c.call(_b);
+                    stateSignal = (_d = region === null || region === void 0 ? void 0 : region.animate) === null || _d === void 0 ? void 0 : _d.getAnimationStateSignalName();
                 }
                 this._product.animation(this._animationConfig);
                 this._product.animationState({
@@ -58707,7 +58766,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             return this._marks;
         }
         _getDefaultStyle() {
-            const defaultStyle = Object.assign(Object.assign({}, super._getDefaultStyle()), { clip: false });
+            const defaultStyle = Object.assign({}, super._getDefaultStyle());
             return defaultStyle;
         }
         isMarkExist(mark) {
@@ -64463,7 +64522,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         registerComponentPlugin(CanvasTooltipHandler);
     };
 
-    const version = "1.10.2-alpha.4";
+    const version = "1.10.2";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -65482,6 +65541,32 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             var _a;
             return (_a = this._viewStackData) === null || _a === void 0 ? void 0 : _a.latestData;
         }
+        _parseSelectorOfInteraction(interactionSpec, marks) {
+            if (!marks || !marks.length) {
+                return [];
+            }
+            const selector = [];
+            if (interactionSpec.markIds) {
+                marks.filter(mark => {
+                    if (interactionSpec.markIds.includes(mark.getProductId())) {
+                        selector.push(`#${mark.getProductId()}`);
+                    }
+                });
+            }
+            else if (interactionSpec.markNames) {
+                marks.forEach(mark => {
+                    if (interactionSpec.markNames.includes(mark.name)) {
+                        selector.push(`#${mark.getProductId()}`);
+                    }
+                });
+            }
+            else {
+                marks.forEach(mark => {
+                    selector.push(`#${mark.getProductId()}`);
+                });
+            }
+            return selector;
+        }
         _parseDefaultInteractionConfig(mainMarks) {
             var _a;
             if (!(mainMarks === null || mainMarks === void 0 ? void 0 : mainMarks.length)) {
@@ -65508,31 +65593,33 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             const res = [];
             if (finalHoverSpec.enable) {
-                res.push({
-                    vchartState: STATE_VALUE_ENUM.STATE_HOVER,
-                    seriesId: this.id,
-                    regionId: this._region.id,
-                    selector: mainMarks.map(mark => `#${mark.getProductId()}`),
-                    type: 'element-highlight',
-                    trigger: finalHoverSpec.trigger,
-                    triggerOff: finalHoverSpec.triggerOff,
-                    blurState: STATE_VALUE_ENUM.STATE_HOVER_REVERSE,
-                    highlightState: STATE_VALUE_ENUM.STATE_HOVER
-                });
+                const selector = this._parseSelectorOfInteraction(finalHoverSpec, mainMarks);
+                selector.length &&
+                    res.push({
+                        seriesId: this.id,
+                        regionId: this._region.id,
+                        selector,
+                        type: 'element-highlight',
+                        trigger: finalHoverSpec.trigger,
+                        triggerOff: finalHoverSpec.triggerOff,
+                        blurState: STATE_VALUE_ENUM.STATE_HOVER_REVERSE,
+                        highlightState: STATE_VALUE_ENUM.STATE_HOVER
+                    });
             }
             if (finalSelectSpec.enable) {
-                res.push({
-                    vchartState: STATE_VALUE_ENUM.STATE_SELECTED,
-                    type: 'element-select',
-                    seriesId: this.id,
-                    regionId: this._region.id,
-                    selector: mainMarks.map(mark => `#${mark.getProductId()}`),
-                    trigger: finalSelectSpec.trigger,
-                    triggerOff: ((_a = finalSelectSpec.triggerOff) !== null && _a !== void 0 ? _a : 'empty'),
-                    reverseState: STATE_VALUE_ENUM.STATE_SELECTED_REVERSE,
-                    state: STATE_VALUE_ENUM.STATE_SELECTED,
-                    isMultiple: finalSelectSpec.mode === 'multiple'
-                });
+                const selector = this._parseSelectorOfInteraction(finalSelectSpec, mainMarks);
+                selector.length &&
+                    res.push({
+                        type: 'element-select',
+                        seriesId: this.id,
+                        regionId: this._region.id,
+                        selector,
+                        trigger: finalSelectSpec.trigger,
+                        triggerOff: ((_a = finalSelectSpec.triggerOff) !== null && _a !== void 0 ? _a : 'empty'),
+                        reverseState: STATE_VALUE_ENUM.STATE_SELECTED_REVERSE,
+                        state: STATE_VALUE_ENUM.STATE_SELECTED,
+                        isMultiple: finalSelectSpec.mode === 'multiple'
+                    });
             }
             return res;
         }
@@ -65550,26 +65637,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             }
             if (interactions && interactions.length) {
                 interactions.forEach(interaction => {
-                    const selectors = [];
-                    if (interaction.markIds) {
-                        this.getMarks().filter(mark => {
-                            if (interaction.markIds.includes(mark.getProductId())) {
-                                selectors.push(`#${mark.getProductId()}`);
-                            }
-                        });
-                    }
-                    else if (interaction.markNames) {
-                        this.getMarks().forEach(mark => {
-                            if (interaction.markNames.includes(mark.name)) {
-                                selectors.push(`#${mark.getProductId()}`);
-                            }
-                        });
-                    }
-                    else if (mainMarks === null || mainMarks === void 0 ? void 0 : mainMarks.length) {
-                        mainMarks.forEach(mark => {
-                            selectors.push(`#${mark.getProductId()}`);
-                        });
-                    }
+                    const selectors = this._parseSelectorOfInteraction(interaction, this.getMarks());
                     if (selectors.length) {
                         compiler.addInteraction(Object.assign(Object.assign({}, interaction), { selector: selectors, seriesId: this.id, regionId: this._region.id }));
                     }
@@ -94668,7 +94736,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             var _a;
             const series = this._getSeries();
             if ((_a = series.getSpec().totalLabel) === null || _a === void 0 ? void 0 : _a.visible) {
-                const mark = series.getMarksInType(["rect", "symbol"])[0];
+                const mark = series.getMarkInName(series.type);
                 const textMark = this._createMark({ type: "label", name: `${mark.name}-total-label` });
                 this._baseMark = mark;
                 this._textMark = textMark;
@@ -95535,11 +95603,24 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this.initMarks();
             this.initEvent();
         }
+        getMarkAttributeContext() {
+            return this._markAttributeContext;
+        }
+        _buildMarkAttributeContext() {
+            this._markAttributeContext = {
+                vchart: this._option.globalInstance,
+                globalScale: (key, value) => {
+                    var _a;
+                    return (_a = this._option.globalScale.getScale(key)) === null || _a === void 0 ? void 0 : _a.scale(value);
+                }
+            };
+        }
         initMarks() {
             if (!this._spec) {
                 return;
             }
             const series = this._option && this._option.getAllSeries();
+            const hasAnimation = this._option.animation !== false;
             const depend = [];
             if (series && series.length) {
                 series.forEach(s => {
@@ -95552,7 +95633,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 });
             }
             this._spec.forEach((m, i) => {
-                this._createExtensionMark(m, null, `${PREFIX}_series_${this.id}_extensionMark`, i, { depend });
+                this._createExtensionMark(m, null, `${PREFIX}_series_${this.id}_extensionMark`, i, { depend, hasAnimation });
             });
         }
         _createExtensionMark(spec, parentMark, namePrefix, index, options) {
@@ -95569,6 +95650,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             if (!mark) {
                 return;
             }
+            if (options.hasAnimation) {
+                const config = animationConfig({}, userAnimationConfig(spec.type, spec, this._markAttributeContext));
+                mark.setAnimationConfig(config);
+            }
             if (options.depend && options.depend.length) {
                 mark.setDepend(...options.depend);
             }