From 8c2e5d4f61eb720e3a86109c17477ef3b620768c489266ed327a7ebea5702ebf Mon Sep 17 00:00:00 2001 From: Evan Carroll Date: Wed, 21 Jan 2026 00:31:40 -0600 Subject: [PATCH] fix: stop modal stacking --- crates/chattyness-user-ui/src/pages/realm.rs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/crates/chattyness-user-ui/src/pages/realm.rs b/crates/chattyness-user-ui/src/pages/realm.rs index 36add8f..b40d0fe 100644 --- a/crates/chattyness-user-ui/src/pages/realm.rs +++ b/crates/chattyness-user-ui/src/pages/realm.rs @@ -813,6 +813,20 @@ pub fn RealmPage() -> impl IntoView { } } + // If any modal is open, skip hotkeys (modals handle their own Escape key) + if settings_open.get_untracked() + || inventory_open.get_untracked() + || log_open.get_untracked() + || keybindings_open.get_untracked() + || avatar_editor_open.get_untracked() + || register_modal_open.get_untracked() + || history_modal_open.get_untracked() + || conversation_modal_open.get_untracked() + { + *e_pressed_clone.borrow_mut() = false; + return; + } + // Handle space to focus chat input (no prefix) if key == " " { set_focus_prefix.set(' ');