fix: do not unescape / and other route characters when following a li…

…nk (leptos-rs#2651)
FuegoFro · Jun 28, 2024 · ff0c825 · ff0c825
1 parent 551f9b0
commit ff0c825
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/router/src/components/router.rs b/router/src/components/router.rs
@@ -435,7 +435,7 @@ impl RouterContextInner {
             }
 
             let url = Url::try_from(href.as_str()).unwrap();
-            let path_name = unescape(&url.pathname);
+            let path_name = crate::history::unescape_minimal(&url.pathname);
 
             // let browser handle this event if it leaves our domain
             // or our base path

diff --git a/router/src/history/url.rs b/router/src/history/url.rs
@@ -28,6 +28,11 @@ pub fn unescape(s: &str) -> String {
     js_sys::decode_uri_component(s).unwrap().into()
 }
 
+#[cfg(not(feature = "ssr"))]
+pub fn unescape_minimal(s: &str) -> String {
+    js_sys::decode_uri(s).unwrap().into()
+}
+
 #[cfg(feature = "ssr")]
 pub fn escape(s: &str) -> String {
     percent_encoding::utf8_percent_encode(s, percent_encoding::NON_ALPHANUMERIC)