Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
223 changes: 116 additions & 107 deletions common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion common/config/rush/version-policies.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"definitionName":"lockStepVersion","policyName":"vgrammarMain","version":"0.15.3","mainProject":"@visactor/vgrammar-core","nextBump":"patch"}]
[{"definitionName":"lockStepVersion","policyName":"vgrammarMain","version":"0.15.4","mainProject":"@visactor/vgrammar-core","nextBump":"patch"}]
26 changes: 13 additions & 13 deletions docs/dev-demos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@
"@internal/eslint-config": "workspace:*",
"@internal/ts-config": "workspace:*",
"@visactor/vutils": "~0.19.3",
"@visactor/vgrammar": "workspace:0.15.3",
"@visactor/vgrammar-core": "workspace:0.15.3",
"@visactor/vgrammar-hierarchy": "workspace:0.15.3",
"@visactor/vgrammar-sankey": "workspace:0.15.3",
"@visactor/vgrammar-projection": "workspace:0.15.3",
"@visactor/vgrammar-wordcloud": "workspace:0.15.3",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.15.3",
"@visactor/vgrammar-plot": "workspace:0.15.3",
"@visactor/vrender-core": "0.21.8",
"@visactor/vrender-kits": "0.21.8",
"@visactor/vrender": "0.21.8",
"@visactor/vgrammar": "workspace:0.15.4",
"@visactor/vgrammar-core": "workspace:0.15.4",
"@visactor/vgrammar-hierarchy": "workspace:0.15.4",
"@visactor/vgrammar-sankey": "workspace:0.15.4",
"@visactor/vgrammar-projection": "workspace:0.15.4",
"@visactor/vgrammar-wordcloud": "workspace:0.15.4",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.15.4",
"@visactor/vgrammar-plot": "workspace:0.15.4",
"@visactor/vrender-core": "0.21.10",
"@visactor/vrender-kits": "0.21.10",
"@visactor/vrender": "0.21.10",
"d3-scale-chromatic": "^3.0.0",
"lodash": "4.17.21",
"typescript": "4.9.5",
"vite": "3.2.6",
"@visactor/vgrammar-util": "workspace:0.15.3",
"@visactor/vgrammar-coordinate": "workspace:0.15.3",
"@visactor/vgrammar-util": "workspace:0.15.4",
"@visactor/vgrammar-coordinate": "workspace:0.15.4",
"@vitejs/plugin-react": "3.1.0"
}
}
13 changes: 13 additions & 0 deletions docs/site/assets/changelog/en/release.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# v0.15.3

2025-01-09


**What's Changed**



**Full Changelog**: https://github.com/VisActor/VGrammar/compare/v0.15.2...v0.15.3

