@rangojs/router 0.0.0-experimental.37 → 0.0.0-experimental.39

package/dist/vite/index.js

@@ -1745,7 +1745,7 @@ import { resolve } from "node:path";
 // package.json
 var package_default = {
   name: "@rangojs/router",
-  version: "0.0.0-experimental.37",
+  version: "0.0.0-experimental.39",
   description: "Django-inspired RSC router with composable URL patterns",
   keywords: [
     "react",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rangojs/router",
-  "version": "0.0.0-experimental.37",
+  "version": "0.0.0-experimental.39",
   "description": "Django-inspired RSC router with composable URL patterns",
   "keywords": [
     "react",

package/src/browser/navigation-bridge.ts

@@ -480,14 +480,16 @@ export function createNavigationBridge(
                 addTransitionType("navigation-back");
               }
               onUpdate(popstateUpdate);
+              // Restore inside the transition so React commits the new
+              // content before scroll restoration measures scrollHeight.
+              handleNavigationEnd({ restore: true, isStreaming });
             });
           } else {
             onUpdate(popstateUpdate);
+            // Restore scroll position for back/forward navigation
+            handleNavigationEnd({ restore: true, isStreaming });
           }
 
-          // Restore scroll position for back/forward navigation
-          handleNavigationEnd({ restore: true, isStreaming });
-
           // SWR: If stale, trigger background revalidation
           if (isStale) {
             debugLog("[Browser] Cache is stale, background revalidating...");

package/src/browser/scroll-restoration.ts

@@ -302,6 +302,10 @@ export function restoreScrollPosition(options?: {
         cancelScrollRestorationPolling();
       }
     }, SCROLL_POLL_INTERVAL_MS);
+
+    // Return true to prevent handleNavigationEnd from falling through
+    // to scrollToTop(). The polling will handle the final scroll.
+    return true;
   }
 
   return false;