@visactor/vgrammar-core 0.14.14 → 0.14.16

package/es/interactions/element-highlight.d.ts

@@ -18,7 +18,7 @@ export declare class ElementHighlight extends BaseInteraction<ElementHighlightOp
         type: EventType;
         handler: (e: InteractionEvent) => void;
     }[];
-    clearPrevElements(): void;
+    resetAll(): void;
     start(element: InteractionEvent['element']): void;
     reset(element: InteractionEvent['element']): void;
     handleStart: (e: InteractionEvent) => void;

package/es/interactions/element-highlight.js

@@ -11,7 +11,12 @@ export class ElementHighlight extends BaseInteraction {
         super(view, options), this.type = ElementHighlight.type, this.handleStart = e => {
             this.start(e.element);
         }, this.handleReset = e => {
-            this.reset(e.element);
+            if (!this._statedElements || !this._statedElements.length) return;
+            const element = e.element;
+            if (element) {
+                const hasActiveElement = this._marks && this._marks.includes(element.mark);
+                "view" !== this._resetType || hasActiveElement ? "self" === this._resetType && hasActiveElement && this.resetAll() : this.resetAll();
+            }
         }, 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 ]);
     }
@@ -30,7 +35,7 @@ export class ElementHighlight extends BaseInteraction {
             handler: this.handleReset
         }), events;
     }
-    clearPrevElements() {
+    resetAll() {
         const {highlightState: highlightState, blurState: blurState} = this.options;
         this._lastElement && (this.clearAllStates(highlightState, blurState), this.dispatchEvent("reset", {
             elements: [ this._lastElement ],
@@ -46,12 +51,10 @@ export class ElementHighlight extends BaseInteraction {
                 elements: [ element ],
                 options: this.options
             });
-        } else this._lastElement && "view" === this._resetType && this.clearPrevElements();
+        } else this._lastElement && "view" === this._resetType && this.resetAll();
     }
     reset(element) {
-        if (!this._statedElements || !this._statedElements.length) return;
-        const hasActiveElement = element && this._marks && this._marks.includes(element.mark);
-        "view" !== this._resetType || hasActiveElement ? "self" === this._resetType && hasActiveElement && this.clearPrevElements() : this.clearPrevElements();
+        element ? this._marks && this._marks.includes(element.mark) && element.removeState([ this.options.highlightState, this.options.blurState ]) : this.resetAll();
     }
 }
 

