Clean up

Author: onurtemizkan

packages/react/src/reactrouterv6-compat-utils.tsx

@@ -149,35 +149,23 @@ function processResolvedRoutes(
         );
       } else if (spanOp === 'navigation') {
         // For navigation spans, update the name with the newly loaded routes
-        updateNavigationSpanWithLazyRoutesLocal(activeRootSpan, location, Array.from(allRoutes));
+        updateNavigationSpanWithLazyRoutes(
+          activeRootSpan,
+          location,
+          Array.from(allRoutes),
+          false,
+          _matchRoutes,
+          rebuildRoutePathFromAllRoutes,
+          locationIsInsideDescendantRoute,
+          getNormalizedName,
+          prefixWithSlash,
+        );
       }
     }
   }
 }
 
-/**
- * Local wrapper for updateNavigationSpanWithLazyRoutes that provides dependencies.
- */
-function updateNavigationSpanWithLazyRoutesLocal(
-  activeRootSpan: Span,
-  location: Location,
-  allRoutes: RouteObject[],
-  forceUpdate = false,
-): void {
-  updateNavigationSpanWithLazyRoutes(
-    activeRootSpan,
-    location,
-    allRoutes,
-    forceUpdate,
-    _matchRoutes,
-    rebuildRoutePathFromAllRoutes,
-    locationIsInsideDescendantRoute,
-    getNormalizedName,
-    prefixWithSlash,
-  );
-}
-
-function wrapPatchRoutesOnNavigationLocal(
+function wrapPatchRoutesOnNavigation(
   opts: Record<string, unknown> | undefined,
   isMemoryRouter = false,
 ): Record<string, unknown> {
@@ -202,7 +190,7 @@ function wrapPatchRoutesOnNavigationLocal(
             addRoutesToAllRoutes(children);
             const activeRootSpan = getActiveRootSpan();
             if (activeRootSpan && (spanToJSON(activeRootSpan) as { op?: string }).op === 'navigation') {
-              updateNavigationSpanWithLazyRoutesLocal(
+              updateNavigationSpanWithLazyRoutes(
                 activeRootSpan,
                 {
                   pathname: targetPath,
@@ -213,6 +201,11 @@ function wrapPatchRoutesOnNavigationLocal(
                 },
                 Array.from(allRoutes),
                 true,
+                _matchRoutes,
+                rebuildRoutePathFromAllRoutes,
+                locationIsInsideDescendantRoute,
+                getNormalizedName,
+                prefixWithSlash,
               );
             }
             return originalPatch(routeId, children);
@@ -229,7 +222,7 @@ function wrapPatchRoutesOnNavigationLocal(
         // without accessing window.location, so we'll use targetPath for both cases
         const pathname = targetPath || (isMemoryRouter ? getGlobalPathname() : undefined);
         if (pathname) {
-          updateNavigationSpanWithLazyRoutesLocal(
+          updateNavigationSpanWithLazyRoutes(
             activeRootSpan,
             {
               pathname,
@@ -239,6 +232,12 @@ function wrapPatchRoutesOnNavigationLocal(
               key: 'default',
             },
             Array.from(allRoutes),
+            false,
+            _matchRoutes,
+            rebuildRoutePathFromAllRoutes,
+            locationIsInsideDescendantRoute,
+            getNormalizedName,
+            prefixWithSlash,
           );
         }
       }
@@ -278,7 +277,7 @@ export function createV6CompatibleWrapCreateBrowserRouter<
     }
 
     // Wrap patchRoutesOnNavigation to detect when lazy routes are loaded
-    const wrappedOpts = wrapPatchRoutesOnNavigationLocal(opts);
+    const wrappedOpts = wrapPatchRoutesOnNavigation(opts);
 
     const router = createRouterFunction(routes, wrappedOpts);
     const basename = opts?.basename;
@@ -367,7 +366,7 @@ export function createV6CompatibleWrapCreateMemoryRouter<
     }
 
     // Wrap patchRoutesOnNavigation to detect when lazy routes are loaded
-    const wrappedOpts = wrapPatchRoutesOnNavigationLocal(opts, true);
+    const wrappedOpts = wrapPatchRoutesOnNavigation(opts, true);
 
     const router = createRouterFunction(routes, wrappedOpts);
     const basename = opts?.basename;
@@ -556,11 +555,11 @@ export function handleNavigation(opts: {
   }
 
   if ((navigationType === 'PUSH' || navigationType === 'POP') && branches) {
-    const [name, source, isLikelyLazyRoute] = resolveRouteName(
+    const [name, source] = resolveRouteNameAndSource(
       location,
       routes,
       allRoutes || routes,
-      branches,
+      branches as RouteMatch[],
       basename,
       locationIsInsideDescendantRoute,
       rebuildRoutePathFromAllRoutes,
@@ -574,9 +573,9 @@ export function handleNavigation(opts: {
 
     // Cross usage can result in multiple navigation spans being created without this check
     if (isAlreadyInNavigationSpan && activeSpan && spanJson) {
-      handleExistingNavigationSpan(activeSpan, spanJson, name, source, isLikelyLazyRoute);
+      handleExistingNavigationSpan(activeSpan, spanJson, name, source, false);
     } else {
-      createNewNavigationSpan(client, name, source, version, isLikelyLazyRoute);
+      createNewNavigationSpan(client, name, source, version, false);
     }
   }
 }
@@ -784,7 +783,7 @@ function getNormalizedName(
 
   const fallbackTransactionName = _stripBasename
     ? stripBasenameFromPathname(location.pathname, basename)
-    : location.pathname || '/';
+    : location.pathname;
 
   return [fallbackTransactionName, 'url'];
 }
@@ -931,51 +930,6 @@ export function resolveRouteNameAndSource(
   return [name || location.pathname, source];
 }
 
-/**
- * Resolves the route name and source for navigation tracking
- */
-export function resolveRouteName(
-  location: Location,
-  routes: RouteObject[],
-  allRoutes: RouteObject[],
-  branches: unknown[],
-  basename: string | undefined,
-  locationIsInsideDescendantRoute: (location: Location, routes: RouteObject[]) => boolean,
-  rebuildRoutePathFromAllRoutes: (allRoutes: RouteObject[], location: Location) => string,
-  getNormalizedName: (
-    routes: RouteObject[],
-    location: Location,
-    branches: RouteMatch[],
-    basename?: string,
-  ) => [string, TransactionSource],
-  prefixWithSlash: (path: string) => string,
-): [string, TransactionSource, boolean] {
-  const [name, source] = resolveRouteNameAndSource(
-    location,
-    routes,
-    allRoutes || routes,
-    branches as RouteMatch[],
-    basename,
-    locationIsInsideDescendantRoute,
-    rebuildRoutePathFromAllRoutes,
-    getNormalizedName,
-    prefixWithSlash,
-  );
-
-  // If we couldn't find a good route name, it might be because we're navigating to a lazy route
-  // that hasn't been loaded yet. In this case, use the pathname as a fallback
-  const isLikelyLazyRoute = source === 'url' && (branches as unknown[]).length === 0;
-  let finalName = name;
-  let finalSource = source;
-
-  if (isLikelyLazyRoute) {
-    finalName = location.pathname;
-    finalSource = 'url';
-  }
-
-  return [finalName, finalSource, isLikelyLazyRoute];
-}
-
 /**
  * Handles updating an existing navigation span
  */