move hooks out of signals crate

examples/memo_chain.rs

@@ -5,23 +5,19 @@ fn main() {
 }
 
 fn app() -> Element {
-    let mut state = use_signal(|| 0);
+    let mut value = use_signal(|| 0);
     let mut depth = use_signal(|| 0 as usize);
     let mut items = use_memo(move || (0..depth()).map(|f| f as _).collect::<Vec<isize>>());
 
-    let a = use_memo(move || state() + 1);
+    let state = use_memo(move || value() + 1);
 
     println!("rendering app");
 
     rsx! {
-        button { onclick: move |_| state += 1, "Increment" }
+        button { onclick: move |_| value += 1, "Increment" }
         button { onclick: move |_| depth += 1, "Add depth" }
         button { onclick: move |_| depth -= 1, "Remove depth" }
-        Child {
-            depth: depth.into(),
-            items: items,
-            state: a,
-        }
+        Child { depth, items, state }
     }
 }
 
@@ -36,7 +32,6 @@ fn Child(
     }
 
     // These memos don't get re-computed when early returns happen
-    // In dioxus futures spawned with use_future won't progress if they don't get hit during rendering
     let state = use_memo(move || state() + 1);
     let item = use_memo(move || items()[depth()]);
     let depth = use_memo(move || depth() - 1);
@@ -45,10 +40,6 @@ fn Child(
 
     rsx! {
         h3 { "Depth({depth})-Item({item}): {state}"}
-        Child {
-            depth,
-            state,
-            items
-        }
+        Child { depth, state, items }
     }
 }

packages/core/README.md

@@ -1,35 +1,54 @@
 # dioxus-core
 
-dioxus-core is a fast and featureful VirtualDom implementation written in and for Rust.
+`dioxus-core` provides a fast and featureful VirtualDom implementation for Rust.
 
-# Features
+```rust, ignore
+use dioxus_core::prelude::*;
 
-- Functions as components
-- Hooks for local state
-- Task pool for spawning futures
-- Template-based architecture
-- Asynchronous components
-- Suspense boundaries
-- Error boundaries through the `anyhow` crate
-- Customizable memoization
+let vdom = VirtualDom::new(app);
+let real_dom = SomeRenderer::new();
 
-If you are just starting, check out the Guides first.
+loop {
+    select! {
+        evt = real_dom.event() => vdom.handle_event(evt),
+        _ = vdom.wait_for_work() => {}
+    }
+    vdom.render(&mut real_dom)
+}
 
-# General Theory
+# fn app() -> Element { None }
+# struct SomeRenderer; impl SomeRenderer { fn new() -> SomeRenderer { SomeRenderer; } async fn event() -> () { todo!() } }
+```
 
-The dioxus-core `VirtualDom` object is built around the concept of a `Template`. Templates describe a layout tree known at compile time with dynamic parts filled at runtime.
+## Features
 
-Each component in the VirtualDom works as a dedicated render loop where re-renders are triggered by events external to the VirtualDom, or from the components themselves.
+A virtualdom is an efficient and flexible tree datastructure that allows you to manage state for a graphical user interface. The Dioxus VirtualDom is perhaps the most fully-featured virtualdom implementation in Rust and powers renderers running across Web, Desktop, Mobile, SSR, TUI, LiveView, and more. When you use the Dioxus VirtualDom, you immediately enable users of your renderer to leverage the wide ecosystem of Dioxus components, hooks, and associated tooling.
 
-When each component re-renders, it must return an `Element`. In Dioxus, the `Element` type is an alias for `Result<VNode>`. Between two renders, Dioxus compares the inner `VNode` object and calculates the differences between the dynamic portions of each internal `Template`. If any attributes or elements are different between the old layout and the new layout, Dioxus will write modifications to the `Mutations` object.
+Some features of `dioxus-core` include:
 
-Dioxus expects the target renderer to save its nodes in a list. Each element is given a numerical ID which can be used to directly index into that list for O(1) lookups.
+- UI components are just functions
+- State is provided by hooks
+- Deep integration with async
+- Strong focus on performance
+- Integrated hotreloading support
+- Extensible system for UI elements and their attributes
 
-# Usage
+If you are just starting, check out the Guides first.
 
-All Dioxus apps start as just a function that takes the [`Scope`] object and returns an [`Element`].
+## Understanding the implementation
 
