remove flume, implement lazier memos
This commit is contained in:
1 parent
716eb11426
commit
492f0329bf
15 files changed
+267
-177
No files matched your search
Generated
-1
@@ -2754,7 +2754,6 @@ version = "0.5.0-alpha.0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"dioxus",
|
"dioxus",
|
||||||
"dioxus-core",
|
"dioxus-core",
|
||||||
"flume",
|
|
||||||
"futures-channel",
|
"futures-channel",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"generational-box",
|
"generational-box",
|
||||||
|
|||||||
@@ -26,11 +26,7 @@ fn app() -> Element {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
fn Child(
|
fn Child(state: Memo<isize>, items: Memo<Vec<isize>>, depth: ReadOnlySignal<usize>) -> Element {
|
||||||
state: ReadOnlySignal<isize>,
|
|
||||||
items: ReadOnlySignal<Vec<isize>>,
|
|
||||||
depth: ReadOnlySignal<usize>,
|
|
||||||
) -> Element {
|
|
||||||
if depth() == 0 {
|
if depth() == 0 {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
use dioxus_core::prelude::*;
|
use dioxus_core::prelude::*;
|
||||||
use dioxus_signals::ReactiveContext;
|
use dioxus_signals::ReactiveContext;
|
||||||
|
use futures_util::StreamExt;
|
||||||
|
|
||||||
/// `use_effect` will subscribe to any changes in the signal values it captures
|
/// `use_effect` will subscribe to any changes in the signal values it captures
|
||||||
/// effects will always run after first mount and then whenever the signal values change
|
/// effects will always run after first mount and then whenever the signal values change
|
||||||
@@ -26,13 +27,13 @@ pub fn use_effect(mut callback: impl FnMut() + 'static) {
|
|||||||
|
|
||||||
use_hook(|| {
|
use_hook(|| {
|
||||||
spawn(async move {
|
spawn(async move {
|
||||||
let rc = ReactiveContext::new_with_origin(location);
|
let (rc, mut changed) = ReactiveContext::new_with_origin(location);
|
||||||
loop {
|
loop {
|
||||||
// Run the effect
|
// Run the effect
|
||||||
rc.run_in(&mut callback);
|
rc.run_in(&mut callback);
|
||||||
|
|
||||||
// Wait for context to change
|
// Wait for context to change
|
||||||
rc.changed().await;
|
let _ = changed.next().await;
|
||||||
|
|
||||||
// Wait for the dom the be finished with sync work
|
// Wait for the dom the be finished with sync work
|
||||||
wait_for_next_render().await;
|
wait_for_next_render().await;
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
use crate::dependency::Dependency;
|
use crate::dependency::Dependency;
|
||||||
use crate::use_signal;
|
use crate::{use_callback, use_signal};
|
||||||
use dioxus_core::prelude::*;
|
use dioxus_core::prelude::*;
|
||||||
|
use dioxus_signals::Memo;
|
||||||
use dioxus_signals::{ReactiveContext, ReadOnlySignal, Readable, Signal, SignalData};
|
use dioxus_signals::{ReactiveContext, ReadOnlySignal, Readable, Signal, SignalData};
|
||||||
use dioxus_signals::{Storage, Writable};
|
use dioxus_signals::{Storage, Writable};
|
||||||
|
use futures_util::StreamExt;
|
||||||
|
|
||||||
/// Creates a new unsync Selector. The selector will be run immediately and whenever any signal it reads changes.
|
/// Creates a new unsync Selector. The selector will be run immediately and whenever any signal it reads changes.
|
||||||
///
|
///
|
||||||
@@ -22,51 +24,9 @@ use dioxus_signals::{Storage, Writable};
|
|||||||
/// }
|
/// }
|
||||||
/// ```
|
/// ```
|
||||||
#[track_caller]
|
#[track_caller]
|
||||||
pub fn use_memo<R: PartialEq>(f: impl FnMut() -> R + 'static) -> ReadOnlySignal<R> {
|
pub fn use_memo<R: PartialEq>(f: impl FnMut() -> R + 'static) -> Memo<R> {
|
||||||
use_maybe_sync_memo(f)
|
let mut callback = use_callback(f);
|
||||||
}
|
use_hook(|| Signal::memo(move || callback.call()))
|
||||||
|
|
||||||
/// 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() -> Element {
|
|
||||||
/// let mut count = use_signal(|| 0);
|
|
||||||
/// let double = use_memo(move || count * 2);
|
|
||||||
/// count += 1;
|
|
||||||
/// assert_eq!(double(), count * 2);
|
|
||||||
///
|
|
||||||
/// rsx! { "{double}" }
|
|
||||||
/// }
|
|
||||||
/// ```
|
|
||||||
#[track_caller]
|
|
||||||
pub fn use_maybe_sync_memo<R: PartialEq, S: Storage<SignalData<R>>>(
|
|
||||||
mut f: impl FnMut() -> R + 'static,
|
|
||||||
) -> ReadOnlySignal<R, S> {
|
|
||||||
use_hook(|| {
|
|
||||||
// Create a new reactive context for the memo
|
|
||||||
let rc = ReactiveContext::new();
|
|
||||||
|
|
||||||
// Create a new signal in that context, wiring up its dependencies and subscribers
|
|
||||||
let mut state: Signal<R, S> = rc.run_in(|| Signal::new_maybe_sync(f()));
|
|
||||||
|
|
||||||
spawn(async move {
|
|
||||||
loop {
|
|
||||||
rc.changed().await;
|
|
||||||
let new = rc.run_in(&mut f);
|
|
||||||
if new != *state.peek() {
|
|
||||||
*state.write() = new;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// And just return the readonly variant of that signal
|
|
||||||
ReadOnlySignal::new_maybe_sync(state)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 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
|
/// 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
|
||||||
@@ -127,7 +87,7 @@ where
|
|||||||
|
|
||||||
let selector = use_hook(|| {
|
let selector = use_hook(|| {
|
||||||
// Get the current reactive context
|
// Get the current reactive context
|
||||||
let rc = ReactiveContext::new();
|
let (rc, mut changed) = ReactiveContext::new();
|
||||||
|
|
||||||
// Create a new signal in that context, wiring up its dependencies and subscribers
|
// Create a new signal in that context, wiring up its dependencies and subscribers
|
||||||
let mut state: Signal<R, S> =
|
let mut state: Signal<R, S> =
|
||||||
@@ -135,7 +95,8 @@ where
|
|||||||
|
|
||||||
spawn(async move {
|
spawn(async move {
|
||||||
loop {
|
loop {
|
||||||
rc.changed().await;
|
// Wait for context to change
|
||||||
|
let _ = changed.next().await;
|
||||||
|
|
||||||
let new = rc.run_in(|| f(dependencies_signal.read().clone()));
|
let new = rc.run_in(|| f(dependencies_signal.read().clone()));
|
||||||
if new != *state.peek() {
|
if new != *state.peek() {
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ use dioxus_core::{
|
|||||||
Task,
|
Task,
|
||||||
};
|
};
|
||||||
use dioxus_signals::*;
|
use dioxus_signals::*;
|
||||||
use futures_util::{future, pin_mut, FutureExt};
|
use futures_util::{future, pin_mut, FutureExt, StreamExt};
|
||||||
use std::future::Future;
|
use std::{cell::Cell, future::Future, rc::Rc};
|
||||||
|
|
||||||
/// A memo that resolve to a value asynchronously.
|
/// A memo that resolve to a value asynchronously.
|
||||||
/// Unlike `use_future`, `use_resource` runs on the **server**
|
/// Unlike `use_future`, `use_resource` runs on the **server**
|
||||||
@@ -44,7 +44,10 @@ where
|
|||||||
{
|
{
|
||||||
let mut value = use_signal(|| None);
|
let mut value = use_signal(|| None);
|
||||||
let mut state = use_signal(|| UseResourceState::Pending);
|
let mut state = use_signal(|| UseResourceState::Pending);
|
||||||
let rc = use_hook(ReactiveContext::new);
|
let (rc, changed) = use_hook(|| {
|
||||||
|
let (rc, changed) = ReactiveContext::new();
|
||||||
|
(rc, Rc::new(Cell::new(Some(changed))))
|
||||||
|
});
|
||||||
|
|
||||||
let mut cb = use_callback(move || {
|
let mut cb = use_callback(move || {
|
||||||
// Create the user's task
|
// Create the user's task
|
||||||
@@ -70,10 +73,11 @@ where
|
|||||||
let mut task = use_hook(|| Signal::new(cb.call()));
|
let mut task = use_hook(|| Signal::new(cb.call()));
|
||||||
|
|
||||||
use_hook(|| {
|
use_hook(|| {
|
||||||
|
let mut changed = changed.take().unwrap();
|
||||||
spawn(async move {
|
spawn(async move {
|
||||||
loop {
|
loop {
|
||||||
// Wait for the dependencies to change
|
// Wait for the dependencies to change
|
||||||
rc.changed().await;
|
let _ = changed.next().await;
|
||||||
|
|
||||||
// Stop the old task
|
// Stop the old task
|
||||||
task.write().cancel();
|
task.write().cancel();
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ once_cell = "1.18.0"
|
|||||||
rustc-hash = { workspace = true }
|
rustc-hash = { workspace = true }
|
||||||
futures-channel = { workspace = true }
|
futures-channel = { workspace = true }
|
||||||
futures-util = { workspace = true }
|
futures-util = { workspace = true }
|
||||||
flume = { version = "0.11.0", default-features = false, features = ["async"] }
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
dioxus = { workspace = true }
|
dioxus = { workspace = true }
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ impl<T: 'static, S: Storage<T>> Writable for CopyValue<T, S> {
|
|||||||
S::try_map_mut(mut_, f)
|
S::try_map_mut(mut_, f)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn try_write(&self) -> Result<Self::Mut<T>, generational_box::BorrowMutError> {
|
fn try_write(&mut self) -> Result<Self::Mut<T>, generational_box::BorrowMutError> {
|
||||||
self.value.try_write()
|
self.value.try_write()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
use crate::{read::Readable, ReadableRef};
|
use crate::{read::Readable, Memo, ReadableRef};
|
||||||
use dioxus_core::prelude::{IntoAttributeValue, ScopeId};
|
use dioxus_core::prelude::{IntoAttributeValue, ScopeId};
|
||||||
use generational_box::UnsyncStorage;
|
use generational_box::UnsyncStorage;
|
||||||
use std::{mem::MaybeUninit, ops::Deref};
|
use std::{mem::MaybeUninit, ops::Deref};
|
||||||
|
|
||||||
use crate::{ReadOnlySignal, Signal};
|
use crate::Signal;
|
||||||
|
|
||||||
use super::get_global_context;
|
use super::get_global_context;
|
||||||
|
|
||||||
@@ -22,14 +22,14 @@ impl<T: PartialEq + 'static> GlobalMemo<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Get the signal that backs this global.
|
/// Get the signal that backs this global.
|
||||||
pub fn signal(&self) -> ReadOnlySignal<T> {
|
pub fn memo(&self) -> Memo<T> {
|
||||||
let key = self as *const _ as *const ();
|
let key = self as *const _ as *const ();
|
||||||
|
|
||||||
let context = get_global_context();
|
let context = get_global_context();
|
||||||
|
|
||||||
let read = context.signal.borrow();
|
let read = context.signal.borrow();
|
||||||
match read.get(&key) {
|
match read.get(&key) {
|
||||||
Some(signal) => *signal.downcast_ref::<ReadOnlySignal<T>>().unwrap(),
|
Some(signal) => *signal.downcast_ref::<Memo<T>>().unwrap(),
|
||||||
None => {
|
None => {
|
||||||
drop(read);
|
drop(read);
|
||||||
// Constructors are always run in the root scope
|
// Constructors are always run in the root scope
|
||||||
@@ -47,7 +47,7 @@ impl<T: PartialEq + 'static> GlobalMemo<T> {
|
|||||||
|
|
||||||
/// Get the generational id of the signal.
|
/// Get the generational id of the signal.
|
||||||
pub fn id(&self) -> generational_box::GenerationalBoxId {
|
pub fn id(&self) -> generational_box::GenerationalBoxId {
|
||||||
self.signal().id()
|
self.memo().id()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,12 +57,12 @@ impl<T: PartialEq + 'static> Readable for GlobalMemo<T> {
|
|||||||
|
|
||||||
#[track_caller]
|
#[track_caller]
|
||||||
fn try_read(&self) -> Result<ReadableRef<Self>, generational_box::BorrowError> {
|
fn try_read(&self) -> Result<ReadableRef<Self>, generational_box::BorrowError> {
|
||||||
self.signal().try_read()
|
self.memo().try_read()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[track_caller]
|
#[track_caller]
|
||||||
fn peek(&self) -> ReadableRef<Self> {
|
fn peek(&self) -> ReadableRef<Self> {
|
||||||
self.signal().peek()
|
self.memo().peek()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -71,7 +71,7 @@ where
|
|||||||
T: Clone + IntoAttributeValue,
|
T: Clone + IntoAttributeValue,
|
||||||
{
|
{
|
||||||
fn into_value(self) -> dioxus_core::AttributeValue {
|
fn into_value(self) -> dioxus_core::AttributeValue {
|
||||||
self.signal().into_value()
|
self.memo().into_value()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -81,7 +81,7 @@ impl<T: PartialEq + 'static> PartialEq for GlobalMemo<T> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Allow calling a signal with signal() syntax
|
/// Allow calling a signal with memo() syntax
|
||||||
///
|
///
|
||||||
/// Currently only limited to copy types, though could probably specialize for string/arc/rc
|
/// Currently only limited to copy types, though could probably specialize for string/arc/rc
|
||||||
impl<T: PartialEq + Clone + 'static> Deref for GlobalMemo<T> {
|
impl<T: PartialEq + Clone + 'static> Deref for GlobalMemo<T> {
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ impl<T: 'static> Writable for GlobalSignal<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[track_caller]
|
#[track_caller]
|
||||||
fn try_write(&self) -> Result<Self::Mut<T>, generational_box::BorrowMutError> {
|
fn try_write(&mut self) -> Result<Self::Mut<T>, generational_box::BorrowMutError> {
|
||||||
self.signal().try_write()
|
self.signal().try_write()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
use crate::copy_value::CopyValue;
|
use crate::copy_value::CopyValue;
|
||||||
|
use crate::memo::Memo;
|
||||||
use crate::read::Readable;
|
use crate::read::Readable;
|
||||||
use crate::signal::Signal;
|
use crate::signal::Signal;
|
||||||
use crate::write::Writable;
|
use crate::write::Writable;
|
||||||
@@ -159,6 +160,16 @@ impl<T: 'static, S: Storage<SignalData<T>>> Clone for ReadOnlySignal<T, S> {
|
|||||||
|
|
||||||
impl<T: 'static, S: Storage<SignalData<T>>> Copy for ReadOnlySignal<T, S> {}
|
impl<T: 'static, S: Storage<SignalData<T>>> Copy for ReadOnlySignal<T, S> {}
|
||||||
|
|
||||||
|
read_impls!(Memo: PartialEq);
|
||||||
|
|
||||||
|
impl<T: 'static> Clone for Memo<T> {
|
||||||
|
fn clone(&self) -> Self {
|
||||||
|
*self
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T: 'static> Copy for Memo<T> {}
|
||||||
|
|
||||||
read_impls!(GlobalSignal);
|
read_impls!(GlobalSignal);
|
||||||
default_impl!(GlobalSignal);
|
default_impl!(GlobalSignal);
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,9 @@ pub use map::*;
|
|||||||
// mod comparer;
|
// mod comparer;
|
||||||
// pub use comparer::*;
|
// pub use comparer::*;
|
||||||
|
|
||||||
|
mod memo;
|
||||||
|
pub use memo::*;
|
||||||
|
|
||||||
mod global;
|
mod global;
|
||||||
pub use global::*;
|
pub use global::*;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,173 @@
|
|||||||
|
use crate::write::Writable;
|
||||||
|
use crate::{read::Readable, ReactiveContext, ReadableRef, Signal};
|
||||||
|
use crate::{CopyValue, ReadOnlySignal};
|
||||||
|
use std::{
|
||||||
|
cell::RefCell,
|
||||||
|
ops::Deref,
|
||||||
|
panic::Location,
|
||||||
|
sync::{atomic::AtomicBool, Arc},
|
||||||
|
};
|
||||||
|
|
||||||
|
use dioxus_core::prelude::*;
|
||||||
|
use futures_util::StreamExt;
|
||||||
|
use generational_box::UnsyncStorage;
|
||||||
|
struct UpdateInformation<T> {
|
||||||
|
dirty: Arc<AtomicBool>,
|
||||||
|
callback: RefCell<Box<dyn FnMut() -> T>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A value that is memoized. This is useful for caching the result of a computation.
|
||||||
|
pub struct Memo<T: 'static> {
|
||||||
|
inner: Signal<T>,
|
||||||
|
update: CopyValue<UpdateInformation<T>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> From<Memo<T>> for ReadOnlySignal<T>
|
||||||
|
where
|
||||||
|
T: PartialEq,
|
||||||
|
{
|
||||||
|
fn from(val: Memo<T>) -> Self {
|
||||||
|
ReadOnlySignal::new(val.inner)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T: 'static> Memo<T> {
|
||||||
|
/// Create a new memo
|
||||||
|
#[track_caller]
|
||||||
|
pub fn new(mut f: impl FnMut() -> T + 'static) -> Self
|
||||||
|
where
|
||||||
|
T: PartialEq,
|
||||||
|
{
|
||||||
|
let dirty = Arc::new(AtomicBool::new(true));
|
||||||
|
let (tx, mut rx) = futures_channel::mpsc::unbounded();
|
||||||
|
|
||||||
|
let callback = {
|
||||||
|
let dirty = dirty.clone();
|
||||||
|
move || {
|
||||||
|
dirty.store(true, std::sync::atomic::Ordering::Relaxed);
|
||||||
|
tx.unbounded_send(()).unwrap();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let rc = ReactiveContext::new_with_callback(
|
||||||
|
callback,
|
||||||
|
current_scope_id().unwrap(),
|
||||||
|
Location::caller(),
|
||||||
|
);
|
||||||
|
|
||||||
|
// Create a new signal in that context, wiring up its dependencies and subscribers
|
||||||
|
let value = rc.run_in(&mut f);
|
||||||
|
let recompute = RefCell::new(Box::new(f) as Box<dyn FnMut() -> T>);
|
||||||
|
let update = CopyValue::new(UpdateInformation {
|
||||||
|
dirty,
|
||||||
|
callback: recompute,
|
||||||
|
});
|
||||||
|
let state: Signal<T> = Signal::new(value);
|
||||||
|
|
||||||
|
let memo = Memo {
|
||||||
|
inner: state,
|
||||||
|
update,
|
||||||
|
};
|
||||||
|
|
||||||
|
spawn(async move {
|
||||||
|
while rx.next().await.is_some() {
|
||||||
|
memo.recompute();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
memo
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Rerun the computation and update the value of the memo if the result has changed.
|
||||||
|
fn recompute(&self)
|
||||||
|
where
|
||||||
|
T: PartialEq,
|
||||||
|
{
|
||||||
|
let mut update_copy = self.update;
|
||||||
|
let update_write = update_copy.write();
|
||||||
|
let peak = self.inner.peek();
|
||||||
|
let new_value = (update_write.callback.borrow_mut())();
|
||||||
|
if new_value != *peak {
|
||||||
|
drop(peak);
|
||||||
|
let mut copy = self.inner;
|
||||||
|
let mut write = copy.write();
|
||||||
|
*write = new_value;
|
||||||
|
update_write
|
||||||
|
.dirty
|
||||||
|
.store(false, std::sync::atomic::Ordering::Relaxed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get the scope that the signal was created in.
|
||||||
|
pub fn origin_scope(&self) -> ScopeId {
|
||||||
|
self.inner.origin_scope()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get the id of the signal.
|
||||||
|
pub fn id(&self) -> generational_box::GenerationalBoxId {
|
||||||
|
self.inner.id()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> Readable for Memo<T>
|
||||||
|
where
|
||||||
|
T: PartialEq,
|
||||||
|
{
|
||||||
|
type Target = T;
|
||||||
|
type Storage = UnsyncStorage;
|
||||||
|
|
||||||
|
#[track_caller]
|
||||||
|
fn try_read(&self) -> Result<ReadableRef<Self>, generational_box::BorrowError> {
|
||||||
|
let read = self.inner.try_read();
|
||||||
|
match read {
|
||||||
|
Ok(r) => {
|
||||||
|
let needs_update = self
|
||||||
|
.update
|
||||||
|
.read()
|
||||||
|
.dirty
|
||||||
|
.swap(false, std::sync::atomic::Ordering::Relaxed);
|
||||||
|
if needs_update {
|
||||||
|
drop(r);
|
||||||
|
self.recompute();
|
||||||
|
self.inner.try_read()
|
||||||
|
} else {
|
||||||
|
Ok(r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => Err(e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get the current value of the signal. **Unlike read, this will not subscribe the current scope to the signal which can cause parts of your UI to not update.**
|
||||||
|
///
|
||||||
|
/// If the signal has been dropped, this will panic.
|
||||||
|
#[track_caller]
|
||||||
|
fn peek(&self) -> ReadableRef<Self> {
|
||||||
|
self.inner.peek()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> IntoAttributeValue for Memo<T>
|
||||||
|
where
|
||||||
|
T: Clone + IntoAttributeValue + PartialEq,
|
||||||
|
{
|
||||||
|
fn into_value(self) -> dioxus_core::AttributeValue {
|
||||||
|
self.with(|f| f.clone().into_value())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T: 'static> PartialEq for Memo<T> {
|
||||||
|
fn eq(&self, other: &Self) -> bool {
|
||||||
|
self.inner == other.inner
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T: Clone> Deref for Memo<T>
|
||||||
|
where
|
||||||
|
T: PartialEq,
|
||||||
|
{
|
||||||
|
type Target = dyn Fn() -> T;
|
||||||
|
|
||||||
|
fn deref(&self) -> &Self::Target {
|
||||||
|
Readable::deref_impl(self)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
use dioxus_core::prelude::{
|
use dioxus_core::prelude::{
|
||||||
current_scope_id, has_context, provide_context, schedule_update_any, ScopeId,
|
current_scope_id, has_context, provide_context, schedule_update_any, ScopeId,
|
||||||
};
|
};
|
||||||
|
use futures_channel::mpsc::UnboundedReceiver;
|
||||||
use generational_box::SyncStorage;
|
use generational_box::SyncStorage;
|
||||||
use rustc_hash::FxHashSet;
|
use std::{cell::RefCell, hash::Hash};
|
||||||
use std::{cell::RefCell, hash::Hash, sync::Arc};
|
|
||||||
|
|
||||||
use crate::{CopyValue, Readable, Writable};
|
use crate::{CopyValue, Readable, Writable};
|
||||||
|
|
||||||
@@ -25,66 +25,48 @@ thread_local! {
|
|||||||
impl std::fmt::Display for ReactiveContext {
|
impl std::fmt::Display for ReactiveContext {
|
||||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
let read = self.inner.read();
|
let read = self.inner.read();
|
||||||
match read.scope_subscriber {
|
#[cfg(debug_assertions)]
|
||||||
Some(scope) => write!(f, "ReactiveContext for scope {:?}", scope),
|
return write!(f, "ReactiveContext created at {}", read.origin);
|
||||||
None => {
|
#[cfg(not(debug_assertions))]
|
||||||
#[cfg(debug_assertions)]
|
write!(f, "ReactiveContext")
|
||||||
return write!(f, "ReactiveContext created at {}", read.origin);
|
|
||||||
#[cfg(not(debug_assertions))]
|
|
||||||
write!(f, "ReactiveContext")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for ReactiveContext {
|
|
||||||
#[track_caller]
|
|
||||||
fn default() -> Self {
|
|
||||||
Self::new_for_scope(None, std::panic::Location::caller())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ReactiveContext {
|
impl ReactiveContext {
|
||||||
/// Create a new reactive context
|
/// Create a new reactive context
|
||||||
#[track_caller]
|
#[track_caller]
|
||||||
pub fn new() -> Self {
|
pub fn new() -> (Self, UnboundedReceiver<()>) {
|
||||||
Self::default()
|
Self::new_with_origin(std::panic::Location::caller())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Create a new reactive context with a location for debugging purposes
|
/// Create a new reactive context with a location for debugging purposes
|
||||||
/// This is useful for reactive contexts created within closures
|
/// This is useful for reactive contexts created within closures
|
||||||
pub fn new_with_origin(origin: &'static std::panic::Location<'static>) -> Self {
|
pub fn new_with_origin(
|
||||||
Self::new_for_scope(None, origin)
|
origin: &'static std::panic::Location<'static>,
|
||||||
|
) -> (Self, UnboundedReceiver<()>) {
|
||||||
|
let (tx, rx) = futures_channel::mpsc::unbounded();
|
||||||
|
let callback = move || {
|
||||||
|
let _ = tx.unbounded_send(());
|
||||||
|
};
|
||||||
|
let _self = Self::new_with_callback(callback, current_scope_id().unwrap(), origin);
|
||||||
|
(_self, rx)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Create a new reactive context that may update a scope
|
/// Create a new reactive context that may update a scope. When any signal that this context subscribes to changes, the callback will be run
|
||||||
#[allow(unused)]
|
pub fn new_with_callback(
|
||||||
pub(crate) fn new_for_scope(
|
callback: impl FnMut() + Send + Sync + 'static,
|
||||||
scope: Option<ScopeId>,
|
scope: ScopeId,
|
||||||
origin: &'static std::panic::Location<'static>,
|
origin: &'static std::panic::Location<'static>,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
let (tx, rx) = flume::unbounded();
|
|
||||||
|
|
||||||
let mut scope_subscribers = FxHashSet::default();
|
|
||||||
if let Some(scope) = scope {
|
|
||||||
scope_subscribers.insert(scope);
|
|
||||||
}
|
|
||||||
|
|
||||||
let inner = Inner {
|
let inner = Inner {
|
||||||
scope_subscriber: scope,
|
|
||||||
sender: tx,
|
|
||||||
self_: None,
|
self_: None,
|
||||||
update_any: schedule_update_any(),
|
update: Box::new(callback),
|
||||||
receiver: rx,
|
|
||||||
#[cfg(debug_assertions)]
|
#[cfg(debug_assertions)]
|
||||||
origin,
|
origin,
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut self_ = Self {
|
let mut self_ = Self {
|
||||||
inner: CopyValue::new_maybe_sync_in_scope(
|
inner: CopyValue::new_maybe_sync_in_scope(inner, scope),
|
||||||
inner,
|
|
||||||
scope.or_else(current_scope_id).unwrap(),
|
|
||||||
),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
self_.inner.write().self_ = Some(self_);
|
self_.inner.write().self_ = Some(self_);
|
||||||
@@ -112,10 +94,17 @@ impl ReactiveContext {
|
|||||||
if let Some(cx) = has_context() {
|
if let Some(cx) = has_context() {
|
||||||
return Some(cx);
|
return Some(cx);
|
||||||
}
|
}
|
||||||
|
let update_any = schedule_update_any();
|
||||||
|
let scope_id = current_scope_id().unwrap();
|
||||||
|
let update_scope = move || {
|
||||||
|
tracing::trace!("Marking scope {:?} as dirty", scope_id);
|
||||||
|
update_any(scope_id)
|
||||||
|
};
|
||||||
|
|
||||||
// Otherwise, create a new context at the current scope
|
// Otherwise, create a new context at the current scope
|
||||||
Some(provide_context(ReactiveContext::new_for_scope(
|
Some(provide_context(ReactiveContext::new_with_callback(
|
||||||
current_scope_id(),
|
update_scope,
|
||||||
|
scope_id,
|
||||||
std::panic::Location::caller(),
|
std::panic::Location::caller(),
|
||||||
)))
|
)))
|
||||||
}
|
}
|
||||||
@@ -137,25 +126,18 @@ impl ReactiveContext {
|
|||||||
///
|
///
|
||||||
/// Returns true if the context was marked as dirty, or false if the context has been dropped
|
/// Returns true if the context was marked as dirty, or false if the context has been dropped
|
||||||
pub fn mark_dirty(&self) -> bool {
|
pub fn mark_dirty(&self) -> bool {
|
||||||
if let Ok(self_read) = self.inner.try_read() {
|
let mut copy = self.inner;
|
||||||
|
if let Ok(mut self_write) = copy.try_write() {
|
||||||
#[cfg(debug_assertions)]
|
#[cfg(debug_assertions)]
|
||||||
{
|
{
|
||||||
if let Some(scope) = self_read.scope_subscriber {
|
tracing::trace!(
|
||||||
tracing::trace!("Marking reactive context for scope {:?} as dirty", scope);
|
"Marking reactive context created at {} as dirty",
|
||||||
} else {
|
self_write.origin
|
||||||
tracing::trace!(
|
);
|
||||||
"Marking reactive context created at {} as dirty",
|
|
||||||
self_read.origin
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if let Some(scope) = self_read.scope_subscriber {
|
|
||||||
(self_read.update_any)(scope);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// mark the listeners as dirty
|
(self_write.update)();
|
||||||
// If the channel is full it means that the receivers have already been marked as dirty
|
|
||||||
_ = self_read.sender.try_send(());
|
|
||||||
true
|
true
|
||||||
} else {
|
} else {
|
||||||
false
|
false
|
||||||
@@ -166,12 +148,6 @@ impl ReactiveContext {
|
|||||||
pub fn origin_scope(&self) -> ScopeId {
|
pub fn origin_scope(&self) -> ScopeId {
|
||||||
self.inner.origin_scope()
|
self.inner.origin_scope()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Wait for this reactive context to change
|
|
||||||
pub async fn changed(&self) {
|
|
||||||
let rx = self.inner.read().receiver.clone();
|
|
||||||
_ = rx.recv_async().await;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Hash for ReactiveContext {
|
impl Hash for ReactiveContext {
|
||||||
@@ -181,14 +157,10 @@ impl Hash for ReactiveContext {
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct Inner {
|
struct Inner {
|
||||||
// A scope we mark as dirty when this context is written to
|
|
||||||
scope_subscriber: Option<ScopeId>,
|
|
||||||
self_: Option<ReactiveContext>,
|
self_: Option<ReactiveContext>,
|
||||||
update_any: Arc<dyn Fn(ScopeId) + Send + Sync>,
|
|
||||||
|
|
||||||
// Futures will call .changed().await
|
// Futures will call .changed().await
|
||||||
sender: flume::Sender<()>,
|
update: Box<dyn FnMut() + Send + Sync>,
|
||||||
receiver: flume::Receiver<()>,
|
|
||||||
|
|
||||||
// Debug information for signal subscriptions
|
// Debug information for signal subscriptions
|
||||||
#[cfg(debug_assertions)]
|
#[cfg(debug_assertions)]
|
||||||
|
|||||||
@@ -1,11 +1,9 @@
|
|||||||
|
use crate::Memo;
|
||||||
use crate::{
|
use crate::{
|
||||||
read::Readable, write::Writable, CopyValue, GlobalMemo, GlobalSignal, ReactiveContext,
|
read::Readable, write::Writable, CopyValue, GlobalMemo, GlobalSignal, ReactiveContext,
|
||||||
ReadOnlySignal, ReadableRef,
|
ReadableRef,
|
||||||
};
|
|
||||||
use dioxus_core::{
|
|
||||||
prelude::{spawn, IntoAttributeValue},
|
|
||||||
ScopeId,
|
|
||||||
};
|
};
|
||||||
|
use dioxus_core::{prelude::IntoAttributeValue, ScopeId};
|
||||||
use generational_box::{AnyStorage, Storage, SyncStorage, UnsyncStorage};
|
use generational_box::{AnyStorage, Storage, SyncStorage, UnsyncStorage};
|
||||||
use std::{
|
use std::{
|
||||||
any::Any,
|
any::Any,
|
||||||
@@ -88,35 +86,8 @@ impl<T: PartialEq + 'static> Signal<T> {
|
|||||||
///
|
///
|
||||||
/// Selectors can be used to efficiently compute derived data from signals.
|
/// Selectors can be used to efficiently compute derived data from signals.
|
||||||
#[track_caller]
|
#[track_caller]
|
||||||
pub fn memo(f: impl FnMut() -> T + 'static) -> ReadOnlySignal<T> {
|
pub fn memo(f: impl FnMut() -> T + 'static) -> Memo<T> {
|
||||||
Self::use_maybe_sync_memo(f)
|
Memo::new(f)
|
||||||
}
|
|
||||||
|
|
||||||
/// Creates a new Selector that may be Sync + Send. The selector will be run immediately and whenever any signal it reads changes.
|
|
||||||
///
|
|
||||||
/// Selectors can be used to efficiently compute derived data from signals.
|
|
||||||
#[track_caller]
|
|
||||||
pub fn use_maybe_sync_memo<S: Storage<SignalData<T>>>(
|
|
||||||
mut f: impl FnMut() -> T + 'static,
|
|
||||||
) -> ReadOnlySignal<T, S> {
|
|
||||||
// Get the current reactive context
|
|
||||||
let rc = ReactiveContext::new();
|
|
||||||
|
|
||||||
// Create a new signal in that context, wiring up its dependencies and subscribers
|
|
||||||
let mut state: Signal<T, S> = rc.run_in(|| Signal::new_maybe_sync(f()));
|
|
||||||
|
|
||||||
spawn(async move {
|
|
||||||
loop {
|
|
||||||
rc.changed().await;
|
|
||||||
let new = f();
|
|
||||||
if new != *state.peek() {
|
|
||||||
*state.write() = new;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// And just return the readonly variant of that signal
|
|
||||||
ReadOnlySignal::new_maybe_sync(state)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -237,7 +208,7 @@ impl<T: 'static, S: Storage<SignalData<T>>> Writable for Signal<T, S> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[track_caller]
|
#[track_caller]
|
||||||
fn try_write(&self) -> Result<Self::Mut<T>, generational_box::BorrowMutError> {
|
fn try_write(&mut self) -> Result<Self::Mut<T>, generational_box::BorrowMutError> {
|
||||||
self.inner.try_write().map(|inner| {
|
self.inner.try_write().map(|inner| {
|
||||||
let borrow = S::map_mut(inner, |v| &mut v.value);
|
let borrow = S::map_mut(inner, |v| &mut v.value);
|
||||||
Write {
|
Write {
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ pub trait Writable: Readable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Try to get a mutable reference to the value. If the value has been dropped, this will panic.
|
/// Try to get a mutable reference to the value. If the value has been dropped, this will panic.
|
||||||
fn try_write(&self) -> Result<Self::Mut<Self::Target>, generational_box::BorrowMutError>;
|
fn try_write(&mut self) -> Result<Self::Mut<Self::Target>, generational_box::BorrowMutError>;
|
||||||
|
|
||||||
/// Run a function with a mutable reference to the value. If the value has been dropped, this will panic.
|
/// Run a function with a mutable reference to the value. If the value has been dropped, this will panic.
|
||||||
#[track_caller]
|
#[track_caller]
|
||||||
|
|||||||
Reference in new issue
Block a user