Merge branch 'main' into feat/enhanced-alignments

.github/workflows/rust.yml

@@ -52,3 +52,6 @@ jobs:
       if: runner.os == 'Linux'
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
+    - name: Make sure the mocked Skia bindings are on sync
+      if: runner.os == 'Linux'
+      run: cargo build --package freya --features mocked-engine-development --no-default-features

.vscode/settings.json

@@ -1,6 +1,7 @@
 {
     "rust-analyzer.cargo.features": [
         "devtools",
-        "log"
+        "log",
+        "use_camera"
     ]
 }

Cargo.toml

@@ -37,21 +37,21 @@ dioxus-core = { version = "0.4" }
 dioxus-hot-reload = { version = "0.4", features = ["file_watcher"] }
 dioxus-router = { version = "0.4", default-features = false }
 
-skia-safe = { version = "0.66.3", features = ["gl", "textlayout", "svg"] }
+skia-safe = { version = "0.67.0", features = ["gl", "textlayout", "svg"] }
 
 gl = "0.14.0"
-glutin = "0.30.6"
+glutin = "0.30.10"
 glutin-winit = "0.3.0"
 raw-window-handle = "0.5.1"
-winit = "0.28.2"
-tokio = { version = "1.23.0", features = ["sync", "rt-multi-thread", "time", "macros"] }
+winit = "0.28.7"
+tokio = { version = "1.33.0", features = ["sync", "rt-multi-thread", "time", "macros"] }
 accesskit = { version = "0.11.0", features = ["serde"]}
 accesskit_winit = "0.14.1"
-zbus = "3.13.1"
+zbus = "3.14.1"
 
-euclid = "0.22.7"
-uuid = { version = "1.2.2", features = ["v4"]}
-futures = "0.3.25"
+euclid = "0.22.9"
+uuid = { version = "1.4.1", features = ["v4"]}
+futures = "0.3.28"
 anymap = "0.12.1"
 tracing = "0.1"
 tracing-subscriber = "0.3.17"
@@ -64,9 +64,9 @@ tokio = { workspace = true }
 dioxus = { workspace = true }
 freya = { workspace = true }
 freya-node-state = { workspace = true }
-reqwest = { version = "0.11.13", features = ["json"] }
-serde = "1.0.152"
-tracing-subscriber = "0.2.25"
+reqwest = { version = "0.11.22", features = ["json"] }
+serde = "1.0.189"
+tracing-subscriber = "0.3.17"
 dioxus-std = { version = "0.4", features = ["utils", "i18n"] }
 rand = "0.8.5"
 dioxus-router = { workspace = true }

crates/components/Cargo.toml

@@ -34,7 +34,7 @@ tokio = { workspace = true }
 tracing = { workspace = true }
 
 open = "5"
-reqwest = { version = "0.11.13", features = ["json"] }
+reqwest = { version = "0.11.22", features = ["json"] }
 
 [dev-dependencies]
 freya = { path = "../freya" }

crates/components/src/input.rs

@@ -84,6 +84,12 @@ pub fn Input<'a>(cx: Scope<'a, InputProps<'a>>) -> Element {
     let theme = use_get_theme(cx);
     let focus_manager = use_focus(cx);
 
