Fix element remove observer (#2258)

atk4 · Feb 18, 2025 · 443fa33 · 443fa33
1 parent 6e1140b
commit 443fa33
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/js/src/Helper/elementRemoveObserver.js b/js/src/Helper/elementRemoveObserver.js
@@ -59,8 +59,10 @@ function handleObserverRecords(elem, mutationRecords) {
 
     const removedElems = new Set();
     for (const mutationRecord of mutationRecords) {
-        for (const removedElem of observedChildren.intersection(mutationRecord.removedNodes)) {
-            removedElems.add(removedElem);
+        for (const removedNode of mutationRecord.removedNodes) {
+            if (observedChildren.has(removedNode)) {
+                removedElems.add(removedNode);
+            }
         }
     }
 

diff --git a/public/js/atkjs-ui.js b/public/js/atkjs-ui.js
@@ -178,8 +178,10 @@ function handleObserverRecords(elem, mutationRecords) {
   const observedChildren = observedChildrenByElement.get(elem);
   const removedElems = new Set();
   for (const mutationRecord of mutationRecords) {
-    for (const removedElem of observedChildren.intersection(mutationRecord.removedNodes)) {
-      removedElems.add(removedElem);
+    for (const removedNode of mutationRecord.removedNodes) {
+      if (observedChildren.has(removedNode)) {
+        removedElems.add(removedNode);
+      }
     }
   }
   for (const removedElem of removedElems) {

diff --git a/public/js/atkjs-ui.js.map b/public/js/atkjs-ui.js.map
diff --git a/public/js/atkjs-ui.min.js b/public/js/atkjs-ui.min.js
diff --git a/public/js/atkjs-ui.min.js.map b/public/js/atkjs-ui.min.js.map
diff --git a/tests-behat/tab.feature b/tests-behat/tab.feature
@@ -13,8 +13,10 @@ Feature: Tab
     When I hide js modal
 
   Scenario: URL exception is displayed
+    Then I should not see "<title>404 Not Found</title>"
     When I click tab with title "URL 404"
     Then Modal is open with text "API Server Error"
-    # TODO text() xpath contains support
     # Then Modal is open with text "<title>404 Not Found</title>"
+    Then I should see "<title>404 Not Found</title>"
     When I hide js modal
+    Then I should not see "<title>404 Not Found</title>"