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

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.39",
+  version: "0.0.0-experimental.40",
   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.39",
+  "version": "0.0.0-experimental.40",
   "description": "Django-inspired RSC router with composable URL patterns",
   "keywords": [
     "react",

package/src/browser/navigation-bridge.ts

@@ -480,16 +480,14 @@ 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

@@ -264,51 +264,35 @@ export function restoreScrollPosition(options?: {
     return false;
   }
 
-  // Check if page is tall enough to scroll to saved position
-  const maxScrollY = document.documentElement.scrollHeight - window.innerHeight;
-  const canScrollToPosition = savedY <= maxScrollY;
-
-  if (canScrollToPosition) {
-    window.scrollTo(0, savedY);
-    debugLog("[Scroll] Restored position:", savedY, "for key:", key);
-    return true;
-  }
-
-  // Scroll as far as we can for now
-  window.scrollTo(0, maxScrollY);
-  debugLog("[Scroll] Partial restore to:", maxScrollY, "target:", savedY);
-
-  // Poll until we can scroll to the target position.
-  // This covers both streaming (content arriving incrementally) and
-  // React's batched startTransition rendering (DOM updates are async
-  // even for cached navigations with no streaming).
-  if (options?.retryIfStreaming) {
+  // If streaming, poll until streaming ends then scroll to saved position
+  if (options?.retryIfStreaming && options?.isStreaming?.()) {
     const startTime = Date.now();
 
     pendingPollInterval = setInterval(() => {
-      // Stop if we've exceeded the timeout
       if (Date.now() - startTime > SCROLL_POLL_TIMEOUT_MS) {
         debugLog("[Scroll] Polling timeout, giving up");
         cancelScrollRestorationPolling();
         return;
       }
 
-      // Check if we can now scroll to the target position
-      const currentMaxScrollY =
-        document.documentElement.scrollHeight - window.innerHeight;
-      if (savedY <= currentMaxScrollY) {
+      if (!options.isStreaming?.()) {
         window.scrollTo(0, savedY);
-        debugLog("[Scroll] Poll restored position:", savedY);
+        debugLog("[Scroll] Restored after streaming:", savedY);
         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;
+  // Not streaming — scroll after React commits and browser paints.
+  // startTransition defers the DOM commit, so scrolling synchronously
+  // would be overwritten when React replaces the content.
+  requestAnimationFrame(() => {
+    window.scrollTo(0, savedY);
+    debugLog("[Scroll] Restored position:", savedY, "for key:", key);
+  });
+  return true;
 }
 
 /**