Add Esc/Enter as a shortcut on modal screens

src/cronboard_widgets/CronCreator.py

@@ -1,6 +1,7 @@
 import crontab
 from textual.app import ComposeResult
 from crontab import CronTab
+from textual import events
 from textual.widgets import Button, Label, Input
 from textual.containers import Grid, Horizontal, Vertical
 from textual.screen import ModalScreen
@@ -80,6 +81,12 @@ def compose(self) -> ComposeResult:
             id="dialog",
         )
 
+    def _on_key(self, event: events.Key) -> None:
+        if event.key == "enter":
+            self.save_content()
+        elif event.key == "escape":
+            self.dismiss(False)
+
     def on_input_changed(self, event: Input.Changed) -> None:
         if event.input.id != "expression":
             return
@@ -93,10 +100,12 @@ def on_input_changed(self, event: Input.Changed) -> None:
             label.remove()
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
-        if event.button.id != "save":
+        if event.button.id == "save":
+            self.save_content()
+        elif event.button.id == "cancel":
             self.dismiss(False)
-            return
 
+    def save_content(self) -> None:
         identificator_input = self.query_one("#identificator", Input)
         expression_input = self.query_one("#expression", Input)
         command_input = self.query_one("#command", Input)

src/cronboard_widgets/CronSSHModal.py

@@ -2,6 +2,7 @@
 from textual.widgets import Button, Label, Input
 from textual.containers import Grid, Horizontal, Vertical
 from textual.screen import ModalScreen
+from textual import events
 
 
 class CronSSHModal(ModalScreen):
@@ -39,6 +40,12 @@ def compose(self) -> ComposeResult:
             id="dialog",
         )
 
+    def _on_key(self, event: events.Key) -> None:
+        if event.key == "enter":
+            self.save_content()
+        elif event.key == "escape":
+            self.dismiss(False)
+
     def on_input_changed(self, event: Input.Changed) -> None:
         if self.query("#error"):
             label_error = self.query_one("#error")
@@ -51,30 +58,31 @@ def on_input_changed(self, event: Input.Changed) -> None:
     def on_button_pressed(self, event: Button.Pressed) -> None:
         if event.button.id == "cancel":
             self.dismiss(False)
-            return
+        elif event.button.id == "add":
+            self.save_content()
 
-        if event.button.id == "add":
-            host_info = self.query_one("#hostname", Input).value.strip()
-            username = self.query_one("#username", Input).value.strip()
-            password = self.query_one("#password", Input).value.strip()
-            content = self.query_one("#content", Vertical)
+    def save_content(self) -> None:
+        host_info = self.query_one("#hostname", Input).value.strip()
+        username = self.query_one("#username", Input).value.strip()
+        password = self.query_one("#password", Input).value.strip()
+        content = self.query_one("#content", Vertical)
 
-            try:
-                hostname, port = host_info.split(":")
-                port = int(port)
-            except ValueError:
-                if not self.query("#error"):
-                    error_label = Label(
-                        "Invalid host format. Use host:port", id="error"
-                    )
-                    content.mount(error_label)
+        try:
+            hostname, port = host_info.split(":")
+            port = int(port)
+        except ValueError:
+            if not self.query("#error"):
+                error_label = Label(
+                    "Invalid host format. Use host:port", id="error"
+                )
+                content.mount(error_label)
 
-            server = {
-                "hostname": hostname,
-                "port": port,
-                "username": username,
-                "password": password,
-                "ssh_key": True if not password else False,
-            }
+        server = {
+            "hostname": hostname,
+            "port": port,
+            "username": username,
+            "password": password,
+            "ssh_key": True if not password else False,
+        }
 
-            self.dismiss(server)
+        self.dismiss(server)