swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove cx in more places

Browse Source
This commit is contained in:
Jonathan Kelley committed 2024-01-13 21:18:36 -08:00
1 parent 1dde044697
commit 9881a94e67
10 files changed
+122 -127
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/fullstack/src/hooks/server_future.rs
+96 -98
View File
@@ -23,89 +23,87 @@ use std::sync::Arc;
///
/// - dependencies: a tuple of references to values that are PartialEq + Clone
#[must_use = "Consider using `cx.spawn` to run a future without reading its value"]
pub fn use_server_future<T, F, D>(
dependencies: D,
future: impl FnOnce(D::Out) -> F,
) -> Option<&UseServerFuture<T>>
pub fn use_server_future<T, F>(future: impl FnOnce() -> F) -> Option<UseServerFuture<T>>
where
T: 'static + Serialize + DeserializeOwned + Debug,
F: Future<Output = T> + 'static,
D: UseFutureDep,
{
let state = cx.use_hook(move || UseServerFuture {
update: cx.schedule_update(),
needs_regen: Cell::new(true),
value: Default::default(),
task: Cell::new(None),
dependencies: Vec::new(),
});
todo!()
let first_run = { state.value.borrow().as_ref().is_none() && state.task.get().is_none() };
// let state = use_hook(move || UseServerFuture {
// update: schedule_update(),
// needs_regen: Cell::new(true),
// value: Default::default(),
// task: Cell::new(None),
// dependencies: Vec::new(),
// });
#[cfg(not(feature = "ssr"))]
{
if first_run {
match crate::html_storage::deserialize::take_server_data() {
Some(data) => {
tracing::trace!("Loaded {data:?} from server");
*state.value.borrow_mut() = Some(Box::new(data));
state.needs_regen.set(false);
return Some(state);
}
None => {
tracing::trace!("Failed to load from server... running future");
}
};
}
}
// let first_run = { state.value.borrow().as_ref().is_none() && state.task.get().is_none() };
if dependencies.clone().apply(&mut state.dependencies) || state.needs_regen.get() {
// We don't need regen anymore
state.needs_regen.set(false);
// #[cfg(not(feature = "ssr"))]
// {
// if first_run {
// match crate::html_storage::deserialize::take_server_data() {
// Some(data) => {
// tracing::trace!("Loaded {data:?} from server");
// *state.value.borrow_mut() = Some(Box::new(data));
// state.needs_regen.set(false);
// return Some(state);
// }
// None => {
// tracing::trace!("Failed to load from server... running future");
// }
// };
// }
// }
// Create the new future
let fut = future(dependencies.out());
// if dependencies.clone().apply(&mut state.dependencies) || state.needs_regen.get() {
// // We don't need regen anymore
// state.needs_regen.set(false);
// Clone in our cells
let value = state.value.clone();
let schedule_update = state.update.clone();
// // Create the new future
// let fut = future(dependencies.out());
// Cancel the current future
if let Some(current) = state.task.take() {
cx.remove_future(current);
}
// // Clone in our cells
// let value = state.value.clone();
// let schedule_update = state.update.clone();
state.task.set(Some(cx.push_future(async move {
let data;
#[cfg(feature = "ssr")]
{
data = fut.await;
if first_run {
if let Err(err) = crate::prelude::server_context().push_html_data(&data) {
tracing::error!("Failed to push HTML data: {}", err);
};
}
}
#[cfg(not(feature = "ssr"))]
{
data = fut.await;
}
*value.borrow_mut() = Some(Box::new(data));
// // Cancel the current future
// if let Some(current) = state.task.take() {
// cx.remove_future(current);
// }
schedule_update();
})));
}
// state.task.set(Some(cx.push_future(async move {
// let data;
// #[cfg(feature = "ssr")]
// {
// data = fut.await;
// if first_run {
// if let Err(err) = crate::prelude::server_context().push_html_data(&data) {
// tracing::error!("Failed to push HTML data: {}", err);
// };
// }
// }
// #[cfg(not(feature = "ssr"))]
// {
// data = fut.await;
// }
// *value.borrow_mut() = Some(Box::new(data));
if first_run {
#[cfg(feature = "ssr")]
{
tracing::trace!("Suspending first run of use_server_future");
cx.suspend();
}
None
} else {
Some(state)
}
// schedule_update();
// })));
// }
// if first_run {
// #[cfg(feature = "ssr")]
// {
// tracing::trace!("Suspending first run of use_server_future");
// cx.suspend();
// }
// None
// } else {
// Some(state)
// }
}
pub struct UseServerFuture<T> {
@@ -117,36 +115,36 @@ pub struct UseServerFuture<T> {
}
impl<T> UseServerFuture<T> {
/// Restart the future with new dependencies.
///
/// Will not cancel the previous future, but will ignore any values that it
/// generates.
pub fn restart(&self) {
self.needs_regen.set(true);
(self.update)();
}
// /// Restart the future with new dependencies.
// ///
// /// Will not cancel the previous future, but will ignore any values that it
// /// generates.
// pub fn restart(&self) {
// self.needs_regen.set(true);
// (self.update)();
// }
/// Forcefully cancel a future
pub fn cancel(&self) {
if let Some(task) = self.task.take() {
cx.remove_future(task);
}
}
// /// Forcefully cancel a future
// pub fn cancel(&self) {
// if let Some(task) = self.task.take() {
// cx.remove_future(task);
// }
// }
/// Return any value, even old values if the future has not yet resolved.
///
/// If the future has never completed, the returned value will be `None`.
pub fn value(&self) -> Ref<'_, T> {
Ref::map(self.value.borrow(), |v| v.as_deref().unwrap())
}
// /// Return any value, even old values if the future has not yet resolved.
// ///
// /// If the future has never completed, the returned value will be `None`.
// pub fn value(&self) -> Ref<'_, T> {
// Ref::map(self.value.borrow(), |v| v.as_deref().unwrap())
// }
/// Get the ID of the future in Dioxus' internal scheduler
pub fn task(&self) -> Option<Task> {
self.task.get()
}
// /// Get the ID of the future in Dioxus' internal scheduler
// pub fn task(&self) -> Option<Task> {
// self.task.get()
// }
/// Get the current state of the future.
pub fn reloading(&self) -> bool {
self.task.get().is_some()
}
// /// Get the current state of the future.
// pub fn reloading(&self) -> bool {
// self.task.get().is_some()
// }
}
packages/fullstack/src/router.rs
+2 -2
View File
@@ -4,7 +4,7 @@ use dioxus::prelude::*;
/// Used by the launch macro
#[doc(hidden)]
pub fn RouteWithCfg<R>(cx: Scope<FullstackRouterConfig<R>>) -> Element
pub fn RouteWithCfg<R>(props: FullstackRouterConfig<R>) -> Element
where
R: dioxus_router::prelude::Routable,
<R as std::str::FromStr>::Err: std::fmt::Display,
@@ -14,7 +14,7 @@ where
#[cfg(feature = "ssr")]
let context = crate::prelude::server_context();
let cfg = *cx.props;
let cfg = props;
render! {
dioxus_router::prelude::Router::<R> {
config: move || {