From 14fb7e13fb272a43b9924d5d2823b0c105d781b0 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 5 Dec 2019 03:09:39 +0100 Subject: Place `TextInput` cursor position on click --- native/src/widget/text_input.rs | 78 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 3 deletions(-) (limited to 'native/src/widget') diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index f97ed424..764f87cf 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -160,7 +160,7 @@ where layout: Layout<'_>, cursor_position: Point, messages: &mut Vec, - _renderer: &Renderer, + renderer: &Renderer, ) { match event { Event::Mouse(mouse::Event::Input { @@ -170,8 +170,22 @@ where self.state.is_focused = layout.bounds().contains(cursor_position); - if self.state.cursor_position(&self.value) == 0 { - self.state.move_cursor_to_end(&self.value); + if self.state.is_focused { + let text_layout = layout.children().next().unwrap(); + let target = cursor_position.x - text_layout.bounds().x; + + if target < 0.0 { + self.state.cursor_position = 0; + } else { + self.state.cursor_position = find_cursor_position( + renderer, + target, + &self.value, + self.size.unwrap_or(renderer.default_size()), + 0, + self.value.len(), + ); + } } } Event::Keyboard(keyboard::Event::CharacterReceived(c)) @@ -275,6 +289,11 @@ pub trait Renderer: crate::Renderer + Sized { /// [`TextInput`]: struct.TextInput.html fn default_size(&self) -> u16; + /// Returns the width of the value of the [`TextInput`]. + /// + /// [`TextInput`]: struct.TextInput.html + fn measure_value(&self, value: &str, size: u16) -> f32; + /// Draws a [`TextInput`]. /// /// It receives: @@ -437,3 +456,56 @@ impl Value { let _ = self.0.remove(index); } } + +// TODO: Reduce allocations +fn find_cursor_position( + renderer: &Renderer, + target: f32, + value: &Value, + size: u16, + start: usize, + end: usize, +) -> usize { + if start >= end { + if start == 0 { + return 0; + } + + let prev = value.until(start - 1); + let next = value.until(start); + + let prev_width = renderer.measure_value(&prev.to_string(), size); + let next_width = renderer.measure_value(&next.to_string(), size); + + if (target - next_width).abs() > (target - prev_width).abs() { + return start - 1; + } else { + return start; + } + } + + let index = (end - start) / 2; + let subvalue = value.until(start + index); + + let width = renderer.measure_value(&subvalue.to_string(), size); + + if width > target { + find_cursor_position( + renderer, + target, + value, + size, + start, + start + index, + ) + } else { + find_cursor_position( + renderer, + target, + value, + size, + start + index + 1, + end, + ) + } +} -- cgit From ef987ae2ec2b2fed3e22fda89625483d15d79927 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 5 Dec 2019 03:14:32 +0100 Subject: Remove unnecessary use of `abs` --- native/src/widget/text_input.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'native/src/widget') diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 764f87cf..122f8973 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -477,7 +477,7 @@ fn find_cursor_position( let prev_width = renderer.measure_value(&prev.to_string(), size); let next_width = renderer.measure_value(&next.to_string(), size); - if (target - next_width).abs() > (target - prev_width).abs() { + if next_width - target > target - prev_width { return start - 1; } else { return start; -- cgit From 7c8799e4936ccea35ad936e4098df75bf3257639 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 5 Dec 2019 03:16:50 +0100 Subject: Support `Home` and `End` keys for `TextInput` --- native/src/widget/text_input.rs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'native/src/widget') diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 122f8973..dae772bc 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -238,6 +238,12 @@ where keyboard::KeyCode::Right => { self.state.move_cursor_right(&self.value); } + keyboard::KeyCode::Home => { + self.state.cursor_position = 0; + } + keyboard::KeyCode::End => { + self.state.move_cursor_to_end(&self.value); + } _ => {} }, _ => {} -- cgit From 65cac922b3ff6cf289319b9c12aab68aabea844a Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 6 Dec 2019 04:01:48 +0100 Subject: Add `ModifiersState` to `keyboard::Event::Input` --- native/src/widget/text_input.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'native/src/widget') diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index dae772bc..cfa8b0f4 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -202,6 +202,7 @@ where Event::Keyboard(keyboard::Event::Input { key_code, state: ButtonState::Pressed, + modifiers, }) if self.state.is_focused => match key_code { keyboard::KeyCode::Enter => { if let Some(on_submit) = self.on_submit.clone() { -- cgit From 114a759d2cb6740c2dce405cbc96ed7874a8842c Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 6 Dec 2019 04:01:54 +0100 Subject: Implement word movement in `TextInput` --- native/src/widget/text_input.rs | 83 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 76 insertions(+), 7 deletions(-) (limited to 'native/src/widget') diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index cfa8b0f4..0620e928 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -234,10 +234,18 @@ where } } keyboard::KeyCode::Left => { - self.state.move_cursor_left(&self.value); + if modifiers.control { + self.state.move_cursor_left_by_words(&self.value); + } else { + self.state.move_cursor_left(&self.value); + } } keyboard::KeyCode::Right => { - self.state.move_cursor_right(&self.value); + if modifiers.control { + self.state.move_cursor_right_by_words(&self.value); + } else { + self.state.move_cursor_right(&self.value); + } } keyboard::KeyCode::Home => { self.state.cursor_position = 0; @@ -382,6 +390,17 @@ impl State { self.cursor_position.min(value.len()) } + /// Moves the cursor of a [`TextInput`] to the left. + /// + /// [`TextInput`]: struct.TextInput.html + pub(crate) fn move_cursor_left(&mut self, value: &Value) { + let current = self.cursor_position(value); + + if current > 0 { + self.cursor_position = current - 1; + } + } + /// Moves the cursor of a [`TextInput`] to the right. /// /// [`TextInput`]: struct.TextInput.html @@ -393,15 +412,22 @@ impl State { } } - /// Moves the cursor of a [`TextInput`] to the left. + /// Moves the cursor of a [`TextInput`] to the previous start of a word. /// /// [`TextInput`]: struct.TextInput.html - pub(crate) fn move_cursor_left(&mut self, value: &Value) { + pub(crate) fn move_cursor_left_by_words(&mut self, value: &Value) { let current = self.cursor_position(value); - if current > 0 { - self.cursor_position = current - 1; - } + self.cursor_position = value.previous_start_of_word(current); + } + + /// Moves the cursor of a [`TextInput`] to the next end of a word. + /// + /// [`TextInput`]: struct.TextInput.html + pub(crate) fn move_cursor_right_by_words(&mut self, value: &Value) { + let current = self.cursor_position(value); + + self.cursor_position = value.next_end_of_word(current); } /// Moves the cursor of a [`TextInput`] to the end. @@ -434,6 +460,49 @@ impl Value { self.0.len() } + /// Returns the position of the previous start of a word from the given + /// `index`. + /// + /// [`Value`]: struct.Value.html + pub fn previous_start_of_word(&self, mut index: usize) -> usize { + let mut skip_space = true; + + while index > 0 { + if skip_space { + skip_space = self.0[index - 1] == ' '; + } else { + if self.0[index - 1] == ' ' { + break; + } + } + + index -= 1; + } + + index + } + + /// Returns the position of the next end of a word from the given `index`. + /// + /// [`Value`]: struct.Value.html + pub fn next_end_of_word(&self, mut index: usize) -> usize { + let mut skip_space = true; + + while index < self.0.len() { + if skip_space { + skip_space = self.0[index] == ' '; + } else { + if self.0[index] == ' ' { + break; + } + } + + index += 1; + } + + index + } + /// Returns a new [`Value`] containing the `char` until the given `index`. /// /// [`Value`]: struct.Value.html -- cgit From a56eef0fecff3ef39576327c042927724e21b760 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 6 Dec 2019 04:46:53 +0100 Subject: Use `unicode-segmentation` for `text_input::Value` --- native/src/widget/text_input.rs | 51 ++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 18 deletions(-) (limited to 'native/src/widget') diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 0620e928..6ab90bf4 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -9,6 +9,7 @@ use crate::{ layout, Element, Event, Hasher, Layout, Length, Point, Rectangle, Size, Widget, }; +use unicode_segmentation::UnicodeSegmentation; /// A field that can be filled with text. /// @@ -441,23 +442,29 @@ impl State { /// The value of a [`TextInput`]. /// /// [`TextInput`]: struct.TextInput.html -// TODO: Use `unicode-segmentation` +// TODO: Reduce allocations, cache results (?) #[derive(Debug)] -pub struct Value(Vec); +pub struct Value { + graphemes: Vec, +} impl Value { /// Creates a new [`Value`] from a string slice. /// /// [`Value`]: struct.Value.html pub fn new(string: &str) -> Self { - Self(string.chars().collect()) + let graphemes = UnicodeSegmentation::graphemes(string, true) + .map(String::from) + .collect(); + + Self { graphemes } } - /// Returns the total amount of `char` in the [`Value`]. + /// Returns the total amount of graphemes in the [`Value`]. /// /// [`Value`]: struct.Value.html pub fn len(&self) -> usize { - self.0.len() + self.graphemes.len() } /// Returns the position of the previous start of a word from the given @@ -469,9 +476,9 @@ impl Value { while index > 0 { if skip_space { - skip_space = self.0[index - 1] == ' '; + skip_space = self.graphemes[index - 1] == " "; } else { - if self.0[index - 1] == ' ' { + if self.graphemes[index - 1] == " " { break; } } @@ -488,11 +495,11 @@ impl Value { pub fn next_end_of_word(&self, mut index: usize) -> usize { let mut skip_space = true; - while index < self.0.len() { + while index < self.graphemes.len() { if skip_space { - skip_space = self.0[index] == ' '; + skip_space = self.graphemes[index] == " "; } else { - if self.0[index] == ' ' { + if self.graphemes[index] == " " { break; } } @@ -503,33 +510,41 @@ impl Value { index } - /// Returns a new [`Value`] containing the `char` until the given `index`. + /// Returns a new [`Value`] containing the graphemes until the given `index`. /// /// [`Value`]: struct.Value.html pub fn until(&self, index: usize) -> Self { - Self(self.0[..index.min(self.len())].to_vec()) + let graphemes = self.graphemes[..index.min(self.len())].to_vec(); + + Self { graphemes } } /// Converts the [`Value`] into a `String`. /// /// [`Value`]: struct.Value.html pub fn to_string(&self) -> String { - use std::iter::FromIterator; - String::from_iter(self.0.iter()) + self.graphemes.concat() } - /// Inserts a new `char` at the given `index`. + /// Inserts a new `char` at the given grapheme `index`. /// /// [`Value`]: struct.Value.html pub fn insert(&mut self, index: usize, c: char) { - self.0.insert(index, c); + self.graphemes.insert(index, c.to_string()); + + self.graphemes = UnicodeSegmentation::graphemes( + self.graphemes.concat().as_ref() as &str, + true, + ) + .map(String::from) + .collect(); } - /// Removes the `char` at the given `index`. + /// Removes the grapheme at the given `index`. /// /// [`Value`]: struct.Value.html pub fn remove(&mut self, index: usize) { - let _ = self.0.remove(index); + let _ = self.graphemes.remove(index); } } -- cgit From 69590bcf7219ca21a8f78623bff7cb81253f8a20 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 6 Dec 2019 05:37:28 +0100 Subject: Consider word bounds in `TextInput` cursor jumps --- native/src/widget/text_input.rs | 85 +++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 42 deletions(-) (limited to 'native/src/widget') diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 6ab90bf4..c57b80aa 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -468,46 +468,49 @@ impl Value { } /// Returns the position of the previous start of a word from the given - /// `index`. + /// grapheme `index`. /// /// [`Value`]: struct.Value.html - pub fn previous_start_of_word(&self, mut index: usize) -> usize { - let mut skip_space = true; - - while index > 0 { - if skip_space { - skip_space = self.graphemes[index - 1] == " "; - } else { - if self.graphemes[index - 1] == " " { - break; - } - } - - index -= 1; - } - - index - } - - /// Returns the position of the next end of a word from the given `index`. + pub fn previous_start_of_word(&self, index: usize) -> usize { + let previous_string = + &self.graphemes[..index.min(self.graphemes.len())].concat(); + + UnicodeSegmentation::split_word_bound_indices(&previous_string as &str) + .filter(|(_, word)| !word.trim_start().is_empty()) + .next_back() + .map(|(i, previous_word)| { + index + - UnicodeSegmentation::graphemes(previous_word, true) + .count() + - UnicodeSegmentation::graphemes( + &previous_string[i + previous_word.len()..] as &str, + true, + ) + .count() + }) + .unwrap_or(0) + } + + /// Returns the position of the next end of a word from the given grapheme + /// `index`. /// /// [`Value`]: struct.Value.html - pub fn next_end_of_word(&self, mut index: usize) -> usize { - let mut skip_space = true; - - while index < self.graphemes.len() { - if skip_space { - skip_space = self.graphemes[index] == " "; - } else { - if self.graphemes[index] == " " { - break; - } - } - - index += 1; - } - - index + pub fn next_end_of_word(&self, index: usize) -> usize { + let next_string = &self.graphemes[index..].concat(); + + UnicodeSegmentation::split_word_bound_indices(&next_string as &str) + .filter(|(_, word)| !word.trim_start().is_empty()) + .next() + .map(|(i, next_word)| { + index + + UnicodeSegmentation::graphemes(next_word, true).count() + + UnicodeSegmentation::graphemes( + &next_string[..i] as &str, + true, + ) + .count() + }) + .unwrap_or(self.len()) } /// Returns a new [`Value`] containing the graphemes until the given `index`. @@ -532,12 +535,10 @@ impl Value { pub fn insert(&mut self, index: usize, c: char) { self.graphemes.insert(index, c.to_string()); - self.graphemes = UnicodeSegmentation::graphemes( - self.graphemes.concat().as_ref() as &str, - true, - ) - .map(String::from) - .collect(); + self.graphemes = + UnicodeSegmentation::graphemes(&self.to_string() as &str, true) + .map(String::from) + .collect(); } /// Removes the grapheme at the given `index`. -- cgit From 34bdfe941613d4bb51848eec1dc0f99f2a59ff21 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 7 Dec 2019 07:18:15 +0100 Subject: Implement `TextInput::password` for secure data --- native/src/widget/text_input.rs | 65 ++++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 11 deletions(-) (limited to 'native/src/widget') diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index c57b80aa..985d1b80 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -39,6 +39,7 @@ pub struct TextInput<'a, Message> { state: &'a mut State, placeholder: String, value: Value, + is_secure: bool, width: Length, max_width: Length, padding: u16, @@ -71,6 +72,7 @@ impl<'a, Message> TextInput<'a, Message> { state, placeholder: String::from(placeholder), value: Value::new(value), + is_secure: false, width: Length::Fill, max_width: Length::Shrink, padding: 0, @@ -80,6 +82,14 @@ impl<'a, Message> TextInput<'a, Message> { } } + /// Converts the [`TextInput`] into a secure password input. + /// + /// [`TextInput`]: struct.TextInput.html + pub fn password(mut self) -> Self { + self.is_secure = true; + self + } + /// Sets the width of the [`TextInput`]. /// /// [`TextInput`]: struct.TextInput.html @@ -177,6 +187,15 @@ where if target < 0.0 { self.state.cursor_position = 0; + } else if self.is_secure { + self.state.cursor_position = find_cursor_position( + renderer, + target, + &self.value.secure(), + self.size.unwrap_or(renderer.default_size()), + 0, + self.value.len(), + ); } else { self.state.cursor_position = find_cursor_position( renderer, @@ -235,14 +254,14 @@ where } } keyboard::KeyCode::Left => { - if modifiers.control { + if modifiers.control && !self.is_secure { self.state.move_cursor_left_by_words(&self.value); } else { self.state.move_cursor_left(&self.value); } } keyboard::KeyCode::Right => { - if modifiers.control { + if modifiers.control && !self.is_secure { self.state.move_cursor_right_by_words(&self.value); } else { self.state.move_cursor_right(&self.value); @@ -269,15 +288,27 @@ where let bounds = layout.bounds(); let text_bounds = layout.children().next().unwrap().bounds(); - renderer.draw( - bounds, - text_bounds, - cursor_position, - self.size.unwrap_or(renderer.default_size()), - &self.placeholder, - &self.value, - &self.state, - ) + if self.is_secure { + renderer.draw( + bounds, + text_bounds, + cursor_position, + self.size.unwrap_or(renderer.default_size()), + &self.placeholder, + &self.value.secure(), + &self.state, + ) + } else { + renderer.draw( + bounds, + text_bounds, + cursor_position, + self.size.unwrap_or(renderer.default_size()), + &self.placeholder, + &self.value, + &self.state, + ) + } } fn hash_layout(&self, state: &mut Hasher) { @@ -547,6 +578,18 @@ impl Value { pub fn remove(&mut self, index: usize) { let _ = self.graphemes.remove(index); } + + /// Returns a new [`Value`] with all its graphemes replaced with the + /// dot ('•') character. + /// + /// [`Value`]: struct.Value.html + pub fn secure(&self) -> Self { + Self { + graphemes: std::iter::repeat(String::from("•")) + .take(self.graphemes.len()) + .collect(), + } + } } // TODO: Reduce allocations -- cgit From c59ff694734ba8bfc0f8e5bd2da3e23acfbe3bc4 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 7 Dec 2019 07:24:55 +0100 Subject: Change `TextInput` word-jump modifier key on macOS --- native/src/widget/text_input.rs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'native/src/widget') diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 985d1b80..f0bb9f87 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -254,14 +254,26 @@ where } } keyboard::KeyCode::Left => { - if modifiers.control && !self.is_secure { + let jump_modifier_pressed = if cfg!(target_os = "macos") { + modifiers.alt + } else { + modifiers.control + }; + + if jump_modifier_pressed && !self.is_secure { self.state.move_cursor_left_by_words(&self.value); } else { self.state.move_cursor_left(&self.value); } } keyboard::KeyCode::Right => { - if modifiers.control && !self.is_secure { + let jump_modifier_pressed = if cfg!(target_os = "macos") { + modifiers.alt + } else { + modifiers.control + }; + + if jump_modifier_pressed && !self.is_secure { self.state.move_cursor_right_by_words(&self.value); } else { self.state.move_cursor_right(&self.value); -- cgit