From 6707e082a5647f51f3260bd84ded77e02a5b702a Mon Sep 17 00:00:00 2001
From: "lixuefei.1313" <lixuef1313@163.com>
Date: Wed, 26 Nov 2025 19:55:46 +0800
Subject: [PATCH 1/2] fix: fix issue of animation state

---
 packages/vrender-core/src/graphic/graphic.ts  | 19 +++++++++++--------
 .../src/plugins/builtin-plugin/edit-module.ts |  7 +++++--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/packages/vrender-core/src/graphic/graphic.ts b/packages/vrender-core/src/graphic/graphic.ts
index fcb4bc904..7a6377aa9 100644
--- a/packages/vrender-core/src/graphic/graphic.ts
+++ b/packages/vrender-core/src/graphic/graphic.ts
@@ -259,29 +259,29 @@ export abstract class Graphic<T extends Partial<IGraphicAttribute> = Partial<IGr
   declare y1WithoutTransform?: number;
 
   // aabbBounds，所有图形都需要有，所以初始化即赋值
-  declare protected _AABBBounds: IAABBBounds;
+  protected declare _AABBBounds: IAABBBounds;
   get AABBBounds(): IAABBBounds {
     return this.tryUpdateAABBBounds();
   }
   // 具有旋转的包围盒，部分图元需要，动态初始化
-  declare protected _OBBBounds?: IOBBBounds;
+  protected declare _OBBBounds?: IOBBBounds;
   get OBBBounds(): IOBBBounds {
     return this.tryUpdateOBBBounds();
   }
-  declare protected _globalAABBBounds: IAABBBounds;
+  protected declare _globalAABBBounds: IAABBBounds;
   // 全局包围盒，部分图元需要，动态初始化，建议使用AABBBounds
   get globalAABBBounds(): IAABBBounds {
     return this.tryUpdateGlobalAABBBounds();
   }
-  declare protected _transMatrix: Matrix;
+  protected declare _transMatrix: Matrix;
   get transMatrix(): Matrix {
     return this.tryUpdateLocalTransMatrix(true);
   }
-  declare protected _globalTransMatrix: Matrix;
+  protected declare _globalTransMatrix: Matrix;
   get globalTransMatrix(): Matrix {
     return this.tryUpdateGlobalTransMatrix(true);
   }
-  declare protected _updateTag: number;
+  protected declare _updateTag: number;
 
   // 上次更新的stamp
   declare stamp?: number;
@@ -1046,7 +1046,10 @@ export abstract class Graphic<T extends Partial<IGraphicAttribute> = Partial<IGr
       // (animate as any).stateNames = stateNames;
       // animate.to(animateAttrs, stateAnimateConfig.duration, stateAnimateConfig.easing);
       noAnimateAttrs && this.setAttributesAndPreventAnimate(noAnimateAttrs, false, { type: AttributeUpdateType.STATE });
-      // Object.assign((this as any).finalAttribute, attrs);
+      // 应用状态的时候要更新 finalAttribute 也就是目标属性
+      if ((this as any).finalAttribute) {
+        Object.assign((this as any).finalAttribute, attrs);
+      }
     } else {
       this.stopStateAnimates();
       this.setAttributesAndPreventAnimate(attrs, false, { type: AttributeUpdateType.STATE });
@@ -1095,7 +1098,7 @@ export abstract class Graphic<T extends Partial<IGraphicAttribute> = Partial<IGr
   private getNormalAttribute(key: string) {
     const value = (this.attribute as any)[key];
 
-    if (this.animates) {
+    if (this.animates && this.animates.size) {
       // this.animates.forEach(animate => {
       //   if ((animate as any).stateNames) {
       //     const endProps = animate.getEndProps();
diff --git a/packages/vrender-core/src/plugins/builtin-plugin/edit-module.ts b/packages/vrender-core/src/plugins/builtin-plugin/edit-module.ts
index 2ea4055d7..6e230027e 100644
--- a/packages/vrender-core/src/plugins/builtin-plugin/edit-module.ts
+++ b/packages/vrender-core/src/plugins/builtin-plugin/edit-module.ts
@@ -420,8 +420,11 @@ export class EditModule {
     this.textAreaDom.removeEventListener('input', this.handleInput);
     this.textAreaDom.removeEventListener('compositionstart', this.handleCompositionStart);
     this.textAreaDom.removeEventListener('compositionend', this.handleCompositionEnd);
-    this.textAreaDom.addEventListener('focusin', this.handleFocusOut);
-    this.textAreaDom.addEventListener('focusout', this.handleFocusOut);
+    this.textAreaDom.removeEventListener('focusin', this.handleFocusOut);
+    this.textAreaDom.removeEventListener('focusout', this.handleFocusOut);
     application.global.removeEventListener('keydown', this.handleKeyDown);
+
+    this.textAreaDom.parentElement?.removeChild(this.textAreaDom);
+    this.textAreaDom = null;
   }
 }

From 4ab3a02a0f83592bfda50ee5bd1b3971c676088c Mon Sep 17 00:00:00 2001
From: "lixuefei.1313" <lixuef1313@163.com>
Date: Wed, 26 Nov 2025 19:55:57 +0800
Subject: [PATCH 2/2] docs: update changlog of rush

---
 ...fix-issue-of-animation-state_2025-11-26-11-55.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@visactor/vrender-core/fix-fix-issue-of-animation-state_2025-11-26-11-55.json

diff --git a/common/changes/@visactor/vrender-core/fix-fix-issue-of-animation-state_2025-11-26-11-55.json b/common/changes/@visactor/vrender-core/fix-fix-issue-of-animation-state_2025-11-26-11-55.json
new file mode 100644
index 000000000..605482a19
--- /dev/null
+++ b/common/changes/@visactor/vrender-core/fix-fix-issue-of-animation-state_2025-11-26-11-55.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: fix issue of animation state\n\n",
+      "type": "none",
+      "packageName": "@visactor/vrender-core"
+    }
+  ],
+  "packageName": "@visactor/vrender-core",
+  "email": "lixuef1313@163.com"
+}
\ No newline at end of file