From f7622a58078ee5b5e27996e4c628169be23c9ca4 Mon Sep 17 00:00:00 2001
From: Mantas Kantautas <mantas.kantautas@gmail.com>
Date: Fri, 23 Oct 2026 09:25:48 +0300
Subject: [PATCH] [popups] Skip the focus-out close for a popup that already
 closed

---
 .../focus/FloatingFocusManager.test.tsx       | 66 +++++++++++++++++++
 .../popups/focus/FloatingFocusManager.tsx     |  6 +-
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/packages/react/src/utils/popups/focus/FloatingFocusManager.test.tsx b/packages/react/src/utils/popups/focus/FloatingFocusManager.test.tsx
index 4112e33d09d..27d2af2eb13 100644
--- a/packages/react/src/utils/popups/focus/FloatingFocusManager.test.tsx
+++ b/packages/react/src/utils/popups/focus/FloatingFocusManager.test.tsx
@@ -2256,6 +2256,72 @@ describe('FloatingFocusManager', () => {
     });
   });
 
+  describe('prop: closeOnFocusOut', () => {
+    // The floating element stays mounted after it closes, as a popup does during its exit
+    // animation or after `preventUnmountOnClose()`.
+    function KeptMountedApp(props: { onOpenChange: (open: boolean, reason: string) => void }) {
+      const [open, setOpen] = React.useState(true);
+      const { refs, context } = useFloating({
+        open,
+        onOpenChange(nextOpen, eventDetails) {
+          props.onOpenChange(nextOpen, eventDetails.reason);
+          setOpen(nextOpen);
+        },
+      });
+
+      return (
+        <>
+          <FloatingFocusManager
+            store={context.rootStore}
+            modal={false}
+            initialFocus={false}
+            closeOnFocusOut
+          >
+            <div
+              role="dialog"
+              ref={refs.setFloating}
+              data-testid="floating"
+              data-open={String(open)}
+            />
+          </FloatingFocusManager>
+          <button data-testid="close" onClick={() => setOpen(false)}>
+            close
+          </button>
+          <button data-testid="reference" ref={refs.setReference} />
+          <button data-testid="last" />
+        </>
+      );
+    }
+
+    test.each([
+      {
+        name: 'closes the floating element while it is open',
+        closeFirst: false,
+        expectedCalls: [[false, 'focus-out']],
+      },
+      {
+        name: 'does not close again a floating element that already closed',
+        closeFirst: true,
+        expectedCalls: [],
+      },
+    ])('focus leaving the reference $name', async ({ closeFirst, expectedCalls }) => {
+      const handleOpenChange = vi.fn();
+      render(<KeptMountedApp onOpenChange={handleOpenChange} />);
+
+      if (closeFirst) {
+        fireEvent.click(screen.getByTestId('close'));
+      }
+      expect(screen.getByTestId('floating')).toHaveAttribute('data-open', String(!closeFirst));
+
+      act(() => screen.getByTestId('reference').focus());
+      await userEvent.tab();
+      await flushMicrotasks();
+
+      expect(screen.getByTestId('last')).toHaveFocus();
+      expect(handleOpenChange.mock.calls).toEqual(expectedCalls);
+    });
+  });
+
   describe('prop: restoreFocus', () => {
     function App({ restoreFocus = true }: { restoreFocus?: boolean | 'popup' }) {
       const [isOpen, setIsOpen] = React.useState(false);
diff --git a/packages/react/src/utils/popups/focus/FloatingFocusManager.tsx b/packages/react/src/utils/popups/focus/FloatingFocusManager.tsx
index a1326737568..98363e452ba 100644
--- a/packages/react/src/utils/popups/focus/FloatingFocusManager.tsx
+++ b/packages/react/src/utils/popups/focus/FloatingFocusManager.tsx
@@ -568,7 +568,11 @@ export function FloatingFocusManager(props: FloatingFocusManagerProps): React.JS
           (isUntrappedTypeableCombobox || relatedTarget !== getPreviouslyFocusedElement())
         ) {
           preventReturnFocusRef.current = true;
-          store.setOpen(false, createChangeEventDetails(REASONS.focusOut, event));
+          // A popup that stays mounted after it closed (during its exit animation or after
+          // `preventUnmountOnClose()`) already reported that close.
+          if (store.select('open')) {
+            store.setOpen(false, createChangeEventDetails(REASONS.focusOut, event));
+          }
         }
       });
     }