+    if &cx.props.value != editable.editor().current().rope() {
+        editable.editor().with_mut(|editor| {
+            editor.set(&cx.props.value);
+        });
+    }
+
     let text = match cx.props.hidden {
         InputMode::Hidden(ch) => ch.to_string().repeat(cx.props.value.len()),
         InputMode::Shown => cx.props.value.clone(),
@@ -94,15 +100,6 @@ pub fn Input<'a>(cx: Scope<'a, InputProps<'a>>) -> Element {
     let height = &cx.props.height;
     let max_lines = &cx.props.max_lines;
 
-    use_memo(cx, &(cx.props.value.to_string(),), {
-        to_owned![editable];
-        move |(text,)| {
-            editable.editor().with_mut(|editor| {
-                editor.set(&text);
-            });
-        }
-    });
-
     let onkeydown = {
         to_owned![editable, focus_manager];
         move |e: Event<KeyboardData>| {

crates/elements/Cargo.toml

@@ -25,4 +25,4 @@ winit = { workspace = true }
 tokio = { workspace = true }
 accesskit = { workspace = true }
 
-keyboard-types = "0.6.2"
+keyboard-types = "0.7.0"

crates/engine/src/mocked.rs

@@ -2,6 +2,7 @@
 #![allow(non_upper_case_globals)]
 #![allow(clippy::upper_case_acronyms)]
 #![allow(non_camel_case_types)]
+#![allow(unused_variables)]
 
 use std::ops::*;
 
@@ -167,7 +168,7 @@ impl Matrix {
         unimplemented!("This is mocked")
     }
 
-    pub fn set_rotate(&self, _degrees: f32, _pivot: impl Into<Option<Point>>) -> &mut Self {
+    pub fn set_rotate(&mut self, _degrees: f32, _pivot: impl Into<Option<Point>>) -> &mut Self {
         unimplemented!("This is mocked")
     }
 }
@@ -420,7 +421,7 @@ impl TextStyle {
         unimplemented!("This is mocked")
     }
 
-    pub fn decoration_mut(&mut self) -> &mut Decoration {
+    pub fn set_decoration(&mut self, decoration: &Decoration) {
         unimplemented!("This is mocked")
     }
 
@@ -708,7 +709,7 @@ impl Paragraph {
         unimplemented!("This is mocked")
     }
 
-    pub fn paint(&self, _canvas: &mut Canvas, _p: impl Into<Point>) {
+    pub fn paint(&self, _canvas: &Canvas, _p: impl Into<Point>) {
         unimplemented!("This is mocked")
     }
 
@@ -947,43 +948,43 @@ impl Canvas {
         unimplemented!("This is mocked")
     }
 
-    pub fn concat(&mut self, _matrix: &Matrix) {
+    pub fn concat(&self, _matrix: &Matrix) {
         unimplemented!("This is mocked")
     }
 
-    pub fn clip_rect(&mut self, _rect: Rect, _clip: ClipOp, _: bool) {
+    pub fn clip_rect(&self, _rect: Rect, _clip: ClipOp, _: bool) {
         unimplemented!("This is mocked")
     }
 
     pub fn draw_image_nine(
-        &mut self,
+        &self,
         _image: Image,
         _center: IRect,
         _dst: Rect,
         _filter_mode: FilterMode,
         _paint: Option<&Paint>,
-    ) -> &mut Self {
+    ) -> &Self {
         unimplemented!("This is mocked")
     }
 
-    pub fn draw_rect(&mut self, _rect: Rect, _paint: &Paint) -> &mut Self {
+    pub fn draw_rect(&self, _rect: Rect, _paint: &Paint) -> &Self {
         unimplemented!("This is mocked")
     }
 
-    pub fn draw_path(&mut self, _path: &Path, _paint: &Paint) -> &mut Self {
+    pub fn draw_path(&self, _path: &Path, _paint: &Paint) -> &Self {
         unimplemented!("This is mocked")
     }
 
     pub fn clip_path(
-        &mut self,
+        &self,
         _path: &Path,
         _op: impl Into<Option<ClipOp>>,
         _do_anti_alias: impl Into<Option<bool>>,
-    ) -> &mut Self {
+    ) -> &Self {
         unimplemented!("This is mocked")
     }
 
-    pub fn translate(&mut self, _d: impl Into<Point>) -> &mut Self {
+    pub fn translate(&self, _d: impl Into<Point>) -> &Self {
         unimplemented!("This is mocked")
     }
 
@@ -995,21 +996,11 @@ impl Canvas {
         unimplemented!("This is mocked")
     }
 
-    pub fn draw_line(
-        &mut self,
-        _p1: impl Into<Point>,
-        _p2: impl Into<Point>,
-        _paint: &Paint,
-    ) -> &mut Self {
+    pub fn draw_line(&self, _p1: impl Into<Point>, _p2: impl Into<Point>, _paint: &Paint) -> &Self {
         unimplemented!("This is mocked")
     }
 
-    pub fn draw_circle(
-        &mut self,
-        _center: impl Into<Point>,
-        _radius: f32,
-        _paint: &Paint,
-    ) -> &mut Self {
+    pub fn draw_circle(&self, _center: impl Into<Point>, _radius: f32, _paint: &Paint) -> &Self {
         unimplemented!("This is mocked")
     }
 }
@@ -1132,7 +1123,7 @@ impl Image {
 pub struct Data;
 
 impl Data {
-    pub fn new_bytes(_bytes: &[u8]) -> Self {
+    pub unsafe fn new_bytes(_bytes: &[u8]) -> Self {
         unimplemented!("This is mocked")
     }
 }
@@ -1328,7 +1319,7 @@ pub mod svg {
             unimplemented!("This is mocked")
         }
 
-        pub fn render(&self, _canvas: &mut Canvas) {
+        pub fn render(&self, _canvas: &Canvas) {
             unimplemented!("This is mocked")
         }
     }
@@ -1353,7 +1344,7 @@ impl From<(i32, i32)> for Size {
 pub struct Surface;
 
 impl Surface {
-    pub fn canvas(&self) -> Canvas {
+    pub fn canvas(&mut self) -> Canvas {
         unimplemented!("This is mocked")
     }
 
@@ -1436,12 +1427,14 @@ impl DirectContext {
 use std::ffi::c_void;
 
 #[repr(u8)]
+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub enum Protected {
     No,
     Yes,
 }
 
-#[derive(Clone, Copy)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
+#[repr(C)]
 pub struct FramebufferInfo {
     pub fboid: i32,
     pub format: Format,
@@ -1450,11 +1443,7 @@ pub struct FramebufferInfo {
 
 impl Default for FramebufferInfo {
     fn default() -> Self {
-        Self {
-            fboid: 0,
-            format: 0,
-            protected: Protected::No,
-        }
+        unimplemented!("This is mocked")
     }
 }
 
@@ -1466,16 +1455,7 @@ pub fn wrap_backend_render_target(
     color_space: impl Into<Option<ColorSpace>>,
     surface_props: Option<&SurfaceProps>,
 ) -> Option<Surface> {
-    Surface::from_ptr(unsafe {
-        sb::C_SkSurfaces_WrapBackendRenderTarget(
-            context.native_mut(),
-            backend_render_target.native(),
-            origin,
-            color_type.into_native(),
-            color_space.into().into_ptr_or_null(),
-            surface_props.native_ptr_or_null(),
-        )
-    })
+    unimplemented!("This is mocked")
 }
 
 pub struct Interface;
@@ -1534,3 +1514,15 @@ impl BackendRenderTarget {
         unimplemented!("This is mocked")
     }
 }
+
+pub mod backend_render_targets {
+    use crate::prelude::*;
+    pub fn make_gl(
+        (width, height): (i32, i32),
+        sample_count: impl Into<Option<usize>>,
+        stencil_bits: usize,
+        info: FramebufferInfo,
+    ) -> BackendRenderTarget {
+        unimplemented!("This is mocked")
+    }
+}

crates/engine/src/skia.rs

@@ -1,6 +1,7 @@
 pub use skia_safe::{
     font_style::{Slant, Weight, Width},
     gpu::{
+        backend_render_targets,
         gl::{Format, FramebufferInfo, Interface},
         surfaces::wrap_backend_render_target,
         BackendRenderTarget, DirectContext, RecordingContext, SurfaceOrigin,

crates/freya/Cargo.toml

@@ -19,6 +19,7 @@ no-default-features = true
 log = ["dep:tracing", "dep:tracing-subscriber"]
 devtools = ["dep:freya-devtools", "freya-dom/shared"]
 use_camera = ["freya-hooks/use_camera"]
+mocked-engine-development = ["freya-engine/mocked-engine"] # This is just for the CI
 default = ["freya-engine/skia-engine"]
 
 [dependencies]

crates/hooks/Cargo.toml

@@ -38,10 +38,10 @@ accesskit = { workspace = true }
 
 euclid = { workspace = true }
 uuid = { workspace = true }
-tween = "2.0.0"
+tween = "2.0.1"
 ropey = "1.6.0"
 nokhwa = { version = "0.10.4", features = ["input-native"], optional = true }
-bytes = "1.3.0"
+bytes = "1.5.0"
 
 [dev-dependencies]
 dioxus = { workspace = true }

crates/hooks/src/rope_editor.rs

@@ -32,6 +32,10 @@ impl RopeEditor {
             mode,
         }
     }
+
+    pub fn rope(&self) -> &Rope {
+        &self.rope
+    }
 }
 
 impl TextEditor for RopeEditor {
@@ -157,6 +161,9 @@ impl TextEditor for RopeEditor {
     fn set(&mut self, text: &str) {
         self.rope.remove(0..);
         self.rope.insert(0, text);
+        if self.cursor_pos() > text.len() {
+            self.set_cursor_pos(text.len());
+        }
     }
 
     fn unhighlight(&mut self) {

crates/hooks/src/text_editor.rs

@@ -4,7 +4,7 @@ use freya_elements::events::keyboard::{Code, Key, Modifiers};
 pub use ropey::Rope;
 
 /// Holds the position of a cursor in a text
-#[derive(Clone, Default)]
+#[derive(Clone, Default, PartialEq, Debug)]
 pub struct TextCursor {
     col: usize,
     row: usize,

crates/hooks/src/use_accessibility.rs

@@ -66,7 +66,7 @@ mod test {
 
         let mut utils = launch_test_with_config(
             use_focus_app,
-            TestingConfig::default().with_size((100.0, 100.0).into()),
+            *TestingConfig::default().with_size((100.0, 100.0).into()),
         );
 
         // Initial state