Merge pull request #1346 from VisActor/release/0.19.23

[Auto release] release 0.19.23
VisActor · Aug 6, 2024 · ad69c81 · ad69c81
2 parents 431c227 + 7c9806b
commit ad69c81
Show file tree

Hide file tree

Showing 25 changed files with 121 additions and 40 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.19.22","nextBump":"patch"}]
+[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.19.23","nextBump":"patch"}]
diff --git a/docs/package.json b/docs/package.json
@@ -13,7 +13,7 @@
     "@visactor/vchart": "1.3.0",
     "@visactor/vutils": "~0.18.10",
     "@visactor/vgrammar": "~0.5.7",
-    "@visactor/vrender": "workspace:0.19.22",
+    "@visactor/vrender": "workspace:0.19.23",
     "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.19.23",
+      "tag": "@visactor/react-vrender-utils_v0.19.23",
+      "date": "Tue, 06 Aug 2024 05:17:39 GMT",
+      "comments": {}
+    },
     {
       "version": "0.19.22",
       "tag": "@visactor/react-vrender-utils_v0.19.22",

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 Mon, 05 Aug 2024 09:08:30 GMT and should not be manually modified.
+This log was last generated on Tue, 06 Aug 2024 05:17:39 GMT and should not be manually modified.
+
+## 0.19.23
+Tue, 06 Aug 2024 05:17:39 GMT
+
+_Version update only_
 
 ## 0.19.22
 Mon, 05 Aug 2024 09:08:30 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.19.22",
+  "version": "0.19.23",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -24,8 +24,8 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@visactor/vrender": "workspace:0.19.22",
-    "@visactor/react-vrender": "workspace:0.19.22",
+    "@visactor/vrender": "workspace:0.19.23",
+    "@visactor/react-vrender": "workspace:0.19.23",
     "@visactor/vutils": "~0.18.10",
     "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.19.23",
+      "tag": "@visactor/react-vrender_v0.19.23",
+      "date": "Tue, 06 Aug 2024 05:17:39 GMT",
+      "comments": {}
+    },
     {
       "version": "0.19.22",
       "tag": "@visactor/react-vrender_v0.19.22",

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 Mon, 05 Aug 2024 09:08:30 GMT and should not be manually modified.
+This log was last generated on Tue, 06 Aug 2024 05:17:39 GMT and should not be manually modified.
+
+## 0.19.23
+Tue, 06 Aug 2024 05:17:39 GMT
+
+_Version update only_
 
 ## 0.19.22
 Mon, 05 Aug 2024 09:08:30 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.19.22",
+  "version": "0.19.23",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -23,7 +23,7 @@
     "react": "^18.2.0"
   },
   "dependencies": {
-    "@visactor/vrender": "workspace:0.19.22",
+    "@visactor/vrender": "workspace:0.19.23",
     "@visactor/vutils": "~0.18.10",
     "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.19.23",
+      "tag": "@visactor/vrender-components_v0.19.23",
+      "date": "Tue, 06 Aug 2024 05:17:39 GMT",
+      "comments": {}
+    },
     {
       "version": "0.19.22",
       "tag": "@visactor/vrender-components_v0.19.22",

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 Mon, 05 Aug 2024 09:08:30 GMT and should not be manually modified.
+This log was last generated on Tue, 06 Aug 2024 05:17:39 GMT and should not be manually modified.
+
+## 0.19.23
+Tue, 06 Aug 2024 05:17:39 GMT
+
+_Version update only_
 
 ## 0.19.22
 Mon, 05 Aug 2024 09:08:30 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.19.22",
+  "version": "0.19.23",
   "description": "components library for dp visualization",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -24,8 +24,8 @@
     "analysis-core": "cross-env DEBUG='Bundler*' bundle -f umd -a -i core.ts"
   },
   "dependencies": {
-    "@visactor/vrender-core": "workspace:0.19.22",
-    "@visactor/vrender-kits": "workspace:0.19.22",
+    "@visactor/vrender-core": "workspace:0.19.23",
+    "@visactor/vrender-kits": "workspace:0.19.23",
     "@visactor/vutils": "~0.18.10",
     "@visactor/vscale": "~0.18.9"
   },

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.19.23",
+      "tag": "@visactor/vrender-core_v0.19.23",
+      "date": "Tue, 06 Aug 2024 05:17:39 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "fix: fix picker of shadow root group\n\n"
+          }
+        ]
+      }
+    },
     {
       "version": "0.19.22",
       "tag": "@visactor/vrender-core_v0.19.22",

diff --git a/packages/vrender-core/CHANGELOG.md b/packages/vrender-core/CHANGELOG.md
@@ -1,6 +1,15 @@
 # Change Log - @visactor/vrender-core
 
-This log was last generated on Mon, 05 Aug 2024 09:08:30 GMT and should not be manually modified.
+This log was last generated on Tue, 06 Aug 2024 05:17:39 GMT and should not be manually modified.
+
+## 0.19.23
+Tue, 06 Aug 2024 05:17:39 GMT
+
+### Updates
+
+- fix: fix picker of shadow root group
+
+
 
 ## 0.19.22
 Mon, 05 Aug 2024 09:08:30 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.19.22",
+  "version": "0.19.23",
   "description": "",
   "sideEffects": [
     "./src/modules.ts",

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

diff --git a/packages/vrender-core/src/interface/graphic.ts b/packages/vrender-core/src/interface/graphic.ts
@@ -315,6 +315,7 @@ export type IGraphicAttribute = IDebugType &
      */
     keepDirIn3d?: boolean;
     shadowRootIdx: number;
+    shadowPickMode?: 'full' | 'graphic';
     globalZIndex: number;
     globalCompositeOperation: CanvasRenderingContext2D['globalCompositeOperation'] | '';
     // 完全支持滚动 | 完全不支持滚动 | 支持x方向的滚动 | 支持y方向的滚动

diff --git a/packages/vrender-core/src/picker/pick-interceptor.ts b/packages/vrender-core/src/picker/pick-interceptor.ts
@@ -13,6 +13,7 @@ import type {
   PickResult
 } from '../interface';
 import { matrixAllocate } from '../allocator/matrix-allocate';
+import { getTheme } from '../graphic';
 
 // 拦截器
 export const PickItemInterceptor = Symbol.for('PickItemInterceptor');
@@ -73,6 +74,8 @@ export class ShadowRootPickItemInterceptorContribution implements IPickItemInter
     const context = pickerService.pickContext;
     context.highPerformanceSave();
 
+    const theme = (getTheme(graphic) as any)?.[graphic.type];
+    const { shadowPickMode = theme?.shadowPickMode } = graphic.attribute;
     const g = graphic.shadowRoot;
     const currentGroupMatrix = matrixAllocate.allocateByObj(parentMatrix);
     const newPoint = new Point(
@@ -95,7 +98,7 @@ export class ShadowRootPickItemInterceptorContribution implements IPickItemInter
     context.highPerformanceRestore();
 
     // 影子节点pick到group也算pick到graphic
-    if (!result.graphic && result.group) {
+    if (!result.graphic && result.group && shadowPickMode === 'full') {
       result.graphic = result.group;
     }
 

diff --git a/packages/vrender-kits/CHANGELOG.json b/packages/vrender-kits/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/vrender-kits",
   "entries": [
+    {
+      "version": "0.19.23",
+      "tag": "@visactor/vrender-kits_v0.19.23",
+      "date": "Tue, 06 Aug 2024 05:17:39 GMT",
+      "comments": {}
+    },
     {
       "version": "0.19.22",
       "tag": "@visactor/vrender-kits_v0.19.22",

diff --git a/packages/vrender-kits/CHANGELOG.md b/packages/vrender-kits/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @visactor/vrender-kits
 
-This log was last generated on Mon, 05 Aug 2024 09:08:30 GMT and should not be manually modified.
+This log was last generated on Tue, 06 Aug 2024 05:17:39 GMT and should not be manually modified.
+
+## 0.19.23
+Tue, 06 Aug 2024 05:17:39 GMT
+
+_Version update only_
 
 ## 0.19.22
 Mon, 05 Aug 2024 09:08:30 GMT

diff --git a/packages/vrender-kits/package.json b/packages/vrender-kits/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-kits",
-  "version": "0.19.22",
+  "version": "0.19.23",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -20,7 +20,7 @@
     "test": ""
   },
   "dependencies": {
-    "@visactor/vrender-core": "workspace:0.19.22",
+    "@visactor/vrender-core": "workspace:0.19.23",
     "@visactor/vutils": "~0.18.10",
     "@resvg/resvg-js": "2.4.1",
     "roughjs": "4.5.2"

diff --git a/packages/vrender/CHANGELOG.json b/packages/vrender/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/vrender",
   "entries": [
+    {
+      "version": "0.19.23",
+      "tag": "@visactor/vrender_v0.19.23",
+      "date": "Tue, 06 Aug 2024 05:17:39 GMT",
+      "comments": {}
+    },
     {
       "version": "0.19.22",
       "tag": "@visactor/vrender_v0.19.22",

diff --git a/packages/vrender/CHANGELOG.md b/packages/vrender/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @visactor/vrender
 
-This log was last generated on Mon, 05 Aug 2024 09:08:30 GMT and should not be manually modified.
+This log was last generated on Tue, 06 Aug 2024 05:17:39 GMT and should not be manually modified.
+
+## 0.19.23
+Tue, 06 Aug 2024 05:17:39 GMT
+
+_Version update only_
 
 ## 0.19.22
 Mon, 05 Aug 2024 09:08:30 GMT

diff --git a/packages/vrender/package.json b/packages/vrender/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender",
-  "version": "0.19.22",
+  "version": "0.19.23",
   "description": "",
   "sideEffects": true,
   "main": "cjs/index.js",
@@ -24,8 +24,8 @@
     "test-watch": "cross-env DEBUG_MODE=1 jest --watch"
   },
   "dependencies": {
-    "@visactor/vrender-core": "workspace:0.19.22",
-    "@visactor/vrender-kits": "workspace:0.19.22"
+    "@visactor/vrender-core": "workspace:0.19.23",
+    "@visactor/vrender-kits": "workspace:0.19.23"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.19.22","nextBump":"patch"}]
		[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.19.23","nextBump":"patch"}]