-The `dioxus` crate exports the `rsx` macro which transforms a helpful, simpler syntax of Rust into the logic required to build Templates.
+`dioxus-core` is designed to be a lightweight crate that. It exposes a number of flexible primitives without being deeply concerned about the intracices of state management itself. We proivde a number of useful abstractions built on these primitives in the `dioxus-hooks` crate as well as the `dioxus-signals` crate.
+
+The important abstractions to understand are:
+- The [`VirtualDom`]
+- The [`Component`] and its [`Properties`]
+- Handling events
+- Working with async
+- Suspense
+
+## Usage
+
+The `dioxus` crate exports the `rsx` macro which transforms a helpful, simpler syntax of Rust.
 
 First, start with your app:
 
@@ -53,67 +72,22 @@ fn main() {
 }
 ```
 
+## Contributing
+- Check out the website [section on contributing](https://dioxuslabs.com/learn/0.4/contributing).
+- Report issues on our [issue tracker](https://github.com/dioxuslabs/dioxus/issues).
+- [Join](https://discord.gg/XgGxMSkvUM) the discord and ask questions!
 
-We can then wait for any asynchronous components or pending futures using the `wait_for_work()` method. If we have a deadline, then we can use render_with_deadline instead:
-```rust
-# #![allow(unused)]
-# use dioxus::prelude::*;
-
-# use std::time::Duration;
-# async fn wait(mut dom: VirtualDom) {
-// Wait for the dom to be marked dirty internally
-dom.wait_for_work().await;
-# }
-```
-
-If an event occurs from outside the VirtualDom while waiting for work, then we can cancel the wait using a `select!` block and inject the event.
-
-```rust, ignore
-loop {
-    select! {
-        evt = real_dom.event() => dom.handle_event("click", evt.data, evt.element, evt.bubbles),
-        _ = dom.wait_for_work() => {}
-    }
-
-    // Render any work without blocking the main thread for too long
-    let mutations = dom.render_with_deadline(tokio::time::sleep(Duration::from_millis(10)));
-
-    // And then apply the edits
-    real_dom.apply(mutations);
-}
-
-```
-
-## Internals
-
-Dioxus-core builds off the many frameworks that came before it. Notably, Dioxus borrows these concepts:
-
-- React: hooks, concurrency, suspense
-- Dodrio: bump allocation, double buffering, and some diffing architecture
-
-Dioxus-core hits a very high level of parity with mature frameworks. However, Dioxus also brings some new unique features:
-
-- managed lifetimes for borrowed data
-- placeholder approach for suspended vnodes
-- fiber/interruptible diffing algorithm
-- custom memory allocator for VNodes and all text content
-- support for fragments w/ lazy normalization
-- slab allocator for scopes
-- mirrored-slab approach for remote VirtualDoms
-- dedicated subtrees for rendering into separate contexts from the same app
 
-There's certainly more to the story, but these optimizations make Dioxus memory use and allocation count extremely minimal. For an average application, no allocations may be needed once the app has been loaded. Only when new components are added to the dom will allocations occur. For a given component, the space of old VNodes is dynamically recycled as new nodes are added. Additionally, Dioxus tracks the average memory footprint of previous components to estimate how much memory allocate for future components.
+<a href="https://github.com/dioxuslabs/dioxus/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=dioxuslabs/dioxus&max=30&columns=10" />
+</a>
 
-All in all, Dioxus treats memory as a valuable resource. Combined with the memory-efficient footprint of Wasm compilation, Dioxus apps can scale to thousands of components and still stay snappy.
 
-## Goals
+## License
+This project is licensed under the [MIT license].
 
-The final implementation of Dioxus must:
+[mit license]: https://github.com/DioxusLabs/dioxus/blob/master/LICENSE-MIT
 
-- Be **fast**. Allocators are typically slow in Wasm/Rust, so we should have a smart way of allocating.
-- Be memory efficient. Servers should handle tens of thousands of simultaneous VDoms with no problem.
-- Be concurrent. Components should be able to pause rendering to let the screen paint the next frame.
-- Be disconnected from a specific renderer (no WebSys dependency in the core crate).
-- Support server-side-rendering (SSR). VNodes should render to a string that can be served via a web server.
-- Be "live". Components should be able to be both server-rendered and client rendered without needing frontend APIs.
-- Be modular. Components and hooks should work anywhere without worrying about the target platform.
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in Dioxus by you, shall be licensed as MIT, without any additional
+terms or conditions.

packages/core/src/virtual_dom.rs

@@ -430,6 +430,7 @@ impl VirtualDom {
     async fn poll_tasks(&mut self) {
         loop {
             // Process all events - Scopes are marked dirty, etc
+            // Sometimes when wakers fire we get a slew of updates at once, so its important that we drain this completely
             self.process_events();
 
             // Now that we have collected all queued work, we should check if we have any dirty scopes. If there are not, then we can poll any queued futures

packages/hooks/src/lib.rs

@@ -54,6 +54,8 @@ macro_rules! to_owned {
         $(to_owned![$($rest)*])?
     };
 }
+mod dependency;
+pub use dependency::*;
 
 mod use_callback;
 pub use use_callback::*;
@@ -76,6 +78,12 @@ pub use use_sorted::*;
 mod use_resource;
 pub use use_resource::*;
 
+mod use_effect;
+pub use use_effect::*;
+
+mod use_memo;
+pub use use_memo::*;
+
 // mod use_on_create;
 // pub use use_on_create::*;
 
@@ -84,3 +92,6 @@ pub use use_root_context::*;
 
 mod use_hook_did_run;
 pub use use_hook_did_run::*;
+
+mod use_signal;
+pub use use_signal::*;

packages/hooks/src/use_effect.rs

@@ -0,0 +1,24 @@
+use crate::use_hook_did_run;
+use dioxus_core::prelude::*;
+use dioxus_signals::{CopyValue, Effect, Writable};
+
+/// Create a new effect. The effect will be run immediately and whenever any signal it reads changes.
+/// The signal will be owned by the current component and will be dropped when the component is dropped.
+///
+/// If the use_effect call was skipped due to an early return, the effect will no longer activate.
+pub fn use_effect(mut callback: impl FnMut() + 'static) {
+    let mut run_effect = use_hook(|| CopyValue::new(true));
+
+    use_hook_did_run(move |did_run| match did_run {
+        true => run_effect.set(true),
+        false => run_effect.set(false),
+    });
+
+    use_hook(|| {
+        Effect::new(move || {
+            if run_effect() {
+                callback();
+            }
+        })
+    });
+}

packages/hooks/src/use_memo.rs

@@ -1,47 +1,123 @@
-use dioxus_core::ScopeState;
+use dioxus_core::prelude::*;
+use dioxus_signals::{CopyValue, ReadOnlySignal, Readable, Signal, SignalData};
+use dioxus_signals::{Storage, Writable};
+// use generational_box::Storage;
 
-use crate::UseFutureDep;
+use crate::{dependency::Dependency, use_hook_did_run};
+use dioxus_signals::use_signal;
+// use dioxus_signals::{signal::SignalData, ReadOnlySignal, Signal};
 
-/// A hook that provides a callback that executes if the dependencies change.
-/// This is useful to avoid running computation-expensive calculations even when the data doesn't change.
+/// Creates a new unsync Selector. The selector will be run immediately and whenever any signal it reads changes.
 ///
-/// - dependencies: a tuple of references to values that are `PartialEq` + `Clone`
+/// Selectors can be used to efficiently compute derived data from signals.
 ///
-/// ## Examples
+/// ```rust
+/// use dioxus::prelude::*;
+/// use dioxus_signals::*;
 ///
