Skip to content

fix: fix issue of animation state #4398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xuefei1313 merged 2 commits into from
Jan 8, 2026
Merged

fix: fix issue of animation state #4398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad3affe
fix: fix issue of animation state
xuefei1313 Jan 6, 2026
e5a7783
chore: update lock
xuefei1313 Jan 8, 2026
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
116 changes: 58 additions & 58 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"@visactor/vchart-theme": "~1.6.6",
"@visactor/vmind": "1.2.4-alpha.5",
"@visactor/vutils": "~1.0.12",
"@visactor/vrender": "~1.0.36",
"@visactor/vrender-kits": "~1.0.36",
"@visactor/vrender": "~1.0.37",
"@visactor/vrender-kits": "~1.0.37",
"@visactor/vtable": "1.19.0-alpha.0",
"@visactor/vtable-editors": "1.19.0-alpha.0",
"@visactor/vtable-gantt": "1.19.0-alpha.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/openinula-vchart/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"dependencies": {
"@visactor/vchart": "workspace:2.0.12",
"@visactor/vutils": "~1.0.12",
"@visactor/vrender-core": "~1.0.36",
"@visactor/vrender-kits": "~1.0.36",
"@visactor/vrender-core": "~1.0.37",
"@visactor/vrender-kits": "~1.0.37",
"react-is": "^18.2.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/react-vchart/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"@visactor/vchart": "workspace:2.0.12",
"@visactor/vchart-extension": "workspace:2.0.12",
"@visactor/vutils": "~1.0.12",
"@visactor/vrender-core": "~1.0.36",
"@visactor/vrender-kits": "~1.0.36",
"@visactor/vrender-core": "~1.0.37",
"@visactor/vrender-kits": "~1.0.37",
"react-is": "^18.2.0"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/vchart-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
"start": "ts-node __tests__/runtime/browser/scripts/initVite.ts && vite serve __tests__/runtime/browser"
},
"dependencies": {
"@visactor/vrender-core": "~1.0.36",
"@visactor/vrender-kits": "~1.0.36",
"@visactor/vrender-components": "~1.0.36",
"@visactor/vrender-animate": "~1.0.36",
"@visactor/vrender-core": "~1.0.37",
"@visactor/vrender-kits": "~1.0.37",
"@visactor/vrender-components": "~1.0.37",
"@visactor/vrender-animate": "~1.0.37",
"@visactor/vchart": "workspace:2.0.12",
"@visactor/vutils": "~1.0.12",
"@visactor/vdataset": "~1.0.12",
Expand Down
8 changes: 4 additions & 4 deletions packages/vchart/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@
"@visactor/vdataset": "~1.0.12",
"@visactor/vscale": "~1.0.12",
"@visactor/vlayouts": "~1.0.12",
"@visactor/vrender-core": "~1.0.36",
"@visactor/vrender-kits": "~1.0.36",
"@visactor/vrender-components": "~1.0.36",
"@visactor/vrender-animate": "~1.0.36",
"@visactor/vrender-core": "~1.0.37",
"@visactor/vrender-kits": "~1.0.37",
"@visactor/vrender-components": "~1.0.37",
"@visactor/vrender-animate": "~1.0.37",
"@visactor/vutils-extension": "workspace:2.0.12"
},
"publishConfig": {
Expand Down
13 changes: 11 additions & 2 deletions packages/vchart/src/mark/base/base-mark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,6 +1446,7 @@ export class BaseMark<T extends ICommonSpec> extends GrammarItem implements IMar
allGraphics.forEach((g, index) => {
g.context.graphicCount = graphicCount;
g.context.graphicIndex = index;
g.stateSort = this._stateSort;
});
this._dataByKey = newGroupedData;
this._graphics = allGraphics;
Expand Down Expand Up @@ -1551,9 +1552,16 @@ export class BaseMark<T extends ICommonSpec> extends GrammarItem implements IMar

protected _runEncoder(graphics: IMarkGraphic[], noGroupEncode?: boolean) {
const attrsByGroup = noGroupEncode ? null : this._runGroupEncoder(this._encoderOfState?.group);

graphics.forEach((g, index) => {
const attrs = this._runEncoderOfGraphic(this._encoderOfState?.update, g);
let attrs = this._runEncoderOfGraphic(this._encoderOfState?.update, g);
// 此时需要将最终的正确的样式设置给graphic，这样后续的动画目标属性才会正确，否则会动画样式只有默认状态的样式
g.currentStates?.forEach((_state: string) => {
const stateAttr = this._runEncoderOfGraphic(this._encoderOfState?.[_state], g);
attrs = {
...attrs,
...stateAttr
};
});

// 配置的优先级高于encoder
if (!isNil(this._markConfig.interactive)) {
Expand Down Expand Up @@ -1585,6 +1593,7 @@ export class BaseMark<T extends ICommonSpec> extends GrammarItem implements IMar
}
g.context = mockGraphic.context;
g.context.diffAttrs = finalAttrs;
g.stateSort = this._stateSort;

const gIndex = this._graphics === graphics ? index : index + this._graphics.length - graphics.length;
if (gIndex >= 0) {
Expand Down
6 changes: 3 additions & 3 deletions tools/story-player/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
"vite": "3.2.6"
},
"dependencies": {
"@visactor/vrender-core": "~1.0.36",
"@visactor/vrender-kits": "~1.0.36",
"@visactor/vrender-core": "~1.0.37",
"@visactor/vrender-kits": "~1.0.37",
"@visactor/vchart": "workspace:2.0.12",
"@visactor/vrender": "~1.0.36",
"@visactor/vrender": "~1.0.37",
"@visactor/vutils": "~1.0.12"
}
}
Loading