Merge pull request #563 from VisActor/fix/clear-state-of-empty-mark

Fix/clear state of empty mark
VisActor · Oct 15, 2024 · 8dde1c2 · 8dde1c2
2 parents e254a4a + a9ebc6c
commit 8dde1c2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/common/changes/@visactor/vgrammar-core/develop_2024-10-10-03-11.json b/common/changes/@visactor/vgrammar-core/develop_2024-10-10-03-11.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: fix error when clear states\n\n",
+      "type": "none",
+      "packageName": "@visactor/vgrammar-core"
+    }
+  ],
+  "packageName": "@visactor/vgrammar-core",
+  "email": "[email protected]"
+}
diff --git a/packages/vgrammar-core/src/interactions/toggle-state-mixin.ts b/packages/vgrammar-core/src/interactions/toggle-state-mixin.ts
@@ -90,7 +90,7 @@ export class ToggleStateMixin implements IToggleStateMixin {
         return;
       }
 
-      mark.elements.forEach(el => {
+      mark.elements?.forEach(el => {
         const isStated = statedElements && statedElements.includes(el);
 
         if (isStated) {
@@ -114,7 +114,7 @@ export class ToggleStateMixin implements IToggleStateMixin {
         return;
       }
 
-      mark.elements.forEach(el => {
+      mark.elements?.forEach(el => {
         const isStated = statedElements && statedElements.includes(el);
 
         if (isStated) {
@@ -132,18 +132,20 @@ export class ToggleStateMixin implements IToggleStateMixin {
     }
 
     this._marks.forEach(mark => {
-      if (reverseState && this._stateMarks[reverseState] && this._stateMarks[reverseState].includes(mark)) {
-        mark.elements.forEach(el => {
-          el.removeState(reverseState);
-        });
-      }
+      if (mark && mark.elements) {
+        if (reverseState && this._stateMarks[reverseState] && this._stateMarks[reverseState].includes(mark)) {
+          mark.elements.forEach(el => {
+            el.removeState(reverseState);
+          });
+        }
 
-      if (state && this._stateMarks[state] && this._stateMarks[state].includes(mark)) {
-        mark.elements.forEach(el => {
-          if (this._statedElements.includes(el)) {
-            el.removeState(state);
-          }
-        });
+        if (state && this._stateMarks[state] && this._stateMarks[state].includes(mark)) {
+          mark.elements.forEach(el => {
+            if (this._statedElements.includes(el)) {
+              el.removeState(state);
+            }
+          });
+        }
       }
     });
   }