-/// ```rust, no_run
-/// # use dioxus::prelude::*;
+/// fn App() -> Element {
+///     let mut count = use_signal(|| 0);
+///     let double = use_memo(move || count * 2);
+///     count += 1;
+///     assert_eq!(double.value(), count * 2);
 ///
-/// #[component]
-/// fn Calculator(number: usize) -> Element {
-///     let bigger_number = use_memo((number,), |(number,)| {
-///         // This will only be calculated when `number` has changed.
-///         number * 100
-///     });
-///     rsx!(
-///         p { "{bigger_number}" }
-///     )
+///     rsx! { "{double}" }
 /// }
+/// ```
+#[track_caller]
+pub fn use_memo<R: PartialEq>(f: impl FnMut() -> R + 'static) -> ReadOnlySignal<R> {
+    use_maybe_sync_memo(f)
+}
+
+/// Creates a new Selector that may be sync. The selector will be run immediately and whenever any signal it reads changes.
 ///
-/// #[component]
-/// fn App() -> Element {
-///     rsx!(Calculator { number: 0 })
+/// Selectors can be used to efficiently compute derived data from signals.
+///
+/// ```rust
+/// use dioxus::prelude::*;
+/// use dioxus_signals::*;
+///
+/// fn App(cx: Scope) -> Element {
+///     let mut count = use_signal(cx, || 0);
+///     let double = use_memo(cx, move || count * 2);
+///     count += 1;
+///     assert_eq!(double.value(), count * 2);
+///
+///     render! { "{double}" }
 /// }
 /// ```
