@remix-run/ui 0.8.0 → 0.9.0

package/dist/runtime/navigation.js

@@ -1,19 +1,18 @@
 import { getTopFrame, getNamedFrame } from './run.js';
 import { reloadFrameForNavigation } from './frame.js';
 import { createFormNavigationResolver } from './form-navigation.js';
+import { isDocumentReload } from './document-reload.js';
 const formSubmissionNavigationInfoType = 'frame-form-submission';
 const frameRedirectNavigationInfoType = 'frame-redirect';
-function resyncWebKitScrollAfterNavigation(event, resetScroll) {
+function resyncWebKitScrollAfterNavigation(event, resetScroll, transition) {
     let userAgent = navigator.userAgent;
-    if (!userAgent.includes('AppleWebKit'))
-        return;
-    if (userAgent.includes('Chrome') || userAgent.includes('Chromium'))
+    if (!userAgent.includes('AppleWebKit') || isChromiumUserAgent(userAgent))
         return;
     if (!resetScroll || (event.navigationType !== 'push' && event.navigationType !== 'replace'))
         return;
     if (new URL(event.destination.url).hash)
         return;
-    window.navigation.addEventListener('navigatesuccess', () => {
+    void transition.finished.then(() => {
         // WebKit can reset its internal scroll position without synchronizing the visual viewport.
         // https://bugs.webkit.org/show_bug.cgi?id=309542
         if (event.signal.aborted || window.scrollX !== 0 || window.scrollY !== 0)
@@ -24,7 +23,7 @@ function resyncWebKitScrollAfterNavigation(event, resetScroll) {
                 return;
             window.scrollTo({ behavior: 'instant', left: 0, top: 0 });
         });
-    }, { once: true, signal: event.signal });
+    }, () => { });
 }
 /**
  * Performs a Navigation API transition understood by Remix frame runtime state.
@@ -39,7 +38,7 @@ export async function navigate(href, options) {
         resetScroll: options?.resetScroll !== false,
         $rmx: true,
     };
-    let navigation = window.navigation;
+    let navigation = getInterceptableNavigation();
     if (!navigation) {
         if (options?.history === 'replace') {
             window.location.replace(href);
@@ -67,7 +66,7 @@ export function startNavigationListener(signal) {
 }
 // Internal version used by unit tests so we can inject stub frames
 export function startNavigationListenerImpl(signal, options) {
-    let navigation = window.navigation;
+    let navigation = getInterceptableNavigation();
     if (!navigation)
         return;
     let resolveFormNavigation = createFormNavigationResolver(signal);
@@ -75,6 +74,8 @@ export function startNavigationListenerImpl(signal, options) {
         state: { target: undefined, src: window.location.href, resetScroll: true, $rmx: true },
     });
     navigation.addEventListener('navigate', (event) => {
+        if (isDocumentReload(event.info))
+            return;
         // Safari seems to incorrectly set canIntercept to true for sub-domain navigations, so
         // we do a host check ourselves/. The spec is clear that a different host should prevent
         // interception so this is likely a bug in Safari:
@@ -82,10 +83,9 @@ export function startNavigationListenerImpl(signal, options) {
         if (!event.canIntercept || isCrossOriginDestination(event))
             return;
         if (isFrameRedirectNavigationInfo(event.info)) {
-            resyncWebKitScrollAfterNavigation(event, event.info.resetScroll);
-            event.intercept({
+            interceptNavigation(navigation, event, event.info.resetScroll, {
                 async handler() { },
-                scroll: event.info.resetScroll === false ? 'manual' : undefined,
+                scroll: 'manual',
             });
             return;
         }
@@ -99,16 +99,12 @@ export function startNavigationListenerImpl(signal, options) {
         if (!runtimeNavigation)
             return;
         let { state } = runtimeNavigation;
-        resyncWebKitScrollAfterNavigation(event, state.resetScroll);
         let topFrame = options.getTopFrame();
         let namedFrame = state.target ? options.getNamedFrame(state.target) : undefined;
         let frame = namedFrame ?? topFrame;
         let handler = async () => {
             if (event.signal.aborted)
                 return;
-            if (event.navigationType === 'traverse' && state.resetScroll) {
-                preserveStartingDocumentScrollState(navigation, event);
-            }
             let submission = await runtimeNavigation.getSubmission?.();
             if (event.signal.aborted)
                 return;
@@ -118,10 +114,16 @@ export function startNavigationListenerImpl(signal, options) {
             topFrame.src = event.destination.url;
             if (frame !== topFrame)
                 frame.src = state.src;
-            let { redirectedTo } = await options.reloadFrame(frame, {
+            let reload = options.reloadFrame(frame, {
                 ...submission,
                 signal: event.signal,
             });
+            await reload.committed;
+            if (event.signal.aborted || reload.signal.aborted)
+                return;
+            if (state.resetScroll)
+                event.scroll();
+            let { redirectedTo } = await reload.finished;
             if (redirectedTo && frame === topFrame) {
                 frame.src = redirectedTo;
                 // Start the successor navigation without awaiting it: this handler must settle before
@@ -146,7 +148,7 @@ export function startNavigationListenerImpl(signal, options) {
                 let supportsPrecommit = typeof Reflect.get(window, 'NavigationPrecommitController') === 'function';
                 // Modern browsers allow you to update the in-flight navigation entry before it's committed
                 if (supportsPrecommit) {
-                    event.intercept({
+                    interceptNavigation(navigation, event, state.resetScroll, {
                         ...interceptOptions,
                         precommitHandler(controller) {
                             controller.redirect(event.destination.url, { history: 'replace' });
@@ -169,7 +171,7 @@ export function startNavigationListenerImpl(signal, options) {
                     return;
                 }
             }
-            event.intercept(interceptOptions);
+            interceptNavigation(navigation, event, state.resetScroll, interceptOptions);
         }
         else {
             // <a>/<form method="get"> navigations
@@ -178,11 +180,20 @@ export function startNavigationListenerImpl(signal, options) {
                 navigation.navigate(event.destination.url, { history: 'replace', state });
             }
             else {
-                event.intercept(interceptOptions);
+                interceptNavigation(navigation, event, state.resetScroll, interceptOptions);
             }
         }
     }, { signal });
 }
+function getInterceptableNavigation() {
+    let navigation = window.navigation;
+    if (!navigation ||
+        typeof NavigateEvent === 'undefined' ||
+        !('sourceElement' in NavigateEvent.prototype)) {
+        return;
+    }
+    return navigation;
+}
 function isRuntimeNavigation(info) {
     return typeof info === 'object' && info != null && '$rmx' in info;
 }
@@ -208,41 +219,125 @@ function isCrossOriginDestination(event) {
     let destination = new URL(event.destination.url);
     return destination.origin !== window.location.origin;
 }
-function preserveStartingDocumentScrollState(navigation, event) {
-    // Full-document reconciliation can temporarily shrink the page or trigger scroll anchoring
-    // before the Navigation API performs its deferred restoration. Preserve the starting scroll
-    // range and position until the navigation finishes so native restoration remains authoritative.
-    // Root scroll height includes page-level effects such as body padding.
-    // We think this is a bug in Chromium where they are incorrectly classifying a
-    // DOM-modification-driven scroll change as a user scroll action, causing it to skip restoration
-    // after the transition. The intended user-scroll behavior is tested here:
-    // https://github.com/web-platform-tests/wpt/blob/master/navigation-api/scroll-behavior/after-transition-skips-restore-when-scrolled.html
-    let { scrollHeight, clientHeight } = document.documentElement;
-    let stylesheet = new CSSStyleSheet();
-    stylesheet.replaceSync(`
-    html {
-      min-height: ${scrollHeight + clientHeight}px !important;
-      overflow-anchor: none !important;
+function interceptNavigation(navigation, event, resetScroll, options) {
+    let scrollStyleWorkarounds = installNavigationScrollStyleWorkarounds(event, resetScroll);
+    let transitionBound = false;
+    function bindTransition() {
+        if (transitionBound)
+            return;
+        if (event.signal.aborted)
+            return scrollStyleWorkarounds?.remove();
+        // The Navigation API creates the transition before running interception handlers.
+        let transition = navigation.transition;
+        if (!transition)
+            return scrollStyleWorkarounds?.remove();
+        transitionBound = true;
+        resyncWebKitScrollAfterNavigation(event, resetScroll, transition);
+        if (scrollStyleWorkarounds) {
+            scheduleNavigationScrollCleanup(transition, scrollStyleWorkarounds.remove, scrollStyleWorkarounds.cleanup);
+        }
+    }
+    let interceptOptions = {
+        ...options,
+        handler() {
+            bindTransition();
+            return options.handler?.();
+        },
+    };
+    let precommitHandler = options.precommitHandler;
+    if (precommitHandler) {
+        interceptOptions.precommitHandler = function precommit(controller) {
+            bindTransition();
+            return precommitHandler(controller);
+        };
+    }
+    try {
+        event.intercept(interceptOptions);
     }
+    catch (error) {
+        scrollStyleWorkarounds?.remove();
+        throw error;
+    }
+}
+function getNavigationScrollStyles(event, resetScroll) {
+    if (!resetScroll)
+        return;
+    if (event.navigationType === 'traverse') {
+        // Full-document reconciliation can temporarily shrink the page or trigger scroll anchoring
+        // before the Navigation API performs its deferred restoration. Preserve the starting scroll
+        // range and position until the navigation finishes so native restoration remains authoritative.
+        // Root scroll height includes page-level effects such as body padding.
+        // We think this is a bug in Chromium where they are incorrectly classifying a
+        // DOM-modification-driven scroll change as a user scroll action, causing it to skip restoration
+        // after the transition. The intended user-scroll behavior is tested here:
+        // https://github.com/web-platform-tests/wpt/blob/master/navigation-api/scroll-behavior/after-transition-skips-restore-when-scrolled.html
+        let { scrollHeight, clientHeight } = document.documentElement;
+        return {
+            cssText: `
+        html {
+          min-height: ${scrollHeight + clientHeight}px !important;
+          overflow-anchor: none !important;
+        }
 
-    body {
-      overflow-anchor: none !important;
+        body {
+          overflow-anchor: none !important;
+        }
+      `,
+            cleanup: 'finished',
+        };
     }
-  `);
+    if (event.navigationType !== 'push' && event.navigationType !== 'replace')
+        return;
+    if (new URL(event.destination.url).hash)
+        return;
+    if (!isChromiumUserAgent(navigator.userAgent))
+        return;
+    // Chromium can treat reconciliation-driven scroll anchoring as user scrolling and preserve an
+    // offset after NavigateEvent.scroll() resets the destination. Suppress anchoring before
+    // interception and keep it disabled through the first post-navigation paint.
+    return {
+        cssText: `
+      html,
+      body {
+        overflow-anchor: none !important;
+      }
+    `,
+        cleanup: 'after-paint',
+    };
+}
+function isChromiumUserAgent(userAgent) {
+    return userAgent.includes('Chrome') || userAgent.includes('Chromium');
+}
+function installNavigationScrollStyleWorkarounds(event, resetScroll) {
+    let scrollStyles = getNavigationScrollStyles(event, resetScroll);
+    if (!scrollStyles)
+        return;
+    let stylesheet = new CSSStyleSheet();
+    stylesheet.replaceSync(scrollStyles.cssText);
     document.adoptedStyleSheets = [...document.adoptedStyleSheets, stylesheet];
-    let cleanedUp = false;
-    let cleanup = () => {
-        if (cleanedUp)
+    let removed = false;
+    function remove() {
+        event.signal.removeEventListener('abort', remove);
+        if (removed)
             return;
-        cleanedUp = true;
-        event.signal.removeEventListener('abort', cleanup);
-        navigation.removeEventListener('navigatesuccess', cleanup);
-        navigation.removeEventListener('navigateerror', cleanup);
+        removed = true;
         document.adoptedStyleSheets = document.adoptedStyleSheets.filter((current) => current !== stylesheet);
-    };
-    event.signal.addEventListener('abort', cleanup, { once: true });
-    navigation.addEventListener('navigatesuccess', cleanup, { once: true });
-    navigation.addEventListener('navigateerror', cleanup, { once: true });
+    }
+    if (event.signal.aborted)
+        remove();
+    else
+        event.signal.addEventListener('abort', remove, { once: true });
+    return { remove, cleanup: scrollStyles.cleanup };
+}
+function scheduleNavigationScrollCleanup(transition, removeScrollStyles, cleanup) {
+    function removeAfterSuccess() {
+        if (cleanup === 'finished')
+            return removeScrollStyles();
+        // The first callback runs before the first post-navigation paint. The second removes the
+        // stylesheet before the following frame.
+        requestAnimationFrame(() => requestAnimationFrame(removeScrollStyles));
+    }
+    void transition.finished.then(removeAfterSuccess, removeScrollStyles);
 }
 function getRuntimeNavigation(navigation, event, resolveFormNavigation) {
     if (event.navigationType === 'traverse') {

package/dist/runtime/navigation.js.map

@@ -1 +1 @@
-{"version":3,"file":"navigation.js","sourceRoot":"","sources":["../../src/runtime/navigation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"navigation.js","sourceRoot":"","sources":["../../src/runtime/navigation.ts"],"names":[],"mappings":"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"}

package/dist/runtime/reconcile.js

@@ -799,6 +799,7 @@ function insertFrame(node, domParent, vParent, context, svg, anchor, cursor) {
                     moduleLoads: runtime.moduleLoads,
                     frameInstances: runtime.frameInstances,
                     namedFrames: runtime.namedFrames,
+                    processClientEntryPreloads: runtime.processClientEntryPreloads,
                 });
                 runtime.frameInstances.set(start, instance);
             }
@@ -844,6 +845,7 @@ function insertFrame(node, domParent, vParent, context, svg, anchor, cursor) {
         moduleLoads: runtime.moduleLoads,
         frameInstances: runtime.frameInstances,
         namedFrames: runtime.namedFrames,
+        processClientEntryPreloads: runtime.processClientEntryPreloads,
     });
     runtime.frameInstances.set(start, instance);
     let committed = Object.assign(node, {
@@ -877,6 +879,7 @@ function resolveClientFrame(node, runtime, serverFrameReload) {
     }
     let resolveController = reload?.controller ?? new AbortController();
     state.resolveController = resolveController;
+    let frameCommitted = Promise.withResolvers();
     let resolve = Promise.resolve()
         .then(() => runtime.resolveFrame(frameSrc, {
         signal: resolveController.signal,
@@ -894,6 +897,8 @@ function resolveClientFrame(node, runtime, serverFrameReload) {
         await instance.render(nextContent, {
             signal: resolveController.signal,
             reconciliationTracker: serverFrameReload?.reconciliationTracker,
+            blockingFrameTracker: serverFrameReload?.blockingFrameTracker,
+            onCommit: frameCommitted.resolve,
         });
         if (state.resolveToken !== token || resolveController.signal.aborted)
             return;
@@ -905,6 +910,7 @@ function resolveClientFrame(node, runtime, serverFrameReload) {
         }
     })
         .finally(() => {
+        frameCommitted.resolve();
         reload?.complete();
         if (state.resolveController === resolveController) {
             state.resolveController = undefined;
@@ -913,6 +919,9 @@ function resolveClientFrame(node, runtime, serverFrameReload) {
     if (serverFrameReload?.reconciliationTracker && !node.props.fallback) {
         serverFrameReload.reconciliationTracker.waitFor(resolve);
     }
+    if (serverFrameReload?.blockingFrameTracker && !node.props.fallback) {
+        serverFrameReload.blockingFrameTracker.waitFor(frameCommitted.promise);
+    }
 }
 function disposeFrameResources(node) {
     let state = node._state;