Merge pull request #1345 from VisActor/fix/shadow-root-picker

Fix/shadow root picker
VisActor · Aug 6, 2024 · f7cb2d2 · f7cb2d2
2 parents fbb37e2 + 7301fb5
commit f7cb2d2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/common/changes/@visactor/vrender-core/fix-shadow-root-picker_2024-08-06-02-51.json b/common/changes/@visactor/vrender-core/fix-shadow-root-picker_2024-08-06-02-51.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: fix picker of shadow root group\n\n",
+      "type": "none",
+      "packageName": "@visactor/vrender-core"
+    }
+  ],
+  "packageName": "@visactor/vrender-core",
+  "email": "[email protected]"
+}
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;
     }