@visactor/vchart 1.13.7-alpha.0 → 2.0.0-alpha.0

package/esm/series/base/base-series.js

@@ -30,8 +30,6 @@ import { invalidTravel } from "../../data/transforms/invalid-travel";
 
 import { getDataScheme } from "../../theme/color-scheme/util";
 
-import { SeriesData } from "./series-data";
-
 import { addDataKey, initKeyMap } from "../../data/transforms/data-key";
 
 import { STATE_VALUE_ENUM } from "../../compile/mark";
@@ -50,7 +48,11 @@ import { getDefaultInteractionConfigByMode } from "../../interaction/config";
 
 import { LayoutZIndex } from "../../constant/layout";
 
-import { is3DMark } from "../../mark/utils";
+import { is3DMark } from "../../mark/utils/common";
+
+import { CompilableData } from "../../compile/data";
+
+import { filterMarksOfInteraction } from "../../interaction/triggers/util";
 
 export class BaseSeries extends BaseModel {
     getRegion() {
@@ -151,8 +153,7 @@ export class BaseSeries extends BaseModel {
         this._initExtensionMark({
             hasAnimation: hasAnimation
         }), this.initMarkStyle(), this.initMarkState(), hasAnimation && this.initAnimation(), 
-        this._option.disableTriggerEvent || this.initInteraction(), this.afterInitMark(), 
-        this.initEvent(), this.event.emit(ChartEvent.afterInitEvent, {
+        this.afterInitMark(), this.initEvent(), this.event.emit(ChartEvent.afterInitEvent, {
             model: this
         });
     }
@@ -201,7 +202,7 @@ export class BaseSeries extends BaseModel {
             const viewData = dataViewFromDataView(this.getStack() ? this._viewDataFilter : this._rawData, this._dataSet, {
                 name: `${this.type}_${this.id}_viewData`
             });
-            this._data = new SeriesData(this._option, viewData), this.getStack() && this._viewDataFilter.target.removeListener("change", viewData.reRunAllTransform);
+            this._data = new CompilableData(this._option, viewData), this.getStack() && this._viewDataFilter.target.removeListener("change", viewData.reRunAllTransform);
         }
         this.initInvalidDataTransform();
     }
@@ -369,11 +370,9 @@ export class BaseSeries extends BaseModel {
     }
     _initExtensionMark(options) {
         var _a;
-        if (!this._spec.extensionMark) return;
-        const mainMarks = this.getMarksWithoutRoot();
-        options.depend = mainMarks, null === (_a = this._spec.extensionMark) || void 0 === _a || _a.forEach(((m, i) => {
+        this._spec.extensionMark && (null === (_a = this._spec.extensionMark) || void 0 === _a || _a.forEach(((m, i) => {
             this._createExtensionMark(m, null, this._getExtensionMarkNamePrefix(), i, options);
-        }));
+        })));
     }
     _createExtensionMark(spec, parentMark, namePrefix, index, options) {
         var _a;
@@ -386,10 +385,7 @@ export class BaseSeries extends BaseModel {
             parent: parentMark,
             dataView: !1,
             componentType: spec.componentType,
-            depend: options.depend,
             key: spec.dataKey
-        }, {
-            setCustomizedShape: null == spec ? void 0 : spec.customShape
         });
         if (mark) {
             if (isValid(spec.id) && mark.setUserId(spec.id), options.hasAnimation) {
@@ -400,7 +396,7 @@ export class BaseSeries extends BaseModel {
                 this._createExtensionMark(s, mark, namePrefix, i, options);
             })); else if (!(parentMark || isNil(spec.dataId) && isNil(spec.dataIndex))) {
                 const dataView = this._option.getSeriesData(spec.dataId, spec.dataIndex);
-                dataView === this._rawData ? mark.setDataView(this.getViewData(), this.getViewDataProductId()) : (mark.setDataView(dataView), 
+                dataView === this._rawData ? mark.setData(this._data) : (mark.setDataView(dataView), 
                 dataView.target.addListener("change", (() => {
                     mark.getData().updateData();
                 })));
@@ -413,24 +409,13 @@ export class BaseSeries extends BaseModel {
             const mark = this._marks.getMarkWithInfo({
                 name: isValid(spec.name) ? `${spec.name}` : `${this._getExtensionMarkNamePrefix()}_${i}`
             });
-            mark && (this.initMarkStyleWithSpec(mark, spec), mark.updateStaticEncode(), mark.updateLayoutState());
+            mark && (this.initMarkStyleWithSpec(mark, spec), mark.commit(!1, !0));
         }));
     }
     getStackData() {
         var _a;
         return null === (_a = this._viewStackData) || void 0 === _a ? void 0 : _a.latestData;
     }
-    _parseSelectorOfInteraction(interactionSpec, marks) {
-        if (!marks || !marks.length) return [];
-        const selector = [];
-        return interactionSpec.markIds ? marks.filter((mark => {
-            interactionSpec.markIds.includes(mark.getProductId()) && selector.push(`#${mark.getProductId()}`);
-        })) : interactionSpec.markNames ? marks.forEach((mark => {
-            interactionSpec.markNames.includes(mark.name) && selector.push(`#${mark.getProductId()}`);
-        })) : marks.forEach((mark => {
-            selector.push(`#${mark.getProductId()}`);
-        })), selector;
-    }
     _parseDefaultInteractionConfig(mainMarks) {
         if (!(null == mainMarks ? void 0 : mainMarks.length)) return [];
         const defaultConfig = getDefaultInteractionConfigByMode(this._option.mode);
@@ -441,22 +426,30 @@ export class BaseSeries extends BaseModel {
         const selectSpec = this._spec.select;
         isBoolean(selectSpec) ? finalSelectSpec.enable = selectSpec : isObject(selectSpec) && (finalSelectSpec.enable = !0, 
         finalSelectSpec = mergeSpec(finalSelectSpec, selectSpec));
-        const res = [];
+        const res = [ {
+            trigger: {
+                type: "dimension-hover"
+            },
+            marks: mainMarks
+        } ];
         if (finalHoverSpec.enable) {
-            const selector = this._parseSelectorOfInteraction(finalHoverSpec, mainMarks);
-            selector.length && res.push(this._defaultHoverConfig(selector, finalHoverSpec));
+            const marks = filterMarksOfInteraction(finalHoverSpec, mainMarks);
+            marks.length && res.push({
+                trigger: this._defaultHoverConfig(finalHoverSpec),
+                marks: marks
+            });
         }
         if (finalSelectSpec.enable) {
-            const selector = this._parseSelectorOfInteraction(finalSelectSpec, mainMarks);
-            selector.length && res.push(this._defaultSelectConfig(selector, finalSelectSpec));
+            const marks = filterMarksOfInteraction(finalSelectSpec, mainMarks);
+            marks.length && res.push({
+                trigger: this._defaultSelectConfig(finalSelectSpec),
+                marks: marks
+            });
         }
         return res;
     }
-    _defaultHoverConfig(selector, finalHoverSpec) {
+    _defaultHoverConfig(finalHoverSpec) {
         return {
-            seriesId: this.id,
-            regionId: this._region.id,
-            selector: selector,
             type: "element-highlight",
             trigger: finalHoverSpec.trigger,
             triggerOff: finalHoverSpec.triggerOff,
@@ -464,13 +457,10 @@ export class BaseSeries extends BaseModel {
             highlightState: STATE_VALUE_ENUM.STATE_HOVER
         };
     }
-    _defaultSelectConfig(selector, finalSelectSpec) {
+    _defaultSelectConfig(finalSelectSpec) {
         const isMultiple = "multiple" === finalSelectSpec.mode, triggerOff = isValid(finalSelectSpec.triggerOff) ? finalSelectSpec.triggerOff : isMultiple ? [ "empty" ] : [ "empty", finalSelectSpec.trigger ];
         return {
             type: "element-select",
-            seriesId: this.id,
-            regionId: this._region.id,
-            selector: selector,
             trigger: finalSelectSpec.trigger,
             triggerOff: triggerOff,
             reverseState: STATE_VALUE_ENUM.STATE_SELECTED_REVERSE,
@@ -479,23 +469,21 @@ export class BaseSeries extends BaseModel {
         };
     }
     _parseInteractionConfig(mainMarks) {
-        const compiler = this.getCompiler();
-        if (!compiler) return;
         const {interactions: interactions} = this._spec, res = this._parseDefaultInteractionConfig(mainMarks);
-        res && res.length && res.forEach((interaction => {
-            compiler.addInteraction(interaction);
-        })), interactions && interactions.length && interactions.forEach((interaction => {
-            const selectors = this._parseSelectorOfInteraction(interaction, this.getMarks());
-            selectors.length && compiler.addInteraction(Object.assign(Object.assign({}, interaction), {
-                selector: selectors,
-                seriesId: this.id,
-                regionId: this._region.id
-            }));
-        }));
+        return interactions && interactions.length && interactions.forEach((interaction => {
+            const marks = filterMarksOfInteraction(interaction, this.getMarks());
+            marks.length && res.push({
+                trigger: interaction,
+                marks: marks
+            });
+        })), res;
     }
-    initInteraction() {
-        const marks = this.getMarksWithoutRoot();
-        this._parseInteractionConfig(marks);
+    getInteractionTriggers() {
+        if (!0 !== this._option.disableTriggerEvent) {
+            const marks = this.getMarksWithoutRoot();
+            return this._parseInteractionConfig(marks);
+        }
+        return [];
     }
     initAnimation() {}
     initMarkState() {
@@ -564,7 +552,7 @@ export class BaseSeries extends BaseModel {
         null === (_c = this._viewDataStatistics) || void 0 === _c || _c.target.addListener("change", this.viewDataStatisticsUpdate.bind(this));
     }
     _releaseEvent() {
-        super._releaseEvent(), this.getCompiler().removeInteraction(this.id);
+        super._releaseEvent();
     }
     initTooltip() {
         this._tooltipHelper = new BaseSeriesTooltipHelper(this);
@@ -602,7 +590,7 @@ export class BaseSeries extends BaseModel {
         marks.forEach((mark => {
             this._spec[mark.name] && this.initMarkStyleWithSpec(mark, this._spec[mark.name]);
         })), this.initMarkStyle(), marks.forEach((mark => {
-            mark.updateStaticEncode(), mark.updateLayoutState(!0);
+            mark.commit(!1);
         })), this._updateExtensionMarkSpec(), this._updateSpecData(), this._tooltipHelper && this._tooltipHelper.updateTooltipSpec();
         isAnimationEnabledForSeries(this) && this.initAnimation();
     }
@@ -611,11 +599,10 @@ export class BaseSeries extends BaseModel {
     }
     onRender(ctx) {}
     release() {
-        var _a, _b, _c;
+        var _a, _b;
         super.release(), this._viewDataMap.clear();
         const transformIndex = null === (_b = null === (_a = this._rawData) || void 0 === _a ? void 0 : _a.transformsArr) || void 0 === _b ? void 0 : _b.findIndex((t => "addVChartProperty" === t.type));
-        transformIndex >= 0 && this._rawData.transformsArr.splice(transformIndex, 1), null === (_c = this._data) || void 0 === _c || _c.release(), 
-        this._dataSet = this._data = this._rawData = this._rawDataStatistics = this._spec = this._region = this._viewDataStatistics = this._viewStackData = null;
+        transformIndex >= 0 && this._rawData.transformsArr.splice(transformIndex, 1), this._dataSet = this._data = this._rawData = this._rawDataStatistics = this._spec = this._region = this._viewDataStatistics = this._viewStackData = null;
     }
     setLayoutStartPosition(pos) {
         isValidNumber(pos.x) && (this._layoutStartPoint.x = pos.x), isValidNumber(pos.y) && (this._layoutStartPoint.y = pos.y);
@@ -682,28 +669,31 @@ export class BaseSeries extends BaseModel {
     }
     onMarkTreePositionUpdate(marks) {}
     _createMark(markInfo, option = {}, config = {}) {
-        var _a, _b, _c, _d, _e, _f;
-        const {key: key, groupKey: groupKey, skipBeforeLayouted: skipBeforeLayouted, themeSpec: themeSpec = {}, markSpec: markSpec, dataView: dataView, dataProductId: dataProductId, parent: parent, isSeriesMark: isSeriesMark, depend: depend, stateSort: stateSort, noSeparateStyle: noSeparateStyle = !1} = option, m = super._createMark(markInfo, {
+        var _a, _b, _c, _d, _e;
+        const {key: key, groupKey: groupKey, skipBeforeLayouted: skipBeforeLayouted, themeSpec: themeSpec = {}, markSpec: markSpec, dataView: dataView, parent: parent, isSeriesMark: isSeriesMark, noSeparateStyle: noSeparateStyle = !1} = option, m = super._createMark(markInfo, {
             key: null != key ? key : this._getDataIdKey(),
             seriesId: this.id,
             attributeContext: this._markAttributeContext,
             componentType: option.componentType,
-            noSeparateStyle: noSeparateStyle
+            noSeparateStyle: noSeparateStyle,
+            parent: !1 !== parent ? null != parent ? parent : this._rootMark : null
         });
         if (isValid(m)) {
             const spec = this.getSpec() || {};
             this._marks.addMark(m, {
                 name: markInfo.name
-            }), isSeriesMark && (this._seriesMark = m), isNil(parent) ? null === (_a = this._rootMark) || void 0 === _a || _a.addMark(m) : !1 !== parent && parent.addMark(m), 
-            isNil(dataView) ? (m.setDataView(this.getViewData(), this.getViewDataProductId()), 
-            m.setSkipBeforeLayouted(!0)) : !1 !== dataView && m.setDataView(dataView, dataProductId), 
-            isBoolean(skipBeforeLayouted) && m.setSkipBeforeLayouted(skipBeforeLayouted), isValid(depend) && m.setDepend(...array(depend)), 
-            isNil(groupKey) || m.setGroupKey(groupKey), stateSort && m.setStateSortCallback(stateSort);
+            }), isSeriesMark && (this._seriesMark = m), isNil(dataView) ? (m.setData(this._data), 
+            m.setSkipBeforeLayouted(!0)) : !1 !== dataView && m.setDataView(dataView), isBoolean(skipBeforeLayouted) && m.setSkipBeforeLayouted(skipBeforeLayouted), 
+            isNil(groupKey) || m.setGroupKey(groupKey);
             const markConfig = Object.assign(Object.assign({}, config), {
-                morph: null !== (_b = config.morph) && void 0 !== _b && _b,
-                support3d: is3DMark(markInfo.type) || (null !== (_c = config.support3d) && void 0 !== _c ? _c : spec.support3d || !!spec.zField),
-                morphKey: (null === (_d = spec.morph) || void 0 === _d ? void 0 : _d.morphKey) || `${this.getSpecIndex()}_${this.getMarks().length}`,
-                morphElementKey: null !== (_f = null === (_e = spec.morph) || void 0 === _e ? void 0 : _e.morphElementKey) && void 0 !== _f ? _f : config.morphElementKey
+                progressiveStep: spec.progressiveStep,
+                progressiveThreshold: spec.progressiveThreshold,
+                large: spec.large,
+                largeThreshold: spec.largeThreshold,
+                morph: null !== (_a = config.morph) && void 0 !== _a && _a,
+                support3d: is3DMark(markInfo.type) || (null !== (_b = config.support3d) && void 0 !== _b ? _b : spec.support3d || !!spec.zField),
+                morphKey: (null === (_c = spec.morph) || void 0 === _c ? void 0 : _c.morphKey) || `${this.getSpecIndex()}_${this.getMarks().length}`,
+                morphElementKey: null !== (_e = null === (_d = spec.morph) || void 0 === _d ? void 0 : _d.morphElementKey) && void 0 !== _e ? _e : config.morphElementKey
             });
             m.setMarkConfig(markConfig), this.initMarkStyleWithSpec(m, mergeSpec({}, themeSpec, markSpec || spec[m.name]));
         }