From 416ec838f268dc00cf6f80365a9f588c369c1b1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= <hector@hecrj.dev>
Date: Fri, 21 Nov 2025 00:15:36 +0100
Subject: [PATCH] Implement macOS-specific key shortcuts for `text_editor`

---
 widget/src/text_editor.rs | 33 +++++++++++++++++++++++++++++++++
 widget/src/text_input.rs  | 34 +++-------------------------------
 2 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index cf185676..e0e5b510 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -1148,6 +1148,9 @@ impl<Message> Binding<Message> {
             return None;
         }
 
+        #[cfg(target_os = "macos")]
+        let key = convert_macos_shortcut(&key, modifiers);
+
         match key.as_ref() {
             keyboard::Key::Named(key::Named::Enter) => Some(Self::Enter),
             keyboard::Key::Named(key::Named::Backspace) => {
@@ -1454,3 +1457,33 @@ pub fn default(theme: &Theme, status: Status) -> Style {
         },
     }
 }
+
+#[cfg(target_os = "macos")]
+pub(crate) fn convert_macos_shortcut(
+    key: &keyboard::Key,
+    modifiers: keyboard::Modifiers,
+) -> &keyboard::Key {
+    if modifiers != keyboard::Modifiers::CTRL {
+        return key;
+    }
+
+    match key.as_ref() {
+        keyboard::Key::Character("b") => {
+            &keyboard::Key::Named(key::Named::ArrowLeft)
+        }
+        keyboard::Key::Character("f") => {
+            &keyboard::Key::Named(key::Named::ArrowRight)
+        }
+        keyboard::Key::Character("a") => {
+            &keyboard::Key::Named(key::Named::Home)
+        }
+        keyboard::Key::Character("e") => &keyboard::Key::Named(key::Named::End),
+        keyboard::Key::Character("h") => {
+            &keyboard::Key::Named(key::Named::Backspace)
+        }
+        keyboard::Key::Character("d") => {
+            &keyboard::Key::Named(key::Named::Delete)
+        }
+        _ => key,
+    }
+}
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index 7d730989..c630a4ec 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -1010,7 +1010,9 @@ where
                     }
 
                     #[cfg(target_os = "macos")]
-                    let key = convert_macos_shortcut(key, modifiers);
+                    let key = crate::text_editor::convert_macos_shortcut(
+                        key, modifiers,
+                    );
 
                     match key.as_ref() {
                         keyboard::Key::Named(key::Named::Enter) => {
@@ -1786,33 +1788,3 @@ fn alignment_offset(
         }
     }
 }
-
-#[cfg(target_os = "macos")]
-fn convert_macos_shortcut(
-    key: &keyboard::Key,
-    modifiers: keyboard::Modifiers,
-) -> &keyboard::Key {
-    if modifiers != keyboard::Modifiers::CTRL {
-        return key;
-    }
-
-    match key.as_ref() {
-        keyboard::Key::Character("b") => {
-            &keyboard::Key::Named(key::Named::ArrowLeft)
-        }
-        keyboard::Key::Character("f") => {
-            &keyboard::Key::Named(key::Named::ArrowRight)
-        }
-        keyboard::Key::Character("a") => {
-            &keyboard::Key::Named(key::Named::Home)
-        }
-        keyboard::Key::Character("e") => &keyboard::Key::Named(key::Named::End),
-        keyboard::Key::Character("h") => {
-            &keyboard::Key::Named(key::Named::Backspace)
-        }
-        keyboard::Key::Character("d") => {
-            &keyboard::Key::Named(key::Named::Delete)
-        }
-        _ => key,
-    }
-}