update(dependency): Dioxus update (#1229)

Co-authored-by: Flemmli97 <Flemmli97@users.noreply.github.com>
Co-authored-by: Darius Clark <dariusc93@users.noreply.github.com>
Co-authored-by: Darius <darius.clark@proton.me>

Cargo.toml

@@ -28,14 +28,14 @@ version = "0.1.6"
 rust-version = "1.70"
 
 [workspace.dependencies]
-dioxus = { version = "0.4" }
-dioxus-hooks = { version = "0.4" }
-dioxus-html = { version = "0.4" }
-dioxus-router = { version = "0.4" }
-dioxus-desktop = { version = "0.4", features = ["transparent"] }
+dioxus = { git = "https://github.com/DioxusLabs/dioxus", rev = "60ee829" }
+dioxus-hooks = { git = "https://github.com/DioxusLabs/dioxus", rev = "60ee829" }
+dioxus-html = { git = "https://github.com/DioxusLabs/dioxus", rev = "60ee829" }
+dioxus-router = { git = "https://github.com/DioxusLabs/dioxus", rev = "60ee829" }
+dioxus-desktop = { git = "https://github.com/DioxusLabs/dioxus", rev = "60ee829", features = ["transparent"] }
 raw-window-handle = "0.5"
-dioxus-core = { version = "0.4" }
-fermi = { version = "0.4" }
+dioxus-core = { git = "https://github.com/DioxusLabs/dioxus", rev = "60ee829" }
+fermi = { git = "https://github.com/DioxusLabs/dioxus", rev = "60ee829" }
 tokio-util = { version = "0.7", features = ["full"] }
 arboard = "3.2"
 humansize = "2.1.3"

extensions/src/lib.rs

@@ -16,7 +16,7 @@ pub static FILE_EXT: &str = "dll";
 pub trait Extension {
     fn details(&self) -> Details;
     fn stylesheet(&self) -> String;
-    fn render<'a>(&self, cx: &'a ScopeState) -> Element<'a>;
+    fn render<'a>(&self, cx: &'a ScopeState, runtime: std::rc::Rc<Runtime>) -> Element<'a>;
     fn rustc_version(&self) -> &'static str {
         RUSTC_VERSION
     }
