mirror of
https://github.com/DioxusLabs/dioxus
synced 2024-09-21 06:41:54 +00:00
fix: use_route should subscribe to changes to the route
This commit is contained in:
parent
ccbb955b7b
commit
a21e7d4dd1
2 changed files with 38 additions and 8 deletions
|
@ -1,4 +1,4 @@
|
|||
use dioxus_core::ScopeState;
|
||||
use dioxus_core::{ScopeId, ScopeState};
|
||||
use gloo::history::{HistoryResult, Location};
|
||||
use serde::de::DeserializeOwned;
|
||||
use std::{rc::Rc, str::FromStr};
|
||||
|
@ -74,10 +74,28 @@ impl UseRoute {
|
|||
/// This hook provides access to information about the current location in the
|
||||
/// context of a [`Router`]. If this function is called outside of a `Router`
|
||||
/// component it will panic.
|
||||
pub fn use_route(cx: &ScopeState) -> UseRoute {
|
||||
let router = cx
|
||||
.consume_context::<RouterService>()
|
||||
.expect("Cannot call use_route outside the scope of a Router component")
|
||||
.clone();
|
||||
UseRoute { router }
|
||||
pub fn use_route(cx: &ScopeState) -> &UseRoute {
|
||||
&cx.use_hook(|_| {
|
||||
let router = cx
|
||||
.consume_context::<RouterService>()
|
||||
.expect("Cannot call use_route outside the scope of a Router component");
|
||||
|
||||
router.subscribe_onchange(cx.scope_id());
|
||||
|
||||
UseRouteInner {
|
||||
router: UseRoute { router },
|
||||
scope: cx.scope_id(),
|
||||
}
|
||||
})
|
||||
.router
|
||||
}
|
||||
|
||||
struct UseRouteInner {
|
||||
router: UseRoute,
|
||||
scope: ScopeId,
|
||||
}
|
||||
impl Drop for UseRouteInner {
|
||||
fn drop(&mut self) {
|
||||
self.router.router.unsubscribe_onchange(self.scope)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use gloo::history::{BrowserHistory, History, HistoryListener, Location};
|
||||
use std::{
|
||||
cell::{Cell, Ref, RefCell},
|
||||
collections::HashMap,
|
||||
collections::{HashMap, HashSet},
|
||||
rc::Rc,
|
||||
};
|
||||
|
||||
|
@ -12,6 +12,7 @@ pub struct RouterService {
|
|||
pub(crate) pending_events: Rc<RefCell<Vec<RouteEvent>>>,
|
||||
history: Rc<RefCell<BrowserHistory>>,
|
||||
slots: Rc<RefCell<Vec<(ScopeId, String)>>>,
|
||||
onchange_listeners: Rc<RefCell<HashSet<ScopeId>>>,
|
||||
root_found: Rc<Cell<Option<ScopeId>>>,
|
||||
cur_path_params: Rc<RefCell<HashMap<String, String>>>,
|
||||
listener: HistoryListener,
|
||||
|
@ -73,6 +74,7 @@ impl RouterService {
|
|||
regen_route,
|
||||
slots,
|
||||
pending_events,
|
||||
onchange_listeners: Rc::new(RefCell::new(HashSet::new())),
|
||||
cur_path_params: Rc::new(RefCell::new(HashMap::new())),
|
||||
}
|
||||
}
|
||||
|
@ -143,6 +145,16 @@ impl RouterService {
|
|||
pub fn current_path_params(&self) -> Ref<HashMap<String, String>> {
|
||||
self.cur_path_params.borrow()
|
||||
}
|
||||
|
||||
pub fn subscribe_onchange(&self, id: ScopeId) {
|
||||
log::trace!("Subscribing onchange for scope id {:?}", id);
|
||||
self.onchange_listeners.borrow_mut().insert(id);
|
||||
}
|
||||
|
||||
pub fn unsubscribe_onchange(&self, id: ScopeId) {
|
||||
log::trace!("Subscribing onchange for scope id {:?}", id);
|
||||
self.onchange_listeners.borrow_mut().remove(&id);
|
||||
}
|
||||
}
|
||||
|
||||
fn clean_route(route: String) -> String {
|
||||
|
|
Loading…
Reference in a new issue