fix(state-layer): ensure all listeners are always remove from the pre…

…vious target element regardless of attached state
tyler-technologies-oss · Dec 7, 2023 · 80a62bf · 80a62bf
1 parent 953d578
commit 80a62bf
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/lib/state-layer/state-layer-foundation.ts b/src/lib/state-layer/state-layer-foundation.ts
@@ -249,10 +249,10 @@ export class StateLayerFoundation implements IStateLayerFoundation {
   }
   public set targetElement(el: HTMLElement | null) {
     // Always remove the listeners from the previous target element
-    if (this._attached) {
-      this._removeListeners();
-    } else {
-      // If unattached destroy the defer listener to recreate on the new target element
+    this._removeListeners();
+
+    // If unattached destroy the defer listener to recreate on the new target element
+    if (!this._attached) {
       this._adapter.destroy();
       this._deferred = false;
     }
@@ -273,9 +273,10 @@ export class StateLayerFoundation implements IStateLayerFoundation {
       this._target = value;
 
       if (this._adapter.isConnected) {
-        if (this._attached) {
-          this._removeListeners();
-        } else {
+        // Always remove the listeners from the previous target element
+        this._removeListeners();
+
+        if (!this._attached) {
           this._adapter.destroy();
           this._deferred = false;
         }