fix: do not set focus on menu after unmounted (#1106)

szhsin · Oct 10, 2023 · 85210a6 · 85210a6
1 parent 0579383
commit 85210a6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/dist/es/components/MenuList.js b/dist/es/components/MenuList.js
@@ -316,7 +316,8 @@ const MenuList = ({
       setItemFocus();
     } else if (captureFocus) {
       const id = setTimeout(() => {
-        if (!menuRef.current.contains(document.activeElement)) {
+        const menuElt = menuRef.current;
+        if (menuElt && !menuElt.contains(document.activeElement)) {
           focusRef.current.focus();
           setItemFocus();
         }

diff --git a/dist/es/utils/submenuCtx.js b/dist/es/utils/submenuCtx.js
@@ -13,7 +13,7 @@ const createSubmenuCtx = () => {
           pending();
         }, closeDelay);
       } else {
-        settled == null ? void 0 : settled();
+        settled == null || settled();
       }
     },
     off: () => {

diff --git a/dist/index.js b/dist/index.js
@@ -271,7 +271,7 @@ const createSubmenuCtx = () => {
           pending();
         }, closeDelay);
       } else {
-        settled == null ? void 0 : settled();
+        settled == null || settled();
       }
     },
     off: () => {
@@ -1172,7 +1172,8 @@ const MenuList = ({
       setItemFocus();
     } else if (captureFocus) {
       const id = setTimeout(() => {
-        if (!menuRef.current.contains(document.activeElement)) {
+        const menuElt = menuRef.current;
+        if (menuElt && !menuElt.contains(document.activeElement)) {
           focusRef.current.focus();
           setItemFocus();
         }

diff --git a/src/components/MenuList.js b/src/components/MenuList.js
@@ -374,7 +374,8 @@ export const MenuList = ({
       const id = setTimeout(
         () => {
           // If focus has already been set to a children element, don't set focus on menu or item
-          if (!menuRef.current.contains(document.activeElement)) {
+          const menuElt = menuRef.current;
+          if (menuElt && !menuElt.contains(document.activeElement)) {
             focusRef.current.focus();
             setItemFocus();
           }