Tweak roving tab index focus behaviour (#7254)

matrix-org · Dec 2, 2021 · 68604e3 · 68604e3
1 parent 0afe141
commit 68604e3
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/accessibility/RovingTabIndex.tsx b/src/accessibility/RovingTabIndex.tsx
@@ -130,7 +130,10 @@ export const reducer = (state: IState, action: IAction) => {
                     state.activeRef = findSiblingElement(state.refs, oldIndex)
                         || findSiblingElement(state.refs, oldIndex, true);
                 }
-                state.activeRef?.current?.focus();
+                if (document.activeElement === document.body) {
+                    // if the focus got reverted to the body then the user was likely focused on the unmounted element
+                    state.activeRef?.current?.focus();
+                }
             }
 
             // update the refs list