fix: allow decoding already-decoded URI components (closes #3606) (#3628

) * fix: allow decoding already-decoded URI components (closes #3606) * clippy
leptos-rs · Feb 19, 2025 · 6ecc681 · 6ecc681
1 parent 7c34b4a
commit 6ecc681
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/router/src/location/mod.rs b/router/src/location/mod.rs
@@ -123,14 +123,20 @@ impl Url {
 
         #[cfg(not(feature = "ssr"))]
         {
-            js_sys::decode_uri_component(s).unwrap().into()
+            match js_sys::decode_uri_component(s) {
+                Ok(v) => v.into(),
+                Err(_) => s.into(),
+            }
         }
     }
 
     pub fn unescape_minimal(s: &str) -> String {
         #[cfg(not(feature = "ssr"))]
         {
-            js_sys::decode_uri(s).unwrap().into()
+            match js_sys::decode_uri(s) {
+                Ok(v) => v.into(),
+                Err(_) => s.into(),
+            }
         }
 
         #[cfg(feature = "ssr")]