0.4

marc2332 · Aug 1, 2023 · 6faa6cf · 6faa6cf
1 parent 4cde914
commit 6faa6cf
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 26 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,15 +26,15 @@ freya-dom = { path = "dom", version = "0.1.0" }
 freya-testing = { path = "testing", version = "0.1.0" }
 torin = { path = "torin", version = "0.1.0" }
 
-dioxus = { git = "https://github.com/DioxusLabs/dioxus", rev="f69b84bf34114c68749e956f26ed61db38079f7c" }
-dioxus-native-core-macro = { git = "https://github.com/DioxusLabs/dioxus", rev="f69b84bf34114c68749e956f26ed61db38079f7c" }
-dioxus-rsx = { git = "https://github.com/DioxusLabs/dioxus", rev="f69b84bf34114c68749e956f26ed61db38079f7c" }
-dioxus-native-core = { git = "https://github.com/DioxusLabs/dioxus", rev="f69b84bf34114c68749e956f26ed61db38079f7c", features=["dioxus"] }
-dioxus-core-macro = { git = "https://github.com/DioxusLabs/dioxus", rev="f69b84bf34114c68749e956f26ed61db38079f7c" }
-dioxus-hooks = { git = "https://github.com/DioxusLabs/dioxus", rev="f69b84bf34114c68749e956f26ed61db38079f7c" }
-dioxus-core = { git = "https://github.com/DioxusLabs/dioxus", rev="f69b84bf34114c68749e956f26ed61db38079f7c" }
-dioxus-hot-reload = { git = "https://github.com/DioxusLabs/dioxus", rev="f69b84bf34114c68749e956f26ed61db38079f7c" }
-dioxus-router = { git = "https://github.com/DioxusLabs/dioxus", rev="f69b84bf34114c68749e956f26ed61db38079f7c" }
+dioxus = { version = "0.4" }
+dioxus-native-core-macro = { version = "0.4" }
+dioxus-rsx = { version = "0.4", features=["hot_reload"] }
+dioxus-native-core = { version = "0.4", features=["dioxus"] }
+dioxus-core-macro = { version = "0.4" }
+dioxus-hooks = { version = "0.4" }
+dioxus-core = { version = "0.4" }
+dioxus-hot-reload = { version = "0.4", features=["file_watcher"] }
+dioxus-router = { version = "0.4" }
 
 gl = "0.14.0"
 glutin = "0.30.6"

diff --git a/README.md b/README.md
@@ -72,7 +72,7 @@ Add Freya as a dependency via git (it's not published on [crates.io](https://cra
 
 ```toml
 freya = { git = "https://github.com/marc2332/freya" }
-dioxus = { git = "https://github.com/DioxusLabs/dioxus", rev="f69b84bf34114c68749e956f26ed61db38079f7c", features = ["macro", "hooks"]}
+dioxus = { version = "0.4", features = ["macro", "hooks"]}
 ```
 
 ### Features ✨

diff --git a/book/src/guides/getting_started.md b/book/src/guides/getting_started.md
@@ -24,7 +24,7 @@ edition = "2021"
 
 [dependencies]
 freya = { git = "https://github.com/marc2332/freya" }
-dioxus = { git = "https://github.com/DioxusLabs/dioxus", rev="f69b84bf34114c68749e956f26ed61db38079f7c", features = ["macro", "hooks"]}
+dioxus = { version = "0.4", features = ["macro", "hooks"]}
 ```
 
 ### src/main.rs

diff --git a/components/src/dropdown.rs b/components/src/dropdown.rs
@@ -222,6 +222,7 @@ where
             }
         )
     } else {
+        let selected = selected.read().to_string();
         render!(
             rect {
                 margin: "5",
@@ -237,7 +238,7 @@ where
                 padding: "7",
                 label {
                     align: "center",
-                    "{selected.read()}"
+                    "{selected}"
                 }
                 rect {
                     width: "100%",

diff --git a/devtools/src/lib.rs b/devtools/src/lib.rs
@@ -184,9 +184,7 @@ pub fn DevTools(cx: Scope<DevToolsProps>) -> Element {
             width: "100%",
             height: "100%",
             color: theme.body.color,
-            Router {
-
-            }
+            Router::<Route> { }
         }
     )
 }
@@ -201,7 +199,7 @@ pub fn DevtoolsBar(cx: Scope) -> Element {
                 label: "Elements"
             }
         }
-        Outlet {}
+        Outlet::<Route> {}
     )
 }
 

diff --git a/devtools/src/tab.rs b/devtools/src/tab.rs
@@ -31,7 +31,7 @@ pub struct TabButtonProps<'a> {
 
 #[allow(non_snake_case)]
 pub fn TabButton<'a>(cx: Scope<'a, TabButtonProps<'a>>) -> Element<'a> {
-    let router = use_generic_navigator::<Route>(cx);
+    let router = use_navigator(cx);
     let theme = use_get_theme(cx);
     let status = use_state(cx, ButtonStatus::default);
 

diff --git a/devtools/src/tabs/tree.rs b/devtools/src/tabs/tree.rs
@@ -1,6 +1,6 @@
 use dioxus::prelude::*;
 use dioxus_native_core::NodeId;
-use dioxus_router::prelude::use_generic_navigator;
+use dioxus_router::prelude::use_navigator;
 use freya_components::*;
 
 use crate::{node::NodeElement, NodeIdSerializer, Route, TreeNode};
@@ -13,7 +13,7 @@ pub fn NodesTree<'a>(
     selected_node_id: Option<NodeId>,
     onselected: EventHandler<'a, &'a TreeNode>,
 ) -> Element<'a> {
-    let router = use_generic_navigator::<Route>(cx);
+    let router = use_navigator(cx);
     let nodes = use_shared_state::<Vec<TreeNode>>(cx).unwrap();
 
     render!(VirtualScrollView {

diff --git a/elements/src/elements.rs b/elements/src/elements.rs
@@ -307,13 +307,12 @@ pub mod events {
             $(
                 $( #[$attr] )*
                 pub fn $name<'a>(_cx: &'a ::dioxus_core::ScopeState, _f: impl FnMut(::dioxus_core::Event<$data>) + 'a) -> ::dioxus_core::Attribute<'a> {
-                    ::dioxus_core::Attribute {
-                        name: stringify!($name),
-                        value: _cx.listener(_f),
-                        namespace: None,
-                        mounted_element: Default::default(),
-                        volatile: false,
-                    }
+                    ::dioxus_core::Attribute::new(
+                        stringify!($name),
+                        _cx.listener(_f),
+                        None,
+                        false,
+                    )
                 }
             )*
         };