Merge pull request #531 from VisActor/release/0.14.2

[Auto release] release 0.14.2
VisActor · Sep 3, 2024 · ab20046 · ab20046
2 parents 6846a80 + d7471e7
commit ab20046
Show file tree

Hide file tree

Showing 24 changed files with 157 additions and 111 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
@@ -1 +1 @@
-[{"definitionName":"lockStepVersion","policyName":"vgrammarMain","version":"0.14.1","mainProject":"@visactor/vgrammar-core","nextBump":"patch"}]
+[{"definitionName":"lockStepVersion","policyName":"vgrammarMain","version":"0.14.2","mainProject":"@visactor/vgrammar-core","nextBump":"patch"}]
diff --git a/docs/dev-demos/package.json b/docs/dev-demos/package.json
@@ -12,23 +12,23 @@
  "@internal/eslint-config": "workspace:*",
  "@internal/ts-config": "workspace:*",
  "@visactor/vutils": "~0.18.15",
- "@visactor/vgrammar": "workspace:0.14.1",
- "@visactor/vgrammar-core": "workspace:0.14.1",
- "@visactor/vgrammar-hierarchy": "workspace:0.14.1",
- "@visactor/vgrammar-sankey": "workspace:0.14.1",
- "@visactor/vgrammar-projection": "workspace:0.14.1",
- "@visactor/vgrammar-wordcloud": "workspace:0.14.1",
- "@visactor/vgrammar-wordcloud-shape": "workspace:0.14.1",
- "@visactor/vgrammar-plot": "workspace:0.14.1",
+ "@visactor/vgrammar": "workspace:0.14.2",
+ "@visactor/vgrammar-core": "workspace:0.14.2",
+ "@visactor/vgrammar-hierarchy": "workspace:0.14.2",
+ "@visactor/vgrammar-sankey": "workspace:0.14.2",
+ "@visactor/vgrammar-projection": "workspace:0.14.2",
+ "@visactor/vgrammar-wordcloud": "workspace:0.14.2",
+ "@visactor/vgrammar-wordcloud-shape": "workspace:0.14.2",
+ "@visactor/vgrammar-plot": "workspace:0.14.2",
  "@visactor/vrender-core": "0.20.1",
  "@visactor/vrender-kits": "0.20.1",
  "@visactor/vrender": "0.20.1",
  "d3-scale-chromatic": "^3.0.0",
  "lodash": "4.17.21",
  "typescript": "4.9.5",
  "vite": "3.2.6",
- "@visactor/vgrammar-util": "workspace:0.14.1",
- "@visactor/vgrammar-coordinate": "workspace:0.14.1",
+ "@visactor/vgrammar-util": "workspace:0.14.2",
+ "@visactor/vgrammar-coordinate": "workspace:0.14.2",
  "@vitejs/plugin-react": "3.1.0"
  }
 }
diff --git 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.15",
- "@visactor/vgrammar": "workspace:0.14.1",
- "@visactor/vgrammar-core": "workspace:0.14.1",
- "@visactor/vgrammar-hierarchy": "workspace:0.14.1",
- "@visactor/vgrammar-sankey": "workspace:0.14.1",
- "@visactor/vgrammar-projection": "workspace:0.14.1",
- "@visactor/vgrammar-wordcloud": "workspace:0.14.1",
- "@visactor/vgrammar-wordcloud-shape": "workspace:0.14.1",
- "@visactor/vgrammar-plot": "workspace:0.14.1",
- "@visactor/vgrammar-util": "workspace:0.14.1",
- "@visactor/vgrammar-coordinate": "workspace:0.14.1",
- "@visactor/vgrammar-venn": "workspace:0.14.1",
+ "@visactor/vgrammar": "workspace:0.14.2",
+ "@visactor/vgrammar-core": "workspace:0.14.2",
+ "@visactor/vgrammar-hierarchy": "workspace:0.14.2",
+ "@visactor/vgrammar-sankey": "workspace:0.14.2",
+ "@visactor/vgrammar-projection": "workspace:0.14.2",
+ "@visactor/vgrammar-wordcloud": "workspace:0.14.2",
+ "@visactor/vgrammar-wordcloud-shape": "workspace:0.14.2",
+ "@visactor/vgrammar-plot": "workspace:0.14.2",
+ "@visactor/vgrammar-util": "workspace:0.14.2",
+ "@visactor/vgrammar-coordinate": "workspace:0.14.2",
+ "@visactor/vgrammar-venn": "workspace:0.14.2",
  "@visactor/vrender-core": "0.20.1",
  "@visactor/vrender-kits": "0.20.1",
  "@visactor/vrender": "0.20.1",

