fix(a11y): focus the AttachmentSelector button after closing dialog

Author: MartinCupela

src/components/MessageComposer/AttachmentSelector/AttachmentSelector.tsx

@@ -326,6 +326,7 @@ export const AttachmentSelector = ({
 
   const [modalContentAction, setModalContentActionAction] =
     useState<AttachmentSelectorAction>();
+  const shouldRestoreFocusToTriggerRef = useRef(false);
   const openModalForAction = useCallback(
     (actionType: AttachmentSelectorAction['type']) => {
       const action = actions.find((a) => a.type === actionType);
@@ -336,13 +337,24 @@ export const AttachmentSelector = ({
   );
 
   const closeModal = useCallback(() => {
+    shouldRestoreFocusToTriggerRef.current = true;
     setModalContentActionAction(undefined);
-    menuButtonRef.current?.focus();
   }, []);
 
   const [fileInput, setFileInput] = useState<HTMLInputElement | null>(null);
   const menuButtonRef = useRef<HTMLButtonElement>(null);
 
+  useEffect(() => {
+    if (modalContentAction || !shouldRestoreFocusToTriggerRef.current) return;
+
+    const frame = requestAnimationFrame(() => {
+      menuButtonRef.current?.focus();
+      shouldRestoreFocusToTriggerRef.current = false;
+    });
+
+    return () => cancelAnimationFrame(frame);
+  }, [modalContentAction]);
+
   const contextMenuItems = useMemo(
     () =>
       actions.map((action) => (

src/components/MessageComposer/__tests__/AttachmentSelector.test.tsx

@@ -452,7 +452,9 @@ describe('AttachmentSelector', () => {
     await waitFor(() => {
       expect(screen.queryByTestId(POLL_CREATION_DIALOG_TEST_ID)).not.toBeInTheDocument();
     });
-    expect(invokeButtonFocusSpy).toHaveBeenCalledTimes(1);
+    await waitFor(() => {
+      expect(invokeButtonFocusSpy).toHaveBeenCalledTimes(1);
+    });
   });
 
   it('opens share location dialog with description wired to initial close control', async () => {
@@ -493,7 +495,9 @@ describe('AttachmentSelector', () => {
     await waitFor(() => {
       expect(screen.queryByTestId('share-location-dialog')).not.toBeInTheDocument();
     });
-    expect(invokeButtonFocusSpy).toHaveBeenCalledTimes(1);
+    await waitFor(() => {
+      expect(invokeButtonFocusSpy).toHaveBeenCalledTimes(1);
+    });
   });
 
   it('is closed if File menu button is clicked', async () => {