From 56afed3129494932fbfd14627051b569a71dc288 Mon Sep 17 00:00:00 2001
From: zhouxinyu <zhouxinyu12138@gmail.com>
Date: Fri, 12 Jan 2024 18:27:43 +0800
Subject: [PATCH] fix: fix issue with shadow bounds

---
 .../src/graphic/graphic-service/graphic-service.ts  |  8 +++++---
 packages/vrender-core/src/graphic/graphic.ts        | 13 ++++++-------
 packages/vrender-core/src/graphic/shadow-root.ts    | 10 +++-------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/packages/vrender-core/src/graphic/graphic-service/graphic-service.ts b/packages/vrender-core/src/graphic/graphic-service/graphic-service.ts
index 33099810d..3219aed70 100644
--- a/packages/vrender-core/src/graphic/graphic-service/graphic-service.ts
+++ b/packages/vrender-core/src/graphic/graphic-service/graphic-service.ts
@@ -719,9 +719,11 @@ export class DefaultGraphicService implements IGraphicService {
     graphic?: IGraphic
   ) {
     if (!this._validCheck(attribute, rectTheme, aabbBounds, graphic)) {
-      return aabbBounds;
-    }
-    if (!this.updatePathProxyAABBBounds(aabbBounds, graphic)) {
+      aabbBounds.clear();
+      if (!graphic.shadowRoot) {
+        return aabbBounds;
+      }
+    } else if (!this.updatePathProxyAABBBounds(aabbBounds, graphic)) {
       let { width, height } = attribute;
       const { x1, y1, x, y } = attribute;
       width = width ?? x1 - x;
diff --git a/packages/vrender-core/src/graphic/graphic.ts b/packages/vrender-core/src/graphic/graphic.ts
index 0c8a5b7b3..e1950b808 100644
--- a/packages/vrender-core/src/graphic/graphic.ts
+++ b/packages/vrender-core/src/graphic/graphic.ts
@@ -331,15 +331,11 @@ export abstract class Graphic<T extends Partial<IGraphicAttribute> = Partial<IGr
   protected abstract tryUpdateOBBBounds(): OBBBounds;
 
   protected tryUpdateGlobalAABBBounds(): AABBBounds {
+    const b = this.AABBBounds;
     if (!this._globalAABBBounds) {
-      this._globalAABBBounds = this.AABBBounds.clone();
+      this._globalAABBBounds = b.clone();
     } else {
-      this._globalAABBBounds.setValue(
-        this._AABBBounds.x1,
-        this._AABBBounds.y1,
-        this._AABBBounds.x2,
-        this._AABBBounds.y2
-      );
+      this._globalAABBBounds.setValue(b.x1, b.y1, b.x2, b.y2);
     }
     // 使用parent的grloalAABBBounds
     // todo: 考虑是否需要性能优化
@@ -959,6 +955,9 @@ export abstract class Graphic<T extends Partial<IGraphicAttribute> = Partial<IGr
 
   protected clearUpdateBoundTag() {
     this._updateTag &= UpdateTag.CLEAR_BOUNDS;
+    // if (this.shadowRoot) {
+    //   this.shadowRoot.clearUpdateBoundTag();
+    // }
   }
   /**
    * 更新位置tag，包括全局tag和局部tag
diff --git a/packages/vrender-core/src/graphic/shadow-root.ts b/packages/vrender-core/src/graphic/shadow-root.ts
index c8e2a1520..d13b7b413 100644
--- a/packages/vrender-core/src/graphic/shadow-root.ts
+++ b/packages/vrender-core/src/graphic/shadow-root.ts
@@ -57,15 +57,11 @@ export class ShadowRoot extends Group {
   // 计算AABBBounds不受影响
   // 计算globalAABBBounds
   protected tryUpdateGlobalAABBBounds(): AABBBounds {
+    const b = this.AABBBounds;
     if (!this._globalAABBBounds) {
-      this._globalAABBBounds = this._AABBBounds.clone();
+      this._globalAABBBounds = b.clone();
     } else {
-      this._globalAABBBounds.setValue(
-        this._AABBBounds.x1,
-        this._AABBBounds.y1,
-        this._AABBBounds.x2,
-        this._AABBBounds.y2
-      );
+      this._globalAABBBounds.setValue(b.x1, b.y1, b.x2, b.y2);
     }
     // 使用shadowHost的grloalAABBBounds
     // todo: 考虑是否需要性能优化