fix: optimize useage of removeState

VisActor · May 28, 2024 · 4e4a3ad · 4e4a3ad
1 parent 462598a
commit 4e4a3ad
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/packages/vgrammar-core/src/interactions/brush-highlight.ts b/packages/vgrammar-core/src/interactions/brush-highlight.ts
@@ -32,10 +32,11 @@ export class BrushHighlight extends BrushBase<BrushHighlightOptions> {
     const elements: (IElement | IGlyphElement)[] = [];
 
     if (event.type === IOperateType.brushClear) {
+      const states = [this.options.blurState, this.options.highlightState];
+
       this._marks.forEach(mark => {
         mark.elements.forEach(el => {
-          el.removeState(this.options.blurState);
-          el.removeState(this.options.highlightState);
+          el.removeState(states);
         });
       });
     } else {

diff --git a/packages/vgrammar-core/src/interactions/element-highlight-by-group.ts b/packages/vgrammar-core/src/interactions/element-highlight-by-group.ts
@@ -38,10 +38,11 @@ export class ElementHighlightByGroup extends BaseInteraction<ElementHighlightOpt
   }
 
   clearPrevElements() {
+    const states = [this.options.highlightState, this.options.blurState];
+
     this._marks.forEach(mark => {
       mark.elements.forEach(el => {
-        el.removeState(this.options.highlightState);
-        el.removeState(this.options.blurState);
+        el.removeState(states);
       });
     });
   }

diff --git a/packages/vgrammar-core/src/interactions/element-highlight-by-key.ts b/packages/vgrammar-core/src/interactions/element-highlight-by-key.ts
@@ -38,10 +38,11 @@ export class ElementHighlightByKey extends BaseInteraction<ElementHighlightOptio
   }
 
   clearPrevElements() {
+    const states = [this.options.highlightState, this.options.blurState];
+
     this._marks.forEach(mark => {
       mark.elements.forEach(el => {
-        el.removeState(this.options.highlightState);
-        el.removeState(this.options.blurState);
+        el.removeState(states);
       });
     });
   }

diff --git a/packages/vgrammar-core/src/interactions/element-highlight-by-legend.ts b/packages/vgrammar-core/src/interactions/element-highlight-by-legend.ts
@@ -67,10 +67,10 @@ export class ElementHighlightByLegend extends BaseInteraction<ElementHighlightBy
   }
 
   reset() {
+    const states = [this.options.blurState, this.options.highlightState];
     this._marks.forEach(mark => {
       mark.elements.forEach(el => {
-        el.removeState(this.options.blurState);
-        el.removeState(this.options.highlightState);
+        el.removeState(states);
       });
     });
   }

diff --git a/packages/vgrammar-core/src/interactions/element-highlight-by-name.ts b/packages/vgrammar-core/src/interactions/element-highlight-by-name.ts
@@ -74,10 +74,11 @@ export class ElementHighlightByName extends BaseInteraction<ElementHighlightByNa
   }
 
   reset() {
+    const states = [this.options.blurState, this.options.highlightState];
+
     this._marks.forEach(mark => {
       mark.elements.forEach(el => {
-        el.removeState(this.options.blurState);
-        el.removeState(this.options.highlightState);
+        el.removeState(states);
       });
     });
   }