react-magma-dom 4.7.0-next.8 → 4.7.0-next.9

package/dist/esm/index.js

@@ -9484,11 +9484,20 @@ function useFocusLock(active, header, body) {
   var focusableItems = useRef([]);
   var updateFocusableItems = function updateFocusableItems() {
     var _rootNode$current;
-    focusableItems.current = (_rootNode$current = rootNode.current) == null ? void 0 : _rootNode$current.querySelectorAll('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"]), video');
+    focusableItems.current = Array.from(((_rootNode$current = rootNode.current) == null ? void 0 : _rootNode$current.querySelectorAll('button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"]), video')) || []);
   };
   useEffect(function () {
     if (active) {
       updateFocusableItems();
+      var observer = new MutationObserver(function () {
+        updateFocusableItems();
+      });
+      if (rootNode.current) {
+        observer.observe(rootNode.current, {
+          childList: true,
+          subtree: true
+        });
+      }
       if (header && header.current) {
         header.current.focus();
       } else if (focusableItems.current && focusableItems.current.length > 0) {
@@ -9498,21 +9507,11 @@ function useFocusLock(active, header, body) {
         body.current.firstChild.setAttribute('tabIndex', '-1');
         body.current.firstChild.focus();
       }
+      return function () {
+        observer.disconnect();
+      };
     }
-  }, [active]);
-  useEffect(function () {
-    var observer = new MutationObserver(function () {
-      updateFocusableItems();
-    });
-    updateFocusableItems();
-    rootNode.current && observer.observe(rootNode.current, {
-      childList: true,
-      subtree: true
-    });
-    return function () {
-      observer.disconnect();
-    };
-  }, [rootNode]);
+  }, [active, header, body]);
   useEffect(function () {
     var handleKeyPress = function handleKeyPress(event) {
       if (!focusableItems.current) return;
@@ -9554,7 +9553,7 @@ function useFocusLock(active, header, body) {
     return function () {
       window.removeEventListener('keydown', handleKeyPress);
     };
-  }, [active, focusableItems]);
+  }, [active, focusableItems, header]);
   return rootNode;
 }