Merge pull request #5 from matthunz/fix-signals

Fix reactivity after signals migration

Cargo.toml

@@ -7,18 +7,18 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 async-channel = "1.9.0"
-dioxus = "0.5.0"
-dioxus-web = "0.5.0"
-dioxus-signals = "0.5.0"
+dioxus = { git = "https://github.com/DioxusLabs/dioxus" }
+dioxus-web = { git = "https://github.com/DioxusLabs/dioxus" }
+dioxus-signals = { git = "https://github.com/DioxusLabs/dioxus" }
 futures = "0.3.28"
 interpolation = "0.3.0"
 js-sys = "0.3.64"
 log = "0.4.20"
 dioxus-logger = "0.4.1"
 wasm-bindgen = "0.2.87"
 web-sys = "0.3.64"
-dioxus-use-mounted = "0.2.0"
+dioxus-use-mounted = { git = "https://github.com/matthunz/dioxus-use-mounted" }
 slotmap = "1.0.6"
 
 [dev-dependencies]
-dioxus-resize-observer = "0.2.0-alpha.1"
+dioxus-resize-observer = { git = "https://github.com/dioxus-community/dioxus-resize-observer", rev = "1a16141a63dbb17230a3dacc97d949861aa2125f" }

examples/use_spring_ref.rs

@@ -0,0 +1,27 @@
+use dioxus::prelude::*;
+use dioxus_spring::use_spring_ref;
+use log::LevelFilter;
+use std::time::Duration;
+
+fn app() -> Element {
+    let mut signal = use_signal(|| 0.);
+    let spring_ref = use_spring_ref(0f32, move |x| {
+        signal.set(x)
+    });
+
+    use_hook(move || {
+        spring_ref.animate(1., Duration::from_secs(1));
+    });
+
+    use_effect(move || {
+        log::info!("{}", signal());
+    });
+
+    rsx!()
+}
+
+fn main() {
+    dioxus_logger::init(LevelFilter::Info).expect("failed to init logger");
+
+    dioxus_web::launch::launch_cfg(app, Default::default())
+}

examples/use_spring_signal.rs

@@ -0,0 +1,24 @@
+use dioxus::prelude::*;
+use dioxus_spring::use_spring_signal;
+use log::LevelFilter;
+use std::time::Duration;
+
+fn app() -> Element {
+    let (value, value_spring) = use_spring_signal(0f32);
+
+    use_hook(move || {
+        value_spring.animate(1., Duration::from_secs(1));
+    });
+
+    use_effect(move || {
+        log::info!("{}", value());
+    });
+
+    rsx!()
+}
+
+fn main() {
+    dioxus_logger::init(LevelFilter::Info).expect("failed to init logger");
+
+    dioxus_web::launch::launch_cfg(app, Default::default())
+}

src/lib.rs

@@ -16,7 +16,7 @@ mod use_spring;
 pub use use_spring::use_spring;
 
 mod use_spring_signal;
-pub use use_spring_signal::{use_spring_signal, UseSpringSignal};
+pub use use_spring_signal::use_spring_signal;
 
 mod use_spring_ref;
 pub use use_spring_ref::{use_spring_ref, UseSpringRef};

src/spring.rs

@@ -4,6 +4,7 @@ use interpolation::Lerp;
 use js_sys::Date;
 use std::time::Duration;
 
+/// Create a stream of interpolated values from one value to another over a [`Duration`].
 pub fn spring<V>(from: V, to: V, duration: Duration) -> impl Stream<Item = V>
 where
     V: Lerp<Scalar = f32> + Clone + 'static,

src/use_animated.rs

@@ -2,6 +2,7 @@ use dioxus::hooks::use_effect;
 use dioxus_signals::{Readable, Signal};
 use dioxus_use_mounted::UseMounted;
 
+/// Hook to use an animated value and apply it to a mounted element.
 pub fn use_animated<V>(
     mounted: UseMounted,
     value_ref: Signal<V>,

src/use_spring.rs

@@ -4,11 +4,14 @@ use dioxus_signals::Signal;
 use interpolation::Lerp;
 use std::time::Duration;
 
+/// Hook to create an animated signal from a reactive value and [`Duration`].
+/// 
+/// When `value` is changed, this signal will linearly interpolate from the current value to `value`.
 pub fn use_spring<V>(value: V, duration: Duration) -> Signal<V>
 where
     V: PartialEq + Lerp<Scalar = f32> + Clone + 'static,
 {
-    let (mut spring_ref, signal) = use_spring_signal(value.clone());
+    let (signal, spring_ref) = use_spring_signal(value.clone());
 
     use_effect(use_reactive((&value,), move |(to,)| {
         spring_ref.animate(to, duration);