fix(@clayui/shared): remove suppression from elements before focus

liferay · Aug 16, 2024 · c9a9e83 · c9a9e83
1 parent 9a99238
commit c9a9e83
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/packages/clay-drop-down/src/Menu.tsx b/packages/clay-drop-down/src/Menu.tsx
@@ -200,7 +200,6 @@ const Menu = React.forwardRef<HTMLDivElement, IProps>(
 
 		return (
 			<Overlay
-				inert
 				isCloseOnInteractOutside={closeOnClickOutside}
 				isKeyboardDismiss
 				isModal={lock}

diff --git a/packages/clay-shared/src/Overlay.tsx b/packages/clay-shared/src/Overlay.tsx
@@ -118,6 +118,11 @@ export function Overlay({
 			onHide('blur');
 		},
 		onInteractStart: (event) => {
+			if (unsuppressCallbackRef.current) {
+				unsuppressCallbackRef.current();
+				unsuppressCallbackRef.current = null;
+			}
+
 			if (overlayStack[overlayStack.length - 1] === menuRef && isModal) {
 				event.stopPropagation();
 				event.preventDefault();
@@ -152,16 +157,16 @@ export function Overlay({
 			// https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/inert
 			if ((isModal || inert) && supportsInert()) {
 				unsuppressCallbackRef.current = suppressOthers(elements);
-
-				return () => {
-					if (unsuppressCallbackRef.current) {
-						unsuppressCallbackRef.current();
-					}
-					unsuppressCallbackRef.current = null;
-				};
 			} else {
-				return hideOthers(elements);
+				unsuppressCallbackRef.current = hideOthers(elements);
 			}
+
+			return () => {
+				if (unsuppressCallbackRef.current) {
+					unsuppressCallbackRef.current();
+				}
+				unsuppressCallbackRef.current = null;
+			};
 		}
 	}, [isModal, inert, isOpen]);