-#[must_use = "Consider using `use_effect` to run rerun a callback when dependencies change"]
-pub fn use_memo<T, D>(, dependencies: D, callback: impl FnOnce(D::Out) -> T) -> &T
+#[track_caller]
+pub fn use_maybe_sync_memo<R: PartialEq, S: Storage<SignalData<R>>>(
+    f: impl FnMut() -> R + 'static,
+) -> ReadOnlySignal<R, S> {
+    use_hook(|| Signal::maybe_sync_memo(f))
+}
+
+/// Creates a new unsync Selector with some local dependencies. The selector will be run immediately and whenever any signal it reads or any dependencies it tracks changes
+///
+/// Selectors can be used to efficiently compute derived data from signals.
+///
+/// ```rust
+/// use dioxus::prelude::*;
+/// use dioxus_signals::*;
+///
+/// fn App(cx: Scope) -> Element {
+///     let mut local_state = use_state(cx, || 0);
+///     let double = use_memo_with_dependencies(cx, (local_state.get(),), move |(local_state,)| local_state * 2);
+///     local_state.set(1);
+///
+///     render! { "{double}" }
+/// }
+/// ```
+#[track_caller]
+pub fn use_memo_with_dependencies<R: PartialEq, D: Dependency>(
+    dependencies: D,
+    f: impl FnMut(D::Out) -> R + 'static,
+) -> ReadOnlySignal<R>
 where
-    T: 'static,
-    D: UseFutureDep,
+    D::Out: 'static,
 {
-    let value = cx.use_hook(|| None);
-
-    let dependancies_vec = cx.use_hook(Vec::new);
+    use_maybe_sync_selector_with_dependencies(dependencies, f)
+}
 
-    if dependencies.clone().apply(dependancies_vec) || value.is_none() {
-        // Create the new value
-        *value = Some(callback(dependencies.out()));
+/// Creates a new Selector that may be sync with some local dependencies. The selector will be run immediately and whenever any signal it reads or any dependencies it tracks changes
+///
+/// Selectors can be used to efficiently compute derived data from signals.
+///
+/// ```rust
+/// use dioxus::prelude::*;
+/// use dioxus_signals::*;
+///
+/// fn App(cx: Scope) -> Element {
+///     let mut local_state = use_state(cx, || 0);
+///     let double = use_memo_with_dependencies(cx, (local_state.get(),), move |(local_state,)| local_state * 2);
+///     local_state.set(1);
+///
+///     render! { "{double}" }
+/// }
+/// ```
+#[track_caller]
+pub fn use_maybe_sync_selector_with_dependencies<
+    R: PartialEq,
+    D: Dependency,
+    S: Storage<SignalData<R>>,
+>(
+    dependencies: D,
+    mut f: impl FnMut(D::Out) -> R + 'static,
+) -> ReadOnlySignal<R, S>
+where
+    D::Out: 'static,
+{
+    let mut dependencies_signal = use_signal(|| dependencies.out());
+    let selector = use_hook(|| {
+        Signal::maybe_sync_memo(move || {
+            let deref = &*dependencies_signal.read();
+            f(deref.clone())
+        })
+    });
+    let changed = { dependencies.changed(&*dependencies_signal.read()) };
+    if changed {
+        dependencies_signal.set(dependencies.out());
     }
-
-    value.as_ref().unwrap()
+    selector
 }

packages/hooks/src/use_signal.rs

@@ -0,0 +1,102 @@
+use dioxus_core::prelude::*;
+use dioxus_signals::{Signal, SignalData, Storage, SyncStorage, UnsyncStorage};
+
+/// Creates a new Signal. Signals are a Copy state management solution with automatic dependency tracking.
+///
+/// ```rust
+/// use dioxus::prelude::*;
+/// use dioxus_signals::*;
+///
+/// fn App() -> Element {
+///     let mut count = use_signal(|| 0);
+///
+///     // Because signals have automatic dependency tracking, if you never read them in a component, that component will not be re-rended when the signal is updated.
+///     // The app component will never be rerendered in this example.
+///     rsx! { Child { state: count } }
+/// }
+///
+/// #[component]
+/// fn Child(state: Signal<u32>) -> Element {
+///     let state = *state;
+///
+///     use_future( |()| async move {
+///         // Because the signal is a Copy type, we can use it in an async block without cloning it.
+///         *state.write() += 1;
+///     });
+///
+///     rsx! {
+///         button {
+///             onclick: move |_| *state.write() += 1,
+///             "{state}"
+///         }
+///     }
+/// }
+/// ```
+#[track_caller]
+#[must_use]
+pub fn use_signal<T: 'static>(f: impl FnOnce() -> T) -> Signal<T, UnsyncStorage> {
+    use_maybe_signal_sync(f)
+}
+
+/// Creates a new `Send + Sync`` Signal. Signals are a Copy state management solution with automatic dependency tracking.
+///
+/// ```rust
+/// use dioxus::prelude::*;
+/// use dioxus_signals::*;
+///
+/// fn App(cx: Scope) -> Element {
+///     let mut count = use_signal_sync(cx, || 0);
+///
+///     // Because signals have automatic dependency tracking, if you never read them in a component, that component will not be re-rended when the signal is updated.
+///     // The app component will never be rerendered in this example.
+///     render! { Child { state: count } }
+/// }
+///
+/// #[component]
+/// fn Child(cx: Scope, state: Signal<u32, SyncStorage>) -> Element {
+///     let state = *state;
+///
+///     use_future!(cx,  |()| async move {
+///         // This signal is Send + Sync, so we can use it in an another thread
+///         tokio::spawn(async move {
+///             // Because the signal is a Copy type, we can use it in an async block without cloning it.
+///             *state.write() += 1;
+///         }).await;
+///     });
+///
+///     render! {
+///         button {
+///             onclick: move |_| *state.write() += 1,
+///             "{state}"
+///         }
+///     }
+/// }
+/// ```
+#[must_use]
+#[track_caller]
+pub fn use_signal_sync<T: Send + Sync + 'static>(f: impl FnOnce() -> T) -> Signal<T, SyncStorage> {
+    use_maybe_signal_sync(f)
+}
+
+#[must_use]
+#[track_caller]
+fn use_maybe_signal_sync<T: 'static, U: Storage<SignalData<T>>>(
+    f: impl FnOnce() -> T,
+) -> Signal<T, U> {
+    #[cfg(debug_assertions)]
+    let caller = std::panic::Location::caller();
+
+    let signal = use_hook(|| {
+        Signal::new_with_caller(
+            f(),
+            #[cfg(debug_assertions)]
+            caller,
+        )
+    });
+
+    // By default, we want to unsubscribe the current component from the signal on every render
+    // any calls to .read() in the body will re-subscribe the component to the signal
+    use_before_render(|| signal.unsubscribe(current_scope_id().unwrap()));
+
+    signal
+}

