From e5e0918c9337890b368d32f142dc917d66cad922 Mon Sep 17 00:00:00 2001
From: codytseng <codytseng98@gmail.com>
Date: Sat, 14 Mar 2026 13:33:27 +0800
Subject: [PATCH] fix: always mount popover backdrop portal to prevent remount
 issues

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/components/ui/popover.tsx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/ui/popover.tsx b/src/components/ui/popover.tsx
index 5fc42f4..09c5642 100644
--- a/src/components/ui/popover.tsx
+++ b/src/components/ui/popover.tsx
@@ -26,8 +26,8 @@ const Popover = ({
 
   return (
     <>
-      {open &&
-        createPortal(
+      {createPortal(
+        open ? (
           <div
             ref={backdropRef}
             className="pointer-events-auto fixed inset-0 z-40"
@@ -35,9 +35,10 @@ const Popover = ({
               e.stopPropagation()
               handleOpenChange(false)
             }}
-          />,
-          document.body
-        )}
+          />
+        ) : null,
+        document.body
+      )}
       <PopoverPrimitive.Root {...props} open={open} onOpenChange={handleOpenChange} modal={false} />
     </>
   )