package/es/interactions/element-highlight.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interactions/element-highlight.ts"],"names":[],"mappings":"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","file":"element-highlight.js","sourcesContent":["import { InteractionStateEnum } from '../graph/enums';\nimport type {\n  ElementHighlightOptions,\n  EventType,\n  IElement,\n  IGlyphElement,\n  IMark,\n  IToggleStateMixin,\n  IView,\n  InteractionEvent\n} from '../types';\nimport { BaseInteraction } from './base';\nimport { groupMarksByState } from './utils';\nimport { isString } from '@visactor/vutils';\n\nexport interface ElementHighlight extends IToggleStateMixin, BaseInteraction<ElementHighlightOptions> {}\n\nexport class ElementHighlight extends BaseInteraction<ElementHighlightOptions> {\n  static type: string = 'element-highlight';\n  type: string = ElementHighlight.type;\n\n  static defaultOptions: ElementHighlightOptions = {\n    highlightState: InteractionStateEnum.highlight,\n    blurState: InteractionStateEnum.blur,\n    trigger: 'pointerover',\n    triggerOff: 'pointerout'\n  };\n  options: ElementHighlightOptions;\n  protected _marks?: IMark[];\n  protected _stateMarks: Record<string, IMark[]>;\n  protected _lastElement?: IElement;\n  protected _statedElements?: (IElement | IGlyphElement)[];\n  protected _resetType?: 'view' | 'self';\n\n  constructor(view: IView, options?: ElementHighlightOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ElementHighlight.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.selector);\n    this._stateMarks = groupMarksByState(this._marks, [this.options.highlightState, this.options.blurState]);\n  }\n\n  getStartState(): string {\n    return this.options.highlightState;\n  }\n\n  protected getEvents() {\n    const triggerOff = this.options.triggerOff;\n    const trigger = this.options.trigger;\n    const events = [\n      {\n        type: trigger,\n        handler: this.handleStart\n      }\n    ];\n\n    let eventName = triggerOff;\n    if (isString(triggerOff) && (triggerOff as string).includes('view:')) {\n      eventName = (triggerOff as string).replace('view:', '') as EventType;\n      this._resetType = 'view';\n    } else {\n      this._resetType = 'self';\n    }\n\n    events.push({ type: eventName as EventType, handler: this.handleReset });\n\n    return events;\n  }\n\n  clearPrevElements() {\n    const { highlightState, blurState } = this.options;\n\n    if (this._lastElement) {\n      this.clearAllStates(highlightState, blurState);\n\n      this.dispatchEvent('reset', { elements: [this._lastElement], options: this.options });\n\n      this._lastElement = null;\n\n      this._statedElements = null;\n    }\n  }\n\n  start(element: InteractionEvent['element']) {\n    if (element && this._marks && this._marks.includes(element.mark)) {\n      const { highlightState, blurState } = this.options;\n\n      if (this._lastElement === element) {\n        return;\n      }\n\n      this._statedElements = this.updateStates([element], this._statedElements, highlightState, blurState);\n\n      this._lastElement = element;\n\n      this.dispatchEvent('start', { elements: [element], options: this.options });\n    } else if (this._lastElement && this._resetType === 'view') {\n      this.clearPrevElements();\n    }\n  }\n\n  reset(element: InteractionEvent['element']) {\n    if (!this._statedElements || !this._statedElements.length) {\n      return;\n    }\n\n    const hasActiveElement = element && this._marks && this._marks.includes(element.mark);\n\n    if (this._resetType === 'view' && !hasActiveElement) {\n      this.clearPrevElements();\n    } else if (this._resetType === 'self' && hasActiveElement) {\n      this.clearPrevElements();\n    }\n  }\n\n  handleStart = (e: InteractionEvent) => {\n    this.start(e.element);\n  };\n\n  handleReset = (e: InteractionEvent) => {\n    this.reset(e.element);\n  };\n}\n"]}
+{"version":3,"sources":["../src/interactions/element-highlight.ts"],"names":[],"mappings":"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","file":"element-highlight.js","sourcesContent":["import { InteractionStateEnum } from '../graph/enums';\nimport type {\n  ElementHighlightOptions,\n  EventType,\n  IElement,\n  IGlyphElement,\n  IMark,\n  IToggleStateMixin,\n  IView,\n  InteractionEvent\n} from '../types';\nimport { BaseInteraction } from './base';\nimport { groupMarksByState } from './utils';\nimport { isString } from '@visactor/vutils';\n\nexport interface ElementHighlight extends IToggleStateMixin, BaseInteraction<ElementHighlightOptions> {}\n\nexport class ElementHighlight extends BaseInteraction<ElementHighlightOptions> {\n  static type: string = 'element-highlight';\n  type: string = ElementHighlight.type;\n\n  static defaultOptions: ElementHighlightOptions = {\n    highlightState: InteractionStateEnum.highlight,\n    blurState: InteractionStateEnum.blur,\n    trigger: 'pointerover',\n    triggerOff: 'pointerout'\n  };\n  options: ElementHighlightOptions;\n  protected _marks?: IMark[];\n  protected _stateMarks: Record<string, IMark[]>;\n  protected _lastElement?: IElement;\n  protected _statedElements?: (IElement | IGlyphElement)[];\n  protected _resetType?: 'view' | 'self';\n\n  constructor(view: IView, options?: ElementHighlightOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ElementHighlight.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.selector);\n    this._stateMarks = groupMarksByState(this._marks, [this.options.highlightState, this.options.blurState]);\n  }\n\n  getStartState(): string {\n    return this.options.highlightState;\n  }\n\n  protected getEvents() {\n    const triggerOff = this.options.triggerOff;\n    const trigger = this.options.trigger;\n    const events = [\n      {\n        type: trigger,\n        handler: this.handleStart\n      }\n    ];\n\n    let eventName = triggerOff;\n    if (isString(triggerOff) && (triggerOff as string).includes('view:')) {\n      eventName = (triggerOff as string).replace('view:', '') as EventType;\n      this._resetType = 'view';\n    } else {\n      this._resetType = 'self';\n    }\n\n    events.push({ type: eventName as EventType, handler: this.handleReset });\n\n    return events;\n  }\n\n  resetAll() {\n    const { highlightState, blurState } = this.options;\n\n    if (this._lastElement) {\n      this.clearAllStates(highlightState, blurState);\n\n      this.dispatchEvent('reset', { elements: [this._lastElement], options: this.options });\n\n      this._lastElement = null;\n\n      this._statedElements = null;\n    }\n  }\n\n  start(element: InteractionEvent['element']) {\n    if (element && this._marks && this._marks.includes(element.mark)) {\n      const { highlightState, blurState } = this.options;\n\n      if (this._lastElement === element) {\n        return;\n      }\n\n      this._statedElements = this.updateStates([element], this._statedElements, highlightState, blurState);\n\n      this._lastElement = element;\n\n      this.dispatchEvent('start', { elements: [element], options: this.options });\n    } else if (this._lastElement && this._resetType === 'view') {\n      this.resetAll();\n    }\n  }\n\n  reset(element: InteractionEvent['element']) {\n    if (element) {\n      if (this._marks && this._marks.includes(element.mark)) {\n        element.removeState([this.options.highlightState, this.options.blurState]);\n      }\n    } else {\n      this.resetAll();\n    }\n  }\n\n  handleStart = (e: InteractionEvent) => {\n    this.start(e.element);\n  };\n\n  handleReset = (e: InteractionEvent) => {\n    if (!this._statedElements || !this._statedElements.length) {\n      return;\n    }\n    const element = e.element;\n\n    if (element) {\n      const hasActiveElement = this._marks && this._marks.includes(element.mark);\n\n      if (this._resetType === 'view' && !hasActiveElement) {\n        this.resetAll();\n      } else if (this._resetType === 'self' && hasActiveElement) {\n        this.resetAll();\n      }\n    }\n  };\n}\n"]}