@@ -44,8 +44,8 @@ macro_rules! export_extension {
 
         #[doc(hidden)]
         #[no_mangle]
-        pub extern "C" fn render(cx: &ScopeState) -> Element {
-            $a.render(cx)
+        pub extern "C" fn render(cx: &ScopeState, runtime: std::rc::Rc<Runtime>) -> Element {
+            $a.render(cx, runtime)
         }
 
         #[doc(hidden)]
@@ -104,9 +104,9 @@ impl UplinkExtension {
         unsafe {
             let res = self
                 .lib
-                .get::<unsafe extern "C" fn(cx: &ScopeState) -> Element>(b"render\0");
+                .get::<unsafe extern "C" fn(cx: &ScopeState, runtime: std::rc::Rc<Runtime>) -> Element>(b"render\0");
             match res {
-                Ok(f) => f(cx),
+                Ok(f) => f(cx, Runtime::current().unwrap()),
                 Err(_) => None,
             }
         }

icons/src/lib.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::type_complexity)]
 //! Dioxus components for [heroicons](https://heroicons.com/)
 //
 // MIT License
@@ -32,7 +33,7 @@
 //! use dioxus::prelude::*;
 //! use dioxus_heroicons::{Icon, IconButton, solid::Shape};
 //!
-//! #[inline_props]
+//! #[component]
 //! fn DeleteButton(cx: Scope, foo: u8) -> Element {
 //!     let onclick = move |evt| {
 //!         // Delete a thing

kit/src/lib.rs

@@ -1,3 +1,7 @@
+//TODO: Look into complex types from clippy in regards to props attr macro.
+//      Low priority and can be ignored
+
+#![allow(clippy::type_complexity)]
 use components::indicator::{Platform, Status};
 
 pub mod components;

native_extensions/clear_all/src/lib.rs

@@ -28,7 +28,8 @@ impl Extension for ClearAll {
         ".clear-all_container, .clear-all_container .btn-wrap, .clear-all_container .btn { width: 100% }".into()
     }
 
-    fn render<'a>(&self, cx: &'a ScopeState) -> Element<'a> {
+    fn render<'a>(&self, cx: &'a ScopeState, runtime: std::rc::Rc<Runtime>) -> Element<'a> {
+        cx.use_hook(|| RuntimeGuard::new(runtime.clone()));
         let styles = self.stylesheet();
 
         cx.render(rsx! (

native_extensions/emoji_selector/src/lib.rs

@@ -35,8 +35,8 @@ fn group_to_str(group: emojis::Group) -> String {
     }
 }
 
-#[inline_props]
-fn build_nav(cx: Scope) -> Element<'a> {
+#[component(no_case_check)]
+fn build_nav(cx: Scope<'_>) -> Element<'_> {
     let routes = vec![
         Route {
             to: "Smileys & Emotion",
@@ -126,7 +126,7 @@ enum Command {
     React(Uuid, Uuid, String),
 }
 
-#[inline_props]
+#[component(no_case_check)]
 fn render_selector<'a>(
     cx: Scope,
     mouse_over_emoji_button: UseRef<bool>,
@@ -269,7 +269,7 @@ fn render_selector<'a>(
 }
 
 // this avoid a BorrowMut error. needs an argument to make the curly braces syntax work
-#[inline_props]
+#[component(no_case_check)]
 fn render_1(cx: Scope, _unused: bool) -> Element {
     let state = use_shared_state::<State>(cx)?;
     let mouse_over_emoji_button = use_ref(cx, || false);
@@ -338,7 +338,8 @@ impl Extension for EmojiSelector {
         include_str!("./style.css").to_string()
     }
 
-    fn render<'a>(&self, cx: &'a ScopeState) -> Element<'a> {
+    fn render<'a>(&self, cx: &'a ScopeState, runtime: std::rc::Rc<Runtime>) -> Element<'a> {
+        cx.use_hook(|| RuntimeGuard::new(runtime.clone()));
         let styles = self.stylesheet();
         cx.render(rsx!(
             style { "{styles}" },

ui/src/auth_guard.rs

@@ -17,7 +17,7 @@ pub enum AuthPages {
 }
 
 /// Guard the app's router with the login flow
-#[inline_props]
+#[component]
 pub fn AuthGuard(cx: Scope, page: UseState<AuthPages>) -> Element {
     log::trace!("rendering auth guard");
 

ui/src/components/debug_logger/mod.rs

@@ -7,7 +7,7 @@ use crate::logger;
 const STYLE: &str = include_str!("./style.scss");
 const SCRIPT: &str = include_str!("./script.js");
 
-#[inline_props]
+#[component]
 #[allow(non_snake_case)]
 pub fn DebugLogger(cx: Scope) -> Element {
     let logs_to_show = use_state(cx, logger::load_debug_log);

ui/src/components/media/popout_player.rs

@@ -13,8 +13,7 @@ use crate::{utils::WindowDropHandler, window_manager::WindowManagerCmd, WINDOW_C
 #[allow(dead_code)]
 pub const SCRIPT: &str = include_str!("./script.js");
 
-#[inline_props]
-#[allow(non_snake_case)]
+#[component]
 pub fn PopoutPlayer(cx: Scope, _drop_handler: WindowDropHandler) -> Element {
     let cmd_tx = WINDOW_CMD_CH.tx.clone();
 

ui/src/layouts/chats/presentation/messages/mod.rs

@@ -90,7 +90,7 @@ pub struct NewelyFetchedMessages {
 /// tell group_messages to flag the first X messages.
 /// if onmouseout triggers over any of those messages, load Y more.
 const DEFAULT_NUM_TO_TAKE: usize = 20;
-#[inline_props]
+#[component(no_case_check)]
 pub fn get_messages(cx: Scope, data: Rc<ChatData>) -> Element {
     log::trace!("get_messages");
     use_shared_state_provider(cx, || -> DownloadTracker { HashMap::new() });

ui/src/layouts/create_account.rs

@@ -21,8 +21,7 @@ use crate::AuthPages;
 pub const MIN_USERNAME_LEN: i32 = 4;
 pub const MAX_USERNAME_LEN: i32 = 32;
 
-#[inline_props]
-#[allow(non_snake_case)]
+#[component]
 pub fn CreateAccountLayout(cx: Scope, page: UseState<AuthPages>, pin: UseRef<String>) -> Element {
     log::trace!("rendering create account layout");
     let username = use_state(cx, String::new);

ui/src/layouts/storage/files_layout/file_modal.rs

@@ -3,7 +3,7 @@ use dioxus::prelude::*;
 use kit::layout::modal::Modal;
 use warp::constellation::file::File;
 
-#[inline_props]
+#[component(no_case_check)]
 pub fn get_file_modal<'a>(
     cx: Scope<'a>,
     on_dismiss: EventHandler<'a, ()>,