@visactor/vgrammar-core 0.14.0-alpha.2 → 0.14.0-alpha.4

package/cjs/view/group.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.GroupMark = void 0;
 
-const attributes_1 = require("../graph/attributes"), constants_1 = require("../graph/constants"), enums_1 = require("../graph/enums"), element_1 = require("../graph/util/element"), graphic_1 = require("../graph/util/graphic"), mark_1 = require("./mark"), vutils_1 = require("@visactor/vutils"), encode_1 = require("../graph/mark/encode");
+const attributes_1 = require("../graph/attributes"), constants_1 = require("../graph/constants"), enums_1 = require("../graph/enums"), graphic_1 = require("../graph/util/graphic"), mark_1 = require("./mark"), vutils_1 = require("@visactor/vutils"), encode_1 = require("../graph/mark/encode");
 
 class GroupMark extends mark_1.Mark {
     constructor(view, group) {
@@ -33,8 +33,8 @@ class GroupMark extends mark_1.Mark {
     }
     evaluateJoin(data) {
         if (!this.elements.length) {
-            const el = (0, element_1.createElement)(this);
-            el.updateData(constants_1.DefaultKey, constants_1.DefaultMarkData, (() => ""), this.view), 
+            const el = this.createElement();
+            el.updateData(constants_1.DefaultKey, constants_1.DefaultMarkData, (() => "")), 
             this.elements = [ el ], this.elementMap.set(constants_1.DefaultKey, el);
         }
     }

package/cjs/view/group.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/view/group.ts"],"names":[],"mappings":"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","file":"group.js","sourcesContent":["import type { INode } from '@visactor/vrender-core';\nimport { transformsByType } from '../graph/attributes';\nimport { DefaultKey, DefaultMarkData } from '../graph/constants';\nimport { BuiltInEncodeNames, GrammarMarkType, HOOK_EVENT } from '../graph/enums';\nimport { createElement } from '../graph/util/element';\nimport { createGraphicItem } from '../graph/util/graphic';\nimport type { IElement, IGlyphMark, IGroupMark, IMark, IView } from '../types';\nimport { Mark } from './mark';\nimport { isFunction, isNil } from '@visactor/vutils';\nimport { invokeEncoderToItems } from '../graph/mark/encode';\n\nexport class GroupMark extends Mark implements IGroupMark {\n  children: (IMark | IGroupMark | IGlyphMark)[];\n\n  layoutChildren?: (IMark | IGroupMark | IGlyphMark)[];\n\n  constructor(view: IView, group?: IGroupMark) {\n    super(view, GrammarMarkType.group, group);\n    this.children = [];\n  }\n\n  parseRenderContext() {\n    return { large: false };\n  }\n\n  appendChild(mark: IMark) {\n    this.children.push(mark);\n    return this;\n  }\n  removeChild(mark: IMark) {\n    this.children = this.children.filter(child => child !== mark);\n    return this;\n  }\n\n  includesChild(mark: IMark, descendant: boolean = true) {\n    if (this.children.includes(mark)) {\n      return true;\n    }\n    if (!descendant) {\n      return false;\n    }\n    return this.children.some(child => {\n      if (child.markType === GrammarMarkType.group) {\n        return (child as IGroupMark).includesChild(mark, true);\n      }\n      return false;\n    });\n  }\n\n  updateLayoutChildren() {\n    if (!this.children.length) {\n      return this;\n    }\n    if (!this.layoutChildren) {\n      this.layoutChildren = [];\n    }\n\n    this.layoutChildren = this.children.filter(child => child.needLayout());\n\n    return this;\n  }\n\n  getAttributeTransforms() {\n    return transformsByType.rect;\n  }\n\n  protected evaluateJoin(data: any[]) {\n    if (!this.elements.length) {\n      const el = createElement(this);\n\n      el.updateData(DefaultKey, DefaultMarkData, () => '', this.view);\n      this.elements = [el];\n      this.elementMap.set(DefaultKey, el);\n    }\n  }\n\n  protected getChannelsFromConfig(element?: IElement) {\n    const spec = this.spec;\n\n    const initAttrs: any = {};\n\n    if (!isNil(spec.clip)) {\n      initAttrs.clip = spec.clip;\n    }\n\n    if (!isNil(spec.zIndex)) {\n      initAttrs.zIndex = spec.zIndex;\n    }\n\n    if (!isNil(spec.clipPath)) {\n      const paths = isFunction(spec.clipPath) ? spec.clipPath([element]) : spec.clipPath;\n\n      if (paths && paths.length) {\n        initAttrs.path = paths;\n      } else {\n        initAttrs.path = null;\n        initAttrs.clip = false;\n      }\n    }\n\n    if (!isNil(spec.interactive)) {\n      initAttrs.pickable = spec.interactive;\n    }\n\n    return initAttrs;\n  }\n\n  protected evaluateGroupEncode(elements: IElement[], groupEncode: any, parameters: any) {\n    const el = this.elements[0];\n    const nextAttrs = {};\n    const items = [Object.assign({}, el.items?.[0], { nextAttrs })];\n    invokeEncoderToItems(el, items, groupEncode, parameters);\n\n    this._groupEncodeResult = nextAttrs;\n    return nextAttrs;\n  }\n\n  protected evaluateEncode(elements: IElement[], encoders: any, parameters: any, noGroupEncode?: boolean) {\n    const initAttrs = this.getChannelsFromConfig();\n\n    if (encoders) {\n      this.emit(HOOK_EVENT.BEFORE_ELEMENT_ENCODE, { encoders, parameters }, this);\n\n      const groupEncodeAttrs = noGroupEncode\n        ? null\n        : this.evaluateGroupEncode(elements, encoders[BuiltInEncodeNames.group], parameters);\n\n      elements.forEach(element => {\n        element.items.forEach(item => {\n          item.nextAttrs = Object.assign(item.nextAttrs, initAttrs, groupEncodeAttrs);\n        });\n\n        element.encodeItems(element.items, encoders, this._isReentered, parameters);\n      });\n\n      this._isReentered = false;\n\n      this.evaluateTransform(this._getTransformsAfterEncodeItems(), elements, parameters);\n\n      elements.forEach(element => {\n        element.encodeGraphic();\n      });\n      this.emit(HOOK_EVENT.AFTER_ELEMENT_ENCODE, { encoders, parameters }, this);\n    } else {\n      elements.forEach(element => {\n        element.initGraphicItem(initAttrs);\n      });\n    }\n  }\n\n  addGraphicItem(attrs: any, groupKey?: string, newGraphicItem?: any) {\n    const graphicItem: any = newGraphicItem ?? createGraphicItem(this, this.markType, attrs);\n\n    if (!graphicItem) {\n      return;\n    }\n\n    this.emit(HOOK_EVENT.BEFORE_ADD_VRENDER_MARK, { graphicItem });\n\n    graphicItem.name = `${this.id() || this.markType}`;\n\n    this.graphicParent.insertIntoKeepIdx(graphicItem as unknown as INode, this.graphicIndex);\n    this.emit(HOOK_EVENT.AFTER_ADD_VRENDER_MARK, { graphicItem });\n\n    return graphicItem;\n  }\n}\n"]}
+{"version":3,"sources":["../src/view/group.ts"],"names":[],"mappings":"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","file":"group.js","sourcesContent":["import type { INode } from '@visactor/vrender-core';\nimport { transformsByType } from '../graph/attributes';\nimport { DefaultKey, DefaultMarkData } from '../graph/constants';\nimport { BuiltInEncodeNames, GrammarMarkType, HOOK_EVENT } from '../graph/enums';\nimport { createGraphicItem } from '../graph/util/graphic';\nimport type { IElement, IGlyphMark, IGroupMark, IMark, IView } from '../types';\nimport { Mark } from './mark';\nimport { isFunction, isNil } from '@visactor/vutils';\nimport { invokeEncoderToItems } from '../graph/mark/encode';\n\nexport class GroupMark extends Mark implements IGroupMark {\n  children: (IMark | IGroupMark | IGlyphMark)[];\n\n  layoutChildren?: (IMark | IGroupMark | IGlyphMark)[];\n\n  constructor(view: IView, group?: IGroupMark) {\n    super(view, GrammarMarkType.group, group);\n    this.children = [];\n  }\n\n  parseRenderContext() {\n    return { large: false };\n  }\n\n  appendChild(mark: IMark) {\n    this.children.push(mark);\n    return this;\n  }\n  removeChild(mark: IMark) {\n    this.children = this.children.filter(child => child !== mark);\n    return this;\n  }\n\n  includesChild(mark: IMark, descendant: boolean = true) {\n    if (this.children.includes(mark)) {\n      return true;\n    }\n    if (!descendant) {\n      return false;\n    }\n    return this.children.some(child => {\n      if (child.markType === GrammarMarkType.group) {\n        return (child as IGroupMark).includesChild(mark, true);\n      }\n      return false;\n    });\n  }\n\n  updateLayoutChildren() {\n    if (!this.children.length) {\n      return this;\n    }\n    if (!this.layoutChildren) {\n      this.layoutChildren = [];\n    }\n\n    this.layoutChildren = this.children.filter(child => child.needLayout());\n\n    return this;\n  }\n\n  getAttributeTransforms() {\n    return transformsByType.rect;\n  }\n\n  protected evaluateJoin(data: any[]) {\n    if (!this.elements.length) {\n      const el = this.createElement();\n\n      el.updateData(DefaultKey, DefaultMarkData, () => '');\n      this.elements = [el];\n      this.elementMap.set(DefaultKey, el);\n    }\n  }\n\n  protected getChannelsFromConfig(element?: IElement) {\n    const spec = this.spec;\n\n    const initAttrs: any = {};\n\n    if (!isNil(spec.clip)) {\n      initAttrs.clip = spec.clip;\n    }\n\n    if (!isNil(spec.zIndex)) {\n      initAttrs.zIndex = spec.zIndex;\n    }\n\n    if (!isNil(spec.clipPath)) {\n      const paths = isFunction(spec.clipPath) ? spec.clipPath([element]) : spec.clipPath;\n\n      if (paths && paths.length) {\n        initAttrs.path = paths;\n      } else {\n        initAttrs.path = null;\n        initAttrs.clip = false;\n      }\n    }\n\n    if (!isNil(spec.interactive)) {\n      initAttrs.pickable = spec.interactive;\n    }\n\n    return initAttrs;\n  }\n\n  protected evaluateGroupEncode(elements: IElement[], groupEncode: any, parameters: any) {\n    const el = this.elements[0];\n    const nextAttrs = {};\n    const items = [Object.assign({}, el.items?.[0], { nextAttrs })];\n    invokeEncoderToItems(el, items, groupEncode, parameters);\n\n    this._groupEncodeResult = nextAttrs;\n    return nextAttrs;\n  }\n\n  protected evaluateEncode(elements: IElement[], encoders: any, parameters: any, noGroupEncode?: boolean) {\n    const initAttrs = this.getChannelsFromConfig();\n\n    if (encoders) {\n      this.emit(HOOK_EVENT.BEFORE_ELEMENT_ENCODE, { encoders, parameters }, this);\n\n      const groupEncodeAttrs = noGroupEncode\n        ? null\n        : this.evaluateGroupEncode(elements, encoders[BuiltInEncodeNames.group], parameters);\n\n      elements.forEach(element => {\n        element.items.forEach(item => {\n          item.nextAttrs = Object.assign(item.nextAttrs, initAttrs, groupEncodeAttrs);\n        });\n\n        element.encodeItems(element.items, encoders, this._isReentered, parameters);\n      });\n\n      this._isReentered = false;\n\n      this.evaluateTransform(this._getTransformsAfterEncodeItems(), elements, parameters);\n\n      elements.forEach(element => {\n        element.encodeGraphic();\n      });\n      this.emit(HOOK_EVENT.AFTER_ELEMENT_ENCODE, { encoders, parameters }, this);\n    } else {\n      elements.forEach(element => {\n        element.initGraphicItem(initAttrs);\n      });\n    }\n  }\n\n  addGraphicItem(attrs: any, groupKey?: string, newGraphicItem?: any) {\n    const graphicItem: any = newGraphicItem ?? createGraphicItem(this, this.markType, attrs);\n\n    if (!graphicItem) {\n      return;\n    }\n\n    this.emit(HOOK_EVENT.BEFORE_ADD_VRENDER_MARK, { graphicItem });\n\n    graphicItem.name = `${this.id() || this.markType}`;\n\n    this.graphicParent.insertIntoKeepIdx(graphicItem as unknown as INode, this.graphicIndex);\n    this.emit(HOOK_EVENT.AFTER_ADD_VRENDER_MARK, { graphicItem });\n\n    return graphicItem;\n  }\n}\n"]}

package/cjs/view/mark-animate-mixin.d.ts

@@ -0,0 +1 @@
+export declare const registerMarkAnimateAPI: () => void;

package/cjs/view/mark-animate-mixin.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.registerMarkAnimateAPI = void 0;
+
+const vutils_1 = require("@visactor/vutils"), animate_1 = require("../graph/animation/animate"), mark_1 = require("./mark");
+
+class MarkAnimateMixin {
+    constructor() {
+        this.animate = new animate_1.Animate(this, {});
+    }
+    initAnimate(spec) {
+        this.animate || (this.animate = new animate_1.Animate(this, spec.animation), this.needAnimate() && this.animate.updateState(spec.animationState));
+    }
+    reuseAnimate(mark) {
+        this.animate = mark.animate, this.animate.mark = this;
+    }
+    updateAnimate(spec) {
+        spec.animation && this.animate.updateConfig(spec.animation), this.animate.updateState(spec.animationState);
+    }
+}
+
+const registerMarkAnimateAPI = () => {
+    (0, vutils_1.mixin)(mark_1.Mark, MarkAnimateMixin);
+};
+
+exports.registerMarkAnimateAPI = registerMarkAnimateAPI;
+//# sourceMappingURL=mark-animate-mixin.js.map

package/cjs/view/mark-animate-mixin.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/view/mark-animate-mixin.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,wDAAqD;AAGrD,iCAA8B;AAE9B,MAAM,gBAAgB;IAAtB;QACE,YAAO,GAAa,IAAI,iBAAO,CAAC,IAAwB,EAAE,EAAE,CAAC,CAAC;IAsBhE,CAAC;IApBC,WAAW,CAAC,IAAc;QACxB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAO,CAAC,IAAwB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACrE,IAAK,IAAY,CAAC,WAAW,EAAE,EAAE;gBAC/B,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aAC/C;SACF;IACH,CAAC;IAED,YAAY,CAAC,IAAW;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAwB,CAAC;IAC/C,CAAC;IAED,aAAa,CAAC,IAAc;QAC1B,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SAC3C;QACD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAChD,CAAC;CACF;AAEM,MAAM,sBAAsB,GAAG,GAAG,EAAE;IACzC,IAAA,cAAK,EAAC,WAAI,EAAE,gBAAgB,CAAC,CAAC;AAChC,CAAC,CAAC;AAFW,QAAA,sBAAsB,0BAEjC","file":"mark-animate-mixin.js","sourcesContent":["import { mixin } from '@visactor/vutils';\nimport { Animate } from '../graph/animation/animate';\nimport type { IMark, MarkSpec } from '../types';\nimport type { IAnimate } from '../types/animate';\nimport { Mark } from './mark';\n\nclass MarkAnimateMixin {\n  animate: IAnimate = new Animate(this as unknown as IMark, {});\n\n  initAnimate(spec: MarkSpec) {\n    if (!this.animate) {\n      this.animate = new Animate(this as unknown as IMark, spec.animation);\n      if ((this as any).needAnimate()) {\n        this.animate.updateState(spec.animationState);\n      }\n    }\n  }\n\n  reuseAnimate(mark: IMark) {\n    this.animate = mark.animate;\n    this.animate.mark = this as unknown as IMark;\n  }\n\n  updateAnimate(spec: MarkSpec) {\n    if (spec.animation) {\n      this.animate.updateConfig(spec.animation);\n    }\n    this.animate.updateState(spec.animationState);\n  }\n}\n\nexport const registerMarkAnimateAPI = () => {\n  mixin(Mark, MarkAnimateMixin);\n};\n"]}

package/cjs/view/mark.d.ts

@@ -4,6 +4,7 @@ import { Differ } from '../graph/mark/differ';
 import { GrammarBase } from './grammar-base';
 import type { GrammarType, ICoordinate, IData, IElement, IGrammarBase, IGroupMark, IMark, IMarkConfig, IView, MarkAnimationSpec, MarkFunctionType, MarkKeySpec, MarkLayoutCallback, MarkLayoutSpec, MarkSortSpec, MarkSpec, MarkStateSpec, MarkType, TransformSpec, Nil, IAnimate, MarkStateSortSpec, BaseSingleEncodeSpec } from '../types';
 import type { IBaseScale } from '@visactor/vscale';
+import { Element } from '../graph/element';
 export declare class Mark extends GrammarBase implements IMark {
     readonly grammarType: GrammarType;
     protected spec: MarkSpec;
@@ -65,6 +66,7 @@ export declare class Mark extends GrammarBase implements IMark {
     getFieldsByChannel(): Record<string, string>;
     protected init(stage: any, parameters: any): void;
     protected update(spec: MarkSpec): void;
+    createElement(): Element;
     protected evaluateJoin(data: any[]): void;
     protected evaluateState(elements: IElement[], stateSpec: MarkStateSpec, parameters: any): void;
     protected evaluateGroupEncode(elements: IElement[], groupEncode: any, parameters: any): {};

package/cjs/view/mark.js

@@ -10,14 +10,13 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.Mark = void 0;
 
-const vutils_1 = require("@visactor/vutils"), constants_1 = require("../graph/constants"), enums_1 = require("../graph/enums"), differ_1 = require("../graph/mark/differ"), animate_1 = require("../graph/animation/animate"), graphic_1 = require("../graph/util/graphic"), grammar_base_1 = require("./grammar-base"), mark_1 = require("../parse/mark"), util_1 = require("../parse/util"), transform_1 = require("../parse/transform"), element_1 = require("../graph/util/element"), encode_1 = require("../graph/mark/encode"), attributes_1 = require("../graph/attributes"), events_extend_1 = __importDefault(require("../graph/util/events-extend")), constants_2 = require("./constants");
+const vutils_1 = require("@visactor/vutils"), constants_1 = require("../graph/constants"), enums_1 = require("../graph/enums"), differ_1 = require("../graph/mark/differ"), graphic_1 = require("../graph/util/graphic"), grammar_base_1 = require("./grammar-base"), mark_1 = require("../parse/mark"), util_1 = require("../parse/util"), transform_1 = require("../parse/transform"), encode_1 = require("../graph/mark/encode"), attributes_1 = require("../graph/attributes"), events_extend_1 = __importDefault(require("../graph/util/events-extend")), constants_2 = require("./constants"), element_1 = require("../graph/element");
 
 class Mark extends grammar_base_1.GrammarBase {
     constructor(view, markType, group) {
         super(view), this.grammarType = "mark", this.elements = [], this.elementMap = new Map, 
-        this.isUpdated = !0, this._isReentered = !1, this.animate = new animate_1.Animate(this, {}), 
-        this.differ = new differ_1.Differ([]), this.markType = markType, this.spec.type = markType, 
-        this.spec.encode = {
+        this.isUpdated = !0, this._isReentered = !1, this.differ = new differ_1.Differ([]), 
+        this.markType = markType, this.spec.type = markType, this.spec.encode = {
             update: {}
         }, this.spec.group = group, group && (this.group = group, this.attach(group), group.appendChild(this));
     }
@@ -46,11 +45,12 @@ class Mark extends grammar_base_1.GrammarBase {
         return this;
     }
     reuse(grammar) {
+        var _b;
         if (grammar.grammarType !== this.grammarType) return this;
         const mark = grammar;
         return this.markType = mark.markType, this.coord = mark.coord, this.elementMap = mark.elementMap, 
         this.elements = mark.elements, this.elementMap.forEach((element => element.mark = this)), 
-        this.differ = mark.differ, this.animate = mark.animate, this.animate.mark = this, 
+        this.differ = mark.differ, null === (_b = this.reuseAnimate) || void 0 === _b || _b.call(this, mark), 
         this._context = mark._context, this.graphicItem = mark.graphicItem, this.graphicIndex = mark.graphicIndex, 
         this.graphicParent = mark.graphicParent, this.needClear = mark.needClear, this.isUpdated = mark.isUpdated, 
         this;
@@ -222,7 +222,7 @@ class Mark extends grammar_base_1.GrammarBase {
         })), res;
     }
     init(stage, parameters) {
-        var _a, _b, _c, _d;
+        var _b, _c, _d, _e, _f;
         if (this._delegateEvent || (this._delegateEvent = (event, type) => {
             var _a;
             const activeElement = null === (_a = event.target) || void 0 === _a ? void 0 : _a[constants_1.BridgeElementKey];
@@ -230,17 +230,17 @@ class Mark extends grammar_base_1.GrammarBase {
                 const extendedEvt = (0, events_extend_1.default)(this.view, event, activeElement, type, constants_2.EVENT_SOURCE_VIEW);
                 this.emitGrammarEvent(type, extendedEvt, activeElement);
             }
-        }, this.initEvent()), this.animate || (this.animate = new animate_1.Animate(this, this.spec.animation), 
-        this.needAnimate() && this.animate.updateState(this.spec.animationState)), !this.group) {
+        }, this.initEvent()), null === (_b = this.initAnimate) || void 0 === _b || _b.call(this, this.spec), 
+        !this.group) {
             const group = (0, util_1.getGrammarOutput)(this.spec.group, parameters);
             this.group = group, group && group.appendChild(this);
         }
-        const groupGraphicItem = this.group ? this.group.getGroupGraphicItem() : stage.defaultLayer, markIndex = null !== (_c = null === (_b = null === (_a = this.group) || void 0 === _a ? void 0 : _a.children) || void 0 === _b ? void 0 : _b.indexOf(this)) && void 0 !== _c ? _c : 0;
+        const groupGraphicItem = this.group ? this.group.getGroupGraphicItem() : stage.defaultLayer, markIndex = null !== (_e = null === (_d = null === (_c = this.group) || void 0 === _c ? void 0 : _c.children) || void 0 === _d ? void 0 : _d.indexOf(this)) && void 0 !== _e ? _e : 0;
         if (this.markType !== enums_1.GrammarMarkType.group) {
             if (!this.graphicItem) {
                 const graphicItem = (0, graphic_1.createGraphicItem)(this, enums_1.GrammarMarkType.group, {
                     pickable: !1,
-                    zIndex: null !== (_d = this.spec.zIndex) && void 0 !== _d ? _d : 0
+                    zIndex: null !== (_f = this.spec.zIndex) && void 0 !== _f ? _f : 0
                 });
                 (this.spec.support3d || constants_1.Mark3DType.includes(this.markType)) && graphicItem.setMode("3d"), 
                 graphicItem.name = `${this.id() || this.markType}`, this.graphicItem = graphicItem;
@@ -250,8 +250,9 @@ class Mark extends grammar_base_1.GrammarBase {
         this.graphicIndex = markIndex;
     }
     update(spec) {
-        if (this._context = this.spec.context, this.isUpdated = !0, this.renderContext.progressive || (this.animate.updateConfig(spec.animation), 
-        this.animate.updateState(spec.animationState)), this.markType !== enums_1.GrammarMarkType.group) {
+        var _b;
+        if (this._context = this.spec.context, this.isUpdated = !0, this.renderContext.progressive || null === (_b = this.updateAnimate) || void 0 === _b || _b.call(this, spec), 
+        this.markType !== enums_1.GrammarMarkType.group) {
             if ((0, vutils_1.isNil)(spec.zIndex) || this.graphicItem.setAttribute("zIndex", spec.zIndex), 
             (0, vutils_1.isNil)(spec.clip) || this.graphicItem.setAttribute("clip", spec.clip), 
             !(0, vutils_1.isNil)(spec.clipPath)) {
@@ -268,29 +269,34 @@ class Mark extends grammar_base_1.GrammarBase {
             element.updateGraphicItem();
         }));
     }
+    createElement() {
+        return new element_1.Element(this);
+    }
     evaluateJoin(data) {
         var _a, _b, _c, _d;
         this.needClear = !0;
         const keyGetter = (0, util_1.parseField)(null !== (_c = null !== (_a = this.spec.key) && void 0 !== _a ? _a : null === (_b = this.grammarSource) || void 0 === _b ? void 0 : _b.getDataIDKey()) && void 0 !== _c ? _c : () => constants_1.DefaultKey), groupKeyGetter = (0, 
         util_1.parseField)(null !== (_d = this.spec.groupBy) && void 0 !== _d ? _d : () => constants_1.DefaultKey), sort = this.spec.sort, isCollectionMark = this.isCollectionMark(), enterElements = new Set(this.elements.filter((element => element.diffState === enums_1.DiffState.enter))), elements = [];
         this.differ.setCallback(((key, data, prevData) => {
+            var _a;
             const elementKey = key;
             let element;
             if ((0, vutils_1.isNil)(data)) element = this.elementMap.get(elementKey), element && (element.diffState = enums_1.DiffState.exit); else if ((0, 
             vutils_1.isNil)(prevData)) {
-                if (element = this.elementMap.has(elementKey) ? this.elementMap.get(elementKey) : (0, 
-                element_1.createElement)(this), element.diffState === enums_1.DiffState.exit) {
+                if (element = this.elementMap.has(elementKey) ? this.elementMap.get(elementKey) : this.createElement(), 
+                element.diffState === enums_1.DiffState.exit) {
                     element.diffState = enums_1.DiffState.enter;
-                    this.animate.getElementAnimators(element, enums_1.DiffState.exit).forEach((animator => animator.stop("start")));
+                    const animators = null === (_a = this.animate) || void 0 === _a ? void 0 : _a.getElementAnimators(element, enums_1.DiffState.exit);
+                    animators && animators.forEach((animator => animator.stop("start")));
                 }
                 element.diffState = enums_1.DiffState.enter;
                 const groupKey = isCollectionMark ? key : groupKeyGetter(data[0]);
-                element.updateData(groupKey, data, keyGetter, this.view), this.elementMap.set(elementKey, element), 
+                element.updateData(groupKey, data, keyGetter), this.elementMap.set(elementKey, element), 
                 elements.push(element);
             } else if (element = this.elementMap.get(elementKey), element) {
                 element.diffState = enums_1.DiffState.update;
                 const groupKey = isCollectionMark ? key : groupKeyGetter(data[0]);
-                element.updateData(groupKey, data, keyGetter, this.view), elements.push(element);
+                element.updateData(groupKey, data, keyGetter), elements.push(element);
             }
             enterElements.delete(element);
         }));
@@ -410,20 +416,20 @@ class Mark extends grammar_base_1.GrammarBase {
         if (this.isCollectionMark()) return this._groupKeys.forEach(((key, index) => {
             const data = this.renderContext.progressive.groupedData.get(key), groupStep = this.renderContext.progressive.step, dataSlice = data.slice(currentIndex * groupStep, (currentIndex + 1) * groupStep);
             if (0 === currentIndex) {
-                const element = (0, element_1.createElement)(this);
-                element.diffState = enums_1.DiffState.enter, element.updateData(key, dataSlice, keyGetter, this.view), 
+                const element = this.createElement();
+                element.diffState = enums_1.DiffState.enter, element.updateData(key, dataSlice, keyGetter), 
                 elements.push(element);
             } else {
                 const element = this.elements[index];
-                element.updateData(key, dataSlice, keyGetter, this.view), elements.push(element);
+                element.updateData(key, dataSlice, keyGetter), elements.push(element);
             }
         })), elements;
         const groupElements = {};
         return this._groupKeys.forEach((key => {
             const data = this.renderContext.progressive.groupedData.get(key), groupStep = this.renderContext.progressive.step, dataSlice = data.slice(currentIndex * groupStep, (currentIndex + 1) * groupStep), group = [];
             dataSlice.forEach((entry => {
-                const element = (0, element_1.createElement)(this);
-                element.diffState = enums_1.DiffState.enter, element.updateData(key, [ entry ], keyGetter, this.view), 
+                const element = this.createElement();
+                element.diffState = enums_1.DiffState.enter, element.updateData(key, [ entry ], keyGetter), 
                 group.push(element), elements.push(element);
             })), groupElements[key] = group;
         })), {
@@ -539,7 +545,8 @@ class Mark extends grammar_base_1.GrammarBase {
         this.group = null, super.clear();
     }
     prepareRelease() {
-        this.animate.stop(), this.elementMap.forEach((element => element.diffState = enums_1.DiffState.exit)), 
+        var _a;
+        null === (_a = this.animate) || void 0 === _a || _a.stop(), this.elementMap.forEach((element => element.diffState = enums_1.DiffState.exit)), 
         this._finalParameters = this.parameters();
     }
     release() {