Fix ScopedRouter not matching current paths with query

tutao · Sep 2, 2024 · 8746b77 · 8746b77
1 parent cb35f9b
commit 8746b77
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/common/gui/ScopedRouter.ts b/src/common/gui/ScopedRouter.ts
@@ -49,5 +49,6 @@ export class ScopedRouter<Scope extends string> implements Router {
 }
 
 export function routeMatchesPrefix(prefixWithoutLeadingSlash: string, route: string): boolean {
-	return route.split("/")[1] === prefixWithoutLeadingSlash
+	const { path } = m.parsePathname(route)
+	return path.split("/")[1] === prefixWithoutLeadingSlash
 }
diff --git a/test/tests/gui/ScopedRouterTest.ts b/test/tests/gui/ScopedRouterTest.ts
@@ -26,5 +26,9 @@ o.spec("ScopedRouter", function () {
 		o("does not match empty", function () {
 			o(routeMatchesPrefix("contact", "/")).equals(false)
 		})
+
+		o("route with query matches prefix", function () {
+			o(routeMatchesPrefix("contact", "/contact?test=1")).equals(true)
+		})
 	})
 })