package/es/interactions/element-select.d.ts

@@ -17,7 +17,7 @@ export declare class ElementSelect extends BaseInteraction<ElementSelectOptions>
         type: EventType | EventType[];
         handler: (e: InteractionEvent) => void;
     }[];
-    clearPrevElements: () => void;
+    resetAll: () => void;
     handleStart: (e: InteractionEvent) => void;
     handleReset: (e: InteractionEvent) => void;
     start(element: InteractionEvent['element']): void;

package/es/interactions/element-select.js

@@ -8,7 +8,7 @@ import { BaseInteraction } from "./base";
 
 export class ElementSelect extends BaseInteraction {
     constructor(view, options) {
-        super(view, options), this.type = ElementSelect.type, this._resetType = [], this.clearPrevElements = () => {
+        super(view, options), this.type = ElementSelect.type, this._resetType = [], this.resetAll = () => {
             const {state: state, reverseState: reverseState} = this.options;
             this._statedElements && this._statedElements.length && (this.clearAllStates(state, reverseState), 
             this.dispatchEvent("reset", {
@@ -18,7 +18,9 @@ export class ElementSelect extends BaseInteraction {
         }, this.handleStart = e => {
             this.start(e.element);
         }, this.handleReset = e => {
-            this.reset(e.element);
+            if (!this._statedElements || !this._statedElements.length) return;
+            const element = e.element, hasActiveElement = element && this._marks && this._marks.includes(element.mark);
+            (this._resetType.includes("view") && !hasActiveElement || this._resetType.includes("self") && hasActiveElement) && this.resetAll();
         }, 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 ]);
     }
@@ -42,20 +44,18 @@ export class ElementSelect extends BaseInteraction {
         if (element && this._marks && this._marks.includes(element.mark)) if (element.hasState(state)) {
             if (this._resetType.includes("self")) {
                 const newStatedElements = this._statedElements && this._statedElements.filter((el => el !== element));
-                newStatedElements && newStatedElements.length ? this._statedElements = this.updateStates(newStatedElements, this._statedElements, state, reverseState) : this.clearPrevElements();
+                newStatedElements && newStatedElements.length ? this._statedElements = this.updateStates(newStatedElements, this._statedElements, state, reverseState) : this.resetAll();
             }
         } else this._timer && clearTimeout(this._timer), element.addState(state), this._statedElements = this.updateStates(isMultiple && this._statedElements ? [ ...this._statedElements, element ] : [ element ], this._statedElements, state, reverseState), 
         this.dispatchEvent("start", {
             elements: this._statedElements,
             options: this.options
         }), this._resetType.includes("timeout") && (this._timer = setTimeout((() => {
-            this.clearPrevElements();
-        }), this.options.triggerOff)); else this._resetType.includes("view") && this._statedElements && this._statedElements.length && this.clearPrevElements();
+            this.resetAll();
+        }), this.options.triggerOff)); else this._resetType.includes("view") && this._statedElements && this._statedElements.length && this.resetAll();
     }
     reset(element) {
-        if (!this._statedElements || !this._statedElements.length) return;
-        const hasActiveElement = element && this._marks && this._marks.includes(element.mark);
-        (this._resetType.includes("view") && !hasActiveElement || this._resetType.includes("self") && hasActiveElement) && this.clearPrevElements();
+        element ? this._marks && this._marks.includes(element.mark) && element.removeState([ this.options.state, this.options.reverseState ]) : this.resetAll();
     }
 }
 