[more detail about v0.15.3](https://github.com/VisActor/VGrammar/releases/tag/v0.15.3)

# v0.15.2

2025-01-06
Expand Down
13 changes: 13 additions & 0 deletions docs/site/assets/changelog/zh/release.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# v0.15.3

2025-01-09


**What's Changed**



**Full Changelog**: https://github.com/VisActor/VGrammar/compare/v0.15.2...v0.15.3

[更多详情请查看 v0.15.3](https://github.com/VisActor/VGrammar/releases/tag/v0.15.3)

# v0.15.2

2025-01-06
Expand Down
28 changes: 14 additions & 14 deletions docs/site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@
"dependencies": {
"@arco-design/web-react": "2.46.1",
"@visactor/vutils": "~0.19.3",
"@visactor/vgrammar": "workspace:0.15.3",
"@visactor/vgrammar-core": "workspace:0.15.3",
"@visactor/vgrammar-hierarchy": "workspace:0.15.3",
"@visactor/vgrammar-sankey": "workspace:0.15.3",
"@visactor/vgrammar-projection": "workspace:0.15.3",
"@visactor/vgrammar-wordcloud": "workspace:0.15.3",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.15.3",
"@visactor/vgrammar-plot": "workspace:0.15.3",
"@visactor/vgrammar-util": "workspace:0.15.3",
"@visactor/vgrammar-coordinate": "workspace:0.15.3",
"@visactor/vgrammar-venn": "workspace:0.15.3",
"@visactor/vrender-core": "0.21.8",
"@visactor/vrender-kits": "0.21.8",
"@visactor/vrender": "0.21.8",
"@visactor/vgrammar": "workspace:0.15.4",
"@visactor/vgrammar-core": "workspace:0.15.4",
"@visactor/vgrammar-hierarchy": "workspace:0.15.4",
"@visactor/vgrammar-sankey": "workspace:0.15.4",
"@visactor/vgrammar-projection": "workspace:0.15.4",
"@visactor/vgrammar-wordcloud": "workspace:0.15.4",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.15.4",
"@visactor/vgrammar-plot": "workspace:0.15.4",
"@visactor/vgrammar-util": "workspace:0.15.4",
"@visactor/vgrammar-coordinate": "workspace:0.15.4",
"@visactor/vgrammar-venn": "workspace:0.15.4",
"@visactor/vrender-core": "0.21.10",
"@visactor/vrender-kits": "0.21.10",
"@visactor/vrender": "0.21.10",
"markdown-it": "^13.0.0",
"highlight.js": "^11.8.0",
"axios": "^1.4.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/vgrammar-coordinate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-coordinate",
"version": "0.15.3",
"version": "0.15.4",
"description": "Coordinates for VGrammar",
"keywords": [
"coordinate",
Expand Down Expand Up @@ -35,7 +35,7 @@
},
"dependencies": {
"@visactor/vutils": "~0.19.3",
"@visactor/vgrammar-util": "workspace:0.15.3"
"@visactor/vgrammar-util": "workspace:0.15.4"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand Down
15 changes: 15 additions & 0 deletions packages/vgrammar-core/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@visactor/vgrammar-core",
"entries": [
{
"version": "0.15.4",
"tag": "@visactor/vgrammar-core_v0.15.4",
"date": "Wed, 15 Jan 2025 07:59:52 GMT",
"comments": {
"none": [
{
"comment": "feat: add customInsertZerosToArray in wordcloud #619"
},
{
"comment": "fix loop animation release"
}
]
}
},
{
"version": "0.15.3",
"tag": "@visactor/vgrammar-core_v0.15.3",
Expand Down
10 changes: 9 additions & 1 deletion packages/vgrammar-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# Change Log - @visactor/vgrammar-core

This log was last generated on Tue, 07 Jan 2025 02:01:38 GMT and should not be manually modified.
This log was last generated on Wed, 15 Jan 2025 07:59:52 GMT and should not be manually modified.

## 0.15.4
Wed, 15 Jan 2025 07:59:52 GMT

### Updates

- feat: add customInsertZerosToArray in wordcloud #619
- fix loop animation release

## 0.15.3
Tue, 07 Jan 2025 02:01:38 GMT
Expand Down
12 changes: 6 additions & 6 deletions packages/vgrammar-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-core",
"version": "0.15.3",
"version": "0.15.4",
"description": "VGrammar is a visual grammar library",
"keywords": [
"grammar",
Expand Down Expand Up @@ -37,12 +37,12 @@
"dependencies": {
"@visactor/vutils": "~0.19.3",
"@visactor/vdataset": "~0.19.3",
"@visactor/vgrammar-coordinate": "workspace:0.15.3",
"@visactor/vgrammar-util": "workspace:0.15.3",
"@visactor/vgrammar-coordinate": "workspace:0.15.4",
"@visactor/vgrammar-util": "workspace:0.15.4",
"@visactor/vscale": "~0.19.3",
"@visactor/vrender-core": "0.21.8",
"@visactor/vrender-kits": "0.21.8",
"@visactor/vrender-components": "0.21.8"
"@visactor/vrender-core": "0.21.10",
"@visactor/vrender-kits": "0.21.10",
"@visactor/vrender-components": "0.21.10"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand Down
15 changes: 14 additions & 1 deletion packages/vgrammar-core/src/graph/animation/animate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@ export class Animate implements IAnimate {
);
});
if (needStopAnimation) {
// do not clear exit element in case it will animate
this.clearElementAnimation(element, false);
}
// clear animations for exit elements
else if (element.diffState === DiffState.exit) {
this.clearElementAnimation(element, false);
}
});
Expand Down Expand Up @@ -297,6 +300,16 @@ export class Animate implements IAnimate {
elementCount: animatedElements.length,
elementIndex: 0
};
// clear animator with same state
animatedElements.forEach(element => {
(this.animators.get(config.state) ?? [])
.filter(animator => animator.element === element && animator.animationOptions.id === config.id)
.forEach(animator => {
animator.stop(null, false);
this.handleAnimatorEnd(animator, false);
});
});
// run animator
animatedElements.forEach((element, index) => {
animationParameters.elementIndex = index;
// add animation parameter into parameters
Expand Down
2 changes: 1 addition & 1 deletion packages/vgrammar-core/src/graph/animation/animator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export class Animator implements IAnimator {
return this;
}

stop(stopState: 'start' | 'end' = 'end', invokeCallback: boolean = true): this {
stop(stopState?: 'start' | 'end', invokeCallback: boolean = true): this {
// FIXME: wait for VRender to fix 'end' parameter
this.runnings.forEach(running => running.stop(stopState));
this.animationEnd(invokeCallback);
Expand Down
6 changes: 6 additions & 0 deletions packages/vgrammar-core/src/types/animate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,13 @@ export type IAnimationConfig = IAnimationTimeline | IAnimationTypeConfig;
* state动画,暂时只支持简单配置
*/
export interface IStateAnimationConfig {
/**
* 状态动画的动画时长
*/
duration?: number;
/**
* 状态动画的缓动函数类型
*/
easing?: EasingType;
}

Expand Down
33 changes: 33 additions & 0 deletions packages/vgrammar-core/src/types/interaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -474,41 +474,74 @@ export interface FishEyeOptions extends IBaseInteractionOptions {
}

export interface ElementActiveSpec extends ElementActiveOptions {
/**
* 设置交互的类型为 'element-active'
*/
type: 'element-active';
}
export interface ElementSelectSpec extends ElementSelectOptions {
/**
* 设置交互的类型为 'element-select'
*/
type: 'element-select';
}
export interface ElementHighlightSpec extends ElementHighlightOptions {
/**
* 设置交互的类型为 'element-highlight'
*/
type: 'element-highlight';
}
export interface ElementHighlightByKeySpec extends ElementHighlightOptions {
/**
* 设置交互的类型为 'element-highlight-by-key'
*/
type: 'element-highlight-by-key';
}
export interface ElementHighlightByGroupSpec extends ElementHighlightOptions {
/**
* 设置交互的类型为 'element-highlight-by-group'
*/
type: 'element-highlight-by-group';
}
export interface ElementActiveByLegendSpec extends ElementActiveByLegendOptions {
/**
* 设置交互的类型为 'element-active-by-legend'
*/
type: 'element-active-by-legend';
}

export interface ElementHighlightByLegendSpec extends ElementHighlightByLegendOptions {
/**
* 设置交互的类型为'element-highlight-by-legend'
*/
type: 'element-highlight-by-legend';
}

export interface ElementHighlightByNameSpec extends ElementHighlightByNameOptions {
/**
* 设置交互的类型为'element-highlight-by-name'
*/
type: 'element-highlight-by-name';
}

export interface BrushHighlightSpec extends BrushHighlightOptions {
/**
* 设置交互类型为'brush-highlight'
*/
type: 'brush-highlight';
}

export interface BrushActiveSpec extends BrushActiveOptions {
/**
* 设置交互类型为 'brush-active'
*/
type: 'brush-active';
}

export interface BrushFilterSpec extends BrushFilterOptions {
/**
* 设置交互类型为'brush-filter'
*/
type: 'brush-filter';
}

Expand Down
18 changes: 9 additions & 9 deletions packages/vgrammar-full/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-full",
"version": "0.15.3",
"version": "0.15.4",
"description": "full packages of vgrammar.",
"keywords": [
"visualization",
Expand Down Expand Up @@ -33,14 +33,14 @@
"test": ""
},
"dependencies": {
"@visactor/vgrammar-core": "workspace:0.15.3",
"@visactor/vgrammar-hierarchy": "workspace:0.15.3",
"@visactor/vgrammar-plot": "workspace:0.15.3",
"@visactor/vgrammar-projection": "workspace:0.15.3",
"@visactor/vgrammar-sankey": "workspace:0.15.3",
"@visactor/vgrammar-wordcloud": "workspace:0.15.3",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.15.3",
"@visactor/vgrammar-venn": "workspace:0.15.3"
"@visactor/vgrammar-core": "workspace:0.15.4",
"@visactor/vgrammar-hierarchy": "workspace:0.15.4",
"@visactor/vgrammar-plot": "workspace:0.15.4",
"@visactor/vgrammar-projection": "workspace:0.15.4",
"@visactor/vgrammar-sankey": "workspace:0.15.4",
"@visactor/vgrammar-wordcloud": "workspace:0.15.4",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.15.4",
"@visactor/vgrammar-venn": "workspace:0.15.4"
},
"devDependencies": {
"d3-array": "1.x",
Expand Down
10 changes: 5 additions & 5 deletions packages/vgrammar-hierarchy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-hierarchy",
"version": "0.15.3",
"version": "0.15.4",
"description": "Layout of hierarchical data for VGrammar",
"keywords": [
"hierarchy",
Expand Down Expand Up @@ -39,10 +39,10 @@
},
"dependencies": {
"@visactor/vutils": "~0.19.3",
"@visactor/vgrammar-core": "workspace:0.15.3",
"@visactor/vgrammar-util": "workspace:0.15.3",
"@visactor/vrender-core": "0.21.8",
"@visactor/vrender-kits": "0.21.8"
"@visactor/vgrammar-core": "workspace:0.15.4",
"@visactor/vgrammar-util": "workspace:0.15.4",
"@visactor/vrender-core": "0.21.10",
"@visactor/vrender-kits": "0.21.10"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand Down
14 changes: 7 additions & 7 deletions packages/vgrammar-plot/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-plot",
"version": "0.15.3",
"version": "0.15.4",
"description": "Plots of vgrammar.",
"keywords": [
"plot",
Expand Down Expand Up @@ -36,12 +36,12 @@
"dependencies": {
"@visactor/vscale": "~0.19.3",
"@visactor/vutils": "~0.19.3",
"@visactor/vgrammar-util": "workspace:0.15.3",
"@visactor/vgrammar-coordinate": "workspace:0.15.3",
"@visactor/vgrammar-core": "workspace:0.15.3",
"@visactor/vrender-components": "0.21.8",
"@visactor/vrender-core": "0.21.8",
"@visactor/vrender-kits": "0.21.8"
"@visactor/vgrammar-util": "workspace:0.15.4",
"@visactor/vgrammar-coordinate": "workspace:0.15.4",
"@visactor/vgrammar-core": "workspace:0.15.4",
"@visactor/vrender-components": "0.21.10",
"@visactor/vrender-core": "0.21.10",
"@visactor/vrender-kits": "0.21.10"
},
"devDependencies": {
"d3-array": "1.x",
Expand Down
Loading
Loading