Merge pull request #468 from VisActor/release/0.13.6

[Auto release] release 0.13.6
VisActor · May 31, 2024 · c09d33c · c09d33c
2 parents 9f4d0ee + a865498
commit c09d33c
Show file tree

Hide file tree

Showing 29 changed files with 391 additions and 274 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.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
@@ -12,23 +12,23 @@
  "@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/vrender-core": "0.19.5",
- "@visactor/vrender-kits": "0.19.5",
- "@visactor/vrender": "0.19.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",
  "d3-scale-chromatic": "^3.0.0",
  "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
@@ -14,20 +14,20 @@
  "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/vrender-core": "0.19.5",
- "@visactor/vrender-kits": "0.19.5",
- "@visactor/vrender": "0.19.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",
  "markdown-it": "^13.0.0",
  "highlight.js": "^11.8.0",
  "axios": "^1.4.0",

diff --git 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
@@ -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,12 +37,12 @@
  "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.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-core/src/graph/animation/animation/fade.ts b/packages/vgrammar-core/src/graph/animation/animation/fade.ts
@@ -6,16 +6,18 @@ export const fadeIn: TypeAnimation<IElement> = (
  options: any,
  animationParameters: IAnimationParameters
 ) => {
+ const finalAttrs = element.getFinalGraphicAttributes();
+
  return {
  from: {
  opacity: 0,
  fillOpacity: 0,
  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
@@ -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,20 +61,20 @@ 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 },
  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;
  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 },