From 5e2635d4e0bdf85464a9c29bf5f40cb97caa84fe Mon Sep 17 00:00:00 2001
From: Presiyan Ivanov <15377841+presiyan-ivanov@users.noreply.github.com>
Date: Thu, 21 Dec 2023 15:18:30 +0200
Subject: [PATCH] Fix word-based actions in text input on macOS

On macOS the text input should check if Super key is held instead of Control to determine if its a word-based action
---
 src/views/text_input.rs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/text_input.rs b/src/views/text_input.rs
index 8356001c..0ce99b75 100644
--- a/src/views/text_input.rs
+++ b/src/views/text_input.rs
@@ -183,6 +183,14 @@ impl From<(&KeyEvent, &SmolStr)> for TextCommand {
     }
 }
 
+fn is_word_based_action(event: &KeyEvent) -> bool {
+    #[cfg(not(target_os = "macos"))]
+    return event.modifiers.contains(ModifiersState::CONTROL);
+
+    #[cfg(target_os = "macos")]
+    return event.modifiers.contains(ModifiersState::SUPER);
+}
+
 const DEFAULT_FONT_SIZE: f32 = 14.0;
 const CURSOR_BLINK_INTERVAL_MS: u64 = 500;
 /// Specifies approximately how many characters wide the input field should be
@@ -622,7 +630,7 @@ impl TextInput {
                 } else {
                     let prev_cursor_idx = self.cursor_glyph_idx;
 
-                    if event.modifiers.contains(ModifiersState::CONTROL) {
+                    if is_word_based_action(event) {
                         self.move_cursor(Movement::Word, Direction::Left);
                     } else {
                         self.move_cursor(Movement::Glyph, Direction::Left);
@@ -649,7 +657,7 @@ impl TextInput {
 
                 let prev_cursor_idx = self.cursor_glyph_idx;
 
-                if event.modifiers.contains(ModifiersState::CONTROL) {
+                if is_word_based_action(event) {
                     self.move_cursor(Movement::Word, Direction::Right);
                 } else {
                     self.move_cursor(Movement::Glyph, Direction::Right);
@@ -675,7 +683,7 @@ impl TextInput {
             Key::Named(NamedKey::ArrowLeft) => {
                 let old_glyph_idx = self.cursor_glyph_idx;
 
-                let cursor_moved = if event.modifiers.contains(ModifiersState::CONTROL) {
+                let cursor_moved = if is_word_based_action(event) {
                     self.move_cursor(Movement::Word, Direction::Left)
                 } else {
                     self.move_cursor(Movement::Glyph, Direction::Left)
@@ -699,7 +707,7 @@ impl TextInput {
             Key::Named(NamedKey::ArrowRight) => {
                 let old_glyph_idx = self.cursor_glyph_idx;
 
-                let cursor_moved = if event.modifiers.contains(ModifiersState::CONTROL) {
+                let cursor_moved = if is_word_based_action(event) {
                     self.move_cursor(Movement::Word, Direction::Right)
                 } else {
                     self.move_cursor(Movement::Glyph, Direction::Right)