packages/hooks/src/use_sorted.rs

@@ -1,7 +1,8 @@
 use std::cmp::Ordering;
 use std::ops::DerefMut;
 
-use dioxus_signals::{use_memo, ReadOnlySignal, Signal};
+use crate::use_memo;
+use dioxus_signals::{ReadOnlySignal, Signal};
 
 pub fn use_sorted<V: 'static, T: PartialEq>(
     collection: impl FnMut() -> Signal<V>,

packages/signals/src/effect.rs

@@ -118,12 +118,6 @@ async fn effect_driver(
     }
 }
 
-/// Create a new effect. The effect will be run immediately and whenever any signal it reads changes.
-/// The signal will be owned by the current component and will be dropped when the component is dropped.
-pub fn use_effect(callback: impl FnMut() + 'static) {
-    use_hook(|| Effect::new(callback));
-}
-
 /// Effects allow you to run code when a signal changes. Effects are run immediately and whenever any signal it reads changes.
 #[derive(Copy, Clone, PartialEq)]
 pub struct Effect {

packages/signals/src/lib.rs

@@ -10,18 +10,12 @@ pub use rt::*;
 mod effect;
 pub use effect::*;
 
-mod memo;
-pub use memo::*;
-
 pub(crate) mod signal;
 pub use signal::*;
 
 mod read_only_signal;
 pub use read_only_signal::*;
 
-mod dependency;
-pub use dependency::*;
-
 mod map;
 pub use map::*;
 

packages/signals/src/memo.rs

@@ -1,123 +0,0 @@
-use crate::read::Readable;
-use crate::write::Writable;
-use dioxus_core::prelude::*;
-use generational_box::Storage;
-
-use crate::dependency::Dependency;
-use crate::use_signal;
-use crate::{signal::SignalData, ReadOnlySignal, Signal};
-
-/// Creates a new unsync Selector. The selector will be run immediately and whenever any signal it reads changes.
-///
-/// Selectors can be used to efficiently compute derived data from signals.
-///
-/// ```rust
-/// use dioxus::prelude::*;
-/// use dioxus_signals::*;
-///
-/// fn App() -> Element {
-///     let mut count = use_signal(|| 0);
-///     let double = use_memo(move || count * 2);
-///     count += 1;
-///     assert_eq!(double.value(), count * 2);
-///
-///     rsx! { "{double}" }
-/// }
-/// ```
-#[track_caller]
-pub fn use_memo<R: PartialEq>(f: impl FnMut() -> R + 'static) -> ReadOnlySignal<R> {
-    use_maybe_sync_memo(f)
-}
-
-/// Creates a new Selector that may be sync. The selector will be run immediately and whenever any signal it reads changes.
-///
-/// Selectors can be used to efficiently compute derived data from signals.
-///
-/// ```rust
-/// use dioxus::prelude::*;
-/// use dioxus_signals::*;
-///
-/// fn App(cx: Scope) -> Element {
-///     let mut count = use_signal(cx, || 0);
-///     let double = use_memo(cx, move || count * 2);
-///     count += 1;
-///     assert_eq!(double.value(), count * 2);
-///
-///     render! { "{double}" }
-/// }
-/// ```
-#[track_caller]
-pub fn use_maybe_sync_memo<R: PartialEq, S: Storage<SignalData<R>>>(
-    f: impl FnMut() -> R + 'static,
-) -> ReadOnlySignal<R, S> {
-    use_hook(|| Signal::maybe_sync_memo(f))
-}
-
-/// Creates a new unsync Selector with some local dependencies. The selector will be run immediately and whenever any signal it reads or any dependencies it tracks changes
-///
-/// Selectors can be used to efficiently compute derived data from signals.
-///
-/// ```rust
-/// use dioxus::prelude::*;
-/// use dioxus_signals::*;
-///
-/// fn App(cx: Scope) -> Element {
-///     let mut local_state = use_state(cx, || 0);
-///     let double = use_memo_with_dependencies(cx, (local_state.get(),), move |(local_state,)| local_state * 2);
-///     local_state.set(1);
-///
-///     render! { "{double}" }
-/// }
-/// ```
-#[track_caller]
-pub fn use_memo_with_dependencies<R: PartialEq, D: Dependency>(
-    dependencies: D,
-    f: impl FnMut(D::Out) -> R + 'static,
-) -> ReadOnlySignal<R>
-where
-    D::Out: 'static,
-{
-    use_maybe_sync_selector_with_dependencies(dependencies, f)
-}
-
-/// Creates a new Selector that may be sync with some local dependencies. The selector will be run immediately and whenever any signal it reads or any dependencies it tracks changes
-///
-/// Selectors can be used to efficiently compute derived data from signals.
-///
-/// ```rust
-/// use dioxus::prelude::*;
-/// use dioxus_signals::*;
-///
-/// fn App(cx: Scope) -> Element {
-///     let mut local_state = use_state(cx, || 0);
-///     let double = use_memo_with_dependencies(cx, (local_state.get(),), move |(local_state,)| local_state * 2);
-///     local_state.set(1);
-///
-///     render! { "{double}" }
-/// }
-/// ```
-#[track_caller]
-pub fn use_maybe_sync_selector_with_dependencies<
-    R: PartialEq,
-    D: Dependency,
-    S: Storage<SignalData<R>>,
->(
-    dependencies: D,
-    mut f: impl FnMut(D::Out) -> R + 'static,
-) -> ReadOnlySignal<R, S>
-where
-    D::Out: 'static,
-{
-    let mut dependencies_signal = use_signal(|| dependencies.out());
-    let selector = use_hook(|| {
-        Signal::maybe_sync_memo(move || {
-            let deref = &*dependencies_signal.read();
-            f(deref.clone())
-        })
-    });
-    let changed = { dependencies.changed(&*dependencies_signal.read()) };
-    if changed {
-        dependencies_signal.set(dependencies.out());
-    }
-    selector
-}

packages/signals/src/signal.rs

@@ -1,26 +1,22 @@
 use crate::{
-    read::Readable, write::Writable, Effect, EffectInner, GlobalMemo, GlobalSignal, MappedSignal,
-    ReadOnlySignal,
+    get_effect_ref, read::Readable, write::Writable, CopyValue, Effect, EffectInner,
+    EffectStackRef, GlobalMemo, GlobalSignal, MappedSignal, ReadOnlySignal, EFFECT_STACK,
 };
-use std::{
-    any::Any,
-    cell::RefCell,
-    ops::{Deref, DerefMut},
-    rc::Rc,
-    sync::Arc,
-};
-
 use dioxus_core::{
     prelude::{
-        current_scope_id, has_context, provide_context, schedule_update_any, use_hook,
-        IntoAttributeValue,
+        current_scope_id, has_context, provide_context, schedule_update_any, IntoAttributeValue,
     },
     ScopeId,
 };
 use generational_box::{AnyStorage, GenerationalBoxId, Storage, SyncStorage, UnsyncStorage};
 use parking_lot::RwLock;
-
-use crate::{get_effect_ref, CopyValue, EffectStackRef, EFFECT_STACK};
+use std::{
+    any::Any,
+    cell::RefCell,
+    ops::{Deref, DerefMut},
+    rc::Rc,
+    sync::Arc,
+};
 
 /// Creates a new Signal. Signals are a Copy state management solution with automatic dependency tracking.
 ///
@@ -28,6 +24,7 @@ use crate::{get_effect_ref, CopyValue, EffectStackRef, EFFECT_STACK};
 /// use dioxus::prelude::*;
 /// use dioxus_signals::*;
 ///
+/// #[component]
 /// fn App() -> Element {
 ///     let mut count = use_signal(|| 0);
 ///
@@ -53,102 +50,12 @@ use crate::{get_effect_ref, CopyValue, EffectStackRef, EFFECT_STACK};
 ///     }
 /// }
 /// ```
-#[track_caller]
-#[must_use]
-pub fn use_signal<T: 'static>(f: impl FnOnce() -> T) -> Signal<T, UnsyncStorage> {
-    #[cfg(debug_assertions)]
-    let caller = std::panic::Location::caller();
-
-    use_hook(|| {
-        Signal::new_with_caller(
-            f(),
-            #[cfg(debug_assertions)]
-            caller,
-        )
-    })
-}
-
-/// Creates a new `Send + Sync`` Signal. Signals are a Copy state management solution with automatic dependency tracking.
-///
-/// ```rust
-/// use dioxus::prelude::*;
-/// use dioxus_signals::*;
-///
-/// fn App(cx: Scope) -> Element {
-///     let mut count = use_signal_sync(cx, || 0);
-///
-///     // Because signals have automatic dependency tracking, if you never read them in a component, that component will not be re-rended when the signal is updated.
-///     // The app component will never be rerendered in this example.
-///     render! { Child { state: count } }
-/// }
-///
-/// #[component]
-/// fn Child(cx: Scope, state: Signal<u32, SyncStorage>) -> Element {
-///     let state = *state;
-///
-///     use_future!(cx,  |()| async move {
-///         // This signal is Send + Sync, so we can use it in an another thread
-///         tokio::spawn(async move {
-///             // Because the signal is a Copy type, we can use it in an async block without cloning it.
-///             *state.write() += 1;
-///         }).await;
-///     });
-///
-///     render! {
-///         button {
-///             onclick: move |_| *state.write() += 1,
-///             "{state}"
-///         }
-///     }
-/// }
-/// ```
-#[must_use]
-#[track_caller]
-pub fn use_signal_sync<T: Send + Sync + 'static>(f: impl FnOnce() -> T) -> Signal<T, SyncStorage> {
-    #[cfg(debug_assertions)]
-    let caller = std::panic::Location::caller();
-    use_hook(|| {
-        Signal::new_with_caller(
-            f(),
-            #[cfg(debug_assertions)]
-            caller,
-        )
-    })
-}
-
-struct Unsubscriber {
-    scope: ScopeId,
-    subscribers: UnsubscriberArray,
-}
-
-type UnsubscriberArray = Vec<Rc<RefCell<Vec<ScopeId>>>>;
-
-impl Drop for Unsubscriber {
-    fn drop(&mut self) {
-        for subscribers in &self.subscribers {
-            subscribers.borrow_mut().retain(|s| *s != self.scope);
-        }
-    }
-}
-
-fn current_unsubscriber() -> Rc<RefCell<Unsubscriber>> {
-    match has_context() {
-        Some(rt) => rt,
-        None => {
-            let owner = Unsubscriber {
-                scope: current_scope_id().expect("in a virtual dom"),
-                subscribers: Default::default(),
-            };
-            provide_context(Rc::new(RefCell::new(owner)))
-        }
-    }
+pub struct Signal<T: 'static, S: Storage<SignalData<T>> = UnsyncStorage> {
+    pub(crate) inner: CopyValue<SignalData<T>, S>,
 }
 