package/es/interactions/element-select.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interactions/element-select.ts"],"names":[],"mappings":"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","file":"element-select.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { InteractionStateEnum } from '../graph/enums';\nimport type {\n  ElementSelectOptions,\n  EventType,\n  IElement,\n  IGlyphElement,\n  IMark,\n  IToggleStateMixin,\n  IView,\n  InteractionEvent\n} from '../types';\nimport { groupMarksByState, parseTriggerOffOfSelect } from './utils';\nimport { BaseInteraction } from './base';\n\nexport interface ElementSelect extends IToggleStateMixin, BaseInteraction<ElementSelectOptions> {}\n\nexport class ElementSelect extends BaseInteraction<ElementSelectOptions> {\n  static type: string = 'element-select';\n  type: string = ElementSelect.type;\n\n  static defaultOptions: ElementSelectOptions = {\n    state: InteractionStateEnum.selected,\n    trigger: 'click'\n  };\n  protected _resetType: ('view' | 'self' | 'timeout')[] = [];\n  protected _marks?: IMark[];\n  protected _stateMarks: Record<string, IMark[]>;\n  private _timer?: number;\n  protected _statedElements?: (IElement | IGlyphElement)[];\n\n  constructor(view: IView, options?: ElementSelectOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ElementSelect.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.selector);\n    this._stateMarks = groupMarksByState(this._marks, [this.options.state, this.options.reverseState]);\n  }\n\n  getStartState(): string {\n    return this.options.state;\n  }\n\n  protected getEvents() {\n    const triggerOff = this.options.triggerOff;\n    const trigger = this.options.trigger;\n\n    const events = [\n      {\n        type: trigger,\n        handler: this.handleStart\n      }\n    ];\n\n    const { eventNames, resetType } = parseTriggerOffOfSelect(triggerOff);\n\n    eventNames.forEach(evt => {\n      if (evt && (isArray(trigger) ? !trigger.includes(evt) : evt !== trigger)) {\n        events.push({ type: evt as EventType, handler: this.handleReset });\n      }\n    });\n\n    this._resetType = resetType;\n\n    return events;\n  }\n\n  clearPrevElements = () => {\n    const { state, reverseState } = this.options;\n\n    if (this._statedElements && this._statedElements.length) {\n      this.clearAllStates(state, reverseState);\n      this.dispatchEvent('reset', { elements: this._statedElements, options: this.options });\n\n      this._statedElements = [];\n    }\n  };\n\n  handleStart = (e: InteractionEvent) => {\n    this.start(e.element);\n  };\n\n  handleReset = (e: InteractionEvent) => {\n    this.reset(e.element);\n  };\n\n  start(element: InteractionEvent['element']) {\n    const { state, reverseState, isMultiple } = this.options;\n    if (element && this._marks && this._marks.includes(element.mark)) {\n      if (element.hasState(state)) {\n        if (this._resetType.includes('self')) {\n          const newStatedElements = this._statedElements && this._statedElements.filter(el => el !== element);\n\n          if (newStatedElements && newStatedElements.length) {\n            this._statedElements = this.updateStates(newStatedElements, this._statedElements, state, reverseState);\n          } else {\n            this.clearPrevElements();\n          }\n        }\n      } else {\n        if (this._timer) {\n          clearTimeout(this._timer);\n        }\n        element.addState(state);\n\n        this._statedElements = this.updateStates(\n          isMultiple && this._statedElements ? [...this._statedElements, element] : [element],\n          this._statedElements,\n          state,\n          reverseState\n        );\n        this.dispatchEvent('start', { elements: this._statedElements, options: this.options });\n\n        if (this._resetType.includes('timeout')) {\n          this._timer = setTimeout(() => {\n            this.clearPrevElements();\n          }, this.options.triggerOff as number) as unknown as number;\n        }\n      }\n    } else if (this._resetType.includes('view') && this._statedElements && this._statedElements.length) {\n      this.clearPrevElements();\n    }\n  }\n\n  reset(element: InteractionEvent['element']) {\n    if (!this._statedElements || !this._statedElements.length) {\n      return;\n    }\n\n    const hasActiveElement = element && this._marks && this._marks.includes(element.mark);\n\n    if (this._resetType.includes('view') && !hasActiveElement) {\n      this.clearPrevElements();\n    } else if (this._resetType.includes('self') && hasActiveElement) {\n      this.clearPrevElements();\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/interactions/element-select.ts"],"names":[],"mappings":"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","file":"element-select.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { InteractionStateEnum } from '../graph/enums';\nimport type {\n  ElementSelectOptions,\n  EventType,\n  IElement,\n  IGlyphElement,\n  IMark,\n  IToggleStateMixin,\n  IView,\n  InteractionEvent\n} from '../types';\nimport { groupMarksByState, parseTriggerOffOfSelect } from './utils';\nimport { BaseInteraction } from './base';\n\nexport interface ElementSelect extends IToggleStateMixin, BaseInteraction<ElementSelectOptions> {}\n\nexport class ElementSelect extends BaseInteraction<ElementSelectOptions> {\n  static type: string = 'element-select';\n  type: string = ElementSelect.type;\n\n  static defaultOptions: ElementSelectOptions = {\n    state: InteractionStateEnum.selected,\n    trigger: 'click'\n  };\n  protected _resetType: ('view' | 'self' | 'timeout')[] = [];\n  protected _marks?: IMark[];\n  protected _stateMarks: Record<string, IMark[]>;\n  private _timer?: number;\n  protected _statedElements?: (IElement | IGlyphElement)[];\n\n  constructor(view: IView, options?: ElementSelectOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ElementSelect.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.selector);\n    this._stateMarks = groupMarksByState(this._marks, [this.options.state, this.options.reverseState]);\n  }\n\n  getStartState(): string {\n    return this.options.state;\n  }\n\n  protected getEvents() {\n    const triggerOff = this.options.triggerOff;\n    const trigger = this.options.trigger;\n\n    const events = [\n      {\n        type: trigger,\n        handler: this.handleStart\n      }\n    ];\n\n    const { eventNames, resetType } = parseTriggerOffOfSelect(triggerOff);\n\n    eventNames.forEach(evt => {\n      if (evt && (isArray(trigger) ? !trigger.includes(evt) : evt !== trigger)) {\n        events.push({ type: evt as EventType, handler: this.handleReset });\n      }\n    });\n\n    this._resetType = resetType;\n\n    return events;\n  }\n\n  resetAll = () => {\n    const { state, reverseState } = this.options;\n\n    if (this._statedElements && this._statedElements.length) {\n      this.clearAllStates(state, reverseState);\n      this.dispatchEvent('reset', { elements: this._statedElements, options: this.options });\n\n      this._statedElements = [];\n    }\n  };\n\n  handleStart = (e: InteractionEvent) => {\n    this.start(e.element);\n  };\n\n  handleReset = (e: InteractionEvent) => {\n    if (!this._statedElements || !this._statedElements.length) {\n      return;\n    }\n    const element = e.element;\n    const hasActiveElement = element && this._marks && this._marks.includes(element.mark);\n\n    if (this._resetType.includes('view') && !hasActiveElement) {\n      this.resetAll();\n    } else if (this._resetType.includes('self') && hasActiveElement) {\n      this.resetAll();\n    }\n  };\n\n  start(element: InteractionEvent['element']) {\n    const { state, reverseState, isMultiple } = this.options;\n    if (element && this._marks && this._marks.includes(element.mark)) {\n      if (element.hasState(state)) {\n        if (this._resetType.includes('self')) {\n          const newStatedElements = this._statedElements && this._statedElements.filter(el => el !== element);\n\n          if (newStatedElements && newStatedElements.length) {\n            this._statedElements = this.updateStates(newStatedElements, this._statedElements, state, reverseState);\n          } else {\n            this.resetAll();\n          }\n        }\n      } else {\n        if (this._timer) {\n          clearTimeout(this._timer);\n        }\n        element.addState(state);\n\n        this._statedElements = this.updateStates(\n          isMultiple && this._statedElements ? [...this._statedElements, element] : [element],\n          this._statedElements,\n          state,\n          reverseState\n        );\n        this.dispatchEvent('start', { elements: this._statedElements, options: this.options });\n\n        if (this._resetType.includes('timeout')) {\n          this._timer = setTimeout(() => {\n            this.resetAll();\n          }, this.options.triggerOff as number) as unknown as number;\n        }\n      }\n    } else if (this._resetType.includes('view') && this._statedElements && this._statedElements.length) {\n      this.resetAll();\n    }\n  }\n\n  reset(element: InteractionEvent['element']) {\n    if (element) {\n      if (this._marks && this._marks.includes(element.mark)) {\n        element.removeState([this.options.state, this.options.reverseState]);\n      }\n    } else {\n      this.resetAll();\n    }\n  }\n}\n"]}

package/es/interactions/fish-eye.js

@@ -95,4 +95,5 @@ FishEye.type = "fish-eye", FishEye.defaultOptions = {
     distortionX: 2,
     distortionY: 2,
     throttle: 100
-};
+};
+//# sourceMappingURL=fish-eye.js.map

