From 4a25e787fac4d59ffe4e3127b9462fcb8cb3f73c Mon Sep 17 00:00:00 2001
From: Philipinho <16838612+Philipinho@users.noreply.github.com>
Date: Tue, 28 Apr 2026 10:46:27 +0100
Subject: [PATCH] prevent create property popover flash

---
 .../base/components/property/create-property-popover.tsx  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/client/src/features/base/components/property/create-property-popover.tsx b/apps/client/src/features/base/components/property/create-property-popover.tsx
index f418e5219..b42ec9fed 100644
--- a/apps/client/src/features/base/components/property/create-property-popover.tsx
+++ b/apps/client/src/features/base/components/property/create-property-popover.tsx
@@ -104,9 +104,13 @@ export function CreatePropertyPopover({ pageId, properties, onPropertyCreated }:
   }, [resetState]);
 
   const handleClose = useCallback(() => {
+    // Don't reset panel/selectedType/etc. here — the popover's close
+    // transition is still rendering the dropdown for a frame, and
+    // resetting `panel` to "typePicker" mid-close flashes the type
+    // picker after the user clicks "Create field". `handleOpen`
+    // resets state on the next open instead.
     setOpened(false);
-    resetState();
-  }, [resetState]);
+  }, []);
 
   const attemptClose = useCallback(() => {
     if (panel === "configure" && hasContent) {