From 2ef27cb0bb485b7ad33e0e3d5f144718504ad757 Mon Sep 17 00:00:00 2001
From: Luxalpa <git@luxalpa.io>
Date: Sun, 2 Jun 2024 20:06:41 +0200
Subject: [PATCH] fix: URL encoding issue (closes #2602) (#2601)

---
 router/src/history/params.rs   | 2 --
 router/src/history/url.rs      | 4 ++--
 router/src/matching/matcher.rs | 7 +++++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/router/src/history/params.rs b/router/src/history/params.rs
index ce2802649a..96b8536e45 100644
--- a/router/src/history/params.rs
+++ b/router/src/history/params.rs
@@ -30,8 +30,6 @@ impl ParamsMap {
     /// Inserts a value into the map.
     #[inline(always)]
     pub fn insert(&mut self, key: String, value: String) -> Option<String> {
-        use crate::history::url::unescape;
-        let value = unescape(&value);
         self.0.insert(key, value)
     }
 
diff --git a/router/src/history/url.rs b/router/src/history/url.rs
index 32cf0a12b3..05f4516935 100644
--- a/router/src/history/url.rs
+++ b/router/src/history/url.rs
@@ -25,7 +25,7 @@ pub fn unescape(s: &str) -> String {
 
 #[cfg(not(feature = "ssr"))]
 pub fn unescape(s: &str) -> String {
-    js_sys::decode_uri(s).unwrap().into()
+    js_sys::decode_uri_component(s).unwrap().into()
 }
 
 #[cfg(feature = "ssr")]
@@ -36,7 +36,7 @@ pub fn escape(s: &str) -> String {
 
 #[cfg(not(feature = "ssr"))]
 pub fn escape(s: &str) -> String {
-    js_sys::encode_uri(s).as_string().unwrap()
+    js_sys::encode_uri_component(s).as_string().unwrap()
 }
 
 #[cfg(not(feature = "ssr"))]
diff --git a/router/src/matching/matcher.rs b/router/src/matching/matcher.rs
index cda2175834..dd0d8a4bd4 100644
--- a/router/src/matching/matcher.rs
+++ b/router/src/matching/matcher.rs
@@ -1,7 +1,7 @@
 // Implementation based on Solid Router
 // see <https://github.com/solidjs/solid-router/blob/main/src/utils.ts>
 
-use crate::ParamsMap;
+use crate::{unescape, ParamsMap};
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 #[doc(hidden)]
@@ -68,7 +68,10 @@ impl Matcher {
                 self.segments.iter().zip(loc_segments.iter())
             {
                 if let Some(param_name) = segment.strip_prefix(':') {
-                    params.insert(param_name.into(), (*loc_segment).into());
+                    params.insert(
+                        param_name.into(),
+                        unescape(*loc_segment).into(),
+                    );
                 } else if segment != loc_segment {
                     // if any segment doesn't match and isn't a param, there's no path match
                     return None;