package/es/interactions/index.js

@@ -148,4 +148,4 @@ export const registerViewRoam = () => {
 export const registerFishEye = () => {
     Factory.registerInteraction(FishEye.type, FishEye);
 };
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/es/interactions/legend-filter.js

@@ -29,4 +29,4 @@ export class LegendFilter extends Filter {
 }
 
 LegendFilter.type = "legend-filter", LegendFilter.defaultOptions = {};
-//# sourceMappingURL=legend-filter.js.map
+//# sourceMappingURL=legend-filter.js.map

package/es/interactions/player-filter.js

@@ -29,4 +29,4 @@ export class PlayerFilter extends Filter {
 }
 
 PlayerFilter.type = "player-filter", PlayerFilter.defaultOptions = {};
-//# sourceMappingURL=player-filter.js.map
+//# sourceMappingURL=player-filter.js.map

package/es/interactions/roll-up.js

@@ -42,4 +42,4 @@ RollUp.type = "roll-up", RollUp.defaultOptions = {
     trigger: "click",
     triggerOff: "empty"
 };
-//# sourceMappingURL=roll-up.js.map
+//# sourceMappingURL=roll-up.js.map

package/es/interactions/scrollbar-filter.js

@@ -50,4 +50,4 @@ export class ScrollbarFilter extends Filter {
 }
 
 ScrollbarFilter.type = "scrollbar-filter", ScrollbarFilter.defaultOptions = {};
-//# sourceMappingURL=scrollbar-filter.js.map
+//# sourceMappingURL=scrollbar-filter.js.map

package/es/interactions/slider-filter.js

@@ -26,4 +26,4 @@ export class SliderFilter extends Filter {
 }
 
 SliderFilter.type = "slider-filter", SliderFilter.defaultOptions = {};
-//# sourceMappingURL=slider-filter.js.map
+//# sourceMappingURL=slider-filter.js.map

package/es/interactions/toggle-state-mixin.js

@@ -46,4 +46,4 @@ export class ToggleStateMixin {
         }));
     }
 }
