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

fix the default server fullstack history

Browse Source
This commit is contained in:
Evan Almloff committed 2024-01-31 16:04:44 -06:00
1 parent 2034591ab3
commit 8f68585c1f
1 file changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files
packages/router/src/router_cfg.rs
+8 -8
View File
@@ -54,7 +54,7 @@ macro_rules! default_history {
return Box::new(AnyHistoryProviderImplWrapper::new(WebHistory::<R>::default())); return Box::new(AnyHistoryProviderImplWrapper::new(WebHistory::<R>::default()));
// If we are using dioxus fullstack and the ssr feature is enabled, use the memory history with the initial path set to the current path in fullstack // If we are using dioxus fullstack and the ssr feature is enabled, use the memory history with the initial path set to the current path in fullstack
#[cfg(all(feature = "fullstack", feature = "ssr"))] #[cfg(all(feature = "fullstack", feature = "ssr"))]
return MemoryHistory::with_initial_path( return Box::new(AnyHistoryProviderImplWrapper::new(MemoryHistory::<R>::with_initial_path(
dioxus_fullstack::prelude::server_context() dioxus_fullstack::prelude::server_context()
.request_parts() .request_parts()
.unwrap() .unwrap()
@@ -69,7 +69,7 @@ macro_rules! default_history {
panic!("Failed to parse uri: {}", err); panic!("Failed to parse uri: {}", err);
}) })
}), }),
); )));
// If we are not on wasm32 and the liveview feature is enabled, use the liveview history. // If we are not on wasm32 and the liveview feature is enabled, use the liveview history.
#[cfg(all(feature = "liveview"))] #[cfg(all(feature = "liveview"))]
return Box::new(AnyHistoryProviderImplWrapper::new(LiveviewHistory::new_with_initial_path($initial_route))); return Box::new(AnyHistoryProviderImplWrapper::new(LiveviewHistory::new_with_initial_path($initial_route)));
@@ -91,9 +91,9 @@ where
{ {
pub(crate) fn get_history(self) -> Box<dyn HistoryProvider<R>> { pub(crate) fn get_history(self) -> Box<dyn HistoryProvider<R>> {
#[allow(unused)] #[allow(unused)]
let initial_route = self.initial_route.clone().unwrap_or("/".parse().unwrap_or_else(|err| let initial_route = self.initial_route.clone().unwrap_or("/".parse().unwrap_or_else(|err|
panic!("index route does not exist:\n{}\n use MemoryHistory::with_initial_path or RouterConfig::initial_route to set a custom path", err) panic!("index route does not exist:\n{}\n use MemoryHistory::with_initial_path or RouterConfig::initial_route to set a custom path", err)
)); ));
self.history self.history
.take() .take()
.unwrap_or_else(|| default_history!(initial_route)) .unwrap_or_else(|| default_history!(initial_route))
@@ -122,9 +122,9 @@ where
{ {
pub(crate) fn take_history(&mut self) -> Box<dyn AnyHistoryProvider> { pub(crate) fn take_history(&mut self) -> Box<dyn AnyHistoryProvider> {
#[allow(unused)] #[allow(unused)]
let initial_route = self.initial_route.clone().unwrap_or("/".parse().unwrap_or_else(|err| let initial_route = self.initial_route.clone().unwrap_or("/".parse().unwrap_or_else(|err|
panic!("index route does not exist:\n{}\n use MemoryHistory::with_initial_path or RouterConfig::initial_route to set a custom path", err) panic!("index route does not exist:\n{}\n use MemoryHistory::with_initial_path or RouterConfig::initial_route to set a custom path", err)
)); ));
self.history self.history
.take() .take()
.unwrap_or_else(|| default_history!(initial_route)) .unwrap_or_else(|| default_history!(initial_route))