Skip to content

Commit d591364

Browse files
xile611xile611
authored
Merge pull request #4325 from VisActor/feat/upgrade-vrender-to-fix-animation
Feat/upgrade vrender to fix animation
2 parents 72e13b8 + a563131 commit d591364

File tree

9 files changed

+90
-79
lines changed

9 files changed

+90
-79
lines changed

‎common/changes/@visactor/vchart/feat-upgrade-vrender-to-fix-animation_2025-11-27-06-44.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "feat: upgrade vrender to 1.0.30\n\n",
5+
"type": "none",
6+
"packageName": "@visactor/vchart"
7+
}
8+
],
9+
"packageName": "@visactor/vchart",
10+
"email": "[email protected]"
11+
}

‎common/config/rush/pnpm-lock.yaml‎

Lines changed: 53 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"@visactor/vchart-theme": "~1.6.6",
2020
"@visactor/vmind": "1.2.4-alpha.5",
2121
"@visactor/vutils": "~1.0.12",
22-
"@visactor/vrender": "~1.0.28",
23-
"@visactor/vrender-kits": "~1.0.28",
22+
"@visactor/vrender": "~1.0.30",
23+
"@visactor/vrender-kits": "~1.0.30",
2424
"@visactor/vtable": "1.19.0-alpha.0",
2525
"@visactor/vtable-editors": "1.19.0-alpha.0",
2626
"@visactor/vtable-gantt": "1.19.0-alpha.0",
@@ -58,4 +58,4 @@
5858
"react-device-detect": "^2.2.2",
5959
"minimist": "1.2.8"
6060
}
61-
}
61+
}

‎packages/openinula-vchart/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"dependencies": {
3131
"@visactor/vchart": "workspace:2.0.9",
3232
"@visactor/vutils": "~1.0.12",
33-
"@visactor/vrender-core": "~1.0.28",
34-
"@visactor/vrender-kits": "~1.0.28",
33+
"@visactor/vrender-core": "~1.0.30",
34+
"@visactor/vrender-kits": "~1.0.30",
3535
"react-is": "^18.2.0"
3636
},
3737
"devDependencies": {
@@ -78,4 +78,4 @@
7878
"access": "public",
7979
"registry": "https://registry.npmjs.org/"
8080
}
81-
}
81+
}

‎packages/react-vchart/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
"@visactor/vchart": "workspace:2.0.9",
3232
"@visactor/vchart-extension": "workspace:2.0.9",
3333
"@visactor/vutils": "~1.0.12",
34-
"@visactor/vrender-core": "~1.0.28",
35-
"@visactor/vrender-kits": "~1.0.28",
34+
"@visactor/vrender-core": "~1.0.30",
35+
"@visactor/vrender-kits": "~1.0.30",
3636
"react-is": "^18.2.0"
3737
},
3838
"devDependencies": {
@@ -83,4 +83,4 @@
8383
"access": "public",
8484
"registry": "https://registry.npmjs.org/"
8585
}
86-
}
86+
}

‎packages/vchart-extension/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
"start": "ts-node __tests__/runtime/browser/scripts/initVite.ts && vite serve __tests__/runtime/browser"
2222
},
2323
"dependencies": {
24-
"@visactor/vrender-core": "~1.0.28",
25-
"@visactor/vrender-kits": "~1.0.28",
26-
"@visactor/vrender-components": "~1.0.28",
27-
"@visactor/vrender-animate": "~1.0.28",
24+
"@visactor/vrender-core": "~1.0.30",
25+
"@visactor/vrender-kits": "~1.0.30",
26+
"@visactor/vrender-components": "~1.0.30",
27+
"@visactor/vrender-animate": "~1.0.30",
2828
"@visactor/vchart": "workspace:2.0.9",
2929
"@visactor/vutils": "~1.0.12",
3030
"@visactor/vdataset": "~1.0.12",
@@ -61,4 +61,4 @@
6161
"registry": "https://registry.npmjs.org/"
6262
},
6363
"license": "MIT"
64-
}
64+
}

‎packages/vchart/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,14 @@
122122
"@visactor/vdataset": "~1.0.12",
123123
"@visactor/vscale": "~1.0.12",
124124
"@visactor/vlayouts": "~1.0.12",
125-
"@visactor/vrender-core": "~1.0.28",
126-
"@visactor/vrender-kits": "~1.0.28",
127-
"@visactor/vrender-components": "~1.0.28",
128-
"@visactor/vrender-animate": "~1.0.28",
125+
"@visactor/vrender-core": "~1.0.30",
126+
"@visactor/vrender-kits": "~1.0.30",
127+
"@visactor/vrender-components": "~1.0.30",
128+
"@visactor/vrender-animate": "~1.0.30",
129129
"@visactor/vutils-extension": "workspace:2.0.9"
130130
},
131131
"publishConfig": {
132132
"access": "public",
133133
"registry": "https://registry.npmjs.org/"
134134
}
135-
}
135+
}

‎packages/vchart/src/mark/base/base-mark.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,7 +1532,7 @@ export class BaseMark<T extends ICommonSpec> extends GrammarItem implements IMar
15321532
}
15331533
};
15341534

1535-
protected _setStateOfGraphic = (g: IMarkGraphic) => {
1535+
protected _setStateOfGraphic = (g: IMarkGraphic, hasAnimation?: boolean) => {
15361536
g.clearStates();
15371537
g.stateProxy = null;
15381538

@@ -1541,7 +1541,7 @@ export class BaseMark<T extends ICommonSpec> extends GrammarItem implements IMar
15411541
return this._runEncoderOfGraphic(this._encoderOfState?.[stateName], g);
15421542
};
15431543

1544-
g.context.states && g.useStates(g.context.states);
1544+
g.context.states && g.useStates(g.context.states, hasAnimation);
15451545
}
15461546
};
15471547

@@ -1625,7 +1625,7 @@ export class BaseMark<T extends ICommonSpec> extends GrammarItem implements IMar
16251625
}
16261626
}
16271627

1628-
this._setStateOfGraphic(g);
1628+
this._setStateOfGraphic(g, hasStateAnimation);
16291629
this._setGraphicFromMarkConfig(g);
16301630
});
16311631
}

‎tools/story-player/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
"vite": "3.2.6"
5757
},
5858
"dependencies": {
59-
"@visactor/vrender-core": "~1.0.28",
60-
"@visactor/vrender-kits": "~1.0.28",
59+
"@visactor/vrender-core": "~1.0.30",
60+
"@visactor/vrender-kits": "~1.0.30",
6161
"@visactor/vchart": "workspace:2.0.9",
62-
"@visactor/vrender": "~1.0.28",
62+
"@visactor/vrender": "~1.0.30",
6363
"@visactor/vutils": "~1.0.12"
6464
}
65-
}
65+
}

0 commit comments

Comments
 (0)