From ae10be1d5618831f5d0c9093bce8078f59ae00d8 Mon Sep 17 00:00:00 2001
From: cesartalen <cesartalense@gmail.com>
Date: Sun, 11 Oct 2026 01:30:45 +0200
Subject: [PATCH] fix(input): run the context menu handler with the input
 released

---
 crates/base/src/input/base/state.rs | 35 ++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/crates/base/src/input/base/state.rs b/crates/base/src/input/base/state.rs
index ae7f425a10..427efab86a 100644
--- a/crates/base/src/input/base/state.rs
+++ b/crates/base/src/input/base/state.rs
@@ -2163,23 +2163,29 @@ impl<M: InputModeKind> InputBaseState<M> {
 
         if let Some(handler) = self.context_menu_handler.clone() {
             let capabilities = self.context_menu_capabilities();
-            cx.defer_in(window, move |this, window, cx| {
+            let state = cx.weak_entity();
+            window.defer(cx, move |window, cx| {
+                let Some(state) = state.upgrade() else {
+                    return;
+                };
                 let previous_focus = window.focused(cx);
                 handler(NativeMenu::new(), capabilities, position, window, cx);
                 // A drawn menu takes focus synchronously; native menus leave it
-                // on the input. Capture it here, while the input is already
-                // borrowed, rather than re-entering the state from its handler.
-                if window.focused(cx) == previous_focus
-                    && !this.focus_handle.is_focused(window)
-                    && this.has_selection_focus(window, cx)
-                {
-                    // A custom handler can reuse an already-focused popup.
-                    return;
-                }
-                let menu_focus = window.focused(cx).filter(|focus| {
-                    Some(focus) != previous_focus.as_ref() && *focus != this.focus_handle
+                // on the input. Capture it after the handler, which runs with
+                // the input released so that it can read the state.
+                state.update(cx, |this, cx| {
+                    if window.focused(cx) == previous_focus
+                        && !this.focus_handle.is_focused(window)
+                        && this.has_selection_focus(window, cx)
+                    {
+                        // A custom handler can reuse an already-focused popup.
+                        return;
+                    }
+                    let menu_focus = window.focused(cx).filter(|focus| {
+                        Some(focus) != previous_focus.as_ref() && *focus != this.focus_handle
+                    });
+                    this.set_selection_focus(menu_focus, cx);
                 });
-                this.set_selection_focus(menu_focus, cx);
             });
         }
     }
@@ -5959,7 +5965,10 @@ mod tests {
                 let calls2 = calls.clone();
                 let items2 = items.clone();
                 let menu_focus = menu_focus.clone();
+                let input = cx.weak_entity();
                 state.on_context_menu(Rc::new(move |menu, _, _, window, cx| {
+                    // Panics if the input is still being updated.
+                    input.update(cx, |state, _| state.cursor()).unwrap();
                     calls2.set(calls2.get() + 1);
                     items2.set(menu.items.len());
                     menu_focus.focus(window, cx);