-//# sourceMappingURL=toggle-state-mixin.js.map
+//# sourceMappingURL=toggle-state-mixin.js.map

package/es/parse/coordinate.js

@@ -62,4 +62,4 @@ export function configureCoordinate(spec, coordinate, parameters) {
     }
     coordinate.applyTransforms(transforms);
 }
-//# sourceMappingURL=coordinate.js.map
+//# sourceMappingURL=coordinate.js.map

package/es/parse/event.js

@@ -20,4 +20,4 @@ export const parseEventSelector = (selector, source = EVENT_SOURCE_VIEW) => {
     } else 1 === splitArr.length && (spec.type = selector, spec.source = source);
     return spec;
 };
-//# sourceMappingURL=event.js.map
+//# sourceMappingURL=event.js.map

package/es/parse/mark.js

@@ -16,4 +16,4 @@ export function parseEncodeType(encoder, view) {
     return encoder.scale && (dependencies = isGrammar(encoder.scale) ? [ encoder.scale ] : array(view.getScaleById(encoder.scale))), 
     dependencies.concat(parseFunctionType(encoder, view));
 }
-//# sourceMappingURL=mark.js.map
+//# sourceMappingURL=mark.js.map

package/es/parse/option.js

@@ -7,5 +7,4 @@ export const parseOptionValue = (value, params) => isGrammar(value) ? value.outp
 export const parseOptions = (options, params) => options ? isObject(options) ? Object.keys(options).reduce(((res, key) => {
     const option = options[key];
     return res[key] = parseOptionValue(option, params), res;
-}), {}) : options.map((option => parseOptionValue(option, params))) : options;
-//# sourceMappingURL=option.js.map
+}), {}) : options.map((option => parseOptionValue(option, params))) : options;

