use base url for href of links (#2177)

yewstack · Nov 22, 2021 · ae7a8be · ae7a8be
1 parent 3e656dd
commit ae7a8be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/packages/yew-router/src/components/link.rs b/packages/yew-router/src/components/link.rs
@@ -1,10 +1,12 @@
+use std::borrow::Cow;
 use std::marker::PhantomData;
 
 use serde::Serialize;
 use wasm_bindgen::UnwrapThrowExt;
 use yew::prelude::*;
+use yew::virtual_dom::AttrValue;
 
-use crate::history::History;
+use crate::history::{BrowserHistory, History};
 use crate::scope_ext::RouterScopeExt;
 use crate::Routable;
 
@@ -90,9 +92,13 @@ where
             e.prevent_default();
             Msg::OnClick
         });
+        let href: AttrValue = match BrowserHistory::route_to_url(to) {
+            Cow::Owned(href) => href.into(),
+            Cow::Borrowed(href) => href.into(),
+        };
         html! {
             <a class={classes}
-                href={to.to_path()}
+                {href}
                 {onclick}
                 {disabled}
             >

diff --git a/packages/yew-router/src/history.rs b/packages/yew-router/src/history.rs
@@ -367,7 +367,7 @@ impl BrowserHistory {
         Self::default()
     }
 
-    fn route_to_url(route: impl Routable) -> Cow<'static, str> {
+    pub(crate) fn route_to_url(route: impl Routable) -> Cow<'static, str> {
         let base = base_url();
         let url = route.to_path();