|
14 | 14 | class UserInput(Widget): |
15 | 15 | BINDINGS = [ |
16 | 16 | Binding(Key.ENTER.value, "submit", "Submit", priority=True), |
17 | | - Binding(Key.ESCAPE.value, "hide_menu", "Hide Menu", priority=True), |
18 | 17 | ] |
19 | 18 |
|
20 | 19 | def __init__(self, actions: Actions) -> None: |
@@ -54,28 +53,35 @@ def on_text_area_changed(self, event: TextArea.Changed) -> None: |
54 | 53 |
|
55 | 54 | async def on_key(self, event) -> None: |
56 | 55 | if event.key == Key.CTRL_J.value: |
57 | | - event.stop() |
58 | | - event.prevent_default() |
59 | | - input_widget = self.query_one(TextArea) |
60 | | - input_widget.insert("\n") |
| 56 | + self._insert_newline(event) |
61 | 57 | return |
62 | 58 |
|
63 | 59 | menu = self.query_one(SlashCommandMenu) |
64 | 60 |
|
65 | | - if menu.is_visible and event.key in (Key.BACKSPACE.value, Key.DELETE.value): |
66 | | - event.stop() |
67 | | - event.prevent_default() |
68 | | - menu.hide() |
69 | | - self.query_one(TextArea).focus() |
| 61 | + if menu.is_visible: |
| 62 | + self._close_menu(event) |
| 63 | + |
| 64 | + def _insert_newline(self, event) -> None: |
| 65 | + event.stop() |
| 66 | + event.prevent_default() |
| 67 | + input_widget = self.query_one(TextArea) |
| 68 | + input_widget.insert("\n") |
| 69 | + |
| 70 | + def _close_menu(self, event) -> None: |
| 71 | + if event.key not in (Key.ESCAPE.value, Key.BACKSPACE.value, Key.DELETE.value): |
| 72 | + return |
| 73 | + |
| 74 | + event.stop() |
| 75 | + event.prevent_default() |
70 | 76 |
|
71 | | - def action_hide_menu(self) -> None: |
72 | 77 | menu = self.query_one(SlashCommandMenu) |
| 78 | + menu.hide() |
73 | 79 |
|
74 | | - if menu.is_visible: |
75 | | - menu.hide() |
76 | | - input_widget = self.query_one(TextArea) |
| 80 | + input_widget = self.query_one(TextArea) |
| 81 | + input_widget.focus() |
| 82 | + |
| 83 | + if event.key == Key.ESCAPE.value: |
77 | 84 | input_widget.clear() |
78 | | - input_widget.focus() |
79 | 85 |
|
80 | 86 | async def action_submit(self) -> None: |
81 | 87 | menu = self.query_one(SlashCommandMenu) |
|
0 commit comments