package/es/parse/scale.js

@@ -344,4 +344,4 @@ export function configureScale(spec, scale, parameters) {
         scale.rescale();
     }
 }
-//# sourceMappingURL=scale.js.map
+//# sourceMappingURL=scale.js.map

package/es/parse/transform.js

@@ -99,4 +99,4 @@ export const parseTransformSpec = (spec, view) => {
     }
     return null;
 };
-//# sourceMappingURL=transform.js.map
+//# sourceMappingURL=transform.js.map

package/es/parse/util.js

@@ -62,4 +62,4 @@ export const isGrammar = el => el && !isNil(el.grammarType);
 export const parseField = field => isFunction(field) ? field : datum => datum[field];
 
 export const parseColor = color => isString(color) && Color.parseColorString(color) ? color : null;
-//# sourceMappingURL=util.js.map
+//# sourceMappingURL=util.js.map

package/es/parse/view.js

@@ -96,4 +96,4 @@ export const normalizeRunningConfig = runningConfig => {
         enableExitAnimation: enableExitAnimation
     };
 };
-//# sourceMappingURL=view.js.map
+//# sourceMappingURL=view.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vgrammar-core",
-  "version": "0.14.14",
+  "version": "0.14.16",
   "description": "VGrammar is a visual grammar library",
   "keywords": [
     "grammar",
@@ -26,12 +26,12 @@
   "dependencies": {
     "@visactor/vutils": "~0.18.18",
     "@visactor/vdataset": "~0.18.18",
-    "@visactor/vgrammar-coordinate": "0.14.14",
-    "@visactor/vgrammar-util": "0.14.14",
+    "@visactor/vgrammar-coordinate": "0.14.16",
+    "@visactor/vgrammar-util": "0.14.16",
     "@visactor/vscale": "~0.18.18",
-    "@visactor/vrender-core": "0.20.14",
-    "@visactor/vrender-kits": "0.20.14",
-    "@visactor/vrender-components": "0.20.14"
+    "@visactor/vrender-core": "0.20.16",
+    "@visactor/vrender-kits": "0.20.16",
+    "@visactor/vrender-components": "0.20.16"
   },
   "devDependencies": {
     "@rushstack/eslint-patch": "~1.1.4",
@@ -44,10 +44,10 @@
     "ts-jest": "~29.1.0",
     "@types/jest": "~29.5.0",
     "typescript": "4.9.5",
-    "@internal/ts-config": "0.0.1",
     "@internal/eslint-config": "0.0.1",
-    "@internal/jest-config": "0.0.1",
-    "@internal/bundler": "0.0.1"
+    "@internal/bundler": "0.0.1",
+    "@internal/ts-config": "0.0.1",
+    "@internal/jest-config": "0.0.1"
   },
   "publishConfig": {
     "access": "public",