Use futures_util mutex instead of flume for sending flush lock wakeups

This commit is contained in:
Jonathan Kelley committed 2024-02-02 13:09:26 -08:00
1 parent 38bdab880d
commit 8f70a84c70
14 files changed
+100 -43

No files matched your search

+4 -3
View File
@@ -1,7 +1,5 @@
use crate::use_hook_did_run;
use dioxus_core::prelude::*;
use dioxus_signals::{CopyValue, Effect, ReactiveContext, Writable};
// use futures_util::select;
use dioxus_signals::ReactiveContext;
/// 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.
@@ -16,6 +14,9 @@ pub fn use_effect(mut callback: impl FnMut() + 'static) {
let rc = ReactiveContext::new(None);
loop {
// Wait for the dom the be finished with sync work
flush_sync().await;
// Run the effect
rc.run_in(|| callback());
+3
View File
@@ -56,6 +56,9 @@ pub fn use_maybe_sync_memo<R: PartialEq, S: Storage<SignalData<R>>>(
spawn(async move {
loop {
// Wait for the dom the be finished with sync work
flush_sync().await;
rc.changed().await;
let new = rc.run_in(|| f());
if new != *state.peek() {
+8 -3
View File
@@ -2,7 +2,7 @@
use crate::{use_callback, use_signal};
use dioxus_core::{
prelude::{spawn, suspend, use_hook},
prelude::{flush_sync, spawn, suspend, use_hook},
Task,
};
use dioxus_signals::*;
@@ -13,7 +13,7 @@ use std::future::Future;
///
/// Regular memos are synchronous and resolve immediately. However, you might want to resolve a memo
#[must_use = "Consider using `cx.spawn` to run a future without reading its value"]
pub fn use_async_memo<T, F>(future: impl Fn() -> F + 'static) -> AsyncMemo<T>
pub fn use_resource<T, F>(future: impl Fn() -> F + 'static) -> AsyncMemo<T>
where
T: 'static,
F: Future<Output = T> + 'static,
@@ -28,6 +28,9 @@ where
// Spawn a wrapper task that polls the innner future and watch its dependencies
spawn(async move {
// Wait for the dom the be finished with sync work
flush_sync().await;
// move the future here and pin it so we can poll it
let fut = fut;
pin_mut!(fut);
@@ -88,7 +91,9 @@ impl<T> AsyncMemo<T> {
// Manually set the value in the future slot without starting the future over
pub fn set(&mut self, new_value: T) {
todo!()
// if let Some(task) = self.task.take() {
// cx.remove_future(task);
// }
// self.value.set(Some(new_value));
}