Don't refocus if the activeElement is still on the page

WordPress · Feb 22, 2022 · 191b2af · 191b2af
1 parent 0212be2
commit 191b2af
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/packages/edit-site/src/components/routes/use-reset-focus-on-route-change.js b/packages/edit-site/src/components/routes/use-reset-focus-on-route-change.js
@@ -35,6 +35,11 @@ export default function useResetFocusOnRouteChange( targetRef ) {
 			}
 		}
 
-		targetRef.current?.focus();
+		const activeElement = targetRef.current?.ownerDocument.activeElement;
+
+		// Don't refocus if the activeElement is still on the page (like NavLink).
+		if ( ! activeElement || activeElement === document.body ) {
+			targetRef.current?.focus();
+		}
 	}, [ location, targetRef, history ] );
 }