-#[derive(Default)]
-pub(crate) struct SignalSubscribers {
-    pub(crate) subscribers: Vec<ScopeId>,
-    pub(crate) effect_subscribers: Vec<GenerationalBoxId>,
-}
+/// A signal that can safely shared between threads.
+pub type SyncSignal<T> = Signal<T, SyncStorage>;
 
 /// The data stored for tracking in a signal.
 pub struct SignalData<T> {
@@ -158,61 +65,10 @@ pub struct SignalData<T> {
     pub(crate) value: T,
 }
 
-/// Creates a new Signal. Signals are a Copy state management solution with automatic dependency tracking.
-///
-/// ```rust
-/// use dioxus::prelude::*;
-/// use dioxus_signals::*;
-///
-/// #[component]
-/// fn App() -> Element {
-///     let mut count = use_signal(|| 0);
-///
-///     // Because signals have automatic dependency tracking, if you never read them in a component, that component will not be re-rended when the signal is updated.
-///     // The app component will never be rerendered in this example.
-///     rsx! { Child { state: count } }
-/// }
-///
-/// #[component]
-/// fn Child(state: Signal<u32>) -> Element {
-///     let state = *state;
-///
-///     use_future( |()| async move {
-///         // Because the signal is a Copy type, we can use it in an async block without cloning it.
-///         *state.write() += 1;
-///     });
-///
-///     rsx! {
-///         button {
-///             onclick: move |_| *state.write() += 1,
-///             "{state}"
-///         }
-///     }
-/// }
-/// ```
-pub struct Signal<T: 'static, S: Storage<SignalData<T>> = UnsyncStorage> {
-    pub(crate) inner: CopyValue<SignalData<T>, S>,
-}
-
-/// A signal that can safely shared between threads.
-pub type SyncSignal<T> = Signal<T, SyncStorage>;
-
-#[cfg(feature = "serde")]
-impl<T: serde::Serialize + 'static, Store: Storage<SignalData<T>>> serde::Serialize
-    for Signal<T, Store>
-{
-    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        self.read().serialize(serializer)
-    }
-}
-
-#[cfg(feature = "serde")]
-impl<'de, T: serde::Deserialize<'de> + 'static, Store: Storage<SignalData<T>>>
-    serde::Deserialize<'de> for Signal<T, Store>
-{
-    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        Ok(Self::new_maybe_sync(T::deserialize(deserializer)?))
-    }
+#[derive(Default)]
+pub(crate) struct SignalSubscribers {
+    pub(crate) subscribers: Vec<ScopeId>,
+    pub(crate) effect_subscribers: Vec<GenerationalBoxId>,
 }
 
 impl<T: 'static> Signal<T> {
