From 6448429103c9c82b90040ac5a5a097bdded23f82 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 12 Sep 2023 14:51:00 +0200
Subject: Draft `Editor` API and `TextEditor` widget

---
 widget/src/text_editor.rs | 457 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 457 insertions(+)
 create mode 100644 widget/src/text_editor.rs

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
new file mode 100644
index 00000000..d09f2c3e
--- /dev/null
+++ b/widget/src/text_editor.rs
@@ -0,0 +1,457 @@
+use crate::core::event::{self, Event};
+use crate::core::keyboard;
+use crate::core::layout::{self, Layout};
+use crate::core::mouse;
+use crate::core::renderer;
+use crate::core::text::editor::{Cursor, Editor as _};
+use crate::core::text::{self, LineHeight};
+use crate::core::widget::{self, Widget};
+use crate::core::{
+    Clipboard, Color, Element, Length, Padding, Pixels, Point, Rectangle,
+    Shell, Vector,
+};
+
+use std::cell::RefCell;
+
+pub use crate::style::text_editor::{Appearance, StyleSheet};
+pub use text::editor::Action;
+
+pub struct TextEditor<'a, Message, Renderer = crate::Renderer>
+where
+    Renderer: text::Renderer,
+    Renderer::Theme: StyleSheet,
+{
+    content: &'a Content<Renderer>,
+    font: Option<Renderer::Font>,
+    text_size: Option<Pixels>,
+    line_height: LineHeight,
+    width: Length,
+    height: Length,
+    padding: Padding,
+    style: <Renderer::Theme as StyleSheet>::Style,
+    on_edit: Option<Box<dyn Fn(Action) -> Message + 'a>>,
+}
+
+impl<'a, Message, Renderer> TextEditor<'a, Message, Renderer>
+where
+    Renderer: text::Renderer,
+    Renderer::Theme: StyleSheet,
+{
+    pub fn new(content: &'a Content<Renderer>) -> Self {
+        Self {
+            content,
+            font: None,
+            text_size: None,
+            line_height: LineHeight::default(),
+            width: Length::Fill,
+            height: Length::Fill,
+            padding: Padding::new(5.0),
+            style: Default::default(),
+            on_edit: None,
+        }
+    }
+
+    pub fn on_edit(mut self, on_edit: impl Fn(Action) -> Message + 'a) -> Self {
+        self.on_edit = Some(Box::new(on_edit));
+        self
+    }
+
+    pub fn font(mut self, font: impl Into<Renderer::Font>) -> Self {
+        self.font = Some(font.into());
+        self
+    }
+
+    pub fn padding(mut self, padding: impl Into<Padding>) -> Self {
+        self.padding = padding.into();
+        self
+    }
+}
+
+pub struct Content<R = crate::Renderer>(RefCell<Internal<R>>)
+where
+    R: text::Renderer;
+
+struct Internal<R>
+where
+    R: text::Renderer,
+{
+    editor: R::Editor,
+    is_dirty: bool,
+}
+
+impl<R> Content<R>
+where
+    R: text::Renderer,
+{
+    pub fn new() -> Self {
+        Self::with("")
+    }
+
+    pub fn with(text: &str) -> Self {
+        Self(RefCell::new(Internal {
+            editor: R::Editor::with_text(text),
+            is_dirty: true,
+        }))
+    }
+
+    pub fn edit(&mut self, action: Action) {
+        let internal = self.0.get_mut();
+
+        internal.editor.perform(action);
+        internal.is_dirty = true;
+    }
+}
+
+impl<Renderer> Default for Content<Renderer>
+where
+    Renderer: text::Renderer,
+{
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+struct State {
+    is_focused: bool,
+    is_dragging: bool,
+    last_click: Option<mouse::Click>,
+}
+
+impl<'a, Message, Renderer> Widget<Message, Renderer>
+    for TextEditor<'a, Message, Renderer>
+where
+    Renderer: text::Renderer,
+    Renderer::Theme: StyleSheet,
+{
+    fn tag(&self) -> widget::tree::Tag {
+        widget::tree::Tag::of::<State>()
+    }
+
+    fn state(&self) -> widget::tree::State {
+        widget::tree::State::new(State {
+            is_focused: false,
+            is_dragging: false,
+            last_click: None,
+        })
+    }
+
+    fn width(&self) -> Length {
+        self.width
+    }
+
+    fn height(&self) -> Length {
+        self.height
+    }
+
+    fn layout(
+        &self,
+        _tree: &mut widget::Tree,
+        renderer: &Renderer,
+        limits: &layout::Limits,
+    ) -> iced_renderer::core::layout::Node {
+        let mut internal = self.content.0.borrow_mut();
+
+        internal.editor.update(
+            limits.pad(self.padding).max(),
+            self.font.unwrap_or_else(|| renderer.default_font()),
+            self.text_size.unwrap_or_else(|| renderer.default_size()),
+            self.line_height,
+        );
+
+        layout::Node::new(limits.max())
+    }
+
+    fn on_event(
+        &mut self,
+        tree: &mut widget::Tree,
+        event: Event,
+        layout: Layout<'_>,
+        cursor: mouse::Cursor,
+        _renderer: &Renderer,
+        clipboard: &mut dyn Clipboard,
+        shell: &mut Shell<'_, Message>,
+        _viewport: &Rectangle,
+    ) -> event::Status {
+        let Some(on_edit) = self.on_edit.as_ref() else {
+            return event::Status::Ignored;
+        };
+
+        let state = tree.state.downcast_mut::<State>();
+
+        let Some(update) = Update::from_event(
+            event,
+            state,
+            layout.bounds(),
+            self.padding,
+            cursor,
+        ) else {
+            return event::Status::Ignored;
+        };
+
+        match update {
+            Update::Focus { click, action } => {
+                state.is_focused = true;
+                state.last_click = Some(click);
+                shell.publish(on_edit(action));
+            }
+            Update::Unfocus => {
+                state.is_focused = false;
+                state.is_dragging = false;
+            }
+            Update::Click { click, action } => {
+                state.last_click = Some(click);
+                state.is_dragging = true;
+                shell.publish(on_edit(action));
+            }
+            Update::StopDragging => {
+                state.is_dragging = false;
+            }
+            Update::Edit(action) => {
+                shell.publish(on_edit(action));
+            }
+            Update::Copy => {}
+            Update::Paste => if let Some(_contents) = clipboard.read() {},
+        }
+
+        event::Status::Captured
+    }
+
+    fn draw(
+        &self,
+        tree: &widget::Tree,
+        renderer: &mut Renderer,
+        theme: &<Renderer as renderer::Renderer>::Theme,
+        style: &renderer::Style,
+        layout: Layout<'_>,
+        cursor: mouse::Cursor,
+        _viewport: &Rectangle,
+    ) {
+        let bounds = layout.bounds();
+
+        let internal = self.content.0.borrow();
+        let state = tree.state.downcast_ref::<State>();
+
+        let is_disabled = self.on_edit.is_none();
+        let is_mouse_over = cursor.is_over(bounds);
+
+        let appearance = if is_disabled {
+            theme.disabled(&self.style)
+        } else if state.is_focused {
+            theme.focused(&self.style)
+        } else if is_mouse_over {
+            theme.hovered(&self.style)
+        } else {
+            theme.active(&self.style)
+        };
+
+        renderer.fill_quad(
+            renderer::Quad {
+                bounds,
+                border_radius: appearance.border_radius,
+                border_width: appearance.border_width,
+                border_color: appearance.border_color,
+            },
+            appearance.background,
+        );
+
+        renderer.fill_editor(
+            &internal.editor,
+            bounds.position()
+                + Vector::new(self.padding.left, self.padding.top),
+            style.text_color,
+        );
+
+        if state.is_focused {
+            match internal.editor.cursor() {
+                Cursor::Caret(position) => {
+                    renderer.fill_quad(
+                        renderer::Quad {
+                            bounds: Rectangle {
+                                x: position.x + bounds.x + self.padding.left,
+                                y: position.y + bounds.y + self.padding.top,
+                                width: 1.0,
+                                height: self
+                                    .line_height
+                                    .to_absolute(self.text_size.unwrap_or_else(
+                                        || renderer.default_size(),
+                                    ))
+                                    .into(),
+                            },
+                            border_radius: 0.0.into(),
+                            border_width: 0.0,
+                            border_color: Color::TRANSPARENT,
+                        },
+                        theme.value_color(&self.style),
+                    );
+                }
+                Cursor::Selection(ranges) => {
+                    for range in ranges {
+                        renderer.fill_quad(
+                            renderer::Quad {
+                                bounds: range + Vector::new(bounds.x, bounds.y),
+                                border_radius: 0.0.into(),
+                                border_width: 0.0,
+                                border_color: Color::TRANSPARENT,
+                            },
+                            theme.selection_color(&self.style),
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    fn mouse_interaction(
+        &self,
+        _state: &widget::Tree,
+        layout: Layout<'_>,
+        cursor: mouse::Cursor,
+        _viewport: &Rectangle,
+        _renderer: &Renderer,
+    ) -> mouse::Interaction {
+        let is_disabled = self.on_edit.is_none();
+
+        if cursor.is_over(layout.bounds()) {
+            if is_disabled {
+                mouse::Interaction::NotAllowed
+            } else {
+                mouse::Interaction::Text
+            }
+        } else {
+            mouse::Interaction::default()
+        }
+    }
+}
+
+impl<'a, Message, Renderer> From<TextEditor<'a, Message, Renderer>>
+    for Element<'a, Message, Renderer>
+where
+    Message: 'a,
+    Renderer: text::Renderer,
+    Renderer::Theme: StyleSheet,
+{
+    fn from(text_editor: TextEditor<'a, Message, Renderer>) -> Self {
+        Self::new(text_editor)
+    }
+}
+
+enum Update {
+    Focus { click: mouse::Click, action: Action },
+    Unfocus,
+    Click { click: mouse::Click, action: Action },
+    StopDragging,
+    Edit(Action),
+    Copy,
+    Paste,
+}
+
+impl Update {
+    fn from_event(
+        event: Event,
+        state: &State,
+        bounds: Rectangle,
+        padding: Padding,
+        cursor: mouse::Cursor,
+    ) -> Option<Self> {
+        match event {
+            Event::Mouse(event) => match event {
+                mouse::Event::ButtonPressed(mouse::Button::Left) => {
+                    if let Some(cursor_position) = cursor.position_in(bounds) {
+                        let cursor_position = cursor_position
+                            - Vector::new(padding.top, padding.left);
+
+                        if state.is_focused {
+                            let click = mouse::Click::new(
+                                cursor_position,
+                                state.last_click,
+                            );
+
+                            let action = match click.kind() {
+                                mouse::click::Kind::Single => {
+                                    Action::Click(cursor_position)
+                                }
+                                mouse::click::Kind::Double => {
+                                    Action::SelectWord
+                                }
+                                mouse::click::Kind::Triple => {
+                                    Action::SelectLine
+                                }
+                            };
+
+                            Some(Update::Click { click, action })
+                        } else {
+                            Some(Update::Focus {
+                                click: mouse::Click::new(cursor_position, None),
+                                action: Action::Click(cursor_position),
+                            })
+                        }
+                    } else if state.is_focused {
+                        Some(Update::Unfocus)
+                    } else {
+                        None
+                    }
+                }
+                mouse::Event::ButtonReleased(mouse::Button::Left) => {
+                    Some(Update::StopDragging)
+                }
+                mouse::Event::CursorMoved { .. } if state.is_dragging => {
+                    let cursor_position = cursor.position_in(bounds)?
+                        - Vector::new(padding.top, padding.left);
+
+                    Some(Self::Edit(Action::Drag(cursor_position)))
+                }
+                _ => None,
+            },
+            Event::Keyboard(event) => match event {
+                keyboard::Event::KeyPressed {
+                    key_code,
+                    modifiers,
+                } if state.is_focused => match key_code {
+                    keyboard::KeyCode::Left => {
+                        if platform::is_jump_modifier_pressed(modifiers) {
+                            Some(Self::Edit(Action::MoveLeftWord))
+                        } else {
+                            Some(Self::Edit(Action::MoveLeft))
+                        }
+                    }
+                    keyboard::KeyCode::Right => {
+                        if platform::is_jump_modifier_pressed(modifiers) {
+                            Some(Self::Edit(Action::MoveRightWord))
+                        } else {
+                            Some(Self::Edit(Action::MoveRight))
+                        }
+                    }
+                    keyboard::KeyCode::Up => Some(Self::Edit(Action::MoveUp)),
+                    keyboard::KeyCode::Down => {
+                        Some(Self::Edit(Action::MoveDown))
+                    }
+                    keyboard::KeyCode::Backspace => {
+                        Some(Self::Edit(Action::Backspace))
+                    }
+                    keyboard::KeyCode::Delete => {
+                        Some(Self::Edit(Action::Delete))
+                    }
+                    keyboard::KeyCode::Escape => Some(Self::Unfocus),
+                    _ => None,
+                },
+                keyboard::Event::CharacterReceived(c) if state.is_focused => {
+                    Some(Self::Edit(Action::Insert(c)))
+                }
+                _ => None,
+            },
+            _ => None,
+        }
+    }
+}
+
+mod platform {
+    use crate::core::keyboard;
+
+    pub fn is_jump_modifier_pressed(modifiers: keyboard::Modifiers) -> bool {
+        if cfg!(target_os = "macos") {
+            modifiers.alt()
+        } else {
+            modifiers.control()
+        }
+    }
+}
-- 
cgit 


From 1455911b636f19810e12eeb12a6eed11c5244cfe Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 12 Sep 2023 15:03:23 +0200
Subject: Add `Enter` variant to `Action` in `text::Editor`

---
 widget/src/text_editor.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index d09f2c3e..fcbd3dad 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -425,6 +425,7 @@ impl Update {
                     keyboard::KeyCode::Down => {
                         Some(Self::Edit(Action::MoveDown))
                     }
+                    keyboard::KeyCode::Enter => Some(Self::Edit(Action::Enter)),
                     keyboard::KeyCode::Backspace => {
                         Some(Self::Edit(Action::Backspace))
                     }
-- 
cgit 


From 40eb648f1e1e2ceb2782eddacbbc966f44de6961 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 13 Sep 2023 15:00:33 +0200
Subject: Implement `Cursor::Selection` calculation in `Editor::cursor`

---
 widget/src/text_editor.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index fcbd3dad..12e66f68 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -288,7 +288,11 @@ where
                     for range in ranges {
                         renderer.fill_quad(
                             renderer::Quad {
-                                bounds: range + Vector::new(bounds.x, bounds.y),
+                                bounds: range
+                                    + Vector::new(
+                                        bounds.x + self.padding.left,
+                                        bounds.y + self.padding.top,
+                                    ),
                                 border_radius: 0.0.into(),
                                 border_width: 0.0,
                                 border_color: Color::TRANSPARENT,
-- 
cgit 


From d502c9f16fc78bf6b5253152751480c5b5e5999c Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 13 Sep 2023 15:16:47 +0200
Subject: Unify `Focus` and `Click` updates in `widget::text_editor`

---
 widget/src/text_editor.rs | 48 ++++++++++++++++-------------------------------
 1 file changed, 16 insertions(+), 32 deletions(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 12e66f68..a8069069 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -189,16 +189,12 @@ where
         };
 
         match update {
-            Update::Focus { click, action } => {
-                state.is_focused = true;
-                state.last_click = Some(click);
-                shell.publish(on_edit(action));
-            }
             Update::Unfocus => {
                 state.is_focused = false;
                 state.is_dragging = false;
             }
             Update::Click { click, action } => {
+                state.is_focused = true;
                 state.last_click = Some(click);
                 state.is_dragging = true;
                 shell.publish(on_edit(action));
@@ -340,9 +336,8 @@ where
 }
 
 enum Update {
-    Focus { click: mouse::Click, action: Action },
-    Unfocus,
     Click { click: mouse::Click, action: Action },
+    Unfocus,
     StopDragging,
     Edit(Action),
     Copy,
@@ -364,31 +359,20 @@ impl Update {
                         let cursor_position = cursor_position
                             - Vector::new(padding.top, padding.left);
 
-                        if state.is_focused {
-                            let click = mouse::Click::new(
-                                cursor_position,
-                                state.last_click,
-                            );
-
-                            let action = match click.kind() {
-                                mouse::click::Kind::Single => {
-                                    Action::Click(cursor_position)
-                                }
-                                mouse::click::Kind::Double => {
-                                    Action::SelectWord
-                                }
-                                mouse::click::Kind::Triple => {
-                                    Action::SelectLine
-                                }
-                            };
-
-                            Some(Update::Click { click, action })
-                        } else {
-                            Some(Update::Focus {
-                                click: mouse::Click::new(cursor_position, None),
-                                action: Action::Click(cursor_position),
-                            })
-                        }
+                        let click = mouse::Click::new(
+                            cursor_position,
+                            state.last_click,
+                        );
+
+                        let action = match click.kind() {
+                            mouse::click::Kind::Single => {
+                                Action::Click(cursor_position)
+                            }
+                            mouse::click::Kind::Double => Action::SelectWord,
+                            mouse::click::Kind::Triple => Action::SelectLine,
+                        };
+
+                        Some(Update::Click { click, action })
                     } else if state.is_focused {
                         Some(Update::Unfocus)
                     } else {
-- 
cgit 


From f4c51a96d50953d5fb6e9eb62194f226e2cbfd3c Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 13 Sep 2023 16:11:43 +0200
Subject: Introduce `Motion` concept in `core::text::editor`

---
 widget/src/text_editor.rs | 77 +++++++++++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 33 deletions(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index a8069069..38c243bd 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -14,7 +14,7 @@ use crate::core::{
 use std::cell::RefCell;
 
 pub use crate::style::text_editor::{Appearance, StyleSheet};
-pub use text::editor::Action;
+pub use text::editor::{Action, Motion};
 
 pub struct TextEditor<'a, Message, Renderer = crate::Renderer>
 where
@@ -189,16 +189,16 @@ where
         };
 
         match update {
-            Update::Unfocus => {
-                state.is_focused = false;
-                state.is_dragging = false;
-            }
             Update::Click { click, action } => {
                 state.is_focused = true;
-                state.last_click = Some(click);
                 state.is_dragging = true;
+                state.last_click = Some(click);
                 shell.publish(on_edit(action));
             }
+            Update::Unfocus => {
+                state.is_focused = false;
+                state.is_dragging = false;
+            }
             Update::StopDragging => {
                 state.is_dragging = false;
             }
@@ -352,6 +352,9 @@ impl Update {
         padding: Padding,
         cursor: mouse::Cursor,
     ) -> Option<Self> {
+        let edit = |action| Some(Update::Edit(action));
+        let move_ = |motion| Some(Update::Edit(Action::Move(motion)));
+
         match event {
             Event::Mouse(event) => match event {
                 mouse::Event::ButtonPressed(mouse::Button::Left) => {
@@ -386,7 +389,7 @@ impl Update {
                     let cursor_position = cursor.position_in(bounds)?
                         - Vector::new(padding.top, padding.left);
 
-                    Some(Self::Edit(Action::Drag(cursor_position)))
+                    edit(Action::Drag(cursor_position))
                 }
                 _ => None,
             },
@@ -394,37 +397,31 @@ impl Update {
                 keyboard::Event::KeyPressed {
                     key_code,
                     modifiers,
-                } if state.is_focused => match key_code {
-                    keyboard::KeyCode::Left => {
-                        if platform::is_jump_modifier_pressed(modifiers) {
-                            Some(Self::Edit(Action::MoveLeftWord))
+                } if state.is_focused => {
+                    if let Some(motion) = motion(key_code) {
+                        let motion = if modifiers.control() {
+                            motion.widen()
                         } else {
-                            Some(Self::Edit(Action::MoveLeft))
-                        }
-                    }
-                    keyboard::KeyCode::Right => {
-                        if platform::is_jump_modifier_pressed(modifiers) {
-                            Some(Self::Edit(Action::MoveRightWord))
+                            motion
+                        };
+
+                        return edit(if modifiers.shift() {
+                            Action::Select(motion)
                         } else {
-                            Some(Self::Edit(Action::MoveRight))
-                        }
-                    }
-                    keyboard::KeyCode::Up => Some(Self::Edit(Action::MoveUp)),
-                    keyboard::KeyCode::Down => {
-                        Some(Self::Edit(Action::MoveDown))
-                    }
-                    keyboard::KeyCode::Enter => Some(Self::Edit(Action::Enter)),
-                    keyboard::KeyCode::Backspace => {
-                        Some(Self::Edit(Action::Backspace))
+                            Action::Move(motion)
+                        });
                     }
-                    keyboard::KeyCode::Delete => {
-                        Some(Self::Edit(Action::Delete))
+
+                    match key_code {
+                        keyboard::KeyCode::Enter => edit(Action::Enter),
+                        keyboard::KeyCode::Backspace => edit(Action::Backspace),
+                        keyboard::KeyCode::Delete => edit(Action::Delete),
+                        keyboard::KeyCode::Escape => Some(Self::Unfocus),
+                        _ => None,
                     }
-                    keyboard::KeyCode::Escape => Some(Self::Unfocus),
-                    _ => None,
-                },
+                }
                 keyboard::Event::CharacterReceived(c) if state.is_focused => {
-                    Some(Self::Edit(Action::Insert(c)))
+                    edit(Action::Insert(c))
                 }
                 _ => None,
             },
@@ -433,6 +430,20 @@ impl Update {
     }
 }
 
+fn motion(key_code: keyboard::KeyCode) -> Option<Motion> {
+    match key_code {
+        keyboard::KeyCode::Left => Some(Motion::Left),
+        keyboard::KeyCode::Right => Some(Motion::Right),
+        keyboard::KeyCode::Up => Some(Motion::Up),
+        keyboard::KeyCode::Down => Some(Motion::Down),
+        keyboard::KeyCode::Home => Some(Motion::Home),
+        keyboard::KeyCode::End => Some(Motion::End),
+        keyboard::KeyCode::PageUp => Some(Motion::PageUp),
+        keyboard::KeyCode::PageDown => Some(Motion::PageDown),
+        _ => None,
+    }
+}
+
 mod platform {
     use crate::core::keyboard;
 
-- 
cgit 


From f14ef7a6069cf45ae11261d7d20df6a5d7870dde Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 13 Sep 2023 16:31:56 +0200
Subject: Fix `clippy` lints

---
 widget/src/text_editor.rs | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 38c243bd..48de6409 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -7,8 +7,8 @@ use crate::core::text::editor::{Cursor, Editor as _};
 use crate::core::text::{self, LineHeight};
 use crate::core::widget::{self, Widget};
 use crate::core::{
-    Clipboard, Color, Element, Length, Padding, Pixels, Point, Rectangle,
-    Shell, Vector,
+    Clipboard, Color, Element, Length, Padding, Pixels, Rectangle, Shell,
+    Vector,
 };
 
 use std::cell::RefCell;
@@ -205,8 +205,12 @@ where
             Update::Edit(action) => {
                 shell.publish(on_edit(action));
             }
-            Update::Copy => {}
-            Update::Paste => if let Some(_contents) = clipboard.read() {},
+            Update::Copy => todo!(),
+            Update::Paste => {
+                if let Some(_contents) = clipboard.read() {
+                    todo!()
+                }
+            }
         }
 
         event::Status::Captured
@@ -353,7 +357,6 @@ impl Update {
         cursor: mouse::Cursor,
     ) -> Option<Self> {
         let edit = |action| Some(Update::Edit(action));
-        let move_ = |motion| Some(Update::Edit(Action::Move(motion)));
 
         match event {
             Event::Mouse(event) => match event {
@@ -399,11 +402,12 @@ impl Update {
                     modifiers,
                 } if state.is_focused => {
                     if let Some(motion) = motion(key_code) {
-                        let motion = if modifiers.control() {
-                            motion.widen()
-                        } else {
-                            motion
-                        };
+                        let motion =
+                            if platform::is_jump_modifier_pressed(modifiers) {
+                                motion.widen()
+                            } else {
+                                motion
+                            };
 
                         return edit(if modifiers.shift() {
                             Action::Select(motion)
@@ -417,6 +421,12 @@ impl Update {
                         keyboard::KeyCode::Backspace => edit(Action::Backspace),
                         keyboard::KeyCode::Delete => edit(Action::Delete),
                         keyboard::KeyCode::Escape => Some(Self::Unfocus),
+                        keyboard::KeyCode::C => Some(Self::Copy),
+                        keyboard::KeyCode::V
+                            if modifiers.command() && !modifiers.alt() =>
+                        {
+                            Some(Self::Paste)
+                        }
                         _ => None,
                     }
                 }
-- 
cgit 


From f7fc13d98c52a9260b1ab55394a0c3d2693318ed Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 14 Sep 2023 22:55:54 +0200
Subject: Fix `Copy` action being triggered without any modifiers

---
 widget/src/text_editor.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 48de6409..114d35ef 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -421,7 +421,9 @@ impl Update {
                         keyboard::KeyCode::Backspace => edit(Action::Backspace),
                         keyboard::KeyCode::Delete => edit(Action::Delete),
                         keyboard::KeyCode::Escape => Some(Self::Unfocus),
-                        keyboard::KeyCode::C => Some(Self::Copy),
+                        keyboard::KeyCode::C if modifiers.command() => {
+                            Some(Self::Copy)
+                        }
                         keyboard::KeyCode::V
                             if modifiers.command() && !modifiers.alt() =>
                         {
-- 
cgit 


From c6d0443627c22dcf1576303e5a426aa3622f1b7d Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sat, 16 Sep 2023 15:27:25 +0200
Subject: Implement methods to query the contents of a `TextEditor`

---
 widget/src/text_editor.rs | 48 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 114d35ef..ec7a6d1d 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -100,6 +100,54 @@ where
         internal.editor.perform(action);
         internal.is_dirty = true;
     }
+
+    pub fn line_count(&self) -> usize {
+        self.0.borrow().editor.line_count()
+    }
+
+    pub fn line(
+        &self,
+        index: usize,
+    ) -> Option<impl std::ops::Deref<Target = str> + '_> {
+        std::cell::Ref::filter_map(self.0.borrow(), |internal| {
+            internal.editor.line(index)
+        })
+        .ok()
+    }
+
+    pub fn lines(
+        &self,
+    ) -> impl Iterator<Item = impl std::ops::Deref<Target = str> + '_> {
+        struct Lines<'a, Renderer: text::Renderer> {
+            internal: std::cell::Ref<'a, Internal<Renderer>>,
+            current: usize,
+        }
+
+        impl<'a, Renderer: text::Renderer> Iterator for Lines<'a, Renderer> {
+            type Item = std::cell::Ref<'a, str>;
+
+            fn next(&mut self) -> Option<Self::Item> {
+                let line = std::cell::Ref::filter_map(
+                    std::cell::Ref::clone(&self.internal),
+                    |internal| internal.editor.line(self.current),
+                )
+                .ok()?;
+
+                self.current += 1;
+
+                Some(line)
+            }
+        }
+
+        Lines {
+            internal: self.0.borrow(),
+            current: 0,
+        }
+    }
+
+    pub fn selection(&self) -> Option<String> {
+        self.0.borrow().editor.selection()
+    }
 }
 
 impl<Renderer> Default for Content<Renderer>
-- 
cgit 


From d051f21597bb333ac10183aaa3214a292e9aa365 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sat, 16 Sep 2023 15:40:16 +0200
Subject: Implement `Copy` and `Paste` actions for `text::Editor`

---
 widget/src/text_editor.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index ec7a6d1d..0bb6b7d3 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -12,6 +12,7 @@ use crate::core::{
 };
 
 use std::cell::RefCell;
+use std::sync::Arc;
 
 pub use crate::style::text_editor::{Appearance, StyleSheet};
 pub use text::editor::{Action, Motion};
@@ -253,10 +254,14 @@ where
             Update::Edit(action) => {
                 shell.publish(on_edit(action));
             }
-            Update::Copy => todo!(),
+            Update::Copy => {
+                if let Some(selection) = self.content.selection() {
+                    clipboard.write(selection);
+                }
+            }
             Update::Paste => {
-                if let Some(_contents) = clipboard.read() {
-                    todo!()
+                if let Some(contents) = clipboard.read() {
+                    shell.publish(on_edit(Action::Paste(Arc::new(contents))));
                 }
             }
         }
-- 
cgit 


From 45c5cfe5774ac99a6e1b1d1014418f68b21b41cf Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sat, 16 Sep 2023 19:05:31 +0200
Subject: Avoid drag on double or triple click for now in `TextEditor`

---
 widget/src/text_editor.rs | 52 +++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 0bb6b7d3..68e3c656 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -162,8 +162,8 @@ where
 
 struct State {
     is_focused: bool,
-    is_dragging: bool,
     last_click: Option<mouse::Click>,
+    drag_click: Option<mouse::click::Kind>,
 }
 
 impl<'a, Message, Renderer> Widget<Message, Renderer>
@@ -179,8 +179,8 @@ where
     fn state(&self) -> widget::tree::State {
         widget::tree::State::new(State {
             is_focused: false,
-            is_dragging: false,
             last_click: None,
+            drag_click: None,
         })
     }
 
@@ -238,18 +238,27 @@ where
         };
 
         match update {
-            Update::Click { click, action } => {
+            Update::Click(click) => {
+                let action = match click.kind() {
+                    mouse::click::Kind::Single => {
+                        Action::Click(click.position())
+                    }
+                    mouse::click::Kind::Double => Action::SelectWord,
+                    mouse::click::Kind::Triple => Action::SelectLine,
+                };
+
                 state.is_focused = true;
-                state.is_dragging = true;
                 state.last_click = Some(click);
+                state.drag_click = Some(click.kind());
+
                 shell.publish(on_edit(action));
             }
             Update::Unfocus => {
                 state.is_focused = false;
-                state.is_dragging = false;
+                state.drag_click = None;
             }
-            Update::StopDragging => {
-                state.is_dragging = false;
+            Update::Release => {
+                state.drag_click = None;
             }
             Update::Edit(action) => {
                 shell.publish(on_edit(action));
@@ -393,9 +402,9 @@ where
 }
 
 enum Update {
-    Click { click: mouse::Click, action: Action },
+    Click(mouse::Click),
     Unfocus,
-    StopDragging,
+    Release,
     Edit(Action),
     Copy,
     Paste,
@@ -423,15 +432,7 @@ impl Update {
                             state.last_click,
                         );
 
-                        let action = match click.kind() {
-                            mouse::click::Kind::Single => {
-                                Action::Click(cursor_position)
-                            }
-                            mouse::click::Kind::Double => Action::SelectWord,
-                            mouse::click::Kind::Triple => Action::SelectLine,
-                        };
-
-                        Some(Update::Click { click, action })
+                        Some(Update::Click(click))
                     } else if state.is_focused {
                         Some(Update::Unfocus)
                     } else {
@@ -439,14 +440,17 @@ impl Update {
                     }
                 }
                 mouse::Event::ButtonReleased(mouse::Button::Left) => {
-                    Some(Update::StopDragging)
+                    Some(Update::Release)
                 }
-                mouse::Event::CursorMoved { .. } if state.is_dragging => {
-                    let cursor_position = cursor.position_in(bounds)?
-                        - Vector::new(padding.top, padding.left);
+                mouse::Event::CursorMoved { .. } => match state.drag_click {
+                    Some(mouse::click::Kind::Single) => {
+                        let cursor_position = cursor.position_in(bounds)?
+                            - Vector::new(padding.top, padding.left);
 
-                    edit(Action::Drag(cursor_position))
-                }
+                        edit(Action::Drag(cursor_position))
+                    }
+                    _ => None,
+                },
                 _ => None,
             },
             Event::Keyboard(event) => match event {
-- 
cgit 


From 76dc82e8e8b5201ec10f8d00d851c1decf998583 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sun, 17 Sep 2023 15:29:14 +0200
Subject: Draft `Highlighter` API

---
 widget/src/text_editor.rs | 64 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 15 deletions(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 68e3c656..b17e1156 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -4,6 +4,7 @@ use crate::core::layout::{self, Layout};
 use crate::core::mouse;
 use crate::core::renderer;
 use crate::core::text::editor::{Cursor, Editor as _};
+use crate::core::text::highlighter::{self, Highlighter};
 use crate::core::text::{self, LineHeight};
 use crate::core::widget::{self, Widget};
 use crate::core::{
@@ -12,13 +13,15 @@ use crate::core::{
 };
 
 use std::cell::RefCell;
+use std::ops::DerefMut;
 use std::sync::Arc;
 
-pub use crate::style::text_editor::{Appearance, StyleSheet};
+pub use crate::style::text_editor::{Appearance, Highlight, StyleSheet};
 pub use text::editor::{Action, Motion};
 
-pub struct TextEditor<'a, Message, Renderer = crate::Renderer>
+pub struct TextEditor<'a, Highlighter, Message, Renderer = crate::Renderer>
 where
+    Highlighter: text::Highlighter,
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
 {
@@ -31,9 +34,11 @@ where
     padding: Padding,
     style: <Renderer::Theme as StyleSheet>::Style,
     on_edit: Option<Box<dyn Fn(Action) -> Message + 'a>>,
+    highlighter_settings: Highlighter::Settings,
 }
 
-impl<'a, Message, Renderer> TextEditor<'a, Message, Renderer>
+impl<'a, Message, Renderer>
+    TextEditor<'a, highlighter::PlainText, Message, Renderer>
 where
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
@@ -49,9 +54,19 @@ where
             padding: Padding::new(5.0),
             style: Default::default(),
             on_edit: None,
+            highlighter_settings: (),
         }
     }
+}
 
+impl<'a, Highlighter, Message, Renderer>
+    TextEditor<'a, Highlighter, Message, Renderer>
+where
+    Highlighter: text::Highlighter,
+    Highlighter::Highlight: Highlight<Renderer::Font, Renderer::Theme>,
+    Renderer: text::Renderer,
+    Renderer::Theme: StyleSheet,
+{
     pub fn on_edit(mut self, on_edit: impl Fn(Action) -> Message + 'a) -> Self {
         self.on_edit = Some(Box::new(on_edit));
         self
@@ -160,20 +175,23 @@ where
     }
 }
 
-struct State {
+struct State<Highlighter> {
     is_focused: bool,
     last_click: Option<mouse::Click>,
     drag_click: Option<mouse::click::Kind>,
+    highlighter: RefCell<Highlighter>,
 }
 
-impl<'a, Message, Renderer> Widget<Message, Renderer>
-    for TextEditor<'a, Message, Renderer>
+impl<'a, Highlighter, Message, Renderer> Widget<Message, Renderer>
+    for TextEditor<'a, Highlighter, Message, Renderer>
 where
+    Highlighter: text::Highlighter,
+    Highlighter::Highlight: Highlight<Renderer::Font, Renderer::Theme>,
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
 {
     fn tag(&self) -> widget::tree::Tag {
-        widget::tree::Tag::of::<State>()
+        widget::tree::Tag::of::<State<Highlighter>>()
     }
 
     fn state(&self) -> widget::tree::State {
@@ -181,6 +199,9 @@ where
             is_focused: false,
             last_click: None,
             drag_click: None,
+            highlighter: RefCell::new(Highlighter::new(
+                &self.highlighter_settings,
+            )),
         })
     }
 
@@ -194,17 +215,19 @@ where
 
     fn layout(
         &self,
-        _tree: &mut widget::Tree,
+        tree: &mut widget::Tree,
         renderer: &Renderer,
         limits: &layout::Limits,
     ) -> iced_renderer::core::layout::Node {
         let mut internal = self.content.0.borrow_mut();
+        let state = tree.state.downcast_mut::<State<Highlighter>>();
 
         internal.editor.update(
             limits.pad(self.padding).max(),
             self.font.unwrap_or_else(|| renderer.default_font()),
             self.text_size.unwrap_or_else(|| renderer.default_size()),
             self.line_height,
+            state.highlighter.borrow_mut().deref_mut(),
         );
 
         layout::Node::new(limits.max())
@@ -225,7 +248,7 @@ where
             return event::Status::Ignored;
         };
 
-        let state = tree.state.downcast_mut::<State>();
+        let state = tree.state.downcast_mut::<State<Highlighter>>();
 
         let Some(update) = Update::from_event(
             event,
@@ -290,8 +313,14 @@ where
     ) {
         let bounds = layout.bounds();
 
-        let internal = self.content.0.borrow();
-        let state = tree.state.downcast_ref::<State>();
+        let mut internal = self.content.0.borrow_mut();
+        let state = tree.state.downcast_ref::<State<Highlighter>>();
+
+        internal.editor.highlight(
+            self.font.unwrap_or_else(|| renderer.default_font()),
+            state.highlighter.borrow_mut().deref_mut(),
+            |highlight| highlight.format(theme),
+        );
 
         let is_disabled = self.on_edit.is_none();
         let is_mouse_over = cursor.is_over(bounds);
@@ -389,14 +418,19 @@ where
     }
 }
 
-impl<'a, Message, Renderer> From<TextEditor<'a, Message, Renderer>>
+impl<'a, Highlighter, Message, Renderer>
+    From<TextEditor<'a, Highlighter, Message, Renderer>>
     for Element<'a, Message, Renderer>
 where
+    Highlighter: text::Highlighter,
+    Highlighter::Highlight: Highlight<Renderer::Font, Renderer::Theme>,
     Message: 'a,
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
 {
-    fn from(text_editor: TextEditor<'a, Message, Renderer>) -> Self {
+    fn from(
+        text_editor: TextEditor<'a, Highlighter, Message, Renderer>,
+    ) -> Self {
         Self::new(text_editor)
     }
 }
@@ -411,9 +445,9 @@ enum Update {
 }
 
 impl Update {
-    fn from_event(
+    fn from_event<H: Highlighter>(
         event: Event,
-        state: &State,
+        state: &State<H>,
         bounds: Rectangle,
         padding: Padding,
         cursor: mouse::Cursor,
-- 
cgit 


From d3011992a76e83e12f74402c2ade616cdc7f1497 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sun, 17 Sep 2023 19:03:58 +0200
Subject: Implement basic syntax highlighting with `syntect` in `editor`
 example

---
 widget/src/text_editor.rs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index b17e1156..03adbb59 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -81,6 +81,24 @@ where
         self.padding = padding.into();
         self
     }
+
+    pub fn highlight<H: text::Highlighter>(
+        self,
+        settings: H::Settings,
+    ) -> TextEditor<'a, H, Message, Renderer> {
+        TextEditor {
+            content: self.content,
+            font: self.font,
+            text_size: self.text_size,
+            line_height: self.line_height,
+            width: self.width,
+            height: self.height,
+            padding: self.padding,
+            style: self.style,
+            on_edit: self.on_edit,
+            highlighter_settings: settings,
+        }
+    }
 }
 
 pub struct Content<R = crate::Renderer>(RefCell<Internal<R>>)
-- 
cgit 


From 2897986f2ded7318894a52572bec3d62754ebfaa Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sun, 17 Sep 2023 19:27:51 +0200
Subject: Notify `Highlighter` of topmost line change

---
 widget/src/text_editor.rs | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 03adbb59..c30e185f 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -17,7 +17,7 @@ use std::ops::DerefMut;
 use std::sync::Arc;
 
 pub use crate::style::text_editor::{Appearance, Highlight, StyleSheet};
-pub use text::editor::{Action, Motion};
+pub use text::editor::{Action, Edit, Motion};
 
 pub struct TextEditor<'a, Highlighter, Message, Renderer = crate::Renderer>
 where
@@ -301,7 +301,7 @@ where
             Update::Release => {
                 state.drag_click = None;
             }
-            Update::Edit(action) => {
+            Update::Action(action) => {
                 shell.publish(on_edit(action));
             }
             Update::Copy => {
@@ -311,7 +311,9 @@ where
             }
             Update::Paste => {
                 if let Some(contents) = clipboard.read() {
-                    shell.publish(on_edit(Action::Paste(Arc::new(contents))));
+                    shell.publish(on_edit(Action::Edit(Edit::Paste(
+                        Arc::new(contents),
+                    ))));
                 }
             }
         }
@@ -457,7 +459,7 @@ enum Update {
     Click(mouse::Click),
     Unfocus,
     Release,
-    Edit(Action),
+    Action(Action),
     Copy,
     Paste,
 }
@@ -470,7 +472,8 @@ impl Update {
         padding: Padding,
         cursor: mouse::Cursor,
     ) -> Option<Self> {
-        let edit = |action| Some(Update::Edit(action));
+        let action = |action| Some(Update::Action(action));
+        let edit = |edit| action(Action::Edit(edit));
 
         match event {
             Event::Mouse(event) => match event {
@@ -499,7 +502,7 @@ impl Update {
                         let cursor_position = cursor.position_in(bounds)?
                             - Vector::new(padding.top, padding.left);
 
-                        edit(Action::Drag(cursor_position))
+                        action(Action::Drag(cursor_position))
                     }
                     _ => None,
                 },
@@ -518,7 +521,7 @@ impl Update {
                                 motion
                             };
 
-                        return edit(if modifiers.shift() {
+                        return action(if modifiers.shift() {
                             Action::Select(motion)
                         } else {
                             Action::Move(motion)
@@ -526,9 +529,9 @@ impl Update {
                     }
 
                     match key_code {
-                        keyboard::KeyCode::Enter => edit(Action::Enter),
-                        keyboard::KeyCode::Backspace => edit(Action::Backspace),
-                        keyboard::KeyCode::Delete => edit(Action::Delete),
+                        keyboard::KeyCode::Enter => edit(Edit::Enter),
+                        keyboard::KeyCode::Backspace => edit(Edit::Backspace),
+                        keyboard::KeyCode::Delete => edit(Edit::Delete),
                         keyboard::KeyCode::Escape => Some(Self::Unfocus),
                         keyboard::KeyCode::C if modifiers.command() => {
                             Some(Self::Copy)
@@ -542,7 +545,7 @@ impl Update {
                     }
                 }
                 keyboard::Event::CharacterReceived(c) if state.is_focused => {
-                    edit(Action::Insert(c))
+                    edit(Edit::Insert(c))
                 }
                 _ => None,
             },
-- 
cgit 


From 8446fe6de52fa68077d23d39f728f79a29b52f00 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Mon, 18 Sep 2023 14:38:54 +0200
Subject: Implement theme selector in `editor` example

---
 widget/src/text_editor.rs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index c30e185f..0cde2c98 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -193,11 +193,12 @@ where
     }
 }
 
-struct State<Highlighter> {
+struct State<Highlighter: text::Highlighter> {
     is_focused: bool,
     last_click: Option<mouse::Click>,
     drag_click: Option<mouse::click::Kind>,
     highlighter: RefCell<Highlighter>,
+    highlighter_settings: Highlighter::Settings,
 }
 
 impl<'a, Highlighter, Message, Renderer> Widget<Message, Renderer>
@@ -220,6 +221,7 @@ where
             highlighter: RefCell::new(Highlighter::new(
                 &self.highlighter_settings,
             )),
+            highlighter_settings: self.highlighter_settings.clone(),
         })
     }
 
@@ -240,6 +242,15 @@ where
         let mut internal = self.content.0.borrow_mut();
         let state = tree.state.downcast_mut::<State<Highlighter>>();
 
+        if state.highlighter_settings != self.highlighter_settings {
+            state
+                .highlighter
+                .borrow_mut()
+                .update(&self.highlighter_settings);
+
+            state.highlighter_settings = self.highlighter_settings.clone();
+        }
+
         internal.editor.update(
             limits.pad(self.padding).max(),
             self.font.unwrap_or_else(|| renderer.default_font()),
-- 
cgit 


From e7326f0af6f16cf2ff04fbac93bf296a044923f4 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Mon, 18 Sep 2023 19:07:41 +0200
Subject: Flesh out the `editor` example a bit more

---
 widget/src/text_editor.rs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 0cde2c98..970ec031 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -182,6 +182,10 @@ where
     pub fn selection(&self) -> Option<String> {
         self.0.borrow().editor.selection()
     }
+
+    pub fn cursor_position(&self) -> (usize, usize) {
+        self.0.borrow().editor.cursor_position()
+    }
 }
 
 impl<Renderer> Default for Content<Renderer>
-- 
cgit 


From 4e757a26d0c1c58001f31cf0592131cd5ad886ad Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 19 Sep 2023 01:18:06 +0200
Subject: Implement `Scroll` action in `text::editor`

---
 widget/src/text_editor.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 970ec031..ad12a076 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -521,6 +521,18 @@ impl Update {
                     }
                     _ => None,
                 },
+                mouse::Event::WheelScrolled { delta } => {
+                    action(Action::Scroll {
+                        lines: match delta {
+                            mouse::ScrollDelta::Lines { y, .. } => {
+                                -y as i32 * 4
+                            }
+                            mouse::ScrollDelta::Pixels { y, .. } => {
+                                -y.signum() as i32
+                            }
+                        },
+                    })
+                }
                 _ => None,
             },
             Event::Keyboard(event) => match event {
-- 
cgit 


From f806d001e6fb44b5a45029ca257261e6e0d4d4b2 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Tue, 19 Sep 2023 20:48:50 +0200
Subject: Introduce new `iced_highlighter` subcrate

---
 widget/src/text_editor.rs | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index ad12a076..c384b8a2 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -16,7 +16,7 @@ use std::cell::RefCell;
 use std::ops::DerefMut;
 use std::sync::Arc;
 
-pub use crate::style::text_editor::{Appearance, Highlight, StyleSheet};
+pub use crate::style::text_editor::{Appearance, StyleSheet};
 pub use text::editor::{Action, Edit, Motion};
 
 pub struct TextEditor<'a, Highlighter, Message, Renderer = crate::Renderer>
@@ -35,6 +35,10 @@ where
     style: <Renderer::Theme as StyleSheet>::Style,
     on_edit: Option<Box<dyn Fn(Action) -> Message + 'a>>,
     highlighter_settings: Highlighter::Settings,
+    highlighter_format: fn(
+        &Highlighter::Highlight,
+        &Renderer::Theme,
+    ) -> highlighter::Format<Renderer::Font>,
 }
 
 impl<'a, Message, Renderer>
@@ -55,6 +59,9 @@ where
             style: Default::default(),
             on_edit: None,
             highlighter_settings: (),
+            highlighter_format: |_highlight, _theme| {
+                highlighter::Format::default()
+            },
         }
     }
 }
@@ -63,7 +70,6 @@ impl<'a, Highlighter, Message, Renderer>
     TextEditor<'a, Highlighter, Message, Renderer>
 where
     Highlighter: text::Highlighter,
-    Highlighter::Highlight: Highlight<Renderer::Font, Renderer::Theme>,
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
 {
@@ -85,6 +91,10 @@ where
     pub fn highlight<H: text::Highlighter>(
         self,
         settings: H::Settings,
+        to_format: fn(
+            &H::Highlight,
+            &Renderer::Theme,
+        ) -> highlighter::Format<Renderer::Font>,
     ) -> TextEditor<'a, H, Message, Renderer> {
         TextEditor {
             content: self.content,
@@ -97,6 +107,7 @@ where
             style: self.style,
             on_edit: self.on_edit,
             highlighter_settings: settings,
+            highlighter_format: to_format,
         }
     }
 }
@@ -203,13 +214,13 @@ struct State<Highlighter: text::Highlighter> {
     drag_click: Option<mouse::click::Kind>,
     highlighter: RefCell<Highlighter>,
     highlighter_settings: Highlighter::Settings,
+    highlighter_format_address: usize,
 }
 
 impl<'a, Highlighter, Message, Renderer> Widget<Message, Renderer>
     for TextEditor<'a, Highlighter, Message, Renderer>
 where
     Highlighter: text::Highlighter,
-    Highlighter::Highlight: Highlight<Renderer::Font, Renderer::Theme>,
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
 {
@@ -226,6 +237,7 @@ where
                 &self.highlighter_settings,
             )),
             highlighter_settings: self.highlighter_settings.clone(),
+            highlighter_format_address: self.highlighter_format as usize,
         })
     }
 
@@ -246,6 +258,13 @@ where
         let mut internal = self.content.0.borrow_mut();
         let state = tree.state.downcast_mut::<State<Highlighter>>();
 
+        if state.highlighter_format_address != self.highlighter_format as usize
+        {
+            state.highlighter.borrow_mut().change_line(0);
+
+            state.highlighter_format_address = self.highlighter_format as usize;
+        }
+
         if state.highlighter_settings != self.highlighter_settings {
             state
                 .highlighter
@@ -354,7 +373,7 @@ where
         internal.editor.highlight(
             self.font.unwrap_or_else(|| renderer.default_font()),
             state.highlighter.borrow_mut().deref_mut(),
-            |highlight| highlight.format(theme),
+            |highlight| (self.highlighter_format)(highlight, theme),
         );
 
         let is_disabled = self.on_edit.is_none();
@@ -458,7 +477,6 @@ impl<'a, Highlighter, Message, Renderer>
     for Element<'a, Message, Renderer>
 where
     Highlighter: text::Highlighter,
-    Highlighter::Highlight: Highlight<Renderer::Font, Renderer::Theme>,
     Message: 'a,
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
-- 
cgit 


From 29fb4eab878a7ba399cae6ab1ec18a71e369ee59 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Wed, 20 Sep 2023 01:23:50 +0200
Subject: Scroll `TextEditor` only if `cursor.is_over(bounds)`

---
 widget/src/text_editor.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index c384b8a2..4191e02c 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -539,7 +539,9 @@ impl Update {
                     }
                     _ => None,
                 },
-                mouse::Event::WheelScrolled { delta } => {
+                mouse::Event::WheelScrolled { delta }
+                    if cursor.is_over(bounds) =>
+                {
                     action(Action::Scroll {
                         lines: match delta {
                             mouse::ScrollDelta::Lines { y, .. } => {
-- 
cgit 


From da5dd2526a2d9ee27e9405ed19c0f7a641160c54 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 21 Sep 2023 06:07:19 +0200
Subject: Round `ScrollDelta::Lines` in `TextEditor`

---
 widget/src/text_editor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 4191e02c..ac927fbc 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -545,7 +545,7 @@ impl Update {
                     action(Action::Scroll {
                         lines: match delta {
                             mouse::ScrollDelta::Lines { y, .. } => {
-                                -y as i32 * 4
+                                -y.round() as i32 * 4
                             }
                             mouse::ScrollDelta::Pixels { y, .. } => {
                                 -y.signum() as i32
-- 
cgit 


From 7373dd856b8837c2d91067b45e43b8f0e767c917 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 21 Sep 2023 06:13:08 +0200
Subject: Scroll at least one line on macOS in `TextEditor`

---
 widget/src/text_editor.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index ac927fbc..76f3cc18 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -545,7 +545,11 @@ impl Update {
                     action(Action::Scroll {
                         lines: match delta {
                             mouse::ScrollDelta::Lines { y, .. } => {
-                                -y.round() as i32 * 4
+                                if y > 0.0 {
+                                    -(y * 4.0).min(1.0) as i32
+                                } else {
+                                    0
+                                }
                             }
                             mouse::ScrollDelta::Pixels { y, .. } => {
                                 -y.signum() as i32
-- 
cgit 


From 68d49459ce0e8b28e56b71970cb26e66ac1b01b4 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 21 Sep 2023 06:17:47 +0200
Subject: Fix vertical scroll for `TextEditor`

---
 widget/src/text_editor.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 76f3cc18..e8187b9c 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -545,8 +545,9 @@ impl Update {
                     action(Action::Scroll {
                         lines: match delta {
                             mouse::ScrollDelta::Lines { y, .. } => {
-                                if y > 0.0 {
-                                    -(y * 4.0).min(1.0) as i32
+                                if y.abs() > 0.0 {
+                                    (y.signum() * -(y.abs() * 4.0).max(1.0))
+                                        as i32
                                 } else {
                                     0
                                 }
-- 
cgit 


From 70e49df4289b925d24f92ce5c91ef2b03dbc54e3 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 22 Sep 2023 05:50:31 +0200
Subject: Fix selection clipping out of bounds in `TextEditor`

---
 widget/src/text_editor.rs | 57 +++++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index e8187b9c..c142c22d 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -406,38 +406,47 @@ where
             style.text_color,
         );
 
+        let translation = Vector::new(
+            bounds.x + self.padding.left,
+            bounds.y + self.padding.top,
+        );
+
         if state.is_focused {
             match internal.editor.cursor() {
                 Cursor::Caret(position) => {
-                    renderer.fill_quad(
-                        renderer::Quad {
-                            bounds: Rectangle {
-                                x: position.x + bounds.x + self.padding.left,
-                                y: position.y + bounds.y + self.padding.top,
-                                width: 1.0,
-                                height: self
-                                    .line_height
-                                    .to_absolute(self.text_size.unwrap_or_else(
-                                        || renderer.default_size(),
-                                    ))
-                                    .into(),
+                    let position = position + translation;
+
+                    if bounds.contains(position) {
+                        renderer.fill_quad(
+                            renderer::Quad {
+                                bounds: Rectangle {
+                                    x: position.x,
+                                    y: position.y,
+                                    width: 1.0,
+                                    height: self
+                                        .line_height
+                                        .to_absolute(
+                                            self.text_size.unwrap_or_else(
+                                                || renderer.default_size(),
+                                            ),
+                                        )
+                                        .into(),
+                                },
+                                border_radius: 0.0.into(),
+                                border_width: 0.0,
+                                border_color: Color::TRANSPARENT,
                             },
-                            border_radius: 0.0.into(),
-                            border_width: 0.0,
-                            border_color: Color::TRANSPARENT,
-                        },
-                        theme.value_color(&self.style),
-                    );
+                            theme.value_color(&self.style),
+                        );
+                    }
                 }
                 Cursor::Selection(ranges) => {
-                    for range in ranges {
+                    for range in ranges.into_iter().filter_map(|range| {
+                        bounds.intersection(&(range + translation))
+                    }) {
                         renderer.fill_quad(
                             renderer::Quad {
-                                bounds: range
-                                    + Vector::new(
-                                        bounds.x + self.padding.left,
-                                        bounds.y + self.padding.top,
-                                    ),
+                                bounds: range,
                                 border_radius: 0.0.into(),
                                 border_width: 0.0,
                                 border_color: Color::TRANSPARENT,
-- 
cgit 


From 8cc19de254c37d3123d5ea1b6513f1f34d35c7c8 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 22 Sep 2023 06:00:51 +0200
Subject: Add `text` helper method for `text_editor::Content`

---
 widget/src/text_editor.rs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index c142c22d..6d25967e 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -190,6 +190,27 @@ where
         }
     }
 
+    pub fn text(&self) -> String {
+        let mut text = self.lines().enumerate().fold(
+            String::new(),
+            |mut contents, (i, line)| {
+                if i > 0 {
+                    contents.push('\n');
+                }
+
+                contents.push_str(&line);
+
+                contents
+            },
+        );
+
+        if !text.ends_with('\n') {
+            text.push('\n');
+        }
+
+        text
+    }
+
     pub fn selection(&self) -> Option<String> {
         self.0.borrow().editor.selection()
     }
-- 
cgit 


From 625cd745f38215b1cb8f629cdc6d2fa41c9a739a Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 27 Oct 2023 05:04:14 +0200
Subject: Write documentation for the new text APIs

---
 widget/src/text_editor.rs | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 6d25967e..da1905dc 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -1,3 +1,4 @@
+//! Display a multi-line text input for text editing.
 use crate::core::event::{self, Event};
 use crate::core::keyboard;
 use crate::core::layout::{self, Layout};
@@ -19,6 +20,7 @@ use std::sync::Arc;
 pub use crate::style::text_editor::{Appearance, StyleSheet};
 pub use text::editor::{Action, Edit, Motion};
 
+/// A multi-line text input.
 pub struct TextEditor<'a, Highlighter, Message, Renderer = crate::Renderer>
 where
     Highlighter: text::Highlighter,
@@ -47,6 +49,7 @@ where
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
 {
+    /// Creates new [`TextEditor`] with the given [`Content`].
     pub fn new(content: &'a Content<Renderer>) -> Self {
         Self {
             content,
@@ -73,21 +76,34 @@ where
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
 {
-    pub fn on_edit(mut self, on_edit: impl Fn(Action) -> Message + 'a) -> Self {
+    /// Sets the message that should be produced when some action is performed in
+    /// the [`TextEditor`].
+    ///
+    /// If this method is not called, the [`TextEditor`] will be disabled.
+    pub fn on_action(
+        mut self,
+        on_edit: impl Fn(Action) -> Message + 'a,
+    ) -> Self {
         self.on_edit = Some(Box::new(on_edit));
         self
     }
 
+    /// Sets the [`Font`] of the [`TextEditor`].
+    ///
+    /// [`Font`]: text::Renderer::Font
     pub fn font(mut self, font: impl Into<Renderer::Font>) -> Self {
         self.font = Some(font.into());
         self
     }
 
+    /// Sets the [`Padding`] of the [`TextEditor`].
     pub fn padding(mut self, padding: impl Into<Padding>) -> Self {
         self.padding = padding.into();
         self
     }
 
+    /// Highlights the [`TextEditor`] with the given [`Highlighter`] and
+    /// a strategy to turn its highlights into some text format.
     pub fn highlight<H: text::Highlighter>(
         self,
         settings: H::Settings,
@@ -112,6 +128,7 @@ where
     }
 }
 
+/// The content of a [`TextEditor`].
 pub struct Content<R = crate::Renderer>(RefCell<Internal<R>>)
 where
     R: text::Renderer;
@@ -128,28 +145,33 @@ impl<R> Content<R>
 where
     R: text::Renderer,
 {
+    /// Creates an empty [`Content`].
     pub fn new() -> Self {
-        Self::with("")
+        Self::with_text("")
     }
 
-    pub fn with(text: &str) -> Self {
+    /// Creates a [`Content`] with the given text.
+    pub fn with_text(text: &str) -> Self {
         Self(RefCell::new(Internal {
             editor: R::Editor::with_text(text),
             is_dirty: true,
         }))
     }
 
-    pub fn edit(&mut self, action: Action) {
+    /// Performs an [`Action`] on the [`Content`].
+    pub fn perform(&mut self, action: Action) {
         let internal = self.0.get_mut();
 
         internal.editor.perform(action);
         internal.is_dirty = true;
     }
 
+    /// Returns the amount of lines of the [`Content`].
     pub fn line_count(&self) -> usize {
         self.0.borrow().editor.line_count()
     }
 
+    /// Returns the text of the line at the given index, if it exists.
     pub fn line(
         &self,
         index: usize,
@@ -160,6 +182,7 @@ where
         .ok()
     }
 
+    /// Returns an iterator of the text of the lines in the [`Content`].
     pub fn lines(
         &self,
     ) -> impl Iterator<Item = impl std::ops::Deref<Target = str> + '_> {
@@ -190,6 +213,9 @@ where
         }
     }
 
+    /// Returns the text of the [`Content`].
+    ///
+    /// Lines are joined with `'\n'`.
     pub fn text(&self) -> String {
         let mut text = self.lines().enumerate().fold(
             String::new(),
@@ -211,10 +237,12 @@ where
         text
     }
 
+    /// Returns the selected text of the [`Content`].
     pub fn selection(&self) -> Option<String> {
         self.0.borrow().editor.selection()
     }
 
+    /// Returns the current cursor position of the [`Content`].
     pub fn cursor_position(&self) -> (usize, usize) {
         self.0.borrow().editor.cursor_position()
     }
-- 
cgit 


From e579d8553088c7d17784e7ff8f6e21360c2bd9ef Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 27 Oct 2023 05:08:06 +0200
Subject: Implement missing debug implementations in `iced_widget`

---
 widget/src/text_editor.rs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index da1905dc..ac24920f 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -14,6 +14,7 @@ use crate::core::{
 };
 
 use std::cell::RefCell;
+use std::fmt;
 use std::ops::DerefMut;
 use std::sync::Arc;
 
@@ -21,6 +22,7 @@ pub use crate::style::text_editor::{Appearance, StyleSheet};
 pub use text::editor::{Action, Edit, Motion};
 
 /// A multi-line text input.
+#[allow(missing_debug_implementations)]
 pub struct TextEditor<'a, Highlighter, Message, Renderer = crate::Renderer>
 where
     Highlighter: text::Highlighter,
@@ -257,6 +259,21 @@ where
     }
 }
 
+impl<Renderer> fmt::Debug for Content<Renderer>
+where
+    Renderer: text::Renderer,
+    Renderer::Editor: fmt::Debug,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let internal = self.0.borrow();
+
+        f.debug_struct("Content")
+            .field("editor", &internal.editor)
+            .field("is_dirty", &internal.is_dirty)
+            .finish()
+    }
+}
+
 struct State<Highlighter: text::Highlighter> {
     is_focused: bool,
     last_click: Option<mouse::Click>,
-- 
cgit 


From c8eca4e6bfae82013e6bb08e9d8bf66560b36564 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 27 Oct 2023 16:37:58 +0200
Subject: Improve `TextEditor` scroll interaction with a touchpad

---
 widget/src/text_editor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'widget/src/text_editor.rs')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index ac24920f..1708a2e5 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -628,7 +628,7 @@ impl Update {
                                 }
                             }
                             mouse::ScrollDelta::Pixels { y, .. } => {
-                                -y.signum() as i32
+                                (-y / 4.0) as i32
                             }
                         },
                     })
-- 
cgit