From 4e4a3ad8a1d7bc065200fc5b3c209ead5dd0dcb4 Mon Sep 17 00:00:00 2001 From: xile611 Date: Tue, 28 May 2024 11:39:47 +0800 Subject: [PATCH 1/5] fix: optimize useage of `removeState` --- packages/vgrammar-core/src/interactions/brush-highlight.ts | 5 +++-- .../src/interactions/element-highlight-by-group.ts | 5 +++-- .../src/interactions/element-highlight-by-key.ts | 5 +++-- .../src/interactions/element-highlight-by-legend.ts | 4 ++-- .../src/interactions/element-highlight-by-name.ts | 5 +++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/vgrammar-core/src/interactions/brush-highlight.ts b/packages/vgrammar-core/src/interactions/brush-highlight.ts index 044036a5..f24059f8 100644 --- a/packages/vgrammar-core/src/interactions/brush-highlight.ts +++ b/packages/vgrammar-core/src/interactions/brush-highlight.ts @@ -32,10 +32,11 @@ export class BrushHighlight extends BrushBase { const elements: (IElement | IGlyphElement)[] = []; if (event.type === IOperateType.brushClear) { + const states = [this.options.blurState, this.options.highlightState]; + this._marks.forEach(mark => { mark.elements.forEach(el => { - el.removeState(this.options.blurState); - el.removeState(this.options.highlightState); + el.removeState(states); }); }); } else { diff --git a/packages/vgrammar-core/src/interactions/element-highlight-by-group.ts b/packages/vgrammar-core/src/interactions/element-highlight-by-group.ts index a15155cc..56f05f70 100644 --- a/packages/vgrammar-core/src/interactions/element-highlight-by-group.ts +++ b/packages/vgrammar-core/src/interactions/element-highlight-by-group.ts @@ -38,10 +38,11 @@ export class ElementHighlightByGroup extends BaseInteraction { mark.elements.forEach(el => { - el.removeState(this.options.highlightState); - el.removeState(this.options.blurState); + el.removeState(states); }); }); } diff --git a/packages/vgrammar-core/src/interactions/element-highlight-by-key.ts b/packages/vgrammar-core/src/interactions/element-highlight-by-key.ts index 91e03e35..dd959b32 100644 --- a/packages/vgrammar-core/src/interactions/element-highlight-by-key.ts +++ b/packages/vgrammar-core/src/interactions/element-highlight-by-key.ts @@ -38,10 +38,11 @@ export class ElementHighlightByKey extends BaseInteraction { mark.elements.forEach(el => { - el.removeState(this.options.highlightState); - el.removeState(this.options.blurState); + el.removeState(states); }); }); } diff --git a/packages/vgrammar-core/src/interactions/element-highlight-by-legend.ts b/packages/vgrammar-core/src/interactions/element-highlight-by-legend.ts index 255c7cb4..17142750 100644 --- a/packages/vgrammar-core/src/interactions/element-highlight-by-legend.ts +++ b/packages/vgrammar-core/src/interactions/element-highlight-by-legend.ts @@ -67,10 +67,10 @@ export class ElementHighlightByLegend extends BaseInteraction { mark.elements.forEach(el => { - el.removeState(this.options.blurState); - el.removeState(this.options.highlightState); + el.removeState(states); }); }); } diff --git a/packages/vgrammar-core/src/interactions/element-highlight-by-name.ts b/packages/vgrammar-core/src/interactions/element-highlight-by-name.ts index 161224c8..cc04c8fc 100644 --- a/packages/vgrammar-core/src/interactions/element-highlight-by-name.ts +++ b/packages/vgrammar-core/src/interactions/element-highlight-by-name.ts @@ -74,10 +74,11 @@ export class ElementHighlightByName extends BaseInteraction { mark.elements.forEach(el => { - el.removeState(this.options.blurState); - el.removeState(this.options.highlightState); + el.removeState(states); }); }); } From ab2dbe3165c256c5005b43457229b100fabff47c Mon Sep 17 00:00:00 2001 From: xile611 Date: Tue, 28 May 2024 11:41:01 +0800 Subject: [PATCH 2/5] fix: fix animation attributes when has state animation --- .../src/graph/animation/animation/fade.ts | 8 ++-- .../animation/animation/grow-interval.ts | 45 ++++++++++--------- .../graph/animation/animation/grow-polar.ts | 45 +++++++++++-------- .../src/graph/animation/animation/move.ts | 10 +++-- .../src/graph/animation/animation/rotate.ts | 3 +- .../src/graph/animation/animation/scale.ts | 10 +++-- 6 files changed, 71 insertions(+), 50 deletions(-) diff --git a/packages/vgrammar-core/src/graph/animation/animation/fade.ts b/packages/vgrammar-core/src/graph/animation/animation/fade.ts index 830b4cd0..a1b103d3 100644 --- a/packages/vgrammar-core/src/graph/animation/animation/fade.ts +++ b/packages/vgrammar-core/src/graph/animation/animation/fade.ts @@ -6,6 +6,8 @@ export const fadeIn: TypeAnimation = ( options: any, animationParameters: IAnimationParameters ) => { + const finalAttrs = element.getFinalGraphicAttributes(); + return { from: { opacity: 0, @@ -13,9 +15,9 @@ export const fadeIn: TypeAnimation = ( strokeOpacity: 0 }, to: { - opacity: element.getGraphicAttribute('opacity', false) ?? 1, - fillOpacity: element.getGraphicAttribute('fillOpacity', false) ?? 1, - strokeOpacity: element.getGraphicAttribute('strokeOpacity', false) ?? 1 + opacity: finalAttrs.opacity ?? 1, + fillOpacity: finalAttrs.fillOpacity ?? 1, + strokeOpacity: finalAttrs.strokeOpacity ?? 1 } }; }; diff --git a/packages/vgrammar-core/src/graph/animation/animation/grow-interval.ts b/packages/vgrammar-core/src/graph/animation/animation/grow-interval.ts index e3ccef7b..c4f47ad4 100644 --- a/packages/vgrammar-core/src/graph/animation/animation/grow-interval.ts +++ b/packages/vgrammar-core/src/graph/animation/animation/grow-interval.ts @@ -9,9 +9,11 @@ function growIntervalInIndividual( options: IGrowCartesianAnimationOptions, animationParameters: IAnimationParameters ) { + const finalAttrs = element.getFinalGraphicAttributes(); + if (options && options.direction === 'x') { - const x = element.getGraphicAttribute('x', false); - const x1 = element.getGraphicAttribute('x1', false); + const x = finalAttrs?.x; + const x1 = finalAttrs?.x1; if (options.orient === 'negative') { return { from: { x: x1, x1: x1 }, @@ -23,8 +25,8 @@ function growIntervalInIndividual( to: { x: x, y1: x1 } }; } - const y = element.getGraphicAttribute('y', false); - const y1 = element.getGraphicAttribute('y1', false); + const y = finalAttrs?.y; + const y1 = finalAttrs?.y1; if (options && options.orient === 'negative') { return { from: { y: y1, y1: y1 }, @@ -42,13 +44,15 @@ function growIntervalInOverall( options: IGrowCartesianAnimationOptions, animationParameters: IAnimationParameters ) { + const finalAttrs = element.getFinalGraphicAttributes(); + if (options && options.direction === 'x') { - const x = element.getGraphicAttribute('x', false); - const x1 = element.getGraphicAttribute('x1', false); + const x = finalAttrs?.x; + const x1 = finalAttrs?.x1; let overallValue: number; if (options.orient === 'negative') { if (isNumber(options.overall)) { - overallValue = options.overall; + overallValue = options.overall as number; } else if (animationParameters.group) { overallValue = (animationParameters as any).groupWidth ?? animationParameters.group.getBounds().width(); @@ -57,7 +61,7 @@ function growIntervalInOverall( overallValue = animationParameters.width; } } else { - overallValue = isNumber(options?.overall) ? options.overall : 0; + overallValue = isNumber(options?.overall) ? (options.overall as number) : 0; } return { from: { x: overallValue, x1: overallValue }, @@ -65,12 +69,12 @@ function growIntervalInOverall( }; } - const y = element.getGraphicAttribute('y', false); - const y1 = element.getGraphicAttribute('y1', false); + const y = finalAttrs?.y; + const y1 = finalAttrs?.y1; let overallValue: number; if (options && options.orient === 'negative') { if (isNumber(options.overall)) { - overallValue = options.overall; + overallValue = options.overall as number; } else if (animationParameters.group) { overallValue = (animationParameters as any).groupHeight ?? animationParameters.group.getBounds().height(); @@ -79,7 +83,7 @@ function growIntervalInOverall( overallValue = animationParameters.height; } } else { - overallValue = isNumber(options?.overall) ? options.overall : 0; + overallValue = isNumber(options?.overall) ? (options.overall as number) : 0; } return { from: { y: overallValue, y1: overallValue }, @@ -110,9 +114,10 @@ function growIntervalOutIndividual( options: IGrowCartesianAnimationOptions, animationParameters: IAnimationParameters ) { + const finalAttrs = element.getFinalGraphicAttributes(); if (options && options.direction === 'x') { - const x = element.getGraphicAttribute('x', false); - const x1 = element.getGraphicAttribute('x1', false); + const x = finalAttrs?.x; + const x1 = finalAttrs?.x1; const prevX = element.getGraphicAttribute('x', true); const prevX1 = element.getGraphicAttribute('x1', true); if (options.orient === 'negative') { @@ -127,8 +132,8 @@ function growIntervalOutIndividual( }; } - const y = element.getGraphicAttribute('y', false); - const y1 = element.getGraphicAttribute('y1', false); + const y = finalAttrs?.y; + const y1 = finalAttrs?.y1; const prevY = element.getGraphicAttribute('y', true); const prevY1 = element.getGraphicAttribute('y1', true); if (options && options.orient === 'negative') { @@ -154,7 +159,7 @@ function growIntervalOutOverall( let overallValue: number; if (options.orient === 'negative') { if (isNumber(options.overall)) { - overallValue = options.overall; + overallValue = options.overall as number; } else if (animationParameters.group) { overallValue = (animationParameters as any).groupWidth ?? animationParameters.group.getBounds().width(); @@ -163,7 +168,7 @@ function growIntervalOutOverall( overallValue = animationParameters.width; } } else { - overallValue = isNumber(options?.overall) ? options.overall : 0; + overallValue = isNumber(options?.overall) ? (options.overall as number) : 0; } return { from: { x: prevX, x1: prevX1 }, @@ -176,7 +181,7 @@ function growIntervalOutOverall( let overallValue: number; if (options && options.orient === 'negative') { if (isNumber(options.overall)) { - overallValue = options.overall; + overallValue = options.overall as number; } else if (animationParameters.group) { overallValue = (animationParameters as any).groupHeight ?? animationParameters.group.getBounds().height(); @@ -185,7 +190,7 @@ function growIntervalOutOverall( overallValue = animationParameters.height; } } else { - overallValue = isNumber(options?.overall) ? options.overall : 0; + overallValue = isNumber(options?.overall) ? (options.overall as number) : 0; } return { from: { y: prevY, y1: prevY1 }, diff --git a/packages/vgrammar-core/src/graph/animation/animation/grow-polar.ts b/packages/vgrammar-core/src/graph/animation/animation/grow-polar.ts index ec40b5f5..7907e23a 100644 --- a/packages/vgrammar-core/src/graph/animation/animation/grow-polar.ts +++ b/packages/vgrammar-core/src/graph/animation/animation/grow-polar.ts @@ -14,15 +14,16 @@ const growAngleInIndividual = ( options: IGrowAngleAnimationOptions, animationParameters: IAnimationParameters ) => { + const finalAttrs = element.getFinalGraphicAttributes(); if (options && options.orient === 'anticlockwise') { return { - from: { startAngle: element.getGraphicAttribute('endAngle', false) }, - to: { startAngle: element.getGraphicAttribute('startAngle', false) } + from: { startAngle: finalAttrs?.endAngle }, + to: { startAngle: finalAttrs?.startAngle } }; } return { - from: { endAngle: element.getGraphicAttribute('startAngle', false) }, - to: { endAngle: element.getGraphicAttribute('endAngle', false) } + from: { endAngle: finalAttrs?.startAngle }, + to: { endAngle: finalAttrs?.endAngle } }; }; @@ -31,6 +32,8 @@ const growAngleInOverall = ( options: IGrowAngleAnimationOptions, animationParameters: IAnimationParameters ) => { + const finalAttrs = element.getFinalGraphicAttributes(); + if (options && options.orient === 'anticlockwise') { const overallValue = isNumber(options.overall) ? options.overall : Math.PI * 2; return { @@ -39,8 +42,8 @@ const growAngleInOverall = ( endAngle: overallValue }, to: { - startAngle: element.getGraphicAttribute('startAngle', false), - endAngle: element.getGraphicAttribute('endAngle', false) + startAngle: finalAttrs?.startAngle, + endAngle: finalAttrs?.endAngle } }; } @@ -51,8 +54,8 @@ const growAngleInOverall = ( endAngle: overallValue }, to: { - startAngle: element.getGraphicAttribute('startAngle', false), - endAngle: element.getGraphicAttribute('endAngle', false) + startAngle: finalAttrs?.startAngle, + endAngle: finalAttrs?.endAngle } }; }; @@ -72,15 +75,17 @@ const growAngleOutIndividual = ( options: IGrowAngleAnimationOptions, animationParameters: IAnimationParameters ) => { + const finalAttrs = element.getFinalGraphicAttributes(); + if (options && options.orient === 'anticlockwise') { return { from: { startAngle: element.getGraphicAttribute('startAngle', true) }, - to: { startAngle: element.getGraphicAttribute('endAngle', false) } + to: { startAngle: finalAttrs?.endAngle } }; } return { from: { endAngle: element.getGraphicAttribute('endAngle', true) }, - to: { endAngle: element.getGraphicAttribute('startAngle', false) } + to: { endAngle: finalAttrs?.startAngle } }; }; @@ -132,15 +137,17 @@ const growRadiusInIndividual = ( options: IGrowRadiusAnimationOptions, animationParameters: IAnimationParameters ) => { + const finalAttrs = element.getFinalGraphicAttributes(); + if (options && options.orient === 'inside') { return { - from: { innerRadius: element.getGraphicAttribute('outerRadius', false) }, - to: { innerRadius: element.getGraphicAttribute('innerRadius', false) } + from: { innerRadius: finalAttrs?.outerRadius }, + to: { innerRadius: finalAttrs?.innerRadius } }; } return { - from: { outerRadius: element.getGraphicAttribute('innerRadius', false) }, - to: { outerRadius: element.getGraphicAttribute('outerRadius', false) } + from: { outerRadius: finalAttrs?.innerRadius }, + to: { outerRadius: finalAttrs?.outerRadius } }; }; @@ -149,6 +156,7 @@ const growRadiusInOverall = ( options: IGrowRadiusAnimationOptions, animationParameters: IAnimationParameters ) => { + const finalAttrs = element.getFinalGraphicAttributes(); const overallValue = isNumber(options?.overall) ? options.overall : 0; return { from: { @@ -156,8 +164,8 @@ const growRadiusInOverall = ( outerRadius: overallValue }, to: { - innerRadius: element.getGraphicAttribute('innerRadius', false), - outerRadius: element.getGraphicAttribute('outerRadius', false) + innerRadius: finalAttrs?.innerRadius, + outerRadius: finalAttrs?.outerRadius } }; }; @@ -177,15 +185,16 @@ const growRadiusOutIndividual = ( options: IGrowRadiusAnimationOptions, animationParameters: IAnimationParameters ) => { + const finalAttrs = element.getFinalGraphicAttributes(); if (options && options.orient === 'inside') { return { from: { innerRadius: element.getGraphicAttribute('innerRadius', true) }, - to: { innerRadius: element.getGraphicAttribute('outerRadius', false) } + to: { innerRadius: finalAttrs?.outerRadius } }; } return { from: { outerRadius: element.getGraphicAttribute('outerRadius', true) }, - to: { outerRadius: element.getGraphicAttribute('innerRadius', false) } + to: { outerRadius: finalAttrs?.innerRadius } }; }; diff --git a/packages/vgrammar-core/src/graph/animation/animation/move.ts b/packages/vgrammar-core/src/graph/animation/animation/move.ts index d6821794..725abe62 100644 --- a/packages/vgrammar-core/src/graph/animation/animation/move.ts +++ b/packages/vgrammar-core/src/graph/animation/animation/move.ts @@ -32,24 +32,26 @@ export const moveIn: TypeAnimation = ( const point = isFunction(pointOpt) ? pointOpt.call(null, element.getDatum(), element, animationParameters) : pointOpt; const fromX = point && isValidNumber(point.x) ? point.x : changedX; const fromY = point && isValidNumber(point.y) ? point.y : changedY; + const finalAttrs = element.getFinalGraphicAttributes(); + switch (direction) { case 'x': return { from: { x: fromX }, - to: { x: element.getGraphicAttribute('x', false) } + to: { x: finalAttrs?.x } }; case 'y': return { from: { y: fromY }, - to: { y: element.getGraphicAttribute('y', false) } + to: { y: finalAttrs?.y } }; case 'xy': default: return { from: { x: fromX, y: fromY }, to: { - x: element.getGraphicAttribute('x', false), - y: element.getGraphicAttribute('y', false) + x: finalAttrs?.x, + y: finalAttrs?.y } }; } diff --git a/packages/vgrammar-core/src/graph/animation/animation/rotate.ts b/packages/vgrammar-core/src/graph/animation/animation/rotate.ts index ddc94877..9fdded85 100644 --- a/packages/vgrammar-core/src/graph/animation/animation/rotate.ts +++ b/packages/vgrammar-core/src/graph/animation/animation/rotate.ts @@ -6,7 +6,8 @@ export const rotateIn: TypeAnimation = ( options: IRotateAnimationOptions, animationParameters: IAnimationParameters ) => { - const finalAngle = element.getGraphicAttribute('angle', false) ?? 0; + const finalAngle = element.getFinalGraphicAttributes()?.angle ?? 0; + let angle = 0; if (isNumberClose(finalAngle / (Math.PI * 2), 0)) { angle = Math.round(finalAngle / (Math.PI * 2)) * Math.PI * 2; diff --git a/packages/vgrammar-core/src/graph/animation/animation/scale.ts b/packages/vgrammar-core/src/graph/animation/animation/scale.ts index 3fc46b1d..c5333fc8 100644 --- a/packages/vgrammar-core/src/graph/animation/animation/scale.ts +++ b/packages/vgrammar-core/src/graph/animation/animation/scale.ts @@ -7,24 +7,26 @@ export const scaleIn: TypeAnimation = ( options: IScaleAnimationOptions, animationParameters: IAnimationParameters ) => { + const finalAttrs = element.getFinalGraphicAttributes(); + switch (options?.direction) { case 'x': return { from: { scaleX: 0 }, - to: { scaleX: element.getGraphicAttribute('scaleX', false) ?? 1 } + to: { scaleX: finalAttrs?.scaleX ?? 1 } }; case 'y': return { from: { scaleY: 0 }, - to: { scaleY: element.getGraphicAttribute('scaleY', false) ?? 1 } + to: { scaleY: finalAttrs?.scaleY ?? 1 } }; case 'xy': default: return { from: { scaleX: 0, scaleY: 0 }, to: { - scaleX: element.getGraphicAttribute('scaleX', false) ?? 1, - scaleY: element.getGraphicAttribute('scaleY', false) ?? 1 + scaleX: finalAttrs?.scaleX ?? 1, + scaleY: finalAttrs?.scaleY ?? 1 } }; } From d8c730cccaa0c6c2717dcfa6609c8cf3cf0355d0 Mon Sep 17 00:00:00 2001 From: xile611 Date: Tue, 28 May 2024 12:24:23 +0800 Subject: [PATCH 3/5] feat: add `updateStates` in vgrammar element --- packages/vgrammar-core/src/graph/element.ts | 62 ++++++++++++++++++- .../src/interactions/brush-highlight.ts | 12 ++-- .../element-highlight-by-group.ts | 12 ++-- .../interactions/element-highlight-by-key.ts | 24 ++++--- .../element-highlight-by-legend.ts | 12 ++-- .../interactions/element-highlight-by-name.ts | 12 ++-- packages/vgrammar-core/src/types/element.ts | 10 ++- 7 files changed, 118 insertions(+), 26 deletions(-) diff --git a/packages/vgrammar-core/src/graph/element.ts b/packages/vgrammar-core/src/graph/element.ts index c494e3ce..6fd29a0a 100644 --- a/packages/vgrammar-core/src/graph/element.ts +++ b/packages/vgrammar-core/src/graph/element.ts @@ -10,7 +10,8 @@ import { isArray, get, isEmpty, - isEqual as isObjEqual + isEqual as isObjEqual, + isObject } from '@visactor/vutils'; import { isEqual } from '@visactor/vgrammar-util'; import type { IBaseCoordinate } from '@visactor/vgrammar-coordinate'; @@ -333,6 +334,65 @@ export class Element implements IElement { return this.states && state && this.states.includes(state); } + updateStates(states: Record) { + if (!this.graphicItem) { + return false; + } + let nextStates = this.states.slice(); + const encode = (this.mark.getSpec() as MarkSpec).encode; + let forceClearState = false; + let hasUpdate = false; + + Object.keys(states).forEach(stateKey => { + if (!stateKey) { + return; + } + + const stateValue = states[stateKey]; + const isRuntimeStateUpdate = + isObject(stateValue) && !isObjEqual(stateValue, this.runtimeStatesEncoder?.[stateKey]); + + if (isRuntimeStateUpdate) { + if (nextStates.includes(stateKey)) { + forceClearState = true; + } else { + nextStates.push(stateKey); + } + this._updateRuntimeStates(stateKey, stateValue); + hasUpdate = true; + } else if (stateValue) { + if (!nextStates.includes(stateKey) && encode?.[stateKey]) { + nextStates.push(stateKey); + hasUpdate = true; + } + } else { + if (nextStates.length) { + const newNextStates = nextStates.filter(state => state !== stateKey); + + if (newNextStates.length !== nextStates.length) { + hasUpdate = true; + nextStates = newNextStates; + } + + if (this.runtimeStatesEncoder && this.runtimeStatesEncoder[stateKey]) { + this.runtimeStatesEncoder[stateKey] = null; + } + } + } + }); + + if (forceClearState) { + this.graphicItem.clearStates(); + } + + if (hasUpdate) { + this.useStates(nextStates); + return true; + } + + return false; + } + addState(state: string | string[], attrs?: BaseSingleEncodeSpec) { if (!this.graphicItem) { return false; diff --git a/packages/vgrammar-core/src/interactions/brush-highlight.ts b/packages/vgrammar-core/src/interactions/brush-highlight.ts index f24059f8..d45f604d 100644 --- a/packages/vgrammar-core/src/interactions/brush-highlight.ts +++ b/packages/vgrammar-core/src/interactions/brush-highlight.ts @@ -46,11 +46,15 @@ export class BrushHighlight extends BrushBase { if (isHighlight) { elements.push(el); - el.removeState(this.options.blurState); - el.addState(this.options.highlightState); + el.updateStates({ + [this.options.blurState]: false, + [this.options.highlightState]: true + }); } else { - el.removeState(this.options.highlightState); - el.addState(this.options.blurState); + el.updateStates({ + [this.options.blurState]: true, + [this.options.highlightState]: false + }); } }); }); diff --git a/packages/vgrammar-core/src/interactions/element-highlight-by-group.ts b/packages/vgrammar-core/src/interactions/element-highlight-by-group.ts index 56f05f70..964cae32 100644 --- a/packages/vgrammar-core/src/interactions/element-highlight-by-group.ts +++ b/packages/vgrammar-core/src/interactions/element-highlight-by-group.ts @@ -59,11 +59,15 @@ export class ElementHighlightByGroup extends BaseInteraction { const isHighlight = filterValue(el) === itemKey; if (isHighlight) { - el.removeState(this.options.blurState); - el.addState(this.options.highlightState); + el.updateStates({ + [this.options.blurState]: false, + [this.options.highlightState]: true + }); } else { - el.removeState(this.options.highlightState); - el.addState(this.options.blurState); + el.updateStates({ + [this.options.blurState]: true, + [this.options.highlightState]: false + }); } }); }); diff --git a/packages/vgrammar-core/src/types/element.ts b/packages/vgrammar-core/src/types/element.ts index 4a069e25..2b428185 100644 --- a/packages/vgrammar-core/src/types/element.ts +++ b/packages/vgrammar-core/src/types/element.ts @@ -19,7 +19,14 @@ import type { } from '@visactor/vrender-core'; import type { DiffState } from '../graph/enums'; import type { IMark, IGlyphMark } from './grammar'; -import type { BaseEncodeSpec, IMarkConfig, MarkFunctionType, MarkKeySpec, MarkType } from './mark'; +import type { + BaseEncodeSpec, + BaseSingleEncodeSpec, + IMarkConfig, + MarkFunctionType, + MarkKeySpec, + MarkType +} from './mark'; export interface ElementGraphicMap { circle: ICircle; @@ -154,6 +161,7 @@ export interface IElement { addState: (state: string | string[], attrs?: any) => boolean; removeState: (state: string | string[]) => boolean; useStates: (states: string[], noAnimation?: boolean) => boolean; + updateStates: (states: Record) => any; } export interface IGlyphElement

extends IElement { From d13a020647c2e219944c8c28ffc25a364ac17a5f Mon Sep 17 00:00:00 2001 From: xile611 Date: Wed, 29 May 2024 15:20:41 +0800 Subject: [PATCH 4/5] fix: upgrade vrender to 0.19.6 --- common/config/rush/pnpm-lock.yaml | 114 +++++++++--------- docs/dev-demos/package.json | 6 +- docs/site/package.json | 6 +- packages/vgrammar-core/package.json | 6 +- packages/vgrammar-hierarchy/package.json | 4 +- packages/vgrammar-plot/package.json | 6 +- packages/vgrammar-sankey/package.json | 4 +- packages/vgrammar-venn/package.json | 4 +- .../vgrammar-wordcloud-shape/package.json | 4 +- packages/vgrammar-wordcloud/package.json | 4 +- 10 files changed, 79 insertions(+), 79 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 3af192e2..d192a55a 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -19,9 +19,9 @@ importers: '@visactor/vgrammar-util': workspace:0.13.5 '@visactor/vgrammar-wordcloud': workspace:0.13.5 '@visactor/vgrammar-wordcloud-shape': workspace:0.13.5 - '@visactor/vrender': 0.19.5 - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender': 0.19.6 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': ~0.18.9 '@vitejs/plugin-react': 3.1.0 d3-scale-chromatic: ^3.0.0 @@ -41,9 +41,9 @@ importers: '@visactor/vgrammar-util': link:../../packages/vgrammar-util '@visactor/vgrammar-wordcloud': link:../../packages/vgrammar-wordcloud '@visactor/vgrammar-wordcloud-shape': link:../../packages/vgrammar-wordcloud-shape - '@visactor/vrender': 0.19.5 - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender': 0.19.6 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': 0.18.9 '@vitejs/plugin-react': 3.1.0_vite@3.2.6 d3-scale-chromatic: 3.1.0 @@ -71,9 +71,9 @@ importers: '@visactor/vgrammar-venn': workspace:0.13.5 '@visactor/vgrammar-wordcloud': workspace:0.13.5 '@visactor/vgrammar-wordcloud-shape': workspace:0.13.5 - '@visactor/vrender': 0.19.5 - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender': 0.19.6 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': ~0.18.9 '@vitejs/plugin-react': 3.1.0 axios: ^1.4.0 @@ -109,9 +109,9 @@ importers: '@visactor/vgrammar-venn': link:../../packages/vgrammar-venn '@visactor/vgrammar-wordcloud': link:../../packages/vgrammar-wordcloud '@visactor/vgrammar-wordcloud-shape': link:../../packages/vgrammar-wordcloud-shape - '@visactor/vrender': 0.19.5 - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender': 0.19.6 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': 0.18.9 axios: 1.6.8 highlight.js: 11.9.0 @@ -231,9 +231,9 @@ importers: '@visactor/vdataset': ~0.18.9 '@visactor/vgrammar-coordinate': workspace:0.13.5 '@visactor/vgrammar-util': workspace:0.13.5 - '@visactor/vrender-components': 0.19.5 - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-components': 0.19.6 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vscale': ~0.18.9 '@visactor/vutils': ~0.18.9 eslint: ~8.18.0 @@ -246,9 +246,9 @@ importers: '@visactor/vdataset': 0.18.9 '@visactor/vgrammar-coordinate': link:../vgrammar-coordinate '@visactor/vgrammar-util': link:../vgrammar-util - '@visactor/vrender-components': 0.19.5 - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-components': 0.19.6 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vscale': 0.18.9 '@visactor/vutils': 0.18.9 devDependencies: @@ -340,8 +340,8 @@ importers: '@types/node': '*' '@visactor/vgrammar-core': workspace:0.13.5 '@visactor/vgrammar-util': workspace:0.13.5 - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': ~0.18.9 eslint: ~8.18.0 jest: ~29.5.0 @@ -352,8 +352,8 @@ importers: dependencies: '@visactor/vgrammar-core': link:../vgrammar-core '@visactor/vgrammar-util': link:../vgrammar-util - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': 0.18.9 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -385,9 +385,9 @@ importers: '@visactor/vgrammar-coordinate': workspace:0.13.5 '@visactor/vgrammar-core': workspace:0.13.5 '@visactor/vgrammar-util': workspace:0.13.5 - '@visactor/vrender-components': 0.19.5 - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-components': 0.19.6 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vscale': ~0.18.9 '@visactor/vutils': ~0.18.9 d3-array: 1.x @@ -401,9 +401,9 @@ importers: '@visactor/vgrammar-coordinate': link:../vgrammar-coordinate '@visactor/vgrammar-core': link:../vgrammar-core '@visactor/vgrammar-util': link:../vgrammar-util - '@visactor/vrender-components': 0.19.5 - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-components': 0.19.6 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vscale': 0.18.9 '@visactor/vutils': 0.18.9 devDependencies: @@ -481,8 +481,8 @@ importers: '@types/node': '*' '@visactor/vgrammar-core': workspace:0.13.5 '@visactor/vgrammar-util': workspace:0.13.5 - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': ~0.18.9 eslint: ~8.18.0 jest: ~29.5.0 @@ -493,8 +493,8 @@ importers: dependencies: '@visactor/vgrammar-core': link:../vgrammar-core '@visactor/vgrammar-util': link:../vgrammar-util - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': 0.18.9 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -559,8 +559,8 @@ importers: '@types/node': '*' '@visactor/vgrammar-core': workspace:0.13.5 '@visactor/vgrammar-util': workspace:0.13.5 - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': ~0.18.9 eslint: ~8.18.0 jest: ~29.5.0 @@ -571,8 +571,8 @@ importers: dependencies: '@visactor/vgrammar-core': link:../vgrammar-core '@visactor/vgrammar-util': link:../vgrammar-util - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': 0.18.9 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -602,8 +602,8 @@ importers: '@types/node': '*' '@visactor/vgrammar-core': workspace:0.13.5 '@visactor/vgrammar-util': workspace:0.13.5 - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': ~0.18.9 eslint: ~8.18.0 jest: ~29.5.0 @@ -614,8 +614,8 @@ importers: dependencies: '@visactor/vgrammar-core': link:../vgrammar-core '@visactor/vgrammar-util': link:../vgrammar-util - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': 0.18.9 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -645,8 +645,8 @@ importers: '@types/node': '*' '@visactor/vgrammar-core': workspace:0.13.5 '@visactor/vgrammar-util': workspace:0.13.5 - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vscale': ~0.18.9 '@visactor/vutils': ~0.18.9 eslint: ~8.18.0 @@ -658,8 +658,8 @@ importers: dependencies: '@visactor/vgrammar-core': link:../vgrammar-core '@visactor/vgrammar-util': link:../vgrammar-util - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vscale': 0.18.9 '@visactor/vutils': 0.18.9 devDependencies: @@ -3446,34 +3446,34 @@ packages: topojson-client: 3.1.0 dev: false - /@visactor/vrender-components/0.19.5: - resolution: {integrity: sha512-EUrpAjRXm9m2DqZ5g2Ooi1Bv7MDZc67RXmbP6jfoFfbSfGBS/bd9KBtnqYhosMlxDlXDVGwlL8vwtYFm05wnWA==} + /@visactor/vrender-components/0.19.6: + resolution: {integrity: sha512-aIhAY/HuIimxMznnBqD9aW/LpEkcxvc/QaOXBSP4p9EPL42VxLo1ld9CDwQSVog/J1Glx1xGlNAQN+o/ZjaqXQ==} dependencies: - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 '@visactor/vscale': 0.18.9 '@visactor/vutils': 0.18.9 dev: false - /@visactor/vrender-core/0.19.5: - resolution: {integrity: sha512-M1xyUe//HLMwTP6TgK7nD06xmvcJiFQWcHbnLYx4ww+LeQTDKCdzFUYY+oh2XlksI0dzbcFDWqY8fUpbJv8Klg==} + /@visactor/vrender-core/0.19.6: + resolution: {integrity: sha512-LMq8ymQMIzlI+plbplHOJFGDZhyzl7KbwJcJkeOSryvJfUyEpPMbUr+qYYZe7/bsBAV7kN8AygVE4RQfuoB0mg==} dependencies: '@visactor/vutils': 0.18.9 color-convert: 2.0.1 - /@visactor/vrender-kits/0.19.5: - resolution: {integrity: sha512-2ZzRHIvR6FUMOjywEMuTi9PH+Fea0VH3uwq187Sug/eYjn0/uY5j4HAIMSZivhN7nUOda94XdB5dtKV1G8l1mA==} + /@visactor/vrender-kits/0.19.6: + resolution: {integrity: sha512-JY2yK34sb7h01Fl82fthsKO8uHUijWvGNaeTp9WvthakV1EOk8CXyr3JjEpdw0bwrH27+9BGwkQLXvRBxRkFFg==} dependencies: '@resvg/resvg-js': 2.4.1 - '@visactor/vrender-core': 0.19.5 + '@visactor/vrender-core': 0.19.6 '@visactor/vutils': 0.18.9 roughjs: 4.5.2 - /@visactor/vrender/0.19.5: - resolution: {integrity: sha512-31GKQnU2qif0LU4kf49sAX7da7Qc37SKwitQhgMRine9QPqqhDbua35f5EKykI6PYlMyoFzixImE8p2OQAy4mg==} + /@visactor/vrender/0.19.6: + resolution: {integrity: sha512-iCMLr1DfvgMLavHrVkw7wzMqKZkLYJnFcfKHyA8QJhQi9B0ibM08r7EU/EgiRhsHJqiBHvH/GwfIbZV/jjkoEw==} dependencies: - '@visactor/vrender-core': 0.19.5 - '@visactor/vrender-kits': 0.19.5 + '@visactor/vrender-core': 0.19.6 + '@visactor/vrender-kits': 0.19.6 /@visactor/vscale/0.18.9: resolution: {integrity: sha512-rglOQQGhkamtjGtbFxY5pcfqsBXDyYU6NiQuBdVSeYRQvB9YpLLk455HpvQcEEhC+bRopNQsQgQV5276Pd0sfQ==} diff --git a/docs/dev-demos/package.json b/docs/dev-demos/package.json index b30de179..7743c82e 100644 --- a/docs/dev-demos/package.json +++ b/docs/dev-demos/package.json @@ -20,9 +20,9 @@ "@visactor/vgrammar-wordcloud": "workspace:0.13.5", "@visactor/vgrammar-wordcloud-shape": "workspace:0.13.5", "@visactor/vgrammar-plot": "workspace:0.13.5", - "@visactor/vrender-core": "0.19.5", - "@visactor/vrender-kits": "0.19.5", - "@visactor/vrender": "0.19.5", + "@visactor/vrender-core": "0.19.6", + "@visactor/vrender-kits": "0.19.6", + "@visactor/vrender": "0.19.6", "d3-scale-chromatic": "^3.0.0", "lodash": "4.17.21", "typescript": "4.9.5", diff --git a/docs/site/package.json b/docs/site/package.json index 58cd0f12..27127bb7 100644 --- a/docs/site/package.json +++ b/docs/site/package.json @@ -25,9 +25,9 @@ "@visactor/vgrammar-util": "workspace:0.13.5", "@visactor/vgrammar-coordinate": "workspace:0.13.5", "@visactor/vgrammar-venn": "workspace:0.13.5", - "@visactor/vrender-core": "0.19.5", - "@visactor/vrender-kits": "0.19.5", - "@visactor/vrender": "0.19.5", + "@visactor/vrender-core": "0.19.6", + "@visactor/vrender-kits": "0.19.6", + "@visactor/vrender": "0.19.6", "markdown-it": "^13.0.0", "highlight.js": "^11.8.0", "axios": "^1.4.0", diff --git a/packages/vgrammar-core/package.json b/packages/vgrammar-core/package.json index e0b0a195..f1f2bd72 100644 --- a/packages/vgrammar-core/package.json +++ b/packages/vgrammar-core/package.json @@ -40,9 +40,9 @@ "@visactor/vgrammar-coordinate": "workspace:0.13.5", "@visactor/vgrammar-util": "workspace:0.13.5", "@visactor/vscale": "~0.18.9", - "@visactor/vrender-core": "0.19.5", - "@visactor/vrender-kits": "0.19.5", - "@visactor/vrender-components": "0.19.5" + "@visactor/vrender-core": "0.19.6", + "@visactor/vrender-kits": "0.19.6", + "@visactor/vrender-components": "0.19.6" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vgrammar-hierarchy/package.json b/packages/vgrammar-hierarchy/package.json index e077299a..aada8278 100644 --- a/packages/vgrammar-hierarchy/package.json +++ b/packages/vgrammar-hierarchy/package.json @@ -41,8 +41,8 @@ "@visactor/vutils": "~0.18.9", "@visactor/vgrammar-core": "workspace:0.13.5", "@visactor/vgrammar-util": "workspace:0.13.5", - "@visactor/vrender-core": "0.19.5", - "@visactor/vrender-kits": "0.19.5" + "@visactor/vrender-core": "0.19.6", + "@visactor/vrender-kits": "0.19.6" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vgrammar-plot/package.json b/packages/vgrammar-plot/package.json index 184a3bbc..e1ac5608 100644 --- a/packages/vgrammar-plot/package.json +++ b/packages/vgrammar-plot/package.json @@ -39,9 +39,9 @@ "@visactor/vgrammar-util": "workspace:0.13.5", "@visactor/vgrammar-coordinate": "workspace:0.13.5", "@visactor/vgrammar-core": "workspace:0.13.5", - "@visactor/vrender-components": "0.19.5", - "@visactor/vrender-core": "0.19.5", - "@visactor/vrender-kits": "0.19.5" + "@visactor/vrender-components": "0.19.6", + "@visactor/vrender-core": "0.19.6", + "@visactor/vrender-kits": "0.19.6" }, "devDependencies": { "d3-array": "1.x", diff --git a/packages/vgrammar-sankey/package.json b/packages/vgrammar-sankey/package.json index aaa8eb3f..0aaaa83d 100644 --- a/packages/vgrammar-sankey/package.json +++ b/packages/vgrammar-sankey/package.json @@ -39,8 +39,8 @@ "@visactor/vutils": "~0.18.9", "@visactor/vgrammar-core": "workspace:0.13.5", "@visactor/vgrammar-util": "workspace:0.13.5", - "@visactor/vrender-core": "0.19.5", - "@visactor/vrender-kits": "0.19.5" + "@visactor/vrender-core": "0.19.6", + "@visactor/vrender-kits": "0.19.6" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vgrammar-venn/package.json b/packages/vgrammar-venn/package.json index cfb0074e..6603c85b 100644 --- a/packages/vgrammar-venn/package.json +++ b/packages/vgrammar-venn/package.json @@ -36,8 +36,8 @@ "dependencies": { "@visactor/vgrammar-core": "workspace:0.13.5", "@visactor/vgrammar-util": "workspace:0.13.5", - "@visactor/vrender-core": "0.19.5", - "@visactor/vrender-kits": "0.19.5", + "@visactor/vrender-core": "0.19.6", + "@visactor/vrender-kits": "0.19.6", "@visactor/vutils": "~0.18.9" }, "devDependencies": { diff --git a/packages/vgrammar-wordcloud-shape/package.json b/packages/vgrammar-wordcloud-shape/package.json index c63025bb..ec3a2d8a 100644 --- a/packages/vgrammar-wordcloud-shape/package.json +++ b/packages/vgrammar-wordcloud-shape/package.json @@ -38,8 +38,8 @@ "@visactor/vscale": "~0.18.9", "@visactor/vgrammar-core": "workspace:0.13.5", "@visactor/vgrammar-util": "workspace:0.13.5", - "@visactor/vrender-core": "0.19.5", - "@visactor/vrender-kits": "0.19.5" + "@visactor/vrender-core": "0.19.6", + "@visactor/vrender-kits": "0.19.6" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vgrammar-wordcloud/package.json b/packages/vgrammar-wordcloud/package.json index e3169626..df6cd75f 100644 --- a/packages/vgrammar-wordcloud/package.json +++ b/packages/vgrammar-wordcloud/package.json @@ -37,8 +37,8 @@ "@visactor/vutils": "~0.18.9", "@visactor/vgrammar-core": "workspace:0.13.5", "@visactor/vgrammar-util": "workspace:0.13.5", - "@visactor/vrender-core": "0.19.5", - "@visactor/vrender-kits": "0.19.5" + "@visactor/vrender-core": "0.19.6", + "@visactor/vrender-kits": "0.19.6" }, "devDependencies": { "@internal/bundler": "workspace:*", From a8654980d886a06cf7129db2380ab821033c74a1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 29 May 2024 07:31:28 +0000 Subject: [PATCH 5/5] build: release version 0.13.6 --- common/config/rush/pnpm-lock.yaml | 96 +++++++++---------- common/config/rush/version-policies.json | 2 +- docs/dev-demos/package.json | 20 ++-- docs/site/package.json | 22 ++--- packages/vgrammar-coordinate/package.json | 4 +- packages/vgrammar-core/package.json | 6 +- packages/vgrammar-full/package.json | 18 ++-- packages/vgrammar-hierarchy/package.json | 6 +- packages/vgrammar-plot/package.json | 8 +- packages/vgrammar-projection/package.json | 6 +- packages/vgrammar-sankey/package.json | 6 +- packages/vgrammar-util/package.json | 2 +- packages/vgrammar-venn/package.json | 6 +- .../vgrammar-wordcloud-shape/package.json | 6 +- packages/vgrammar-wordcloud/package.json | 6 +- packages/vgrammar/package.json | 4 +- 16 files changed, 109 insertions(+), 109 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index d192a55a..6b8d2d0a 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -9,16 +9,16 @@ importers: specifiers: '@internal/eslint-config': workspace:* '@internal/ts-config': workspace:* - '@visactor/vgrammar': workspace:0.13.5 - '@visactor/vgrammar-coordinate': workspace:0.13.5 - '@visactor/vgrammar-core': workspace:0.13.5 - '@visactor/vgrammar-hierarchy': workspace:0.13.5 - '@visactor/vgrammar-plot': workspace:0.13.5 - '@visactor/vgrammar-projection': workspace:0.13.5 - '@visactor/vgrammar-sankey': workspace:0.13.5 - '@visactor/vgrammar-util': workspace:0.13.5 - '@visactor/vgrammar-wordcloud': workspace:0.13.5 - '@visactor/vgrammar-wordcloud-shape': workspace:0.13.5 + '@visactor/vgrammar': workspace:0.13.6 + '@visactor/vgrammar-coordinate': workspace:0.13.6 + '@visactor/vgrammar-core': workspace:0.13.6 + '@visactor/vgrammar-hierarchy': workspace:0.13.6 + '@visactor/vgrammar-plot': workspace:0.13.6 + '@visactor/vgrammar-projection': workspace:0.13.6 + '@visactor/vgrammar-sankey': workspace:0.13.6 + '@visactor/vgrammar-util': workspace:0.13.6 + '@visactor/vgrammar-wordcloud': workspace:0.13.6 + '@visactor/vgrammar-wordcloud-shape': workspace:0.13.6 '@visactor/vrender': 0.19.6 '@visactor/vrender-core': 0.19.6 '@visactor/vrender-kits': 0.19.6 @@ -60,17 +60,17 @@ importers: '@types/markdown-it': ^13.0.0 '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 - '@visactor/vgrammar': workspace:0.13.5 - '@visactor/vgrammar-coordinate': workspace:0.13.5 - '@visactor/vgrammar-core': workspace:0.13.5 - '@visactor/vgrammar-hierarchy': workspace:0.13.5 - '@visactor/vgrammar-plot': workspace:0.13.5 - '@visactor/vgrammar-projection': workspace:0.13.5 - '@visactor/vgrammar-sankey': workspace:0.13.5 - '@visactor/vgrammar-util': workspace:0.13.5 - '@visactor/vgrammar-venn': workspace:0.13.5 - '@visactor/vgrammar-wordcloud': workspace:0.13.5 - '@visactor/vgrammar-wordcloud-shape': workspace:0.13.5 + '@visactor/vgrammar': workspace:0.13.6 + '@visactor/vgrammar-coordinate': workspace:0.13.6 + '@visactor/vgrammar-core': workspace:0.13.6 + '@visactor/vgrammar-hierarchy': workspace:0.13.6 + '@visactor/vgrammar-plot': workspace:0.13.6 + '@visactor/vgrammar-projection': workspace:0.13.6 + '@visactor/vgrammar-sankey': workspace:0.13.6 + '@visactor/vgrammar-util': workspace:0.13.6 + '@visactor/vgrammar-venn': workspace:0.13.6 + '@visactor/vgrammar-wordcloud': workspace:0.13.6 + '@visactor/vgrammar-wordcloud-shape': workspace:0.13.6 '@visactor/vrender': 0.19.6 '@visactor/vrender-core': 0.19.6 '@visactor/vrender-kits': 0.19.6 @@ -153,7 +153,7 @@ importers: '@types/d3-geo': ^1.11.1 '@types/jest': ~29.5.0 '@types/node': '*' - '@visactor/vgrammar-core': workspace:0.13.5 + '@visactor/vgrammar-core': workspace:0.13.6 d3-array: 1.x eslint: ~8.18.0 jest: ~29.5.0 @@ -191,7 +191,7 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/jest': ~29.5.0 '@types/node': '*' - '@visactor/vgrammar-util': workspace:0.13.5 + '@visactor/vgrammar-util': workspace:0.13.6 '@visactor/vutils': ~0.18.9 eslint: ~8.18.0 jest: ~29.5.0 @@ -229,8 +229,8 @@ importers: '@types/jest': ~29.5.0 '@types/node': '*' '@visactor/vdataset': ~0.18.9 - '@visactor/vgrammar-coordinate': workspace:0.13.5 - '@visactor/vgrammar-util': workspace:0.13.5 + '@visactor/vgrammar-coordinate': workspace:0.13.6 + '@visactor/vgrammar-util': workspace:0.13.6 '@visactor/vrender-components': 0.19.6 '@visactor/vrender-core': 0.19.6 '@visactor/vrender-kits': 0.19.6 @@ -279,14 +279,14 @@ importers: '@types/jest': ~29.5.0 '@types/node': '*' '@types/node-fetch': 2.6.4 - '@visactor/vgrammar-core': workspace:0.13.5 - '@visactor/vgrammar-hierarchy': workspace:0.13.5 - '@visactor/vgrammar-plot': workspace:0.13.5 - '@visactor/vgrammar-projection': workspace:0.13.5 - '@visactor/vgrammar-sankey': workspace:0.13.5 - '@visactor/vgrammar-venn': workspace:0.13.5 - '@visactor/vgrammar-wordcloud': workspace:0.13.5 - '@visactor/vgrammar-wordcloud-shape': workspace:0.13.5 + '@visactor/vgrammar-core': workspace:0.13.6 + '@visactor/vgrammar-hierarchy': workspace:0.13.6 + '@visactor/vgrammar-plot': workspace:0.13.6 + '@visactor/vgrammar-projection': workspace:0.13.6 + '@visactor/vgrammar-sankey': workspace:0.13.6 + '@visactor/vgrammar-venn': workspace:0.13.6 + '@visactor/vgrammar-wordcloud': workspace:0.13.6 + '@visactor/vgrammar-wordcloud-shape': workspace:0.13.6 d3-array: 1.x eslint: ~8.18.0 form-data: ~4.0.0 @@ -338,8 +338,8 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/jest': ~29.5.0 '@types/node': '*' - '@visactor/vgrammar-core': workspace:0.13.5 - '@visactor/vgrammar-util': workspace:0.13.5 + '@visactor/vgrammar-core': workspace:0.13.6 + '@visactor/vgrammar-util': workspace:0.13.6 '@visactor/vrender-core': 0.19.6 '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': ~0.18.9 @@ -382,9 +382,9 @@ importers: '@types/d3-geo': ^1.11.1 '@types/jest': ~29.5.0 '@types/node': '*' - '@visactor/vgrammar-coordinate': workspace:0.13.5 - '@visactor/vgrammar-core': workspace:0.13.5 - '@visactor/vgrammar-util': workspace:0.13.5 + '@visactor/vgrammar-coordinate': workspace:0.13.6 + '@visactor/vgrammar-core': workspace:0.13.6 + '@visactor/vgrammar-util': workspace:0.13.6 '@visactor/vrender-components': 0.19.6 '@visactor/vrender-core': 0.19.6 '@visactor/vrender-kits': 0.19.6 @@ -435,8 +435,8 @@ importers: '@types/d3-geo': ^1.11.1 '@types/jest': ~29.5.0 '@types/node': '*' - '@visactor/vgrammar-core': workspace:0.13.5 - '@visactor/vgrammar-util': workspace:0.13.5 + '@visactor/vgrammar-core': workspace:0.13.6 + '@visactor/vgrammar-util': workspace:0.13.6 '@visactor/vutils': ~0.18.9 d3-array: 1.x d3-geo: ^1.12.1 @@ -479,8 +479,8 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/jest': ~29.5.0 '@types/node': '*' - '@visactor/vgrammar-core': workspace:0.13.5 - '@visactor/vgrammar-util': workspace:0.13.5 + '@visactor/vgrammar-core': workspace:0.13.6 + '@visactor/vgrammar-util': workspace:0.13.6 '@visactor/vrender-core': 0.19.6 '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': ~0.18.9 @@ -557,8 +557,8 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/jest': ~29.5.0 '@types/node': '*' - '@visactor/vgrammar-core': workspace:0.13.5 - '@visactor/vgrammar-util': workspace:0.13.5 + '@visactor/vgrammar-core': workspace:0.13.6 + '@visactor/vgrammar-util': workspace:0.13.6 '@visactor/vrender-core': 0.19.6 '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': ~0.18.9 @@ -600,8 +600,8 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/jest': ~29.5.0 '@types/node': '*' - '@visactor/vgrammar-core': workspace:0.13.5 - '@visactor/vgrammar-util': workspace:0.13.5 + '@visactor/vgrammar-core': workspace:0.13.6 + '@visactor/vgrammar-util': workspace:0.13.6 '@visactor/vrender-core': 0.19.6 '@visactor/vrender-kits': 0.19.6 '@visactor/vutils': ~0.18.9 @@ -643,8 +643,8 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/jest': ~29.5.0 '@types/node': '*' - '@visactor/vgrammar-core': workspace:0.13.5 - '@visactor/vgrammar-util': workspace:0.13.5 + '@visactor/vgrammar-core': workspace:0.13.6 + '@visactor/vgrammar-util': workspace:0.13.6 '@visactor/vrender-core': 0.19.6 '@visactor/vrender-kits': 0.19.6 '@visactor/vscale': ~0.18.9 diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json index 8b588bd5..11a8c455 100644 --- a/common/config/rush/version-policies.json +++ b/common/config/rush/version-policies.json @@ -1 +1 @@ -[{"definitionName":"lockStepVersion","policyName":"vgrammarMain","version":"0.13.4","mainProject":"@visactor/vgrammar-core","nextBump":"patch"}] +[{"definitionName":"lockStepVersion","policyName":"vgrammarMain","version":"0.13.5","mainProject":"@visactor/vgrammar-core","nextBump":"patch"}] diff --git a/docs/dev-demos/package.json b/docs/dev-demos/package.json index 7743c82e..1062cca3 100644 --- a/docs/dev-demos/package.json +++ b/docs/dev-demos/package.json @@ -12,14 +12,14 @@ "@internal/eslint-config": "workspace:*", "@internal/ts-config": "workspace:*", "@visactor/vutils": "~0.18.9", - "@visactor/vgrammar": "workspace:0.13.5", - "@visactor/vgrammar-core": "workspace:0.13.5", - "@visactor/vgrammar-hierarchy": "workspace:0.13.5", - "@visactor/vgrammar-sankey": "workspace:0.13.5", - "@visactor/vgrammar-projection": "workspace:0.13.5", - "@visactor/vgrammar-wordcloud": "workspace:0.13.5", - "@visactor/vgrammar-wordcloud-shape": "workspace:0.13.5", - "@visactor/vgrammar-plot": "workspace:0.13.5", + "@visactor/vgrammar": "workspace:0.13.6", + "@visactor/vgrammar-core": "workspace:0.13.6", + "@visactor/vgrammar-hierarchy": "workspace:0.13.6", + "@visactor/vgrammar-sankey": "workspace:0.13.6", + "@visactor/vgrammar-projection": "workspace:0.13.6", + "@visactor/vgrammar-wordcloud": "workspace:0.13.6", + "@visactor/vgrammar-wordcloud-shape": "workspace:0.13.6", + "@visactor/vgrammar-plot": "workspace:0.13.6", "@visactor/vrender-core": "0.19.6", "@visactor/vrender-kits": "0.19.6", "@visactor/vrender": "0.19.6", @@ -27,8 +27,8 @@ "lodash": "4.17.21", "typescript": "4.9.5", "vite": "3.2.6", - "@visactor/vgrammar-util": "workspace:0.13.5", - "@visactor/vgrammar-coordinate": "workspace:0.13.5", + "@visactor/vgrammar-util": "workspace:0.13.6", + "@visactor/vgrammar-coordinate": "workspace:0.13.6", "@vitejs/plugin-react": "3.1.0" } } diff --git a/docs/site/package.json b/docs/site/package.json index 27127bb7..0b3c0fbe 100644 --- a/docs/site/package.json +++ b/docs/site/package.json @@ -14,17 +14,17 @@ "dependencies": { "@arco-design/web-react": "2.46.1", "@visactor/vutils": "~0.18.9", - "@visactor/vgrammar": "workspace:0.13.5", - "@visactor/vgrammar-core": "workspace:0.13.5", - "@visactor/vgrammar-hierarchy": "workspace:0.13.5", - "@visactor/vgrammar-sankey": "workspace:0.13.5", - "@visactor/vgrammar-projection": "workspace:0.13.5", - "@visactor/vgrammar-wordcloud": "workspace:0.13.5", - "@visactor/vgrammar-wordcloud-shape": "workspace:0.13.5", - "@visactor/vgrammar-plot": "workspace:0.13.5", - "@visactor/vgrammar-util": "workspace:0.13.5", - "@visactor/vgrammar-coordinate": "workspace:0.13.5", - "@visactor/vgrammar-venn": "workspace:0.13.5", + "@visactor/vgrammar": "workspace:0.13.6", + "@visactor/vgrammar-core": "workspace:0.13.6", + "@visactor/vgrammar-hierarchy": "workspace:0.13.6", + "@visactor/vgrammar-sankey": "workspace:0.13.6", + "@visactor/vgrammar-projection": "workspace:0.13.6", + "@visactor/vgrammar-wordcloud": "workspace:0.13.6", + "@visactor/vgrammar-wordcloud-shape": "workspace:0.13.6", + "@visactor/vgrammar-plot": "workspace:0.13.6", + "@visactor/vgrammar-util": "workspace:0.13.6", + "@visactor/vgrammar-coordinate": "workspace:0.13.6", + "@visactor/vgrammar-venn": "workspace:0.13.6", "@visactor/vrender-core": "0.19.6", "@visactor/vrender-kits": "0.19.6", "@visactor/vrender": "0.19.6", diff --git a/packages/vgrammar-coordinate/package.json b/packages/vgrammar-coordinate/package.json index 3133552c..1a0f85c8 100644 --- a/packages/vgrammar-coordinate/package.json +++ b/packages/vgrammar-coordinate/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vgrammar-coordinate", - "version": "0.13.5", + "version": "0.13.6", "description": "Coordinates for VGrammar", "keywords": [ "coordinate", @@ -35,7 +35,7 @@ }, "dependencies": { "@visactor/vutils": "~0.18.9", - "@visactor/vgrammar-util": "workspace:0.13.5" + "@visactor/vgrammar-util": "workspace:0.13.6" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vgrammar-core/package.json b/packages/vgrammar-core/package.json index f1f2bd72..42d95acc 100644 --- a/packages/vgrammar-core/package.json +++ b/packages/vgrammar-core/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vgrammar-core", - "version": "0.13.5", + "version": "0.13.6", "description": "VGrammar is a visual grammar library", "keywords": [ "grammar", @@ -37,8 +37,8 @@ "dependencies": { "@visactor/vutils": "~0.18.9", "@visactor/vdataset": "~0.18.9", - "@visactor/vgrammar-coordinate": "workspace:0.13.5", - "@visactor/vgrammar-util": "workspace:0.13.5", + "@visactor/vgrammar-coordinate": "workspace:0.13.6", + "@visactor/vgrammar-util": "workspace:0.13.6", "@visactor/vscale": "~0.18.9", "@visactor/vrender-core": "0.19.6", "@visactor/vrender-kits": "0.19.6", diff --git a/packages/vgrammar-full/package.json b/packages/vgrammar-full/package.json index 88882181..fc1a8602 100644 --- a/packages/vgrammar-full/package.json +++ b/packages/vgrammar-full/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vgrammar-full", - "version": "0.13.5", + "version": "0.13.6", "description": "full packages of vgrammar.", "keywords": [ "visualization", @@ -33,14 +33,14 @@ "test": "" }, "dependencies": { - "@visactor/vgrammar-core": "workspace:0.13.5", - "@visactor/vgrammar-hierarchy": "workspace:0.13.5", - "@visactor/vgrammar-plot": "workspace:0.13.5", - "@visactor/vgrammar-projection": "workspace:0.13.5", - "@visactor/vgrammar-sankey": "workspace:0.13.5", - "@visactor/vgrammar-wordcloud": "workspace:0.13.5", - "@visactor/vgrammar-wordcloud-shape": "workspace:0.13.5", - "@visactor/vgrammar-venn": "workspace:0.13.5" + "@visactor/vgrammar-core": "workspace:0.13.6", + "@visactor/vgrammar-hierarchy": "workspace:0.13.6", + "@visactor/vgrammar-plot": "workspace:0.13.6", + "@visactor/vgrammar-projection": "workspace:0.13.6", + "@visactor/vgrammar-sankey": "workspace:0.13.6", + "@visactor/vgrammar-wordcloud": "workspace:0.13.6", + "@visactor/vgrammar-wordcloud-shape": "workspace:0.13.6", + "@visactor/vgrammar-venn": "workspace:0.13.6" }, "devDependencies": { "d3-array": "1.x", diff --git a/packages/vgrammar-hierarchy/package.json b/packages/vgrammar-hierarchy/package.json index aada8278..d20ecdc8 100644 --- a/packages/vgrammar-hierarchy/package.json +++ b/packages/vgrammar-hierarchy/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vgrammar-hierarchy", - "version": "0.13.5", + "version": "0.13.6", "description": "Layout of hierarchical data for VGrammar", "keywords": [ "hierarchy", @@ -39,8 +39,8 @@ }, "dependencies": { "@visactor/vutils": "~0.18.9", - "@visactor/vgrammar-core": "workspace:0.13.5", - "@visactor/vgrammar-util": "workspace:0.13.5", + "@visactor/vgrammar-core": "workspace:0.13.6", + "@visactor/vgrammar-util": "workspace:0.13.6", "@visactor/vrender-core": "0.19.6", "@visactor/vrender-kits": "0.19.6" }, diff --git a/packages/vgrammar-plot/package.json b/packages/vgrammar-plot/package.json index e1ac5608..14cedcb4 100644 --- a/packages/vgrammar-plot/package.json +++ b/packages/vgrammar-plot/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vgrammar-plot", - "version": "0.13.5", + "version": "0.13.6", "description": "Plots of vgrammar.", "keywords": [ "plot", @@ -36,9 +36,9 @@ "dependencies": { "@visactor/vscale": "~0.18.9", "@visactor/vutils": "~0.18.9", - "@visactor/vgrammar-util": "workspace:0.13.5", - "@visactor/vgrammar-coordinate": "workspace:0.13.5", - "@visactor/vgrammar-core": "workspace:0.13.5", + "@visactor/vgrammar-util": "workspace:0.13.6", + "@visactor/vgrammar-coordinate": "workspace:0.13.6", + "@visactor/vgrammar-core": "workspace:0.13.6", "@visactor/vrender-components": "0.19.6", "@visactor/vrender-core": "0.19.6", "@visactor/vrender-kits": "0.19.6" diff --git a/packages/vgrammar-projection/package.json b/packages/vgrammar-projection/package.json index 95ad17b2..93ade01b 100644 --- a/packages/vgrammar-projection/package.json +++ b/packages/vgrammar-projection/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vgrammar-projection", - "version": "0.13.5", + "version": "0.13.6", "description": "Projections for map, used in VGrammar.", "keywords": [ "projection", @@ -35,8 +35,8 @@ }, "dependencies": { "@visactor/vutils": "~0.18.9", - "@visactor/vgrammar-util": "workspace:0.13.5", - "@visactor/vgrammar-core": "workspace:0.13.5", + "@visactor/vgrammar-util": "workspace:0.13.6", + "@visactor/vgrammar-core": "workspace:0.13.6", "d3-geo": "^1.12.1" }, "devDependencies": { diff --git a/packages/vgrammar-sankey/package.json b/packages/vgrammar-sankey/package.json index 0aaaa83d..800e6286 100644 --- a/packages/vgrammar-sankey/package.json +++ b/packages/vgrammar-sankey/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vgrammar-sankey", - "version": "0.13.5", + "version": "0.13.6", "description": "Layout of sankey chart, used by VGrammar", "keywords": [ "sankey", @@ -37,8 +37,8 @@ }, "dependencies": { "@visactor/vutils": "~0.18.9", - "@visactor/vgrammar-core": "workspace:0.13.5", - "@visactor/vgrammar-util": "workspace:0.13.5", + "@visactor/vgrammar-core": "workspace:0.13.6", + "@visactor/vgrammar-util": "workspace:0.13.6", "@visactor/vrender-core": "0.19.6", "@visactor/vrender-kits": "0.19.6" }, diff --git a/packages/vgrammar-util/package.json b/packages/vgrammar-util/package.json index 6afd4a2b..c3e51be5 100644 --- a/packages/vgrammar-util/package.json +++ b/packages/vgrammar-util/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vgrammar-util", - "version": "0.13.5", + "version": "0.13.6", "description": "The common utils functions of VGrammar", "keywords": [ "utils", diff --git a/packages/vgrammar-venn/package.json b/packages/vgrammar-venn/package.json index 6603c85b..3a0abca6 100644 --- a/packages/vgrammar-venn/package.json +++ b/packages/vgrammar-venn/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vgrammar-venn", - "version": "0.13.5", + "version": "0.13.6", "description": "Venn layout transform for VGrammar", "keywords": [ "venn", @@ -34,8 +34,8 @@ "test-check": "DEBUG=jest jest --forceExit --detectOpenHandles --silent false --verbose false --runInBand" }, "dependencies": { - "@visactor/vgrammar-core": "workspace:0.13.5", - "@visactor/vgrammar-util": "workspace:0.13.5", + "@visactor/vgrammar-core": "workspace:0.13.6", + "@visactor/vgrammar-util": "workspace:0.13.6", "@visactor/vrender-core": "0.19.6", "@visactor/vrender-kits": "0.19.6", "@visactor/vutils": "~0.18.9" diff --git a/packages/vgrammar-wordcloud-shape/package.json b/packages/vgrammar-wordcloud-shape/package.json index ec3a2d8a..d8ac56f0 100644 --- a/packages/vgrammar-wordcloud-shape/package.json +++ b/packages/vgrammar-wordcloud-shape/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vgrammar-wordcloud-shape", - "version": "0.13.5", + "version": "0.13.6", "description": "Layout WordCloud in specified shape, this is a transform for VGrammar.", "keywords": [ "wordcloud", @@ -36,8 +36,8 @@ "dependencies": { "@visactor/vutils": "~0.18.9", "@visactor/vscale": "~0.18.9", - "@visactor/vgrammar-core": "workspace:0.13.5", - "@visactor/vgrammar-util": "workspace:0.13.5", + "@visactor/vgrammar-core": "workspace:0.13.6", + "@visactor/vgrammar-util": "workspace:0.13.6", "@visactor/vrender-core": "0.19.6", "@visactor/vrender-kits": "0.19.6" }, diff --git a/packages/vgrammar-wordcloud/package.json b/packages/vgrammar-wordcloud/package.json index df6cd75f..aa298283 100644 --- a/packages/vgrammar-wordcloud/package.json +++ b/packages/vgrammar-wordcloud/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vgrammar-wordcloud", - "version": "0.13.5", + "version": "0.13.6", "description": "WordCloud layout transform for VGrammar", "keywords": [ "wordcloud", @@ -35,8 +35,8 @@ }, "dependencies": { "@visactor/vutils": "~0.18.9", - "@visactor/vgrammar-core": "workspace:0.13.5", - "@visactor/vgrammar-util": "workspace:0.13.5", + "@visactor/vgrammar-core": "workspace:0.13.6", + "@visactor/vgrammar-util": "workspace:0.13.6", "@visactor/vrender-core": "0.19.6", "@visactor/vrender-kits": "0.19.6" }, diff --git a/packages/vgrammar/package.json b/packages/vgrammar/package.json index 1b198604..3321a1c2 100644 --- a/packages/vgrammar/package.json +++ b/packages/vgrammar/package.json @@ -1,6 +1,6 @@ { "name": "@visactor/vgrammar", - "version": "0.13.5", + "version": "0.13.6", "description": "simple package of vgrammar.", "keywords": [ "visualization", @@ -30,7 +30,7 @@ "test": "" }, "dependencies": { - "@visactor/vgrammar-core": "workspace:0.13.5" + "@visactor/vgrammar-core": "workspace:0.13.6" }, "devDependencies": { "d3-array": "1.x",