@@ -312,7 +168,7 @@ impl<T: 'static, S: Storage<SignalData<T>>> Signal<T, S> {
     }
 
     /// Creates a new Signal. Signals are a Copy state management solution with automatic dependency tracking.
-    fn new_with_caller(
+    pub fn new_with_caller(
         value: T,
         #[cfg(debug_assertions)] caller: &'static std::panic::Location<'static>,
     ) -> Self {
@@ -386,6 +242,15 @@ impl<T: 'static, S: Storage<SignalData<T>>> Signal<T, S> {
         }
     }
 
+    pub fn unsubscribe(&self, scope: ScopeId) {
+        self.inner
+            .read()
+            .subscribers
+            .write()
+            .subscribers
+            .retain(|s| *s != scope);
+    }
+
     /// Map the signal to a new type.
     pub fn map<O>(self, f: impl Fn(&T) -> &O + 'static) -> MappedSignal<S::Ref<O>> {
         MappedSignal::new(self, f)
@@ -411,7 +276,8 @@ impl<T, S: Storage<SignalData<T>>> Readable<T> for Signal<T, S> {
         S::try_map(ref_, f)
     }
 
-    /// Get the current value of the signal. This will subscribe the current scope to the signal.  If you would like to read the signal without subscribing to it, you can use [`Self::peek`] instead.
+    /// Get the current value of the signal. This will subscribe the current scope to the signal.
+    /// If you would like to read the signal without subscribing to it, you can use [`Self::peek`] instead.
     ///
     /// If the signal has been dropped, this will panic.
     #[track_caller]
@@ -509,6 +375,52 @@ impl<T: Clone, S: Storage<SignalData<T>> + 'static> Deref for Signal<T, S> {
     }
 }
 
