chore: Update freya to rc4 and bump to v0.20.0

Author: marc2332

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "valin"
-version = "0.0.19"
+version = "0.0.20"
 edition = "2021"
 
 [patch.crates-io]
@@ -14,8 +14,8 @@ edition = "2021"
 # generational-box  = { git = "https://github.com/marc2332/dioxus", rev = "17b8b22d9b6c31a9ad5a8e291627776fa3c1ec49" }
 
 [dependencies]
-freya = { version = "0.3.0-rc.1" }
-freya-hooks = { version = "0.3.0-rc.1" }
+freya = { version = "0.3.0-rc.4" }
+freya-hooks = { version = "0.3.0-rc.4" }
 
 dioxus-radio = { version = "0.5.1", features = ["tracing"] }
 dioxus = { version = "0.6", default-features = false }

Cargo.toml

@@ -80,7 +80,6 @@ pub fn TextArea(props: TextAreaProps) -> Element {
             border: "1 solid {border_fill}",
             padding: "8 6",
             margin: "0 0 2 0",
-            cursor_reference,
             a11y_id: focus.attribute(),
             a11y_role: "text-input",
             a11y_auto_focus: "true",
@@ -91,6 +90,7 @@ pub fn TextArea(props: TextAreaProps) -> Element {
                 onmouseleave,
                 onmousemove,
                 width: "100%",
+                cursor_reference,
                 cursor_id: "0",
                 cursor_index: "{cursor_char}",
                 cursor_mode: "editable",

src/components/text_area.rs

@@ -108,7 +108,10 @@ impl UseEdit {
                     }
                 }
 
-                let event = editor_tab.editor.process_key(&e.key, &e.code, &e.modifiers);
+                let event =
+                    editor_tab
+                        .editor
+                        .process_key(&e.key, &e.code, &e.modifiers, true, true, true);
                 if event.contains(TextEvent::TEXT_CHANGED) {
                     editor_tab.editor.run_parser();
                     *self.dragging.write() = TextDragging::None;
@@ -134,7 +137,9 @@ impl UseEdit {
         };
 
         if let Some((cursor_id, cursor_position, cursor_selection)) = res {
+            println!("{res:?}");
             if self.dragging.peek().has_cursor_coords() {
+                println!("..-");
                 self.platform
                     .send(EventLoopMessage::RemeasureTextGroup(TextGroupMeasurement {
                         text_id: self.cursor_reference.peek().text_id,

src/hooks/use_edit.rs

@@ -2,8 +2,7 @@ use std::{collections::HashMap, vec};
 
 use dioxus_clipboard::prelude::UseClipboard;
 use dioxus_radio::prelude::{Radio, RadioChannel};
-use freya::core::accessibility::AccessibilityFocusStrategy;
-use freya_hooks::UsePlatform;
+use freya::{core::accessibility::AccessibilityFocusStrategy, hooks::UsePlatform};
 use skia_safe::{textlayout::FontCollection, FontMgr};
 use tracing::info;
 
@@ -314,7 +313,7 @@ impl AppState {
     pub fn focus_tab(&mut self, panel_i: usize, tab: Option<usize>) {
         self.panels[panel_i].active_tab = tab;
         if let Some(tab) = tab {
-            let platform = UsePlatform::new();
+            let platform = UsePlatform::current();
             let tab = self.panels[panel_i].tab(tab);
             platform.focus(AccessibilityFocusStrategy::Node(tab.get_data().focus_id));
         }

src/state/app.rs

@@ -1,5 +1,8 @@
-use freya::{core::accessibility::AccessibilityFocusStrategy, prelude::AccessibilityId};
-use freya_hooks::{UseFocus, UsePlatform};
+use freya::{
+    core::accessibility::AccessibilityFocusStrategy,
+    hooks::{UseFocus, UsePlatform},
+    prelude::AccessibilityId,
+};
 
 use super::file_explorer_ui::ExplorerItem;
 
@@ -17,7 +20,7 @@ impl FileExplorerState {
     }
 
     pub fn focus(&self) {
-        let platform = UsePlatform::new();
+        let platform = UsePlatform::current();
         platform.focus(AccessibilityFocusStrategy::Node(self.focus_id));
     }
 

src/views/file_explorer/file_explorer_state.rs

@@ -138,7 +138,7 @@ enum TreeTask {
 pub fn FileExplorer() -> Element {
     let mut radio_app_state = use_radio::<AppState, Channel>(Channel::FileExplorer);
     let app_state = radio_app_state.read();
-    let mut focus = use_focus_from_id(app_state.file_explorer.focus_id);
+    let mut focus = use_focus_for_id(app_state.file_explorer.focus_id);
     let mut focused_item_index = use_signal(|| 0);
 
     let items = app_state
@@ -289,7 +289,7 @@ pub fn FileExplorer() -> Element {
 
     let onclick = move |e: MouseEvent| {
         e.stop_propagation();
-        focus.focus();
+        focus.request_focus();
     };
 
     if items.is_empty() {

src/views/file_explorer/file_explorer_ui.rs

@@ -4,9 +4,8 @@ use std::rc::Rc;
 use std::{cmp::Ordering, fmt::Display, ops::Range, path::PathBuf};
 
 use dioxus_clipboard::prelude::UseClipboard;
-use freya::hooks::{EditorHistory, HistoryChange, Line, TextCursor, TextEditor};
+use freya::hooks::{EditorHistory, HistoryChange, Line, LinesIterator, TextCursor, TextEditor};
 use freya::prelude::Rope;
-use freya_hooks::LinesIterator;
 use lsp_types::Url;
 use skia_safe::textlayout::FontCollection;
 

src/views/panels/tabs/editor/editor_data.rs

@@ -125,6 +125,7 @@ pub fn EditorLine(
     let line = editor.metrics.syntax_blocks.get_line(line_index);
     let highlights = editable.highlights_attr(line_index, editor_tab);
     let gutter_width = font_size * 5.0;
+    let cursor_reference = editable.cursor_attr();
 
     let is_line_selected = editor.cursor_row() == line_index;
 
@@ -198,6 +199,7 @@ pub fn EditorLine(
                 cursor_index,
                 cursor_color: "white",
                 max_lines: "1",
+                cursor_reference,
                 cursor_mode: "editable",
                 cursor_id: "{line_index}",
                 highlights,

src/views/panels/tabs/editor/editor_line.rs

@@ -35,7 +35,7 @@ pub fn EditorUi(
     let editor = &editor_tab.editor;
     let paths = editor.editor_type().paths();
 
-    let mut focus = use_focus_from_id(editor_tab.focus_id);
+    let mut focus = use_focus_for_id(editor_tab.focus_id);
 
     // What position in the text the user is hovering
     let hover_location = use_signal(|| None);
@@ -90,7 +90,7 @@ pub fn EditorUi(
 
     let onclick = move |e: MouseEvent| {
         e.stop_propagation();
-        focus.focus();
+        focus.request_focus();
         radio_app_state.write_with_channel_selection(|app_state| {
             let mut channel = ChannelSelection::Silence;
 
@@ -117,7 +117,6 @@ pub fn EditorUi(
         });
     };
 
-    let cursor_reference = editable.cursor_attr();
     let line_height = app_state.line_height();
     let font_size = app_state.font_size();
 
@@ -242,7 +241,6 @@ pub fn EditorUi(
                 onkeydown,
                 onkeyup,
                 onclick,
-                cursor_reference,
                 EditorScrollView {
                     offset_x: scroll_offsets.read().0,
                     offset_y: scroll_offsets.read().1,