Merge pull request #1558 from VisActor/release/0.20.15

[Auto release] release 0.20.15
VisActor · Nov 18, 2024 · 130915e · 130915e
2 parents c202905 + a31fb3c
commit 130915e
Show file tree

Hide file tree

Showing 42 changed files with 202 additions and 62 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":"vrenderMain","version":"0.20.14","nextBump":"patch"}]
+[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.20.15","nextBump":"patch"}]
diff --git a/docs/assets/changelog/en/changelog.md b/docs/assets/changelog/en/changelog.md
@@ -1,3 +1,16 @@
+# v0.20.14
+
+2024-11-13
+
+
+**What's Changed**
+
+* fix: incorrect default hover trigger of discrete legend by @xiaoluoHe in https://github.com/VisActor/VRender/pull/1550
+
+**Full Changelog**: https://github.com/VisActor/VRender/compare/v0.20.13...v0.20.14
+
+[more detail about v0.20.14](https://github.com/VisActor/VRender/releases/tag/v0.20.14)
+
 # v0.20.13
 
 2024-11-13

diff --git a/docs/assets/changelog/zh/changelog.md b/docs/assets/changelog/zh/changelog.md
@@ -1,3 +1,16 @@
+# v0.20.14
+
+2024-11-13
+
+
+**What's Changed**
+
+* fix: incorrect default hover trigger of discrete legend by @xiaoluoHe in https://github.com/VisActor/VRender/pull/1550
+
+**Full Changelog**: https://github.com/VisActor/VRender/compare/v0.20.13...v0.20.14
+
+[更多详情请查看 v0.20.14](https://github.com/VisActor/VRender/releases/tag/v0.20.14)
+
 # v0.20.13
 
 2024-11-13

diff --git a/docs/package.json b/docs/package.json
@@ -13,7 +13,7 @@
     "@visactor/vchart": "1.3.0",
     "@visactor/vutils": "~0.18.18",
     "@visactor/vgrammar": "~0.5.7",
-    "@visactor/vrender": "workspace:0.20.14",
+    "@visactor/vrender": "workspace:0.20.15",
     "markdown-it": "^13.0.0",
     "highlight.js": "^11.8.0",
     "axios": "^1.4.0",

diff --git a/packages/react-vrender-utils/CHANGELOG.json b/packages/react-vrender-utils/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/react-vrender-utils",
   "entries": [
+    {
+      "version": "0.20.15",
+      "tag": "@visactor/react-vrender-utils_v0.20.15",
+      "date": "Fri, 15 Nov 2024 08:34:34 GMT",
+      "comments": {}
+    },
     {
       "version": "0.20.14",
       "tag": "@visactor/react-vrender-utils_v0.20.14",

diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @visactor/react-vrender-utils
 
-This log was last generated on Wed, 13 Nov 2024 07:47:15 GMT and should not be manually modified.
+This log was last generated on Fri, 15 Nov 2024 08:34:34 GMT and should not be manually modified.
+
+## 0.20.15
+Fri, 15 Nov 2024 08:34:34 GMT
+
+_Version update only_
 
 ## 0.20.14
 Wed, 13 Nov 2024 07:47:15 GMT

diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/react-vrender-utils",
-  "version": "0.20.14",
+  "version": "0.20.15",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -24,8 +24,8 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@visactor/vrender": "workspace:0.20.14",
-    "@visactor/react-vrender": "workspace:0.20.14",
+    "@visactor/vrender": "workspace:0.20.15",
+    "@visactor/react-vrender": "workspace:0.20.15",
     "@visactor/vutils": "~0.18.18",
     "react-reconciler": "^0.29.0",
     "tslib": "^2.3.1"

diff --git a/packages/react-vrender/CHANGELOG.json b/packages/react-vrender/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/react-vrender",
   "entries": [
+    {
+      "version": "0.20.15",
+      "tag": "@visactor/react-vrender_v0.20.15",
+      "date": "Fri, 15 Nov 2024 08:34:34 GMT",
+      "comments": {}
+    },
     {
       "version": "0.20.14",
       "tag": "@visactor/react-vrender_v0.20.14",

diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @visactor/react-vrender
 
-This log was last generated on Wed, 13 Nov 2024 07:47:15 GMT and should not be manually modified.
+This log was last generated on Fri, 15 Nov 2024 08:34:34 GMT and should not be manually modified.
+
+## 0.20.15
+Fri, 15 Nov 2024 08:34:34 GMT
+
+_Version update only_
 
 ## 0.20.14
 Wed, 13 Nov 2024 07:47:15 GMT

diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/react-vrender",
-  "version": "0.20.14",
+  "version": "0.20.15",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -23,7 +23,7 @@
     "react": "^18.2.0"
   },
   "dependencies": {
-    "@visactor/vrender": "workspace:0.20.14",
+    "@visactor/vrender": "workspace:0.20.15",
     "@visactor/vutils": "~0.18.18",
     "react-reconciler": "^0.29.0",
     "tslib": "^2.3.1"

diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/vrender-components",
   "entries": [
+    {
+      "version": "0.20.15",
+      "tag": "@visactor/vrender-components_v0.20.15",
+      "date": "Fri, 15 Nov 2024 08:34:34 GMT",
+      "comments": {}
+    },
     {
       "version": "0.20.14",
       "tag": "@visactor/vrender-components_v0.20.14",

diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @visactor/vrender-components
 
-This log was last generated on Wed, 13 Nov 2024 07:47:16 GMT and should not be manually modified.
+This log was last generated on Fri, 15 Nov 2024 08:34:34 GMT and should not be manually modified.
+
+## 0.20.15
+Fri, 15 Nov 2024 08:34:34 GMT
+
+_Version update only_
 
 ## 0.20.14
 Wed, 13 Nov 2024 07:47:16 GMT

diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-components",
-  "version": "0.20.14",
+  "version": "0.20.15",
   "description": "components library for dp visualization",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -26,8 +26,8 @@
   "dependencies": {
     "@visactor/vutils": "~0.18.18",
     "@visactor/vscale": "~0.18.18",
-    "@visactor/vrender-core": "workspace:0.20.14",
-    "@visactor/vrender-kits": "workspace:0.20.14"
+    "@visactor/vrender-core": "workspace:0.20.15",
+    "@visactor/vrender-kits": "workspace:0.20.15"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",

diff --git a/packages/vrender-core/CHANGELOG.json b/packages/vrender-core/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@visactor/vrender-core",
   "entries": [
+    {
+      "version": "0.20.15",
+      "tag": "@visactor/vrender-core_v0.20.15",
+      "date": "Fri, 15 Nov 2024 08:34:34 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "feat: support keepStrokeScale"
+          }
+        ]
+      }
+    },
     {
       "version": "0.20.14",
       "tag": "@visactor/vrender-core_v0.20.14",

diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @visactor/vrender-core
 
-This log was last generated on Wed, 13 Nov 2024 07:47:16 GMT and should not be manually modified.
+This log was last generated on Fri, 15 Nov 2024 08:34:34 GMT and should not be manually modified.
+
+## 0.20.15
+Fri, 15 Nov 2024 08:34:34 GMT
+
+### Updates
+
+- feat: support keepStrokeScale
 
 ## 0.20.14
 Wed, 13 Nov 2024 07:47:16 GMT

diff --git a/packages/vrender-core/package.json b/packages/vrender-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-core",
-  "version": "0.20.14",
+  "version": "0.20.15",
   "description": "",
   "sideEffects": [
     "./src/modules.ts",

diff --git a/packages/vrender-core/src/graphic/config.ts b/packages/vrender-core/src/graphic/config.ts
@@ -188,6 +188,7 @@ export const DefaultAttribute: Required<IGraphicAttribute> = {
   globalCompositeOperation: '',
   overflow: 'hidden',
   shadowPickMode: 'graphic',
+  keepStrokeScale: false,
   ...DefaultDebugAttribute,
   ...DefaultStyle,
   ...DefaultTransform

diff --git a/packages/vrender-core/src/interface/context.ts b/packages/vrender-core/src/interface/context.ts
@@ -34,6 +34,7 @@ export interface IStrokeStyleParams {
   lineJoin?: CanvasLineJoin;
   miterLimit?: number;
   opacity?: number;
+  keepStrokeScale?: boolean;
 }
 export interface ITextStyleParams {
   font?: string;

diff --git a/packages/vrender-core/src/interface/graphic.ts b/packages/vrender-core/src/interface/graphic.ts
@@ -322,6 +322,9 @@ export type IGraphicAttribute = IDebugType &
     overflow: 'scroll' | 'hidden' | 'scroll-x' | 'scroll-y';
     // 绘制fill和stroke的顺序，为0表示fill先绘制，1表示stroke先绘制
     fillStrokeOrder: number;
+    // @since 0.20.15
+    // 保持stroke的scale，默认为false，为true的话stroke显示的宽度会随着scale变化
+    keepStrokeScale: boolean;
   };
 
 export interface IGraphicJson<T extends Partial<IGraphicAttribute> = Partial<IGraphicAttribute>> {

diff --git a/...ges/vrender-core/src/render/contributions/render/contributions/arc-contribution-render.ts b/...ges/vrender-core/src/render/contributions/render/contributions/arc-contribution-render.ts
@@ -56,7 +56,8 @@ export class DefaultArcRenderContribution implements IArcRenderContribution {
       x: originX = arcAttribute.x,
       y: originY = arcAttribute.y,
       scaleX = arcAttribute.scaleX,
-      scaleY = arcAttribute.scaleY
+      scaleY = arcAttribute.scaleY,
+      keepStrokeScale = arcAttribute.keepStrokeScale
     } = arc.attribute;
     let { innerRadius = arcAttribute.innerRadius, outerRadius = arcAttribute.outerRadius } = arc.attribute;
     outerRadius += outerPadding;
@@ -66,7 +67,7 @@ export class DefaultArcRenderContribution implements IArcRenderContribution {
       const doStroke = !!(borderStyle && borderStyle.stroke);
 
       const { distance = arcAttribute[key].distance } = borderStyle;
-      const d = getScaledStroke(context, distance as number, context.dpr);
+      const d = keepStrokeScale ? (distance as number) : getScaledStroke(context, distance as number, context.dpr);
       const deltaAngle = (distance as number) / outerRadius;
       const sign = key === 'outerBorder' ? 1 : -1;
       arc.setAttributes({

diff --git a/.../vrender-core/src/render/contributions/render/contributions/circle-contribution-render.ts b/.../vrender-core/src/render/contributions/render/contributions/circle-contribution-render.ts
@@ -54,14 +54,15 @@ export class DefaultCircleRenderContribution implements ICircleRenderContributio
       x: originX = circleAttribute.x,
       y: originY = circleAttribute.y,
       scaleX = circleAttribute.scaleX,
-      scaleY = circleAttribute.scaleY
+      scaleY = circleAttribute.scaleY,
+      keepStrokeScale = circleAttribute.keepStrokeScale
     } = circle.attribute;
 
     const renderBorder = (borderStyle: Partial<IBorderStyle>, key: 'outerBorder' | 'innerBorder') => {
       const doStroke = !!(borderStyle && borderStyle.stroke);
 
       const { distance = circleAttribute[key].distance } = borderStyle;
-      const d = getScaledStroke(context, distance as number, context.dpr);
+      const d = keepStrokeScale ? (distance as number) : getScaledStroke(context, distance as number, context.dpr);
       const sign = key === 'outerBorder' ? 1 : -1;
       context.beginPath();
       context.arc(x, y, radius + sign * d, startAngle, endAngle);

diff --git a/...es/vrender-core/src/render/contributions/render/contributions/rect-contribution-render.ts b/...es/vrender-core/src/render/contributions/render/contributions/rect-contribution-render.ts
@@ -57,7 +57,8 @@ export class DefaultRectRenderContribution implements IRectRenderContribution {
       scaleX = rectAttribute.scaleX,
       scaleY = rectAttribute.scaleY,
       x1,
-      y1
+      y1,
+      keepStrokeScale = rectAttribute.keepStrokeScale
     } = rect.attribute;
 
     let { width, height } = rect.attribute;
@@ -70,7 +71,7 @@ export class DefaultRectRenderContribution implements IRectRenderContribution {
 
       const sign = key === 'outerBorder' ? -1 : 1;
       const { distance = rectAttribute[key].distance } = borderStyle;
-      const d = getScaledStroke(context, distance as number, context.dpr);
+      const d = keepStrokeScale ? (distance as number) : getScaledStroke(context, distance as number, context.dpr);
       const nextX = x + sign * d;
       const nextY = y + sign * d;
       const dw = d * 2;

diff --git a/.../vrender-core/src/render/contributions/render/contributions/symbol-contribution-render.ts b/.../vrender-core/src/render/contributions/render/contributions/symbol-contribution-render.ts
@@ -59,14 +59,15 @@ export class DefaultSymbolRenderContribution implements ISymbolRenderContributio
       x: originX = symbolAttribute.x,
       y: originY = symbolAttribute.y,
       scaleX = symbolAttribute.scaleX,
-      scaleY = symbolAttribute.scaleY
+      scaleY = symbolAttribute.scaleY,
+      keepStrokeScale = symbolAttribute.keepStrokeScale
     } = symbol.attribute;
 
     const renderBorder = (borderStyle: Partial<IBorderStyle>, key: 'outerBorder' | 'innerBorder') => {
       const doStroke = !!(borderStyle && borderStyle.stroke);
 
       const { distance = symbolAttribute[key].distance } = borderStyle;
-      const d = getScaledStroke(context, distance as number, context.dpr);
+      const d = keepStrokeScale ? (distance as number) : getScaledStroke(context, distance as number, context.dpr);
       const sign = key === 'outerBorder' ? 1 : -1;
 
       context.beginPath();