simplify router logic

CrimsonChi · Feb 24, 2024 · bc7fa3d · bc7fa3d
1 parent 2ef5f42
commit bc7fa3d
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/packages/lib/src/router.ts b/packages/lib/src/router.ts
@@ -38,22 +38,22 @@ function Router(props: RouterProps) {
 
   let fallbackRoute: RouteComponent | undefined
   for (const child of props.children ?? []) {
-    if (isRoute(child)) {
-      if (isFallbackRoute(child)) {
-        fallbackRoute = child
-        continue
-      }
-      const routeSegments = ((props.basePath || "") + child.props.path).split(
-        "/"
-      )
-      const params = matchPath(routeSegments, pathSegments)
-      if (params) {
-        return fragment({
-          children: [createElement(child.props.element, { params, query })],
-        })
-      }
+    if (!isRoute(child)) continue
+
+    if (isFallbackRoute(child)) {
+      fallbackRoute = child
+      continue
+    }
+
+    const routeSegments = ((props.basePath || "") + child.props.path).split("/")
+    const params = matchPath(routeSegments, pathSegments)
+    if (params) {
+      return fragment({
+        children: [createElement(child.props.element, { params, query })],
+      })
     }
   }
+
   if (fallbackRoute) {
     return fragment({
       children: [