Merge branch 'feat/updated-dioxus' into feat/memoized-focused-node

crates/components/src/accordion.rs

@@ -3,8 +3,8 @@ use freya_elements::elements as dioxus_elements;
 use freya_elements::events::MouseEvent;
 
 use freya_hooks::{
-    use_animation, use_applied_theme, use_node, use_platform, AccordionTheme, AccordionThemeWith,
-    Animation,
+    use_animation, use_applied_theme, use_node_signal, use_platform, AccordionTheme,
+    AccordionThemeWith, Animation,
 };
 use winit::window::CursorIcon;
 
@@ -22,7 +22,6 @@ pub enum AccordionStatus {
 #[derive(Props, Clone, PartialEq)]
 pub struct AccordionProps {
     /// Theme override.
-    #[props(optional)]
     pub theme: Option<AccordionThemeWith>,
     /// Inner children for the Accordion.
     pub children: Element,
@@ -42,8 +41,8 @@ pub struct AccordionProps {
 pub fn Accordion(props: AccordionProps) -> Element {
     let theme = use_applied_theme!(&props.theme, accordion);
     let mut animation = use_animation(|| 0.0);
-    let open = use_signal(|| false);
-    let (node_ref, size) = use_node();
+    let mut open = use_signal(|| false);
+    let (node_ref, size) = use_node_signal();
     let mut status = use_signal(AccordionStatus::default);
     let platform = use_platform();
 
@@ -55,30 +54,23 @@ pub fn Accordion(props: AccordionProps) -> Element {
     } = theme;
 
     // Adapt the accordion if the body size changes
-    let _ = use_memo_with_dependencies(
-        &(
-            size.area.width(),
-            size.area.height(),
-            animation.is_animating(),
-        ),
-        {
-            to_owned![animation];
-            move |(_, height, animating)| {
-                if (height as f64) < animation.value() && !animating {
-                    animation.set_value(size.area.height() as f64);
-                }
+    use_memo({
+        to_owned![animation];
+        move || {
+            if (size().area.height() as f64) < animation.value() && !animation.is_animating() {
+                animation.set_value(size().area.height() as f64);
             }
-        },
-    );
+        }
+    });
 
     let onclick = move |_: MouseEvent| {
-        let bodyHeight = size.area.height() as f64;
+        let bodyHeight = size.peek().area.height() as f64;
         if *open.read() {
             animation.start(Animation::new_sine_in_out(bodyHeight..=0.0, 200));
         } else {
             animation.start(Animation::new_sine_in_out(0.0..=bodyHeight, 200));
         }
-        open.with_mut(|o| *o = !*o);
+        open.toggle();
     };
 
     use_drop({

crates/components/src/button.rs

@@ -9,12 +9,10 @@ use winit::window::CursorIcon;
 #[derive(Props, Clone, PartialEq)]
 pub struct ButtonProps {
     /// Theme override.
-    #[props(optional)]
     pub theme: Option<ButtonThemeWith>,
     /// Inner children for the Button.
     pub children: Element,
     /// Handler for the `onclick` event.
-    #[props(optional)]
     pub onclick: Option<EventHandler<Option<MouseEvent>>>,
 }
 

crates/components/src/drag_drop.rs

@@ -1,7 +1,7 @@
 use dioxus::prelude::*;
 use freya_elements::elements as dioxus_elements;
 use freya_elements::events::MouseEvent;
-use freya_hooks::use_node_ref;
+use freya_hooks::use_node_signal;
 use torin::prelude::CursorPoint;
 
 /// [`DragProvider`] component properties.
@@ -49,7 +49,7 @@ pub fn DragZone<T: 'static + Clone>(
     let drags = use_context::<Signal<Option<T>>>();
     let mut dragging = use_signal(|| false);
     let mut pos = use_signal(CursorPoint::default);
-    let (node_reference, size) = use_node_ref();
+    let (node_reference, size) = use_node_signal();
 
     let onglobalmouseover = move |e: MouseEvent| {
         if *dragging.read() {

crates/components/src/dropdown.rs

@@ -22,7 +22,6 @@ pub struct DropdownItemProps<T: 'static + Clone> {
     /// Selected value.
     pub value: T,
     /// Handler for the `onclick` event.
-    #[props(optional)]
     pub onclick: Option<EventHandler<()>>,
 }
 

crates/components/src/external_link.rs

@@ -10,12 +10,10 @@ use crate::Tooltip;
 #[derive(Props, Clone, PartialEq)]
 pub struct ExternalLinkProps {
     /// Theme override.
-    #[props(optional)]
     pub theme: Option<ExternalLinkThemeWith>,
     /// Inner children for the ExternalLink.
     pub children: Element,
     /// Handler for the `onerror` event.
-    #[props(optional)]
     pub onerror: Option<EventHandler<()>>,
     /// Whether to show a tooltip with the URL or not.
     #[props(optional, default = true)]
@@ -55,11 +53,11 @@ pub fn ExternalLink(props: ExternalLinkProps) -> Element {
     let is_hovering = use_signal(|| false);
 
     let onmouseover = move |_: MouseEvent| {
-        is_hovering.with_mut(|v| *v = true);
+        *is_hovering.write() = true;
     };
 
     let onmouseleave = move |_: MouseEvent| {
-        is_hovering.with_mut(|v| *v = false);
+        *is_hovering.write() = false;
     };
 
     let onclick = {

crates/components/src/graph.rs

@@ -26,7 +26,6 @@ impl GraphLine {
 #[derive(Debug, Props, PartialEq, Clone)]
 pub struct GraphProps {
     /// Theme override.
-    #[props(optional)]
     pub theme: Option<GraphThemeWith>,
     /// X axis labels.
     labels: Vec<String>,

crates/components/src/icons/arrow.rs

@@ -6,7 +6,6 @@ use freya_hooks::{use_applied_theme, ArrowIconTheme, ArrowIconThemeWith};
 #[derive(Props, Clone, PartialEq)]
 pub struct ArrowIconProps {
     /// Theme override.
-    #[props(optional)]
     pub theme: Option<ArrowIconThemeWith>,
     #[props(into)]
     pub rotate: String,

crates/components/src/input.rs

@@ -97,9 +97,7 @@ pub fn Input(
     let focus = use_focus();
 
     if &value != editable.editor().read().rope() {
-        editable.editor_mut().with_mut(|editor| {
-            editor.set(&value);
-        });
+        editable.editor_mut().write().set(&value);
     }
 
     let text = match mode {

crates/components/src/network_image.rs

@@ -118,7 +118,7 @@ pub fn NetworkImage(props: NetworkImageProps) -> Element {
     } else {
         rsx!({
             image_bytes.as_ref().map(|bytes| {
-                let image_data = bytes_to_data(&*bytes);
+                let image_data = bytes_to_data(&bytes);
                 rsx!(image {
                     height: "{height}",
                     width: "{width}",

crates/components/src/progress_bar.rs

@@ -7,7 +7,6 @@ use freya_hooks::{use_applied_theme, ProgressBarTheme, ProgressBarThemeWith};
 #[derive(Props, Clone, PartialEq)]
 pub struct ProgressBarProps {
     /// Theme override.
-    #[props(optional)]
     pub theme: Option<ProgressBarThemeWith>,
     /// Show a label with the current progress. Default to false.
     #[props(default = false)]

crates/components/src/scroll_views/scroll_thumb.rs

@@ -7,7 +7,6 @@ use freya_hooks::{use_applied_theme, ScrollBarThemeWith};
 #[derive(Props, Clone, PartialEq)]
 pub struct ScrollThumbProps {
     /// Theme override.
-    #[props(optional)]
     pub theme: Option<ScrollBarThemeWith>,
     pub clicking_scrollbar: bool,
     pub onmousedown: EventHandler<MouseEvent>,

crates/components/src/scroll_views/scroll_view.rs

@@ -116,7 +116,7 @@ pub fn ScrollView(props: ScrollViewProps) -> Element {
                     corrected_scrolled_y,
                 );
 
-                scrolled_y.with_mut(|y| *y = scroll_position_y);
+                *scrolled_y.write() = scroll_position_y;
             }
 
             let wheel_x = if *clicking_shift.read() {
@@ -132,7 +132,7 @@ pub fn ScrollView(props: ScrollViewProps) -> Element {
                 corrected_scrolled_x,
             );
 
-            scrolled_x.with_mut(|x| *x = scroll_position_x);
+            *scrolled_x.write() = scroll_position_x;
 
             focus.focus();
         }
@@ -154,7 +154,7 @@ pub fn ScrollView(props: ScrollViewProps) -> Element {
                     size.area.height(),
                 );
 
-                scrolled_y.with_mut(|y| *y = scroll_position);
+                *scrolled_y.write() = scroll_position;
             } else if let Some((Axis::X, x)) = *clicking_scrollbar {
                 let coordinates = e.get_element_coordinates();
                 let cursor_x = coordinates.x - x - size.area.min_x() as f64;
@@ -165,7 +165,7 @@ pub fn ScrollView(props: ScrollViewProps) -> Element {
                     size.area.width(),
                 );
 
-                scrolled_x.with_mut(|x| *x = scroll_position);
+                *scrolled_x.write() = scroll_position;
             }
 
             if clicking_scrollbar.is_some() {

crates/components/src/scroll_views/virtual_scroll_view.rs

@@ -149,7 +149,7 @@ pub fn VirtualScrollView<T: Clone>(props: VirtualScrollViewProps<T>) -> Element
                     corrected_scrolled_y,
                 );
 
-                scrolled_y.with_mut(|y| *y = scroll_position_y);
+                *scrolled_y.write() = scroll_position_y;
             }
 
             let wheel_x = if *clicking_shift.peek() {
@@ -165,7 +165,7 @@ pub fn VirtualScrollView<T: Clone>(props: VirtualScrollViewProps<T>) -> Element
                 corrected_scrolled_x,
             );
 
-            scrolled_x.with_mut(|x| *x = scroll_position_x);
+            *scrolled_x.write() = scroll_position_x;
 
             focus.focus();
         }
@@ -187,15 +187,15 @@ pub fn VirtualScrollView<T: Clone>(props: VirtualScrollViewProps<T>) -> Element
                     size.area.height(),
                 );
 
-                scrolled_y.with_mut(|y| *y = scroll_position);
+                *scrolled_y.write() = scroll_position;
             } else if let Some((Axis::X, x)) = *clicking_scrollbar {
                 let coordinates = e.get_element_coordinates();
                 let cursor_x = coordinates.x - x - size.area.min_x() as f64;
 
                 let scroll_position =
                     get_scroll_position_from_cursor(cursor_x as f32, inner_size, size.area.width());
 
-                scrolled_x.with_mut(|x| *x = scroll_position);
+                *scrolled_x.write() = scroll_position;
             }
 
             if clicking_scrollbar.is_some() {

crates/components/src/slider.rs

@@ -162,7 +162,7 @@ pub fn Slider(
     let border = if focus.is_selected() {
         format!("2 solid {}", theme.border_fill)
     } else {
-        format!("none")
+        "none".to_string()
     };
 
     rsx!(

crates/components/src/switch.rs

@@ -47,7 +47,7 @@ pub enum SwitchStatus {
 ///         Switch {
 ///             enabled: *enabled.read(),
 ///             ontoggled: move |_| {
-///                 enabled.with_mut(|v| *v = !*v);
+///                 enabled.toggle();
 ///             }
 ///         }
 ///     )

crates/components/src/table.rs

@@ -79,7 +79,7 @@ pub struct TableRowProps {
 /// Inherits the [`TableTheme`](freya_hooks::TableTheme) theme.
 ///
 #[allow(non_snake_case)]
-pub fn TableRow<'a>(
+pub fn TableRow(
     TableRowProps {
         theme,
         children,

crates/core/tests/pointer_events.rs

@@ -8,17 +8,17 @@ use winit::event::TouchPhase;
 #[tokio::test]
 pub async fn pointer_events_from_mouse() {
     fn pointer_events_app() -> Element {
-        let state = use_signal(|| vec![]);
+        let mut state = use_signal(|| vec![]);
 
-        let onpointerdown = move |_| state.with_mut(|v| v.push("down".to_string()));
+        let onpointerdown = move |_| state.push("down".to_string());
 
-        let onpointerup = move |_| state.with_mut(|v| v.push("up".to_string()));
+        let onpointerup = move |_| state.push("up".to_string());
 
-        let onpointerover = move |_| state.with_mut(|v| v.push("over".to_string()));
+        let onpointerover = move |_| state.push("over".to_string());
 
-        let onpointerenter = move |_| state.with_mut(|v| v.push("enter".to_string()));
+        let onpointerenter = move |_| state.push("enter".to_string());
 
-        let onpointerleave = move |_| state.with_mut(|v| v.push("leave".to_string()));
+        let onpointerleave = move |_| state.push("leave".to_string());
 
         rsx!(
             rect {
@@ -96,15 +96,15 @@ pub async fn pointer_events_from_mouse() {
 #[tokio::test]
 pub async fn pointer_events_from_touch() {
     fn pointer_events_app() -> Element {
-        let state = use_signal(|| vec![]);
+        let mut state = use_signal(|| vec![]);
 
-        let onpointerdown = move |_| state.with_mut(|v| v.push("down".to_string()));
+        let onpointerdown = move |_| state.push("down".to_string());
 
-        let onpointerup = move |_| state.with_mut(|v| v.push("up".to_string()));
+        let onpointerup = move |_| state.push("up".to_string());
 
-        let onpointerover = move |_| state.with_mut(|v| v.push("over".to_string()));
+        let onpointerover = move |_| state.push("over".to_string());
 
-        let onpointerenter = move |_| state.with_mut(|v| v.push("enter".to_string()));
+        let onpointerenter = move |_| state.push("enter".to_string());
 
         rsx!(
             rect {
@@ -118,7 +118,6 @@ pub async fn pointer_events_from_touch() {
                     onpointerup: onpointerup,
                     onpointerover: onpointerover,
                     onpointerenter: onpointerenter,
-
                     label { "{state:?}" }
                 }
             }

crates/devtools/src/lib.rs

@@ -128,11 +128,9 @@ pub fn DevTools(props: DevToolsProps) -> Element {
     let theme = theme.read();
     let color = &theme.body.color;
 
-    #[allow(clippy::await_holding_lock)]
     use_effect(move || {
         let rdom = props.rdom.clone();
         let mutations_notifier = props.mutations_notifier.clone();
-        let children = children.clone();
         spawn(async move {
             loop {
                 mutations_notifier.notified().await;

crates/dom/src/mutations_writer.rs

@@ -41,7 +41,7 @@ impl<'a> WriteMutations for MutationsWriter<'a> {
 
     fn replace_node_with(&mut self, id: dioxus_core::ElementId, m: usize) {
         if m > 0 {
-            let mut dom_adapter = DioxusDOMAdapter::new_with_cache(&self.native_writer.rdom);
+            let mut dom_adapter = DioxusDOMAdapter::new_with_cache(self.native_writer.rdom);
             self.layout.remove(
                 self.native_writer.state.element_to_node_id(id),
                 &mut dom_adapter,
@@ -89,7 +89,7 @@ impl<'a> WriteMutations for MutationsWriter<'a> {
     }
 
     fn remove_node(&mut self, id: dioxus_core::ElementId) {
-        let mut dom_adapter = DioxusDOMAdapter::new_with_cache(&self.native_writer.rdom);
+        let mut dom_adapter = DioxusDOMAdapter::new_with_cache(self.native_writer.rdom);
         self.layout.remove(
             self.native_writer.state.element_to_node_id(id),
             &mut dom_adapter,

crates/elements/src/definitions.rs

@@ -149,8 +149,6 @@ macro_rules! impl_element {
                     pub const $fil: AttributeDescription = (stringify!($fil), None, false);
                 )*
             }
-
-            impl GlobalAttributes for $name {}
         )*
     };
 }
@@ -631,9 +629,3 @@ pub mod events {
         onpointerleave
     ];
 }
-
-#[doc(hidden)]
-pub trait GlobalAttributes {}
-
-#[doc(hidden)]
-pub trait SvgAttributes {}

crates/elements/src/events/keyboard.rs

@@ -390,6 +390,6 @@ impl KeyboardData {
 
 impl From<&PlatformEventData> for KeyboardData {
     fn from(val: &PlatformEventData) -> Self {
-        val.downcast::<KeyboardData>().cloned().unwrap().into()
+        val.downcast::<KeyboardData>().cloned().unwrap()
     }
 }