+#[cfg(feature = "serde")]
+impl<T: serde::Serialize + 'static, Store: Storage<SignalData<T>>> serde::Serialize
+    for Signal<T, Store>
+{
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        self.read().serialize(serializer)
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<'de, T: serde::Deserialize<'de> + 'static, Store: Storage<SignalData<T>>>
+    serde::Deserialize<'de> for Signal<T, Store>
+{
+    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        Ok(Self::new_maybe_sync(T::deserialize(deserializer)?))
+    }
+}
+
+struct Unsubscriber {
+    scope: ScopeId,
+    subscribers: UnsubscriberArray,
+}
+
+type UnsubscriberArray = Vec<Rc<RefCell<Vec<ScopeId>>>>;
+
+impl Drop for Unsubscriber {
+    fn drop(&mut self) {
+        for subscribers in &self.subscribers {
+            subscribers.borrow_mut().retain(|s| *s != self.scope);
+        }
+    }
+}
+
+fn current_unsubscriber() -> Rc<RefCell<Unsubscriber>> {
+    match has_context() {
+        Some(rt) => rt,
+        None => {
+            let owner = Unsubscriber {
+                scope: current_scope_id().expect("in a virtual dom"),
+                subscribers: Default::default(),
+            };
+            provide_context(Rc::new(RefCell::new(owner)))
+        }
+    }
+}
+
 struct SignalSubscriberDrop<T: 'static, S: Storage<SignalData<T>>> {
     signal: Signal<T, S>,
 }