diff --git a/packages/vgrammar-coordinate/package.json b/packages/vgrammar-coordinate/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@visactor/vgrammar-coordinate",
- "version": "0.14.1",
+ "version": "0.14.2",
  "description": "Coordinates for VGrammar",
  "keywords": [
  "coordinate",
@@ -35,7 +35,7 @@
  },
  "dependencies": {
  "@visactor/vutils": "~0.18.15",
- "@visactor/vgrammar-util": "workspace:0.14.1"
+ "@visactor/vgrammar-util": "workspace:0.14.2"
  },
  "devDependencies": {
  "@internal/bundler": "workspace:*",

diff --git a/packages/vgrammar-core/CHANGELOG.json b/packages/vgrammar-core/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
  "name": "@visactor/vgrammar-core",
  "entries": [
+ {
+ "version": "0.14.2",
+ "tag": "@visactor/vgrammar-core_v0.14.2",
+ "date": "Mon, 02 Sep 2024 10:59:02 GMT",
+ "comments": {
+ "none": [
+ {
+ "comment": "fix: fix the issue of merging data in label component"
+ },
+ {
+ "comment": "fix: fix animation of word-cloud-shape\n\n"
+ }
+ ]
+ }
+ },
  {
  "version": "0.14.1",
  "tag": "@visactor/vgrammar-core_v0.14.1",

diff --git a/packages/vgrammar-core/CHANGELOG.md b/packages/vgrammar-core/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Change Log - @visactor/vgrammar-core
 
-This log was last generated on Mon, 02 Sep 2024 02:02:24 GMT and should not be manually modified.
+This log was last generated on Mon, 02 Sep 2024 10:59:02 GMT and should not be manually modified.
+
+## 0.14.2
+Mon, 02 Sep 2024 10:59:02 GMT
+
+### Updates
+
+- fix: fix the issue of merging data in label component
+- fix: fix animation of word-cloud-shape
+
+
 
 ## 0.14.1
 Mon, 02 Sep 2024 02:02:24 GMT

diff --git a/packages/vgrammar-core/package.json b/packages/vgrammar-core/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@visactor/vgrammar-core",
- "version": "0.14.1",
+ "version": "0.14.2",
  "description": "VGrammar is a visual grammar library",
  "keywords": [
  "grammar",
@@ -37,8 +37,8 @@
  "dependencies": {
  "@visactor/vutils": "~0.18.15",
  "@visactor/vdataset": "~0.18.15",
- "@visactor/vgrammar-coordinate": "workspace:0.14.1",
- "@visactor/vgrammar-util": "workspace:0.14.1",
+ "@visactor/vgrammar-coordinate": "workspace:0.14.2",
+ "@visactor/vgrammar-util": "workspace:0.14.2",
  "@visactor/vscale": "~0.18.15",
  "@visactor/vrender-core": "0.20.1",
  "@visactor/vrender-kits": "0.20.1",

diff --git a/packages/vgrammar-core/src/component/label.ts b/packages/vgrammar-core/src/component/label.ts
@@ -81,7 +81,7 @@ export const generateLabelAttributes = (
  } else {
  const mergeAttributes = (attributes: any, themeDatum: any) => {
  const { data: labelData, ...restAttribute } = attributes;
- return { data: labelData, ...merge({}, themeDatum, restAttribute) };
+ return { ...merge({}, themeDatum, restAttribute), data: labelData };
  };
  // process by order of elements
  mark.elements.forEach(element => {

diff --git a/packages/vgrammar-core/src/types/grammar.ts b/packages/vgrammar-core/src/types/grammar.ts
@@ -216,6 +216,8 @@ export interface IProgressiveGrammar {
  restartProgressive: () => void;
  /** 分片执行 */
  evaluateProgressive: () => void;
+ /** 增量流程后，是否执行动画 */
+ canAnimateAfterProgressive: () => boolean;
 }
 
 export interface IMark extends IGrammarBase, IProgressiveGrammar {

diff --git a/packages/vgrammar-core/src/types/transform.ts b/packages/vgrammar-core/src/types/transform.ts
@@ -376,6 +376,10 @@ export interface IProgressiveTransformResult<Output = any> {
  progressiveRun: () => void;
  /** release the progressive context */
  release: () => void;
+ /**
+ * can animate after progressive
+ */
+ canAnimate?: () => boolean;
 }
 
 export interface IProgressiveTransform<Output = any> {

diff --git a/packages/vgrammar-core/src/view/View.ts b/packages/vgrammar-core/src/view/View.ts
@@ -1342,6 +1342,10 @@ export default class View extends EventEmitter implements IView {
  if (this._progressiveMarks && this._progressiveMarks.some(mark => mark.isDoingProgressive())) {
  const raf = vglobal.getRequestAnimationFrame();
  this._progressiveRafId = raf(this.handleProgressiveFrame);
+ } else if (this._progressiveMarks && this._progressiveMarks.every(mark => mark.canAnimateAfterProgressive())) {
+ this.animate.animate();
+ } else if (this._progressiveMarks) {
+ this._progressiveMarks = null;
  }
  }
 

diff --git a/packages/vgrammar-core/src/view/mark.ts b/packages/vgrammar-core/src/view/mark.ts
@@ -934,6 +934,14 @@ export class Mark extends GrammarBase implements IMark {
  return this.renderContext && (!!this.renderContext.progressive || !!this.renderContext.beforeTransformProgressive);
  }
 
+ canAnimateAfterProgressive() {
+ return (
+ this.renderContext &&
+ this.renderContext.beforeTransformProgressive &&
+ this.renderContext.beforeTransformProgressive.canAnimate()
+ );
+ }
+
  isDoingProgressive() {
  return (
  this.renderContext &&