Experiment part 4.

yewstack · Sep 12, 2024 · 09463b7 · 09463b7
1 parent 65c72b7
commit 09463b7
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/packages/yew-router/src/router.rs b/packages/yew-router/src/router.rs
@@ -79,6 +79,10 @@ fn base_router(props: &RouterProps) -> Html {
         ctr: 0,
     });
 
+    if loc_ctx.ctr > 10 {
+        panic!("loc ctx");
+    }
+
     let basename = basename.map(|m| strip_slash_suffix(&m).to_string());
     let old_basename = use_state_eq(|| Option::<String>::None);
 
@@ -97,15 +101,9 @@ fn base_router(props: &RouterProps) -> Html {
         let stripped = old_navigator.strip_basename(Cow::from(location.path()));
         let prefixed = navigator.prefix_basename(&stripped);
         if prefixed != location.path() {
-            history.replace(prefixed);
-            let _ = Raw(location.query_str());
-
-            /*
-            // Won't fail because `Raw::to_query` is infallible.
             history
                 .replace_with_query(prefixed, Raw(location.query_str()))
-                .expect("failed to replace with query");
-            */
+                .unwrap_or_else(|never| match never {})
         }
     }