Fix route outside of a Switch.

Author: futursolo

packages/yew-router/src/hooks.rs

@@ -28,5 +28,5 @@ pub fn use_route<R>() -> Option<R>
 where
     R: Routable + 'static,
 {
-    use_context::<Option<R>>().and_then(|m| m)
+    use_location()?.route::<R>()
 }

packages/yew-router/src/scope_ext.rs

@@ -10,14 +10,6 @@ pub struct HistoryHandle {
     _inner: ContextHandle<RouterState>,
 }
 
-/// A [`ContextHandle`] for [`add_route_listener`](RouterScopeExt::add_route_listener).
-pub struct RouteHandle<R>
-where
-    R: Routable + 'static,
-{
-    _inner: ContextHandle<Option<R>>,
-}
-
 /// An extension to [`Scope`](yew::html::Scope) that provides session history information.
 ///
 /// You can access on `ctx.link()`
@@ -92,17 +84,6 @@ pub trait RouterScopeExt {
     /// when the handle is dropped. You need to keep the handle for as long as you need the
     /// callback.
     fn add_history_listener(&self, cb: Callback<AnyHistory>) -> Option<HistoryHandle>;
-
-    /// Adds a listener that gets notified when route changes.
-    ///
-    /// # Note
-    ///
-    /// [`RouteHandle`] works like a normal [`ContextHandle`] and it unregisters the callback
-    /// when the handle is dropped. You need to keep the handle for as long as you need the
-    /// callback.
-    fn add_route_listener<R>(&self, cb: Callback<Option<R>>) -> Option<RouteHandle<R>>
-    where
-        R: Routable + 'static;
 }
 
 impl<COMP: Component> RouterScopeExt for yew::html::Scope<COMP> {
@@ -119,20 +100,11 @@ impl<COMP: Component> RouterScopeExt for yew::html::Scope<COMP> {
     where
         R: Routable + 'static,
     {
-        self.context::<Option<R>>(Callback::from(|_| {}))
-            .and_then(|(m, _)| m)
+        self.location()?.route()
     }
 
     fn add_history_listener(&self, cb: Callback<AnyHistory>) -> Option<HistoryHandle> {
         self.context::<RouterState>(Callback::from(move |m: RouterState| cb.emit(m.history())))
             .map(|(_, m)| HistoryHandle { _inner: m })
     }
-
-    fn add_route_listener<R>(&self, cb: Callback<Option<R>>) -> Option<RouteHandle<R>>
-    where
-        R: Routable + 'static,
-    {
-        self.context::<Option<R>>(Callback::from(move |m: Option<R>| cb.emit(m)))
-            .map(|(_, m)| RouteHandle { _inner: m })
-    }
 }

packages/yew-router/src/switch.rs

@@ -102,11 +102,7 @@ where
             }
         };
 
-        html! {
-            <ContextProvider<Option<R>> context={route}>
-                {children}
-            </ContextProvider<Option<R>>>
-        }
+        html! {<>{children}</>}
     }
 }
 

packages/yew-router/src/utils.rs

@@ -43,8 +43,6 @@ pub fn fetch_base_url() -> Option<String> {
 
 #[cfg(test)]
 mod tests {
-    // use serde::Serialize;
-    // use std::collections::HashMap;
     use wasm_bindgen_test::wasm_bindgen_test as test;
     use yew::utils::*;
     use yew_router::prelude::*;
@@ -80,34 +78,4 @@ mod tests {
             .set_inner_html(r#"<base href="/base">"#);
         assert_eq!(fetch_base_url(), Some("/base".to_string()));
     }
-
-    // #[derive(Serialize, Clone)]
-    // struct QueryParams {
-    //     foo: String,
-    //     bar: u32,
-    // }
-
-    // #[test]
-    // fn test_get_query_params() {
-    //     assert_eq!(
-    //         parse_query::<HashMap<String, String>>().unwrap(),
-    //         HashMap::new()
-    //     );
-
-    //     let query = QueryParams {
-    //         foo: "test".to_string(),
-    //         bar: 69,
-    //     };
-
-    //     yew_router::push_route_with_query(Routes::Home, query).unwrap();
-
-    //     let params: HashMap<String, String> = parse_query().unwrap();
-
-    //     assert_eq!(params, {
-    //         let mut map = HashMap::new();
-    //         map.insert("foo".to_string(), "test".to_string());
-    //         map.insert("bar".to_string(), "69".to_string());
-    //         map
-    //     });
-    // }
 }