@react-navigation/stack 8.0.0-alpha.30 → 8.0.0-alpha.32

package/lib/module/views/Header/HeaderContainer.js

@@ -24,7 +24,7 @@ export function HeaderContainer({
   } = useLinkBuilder();
   return /*#__PURE__*/_jsx(View, {
     style: [styles.container, style],
-    children: scenes.slice(-2).map((scene, i, self) => {
+    children: scenes.map((scene, i, self) => {
       if (mode === 'screen' && i !== self.length - 1 || !scene) {
         return null;
       }
@@ -62,6 +62,9 @@ export function HeaderContainer({
         headerShown: previousHeaderShown = true,
         headerMode: previousHeaderMode
       } = previousDescriptor?.options || {};
+      const {
+        headerTransparent: nextHeaderTransparent
+      } = nextDescriptor?.options || {};
 
       // If any of the next screens don't have a header or header is part of the screen
       // Then we need to move this header offscreen so that it doesn't cover it
@@ -78,7 +81,10 @@ export function HeaderContainer({
       const isHeaderStatic = (previousHeaderShown === false || previousHeaderMode === 'screen') &&
       // We still need to animate when coming back from next scene
       // A hacky way to check this is if the next scene exists
-      !nextDescriptor || nextHeaderlessScene;
+      !nextDescriptor ||
+      // If next header is tranparent, we want to treat this header as static
+      // Otherwise it may show through the next header
+      nextHeaderTransparent || nextHeaderlessScene;
       const props = {
         back: headerBack,
         progress: scene.progress,
@@ -87,6 +93,25 @@ export function HeaderContainer({
         navigation: scene.descriptor.navigation,
         styleInterpolator: mode === 'float' ? isHeaderStatic ? nextHeaderlessGestureDirection === 'vertical' || nextHeaderlessGestureDirection === 'vertical-inverted' ? forSlideUp : nextHeaderlessGestureDirection === 'horizontal-inverted' ? forSlideRight : forSlideLeft : headerStyleInterpolator : forNoAnimation
       };
+      const onRef = node => {
+        node?.measure((_x, _y, _width, height) => {
+          if (height && !contentHeight?.measured) {
+            onContentHeightChange({
+              route: scene.descriptor.route,
+              height
+            });
+          }
+        });
+      };
+      const onLayout = e => {
+        const {
+          height
+        } = e.nativeEvent.layout;
+        onContentHeightChange({
+          route: scene.descriptor.route,
+          height
+        });
+      };
       return /*#__PURE__*/_jsx(NavigationProvider, {
         navigation: scene.descriptor.navigation,
         route: scene.descriptor.route,
@@ -99,20 +124,13 @@ export function HeaderContainer({
           // This is needed for screen readers, and testing tools on Android
           // For float header, it's handled in CardStack
           {
-            minHeight: contentHeight
+            minHeight: contentHeight?.value
           } : null] : null, {
             pointerEvents: isFocused ? 'box-none' : 'none'
           }],
           children: /*#__PURE__*/_jsx(View, {
-            onLayout: onContentHeightChange ? e => {
-              const {
-                height
-              } = e.nativeEvent.layout;
-              onContentHeightChange({
-                route: scene.descriptor.route,
-                height
-              });
-            } : undefined,
+            ref: onRef,
+            onLayout: onLayout,
             style: {
               pointerEvents: 'box-none'
             },

package/lib/module/views/Header/HeaderContainer.js.map

@@ -1 +1 @@
-{"version":3,"names":["getHeaderTitle","HeaderBackContext","ActivityView","NavigationProvider","useLinkBuilder","React","StyleSheet","View","forNoAnimation","forSlideLeft","forSlideRight","forSlideUp","Header","jsx","_jsx","HeaderContainer","mode","scenes","getPreviousScene","getFocusedRoute","contentHeight","onContentHeightChange","style","focusedRoute","parentHeaderBack","use","buildHref","styles","container","children","slice","map","scene","i","self","length","header","headerMode","headerShown","headerTransparent","headerStyleInterpolator","descriptor","options","isFocused","key","route","previousScene","headerBack","title","name","href","params","previousDescriptor","nextDescriptor","previousHeaderShown","previousHeaderMode","nextHeaderlessScene","find","currentHeaderShown","currentHeaderMode","gestureDirection","nextHeaderlessGestureDirection","isHeaderStatic","props","back","progress","navigation","styleInterpolator","absolute","minHeight","pointerEvents","onLayout","e","height","nativeEvent","layout","undefined","visible","create","position","top","start","end"],"sourceRoot":"../../../../src","sources":["views/Header/HeaderContainer.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getHeaderTitle","HeaderBackContext","ActivityView","NavigationProvider","useLinkBuilder","React","StyleSheet","View","forNoAnimation","forSlideLeft","forSlideRight","forSlideUp","Header","jsx","_jsx","HeaderContainer","mode","scenes","getPreviousScene","getFocusedRoute","contentHeight","onContentHeightChange","style","focusedRoute","parentHeaderBack","use","buildHref","styles","container","children","map","scene","i","self","length","header","headerMode","headerShown","headerTransparent","headerStyleInterpolator","descriptor","options","isFocused","key","route","previousScene","headerBack","title","name","href","params","previousDescriptor","nextDescriptor","previousHeaderShown","previousHeaderMode","nextHeaderTransparent","nextHeaderlessScene","slice","find","currentHeaderShown","currentHeaderMode","gestureDirection","nextHeaderlessGestureDirection","isHeaderStatic","props","back","progress","navigation","styleInterpolator","onRef","node","measure","_x","_y","_width","height","measured","onLayout","e","nativeEvent","layout","absolute","minHeight","value","pointerEvents","ref","visible","undefined","create","position","top","start","end"],"sourceRoot":"../../../../src","sources":["views/Header/HeaderContainer.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/views/Stack/CardContainer.js

@@ -7,9 +7,7 @@ import { StyleSheet, View } from 'react-native';
 import { ModalPresentationContext } from "../../utils/ModalPresentationContext.js";
 import { useKeyboardManager } from "../../utils/useKeyboardManager.js";
 import { Card } from "./Card.js";
-import { CardA11yWrapper } from "./CardA11yWrapper.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const EPSILON = 0.1;
 function CardContainerInner({
   interpolationIndex,
   index,
@@ -21,11 +19,9 @@ function CardContainerInner({
   modal,
   getPreviousScene,
   getFocusedRoute,
-  hasAbsoluteFloatHeader,
   headerHeight,
   onHeaderHeightChange,
   isParentHeaderShown,
-  isNextScreenTransparent,
   layout,
   onCloseRoute,
   onOpenRoute,
@@ -43,7 +39,6 @@ function CardContainerInner({
   scene,
   children
 }) {
-  const wrapperRef = React.useRef(null);
   const {
     direction
   } = useLocale();
@@ -112,7 +107,6 @@ function CardContainerInner({
     closing,
     gesture
   }) => {
-    wrapperRef.current?.setInert(closing);
     const {
       route
     } = scene.descriptor;
@@ -134,18 +128,6 @@ function CardContainerInner({
   const {
     colors
   } = useTheme();
-  React.useEffect(() => {
-    const listener = scene.progress.next?.addListener?.(({
-      value
-    }) => {
-      wrapperRef.current?.setInert(value > EPSILON);
-    });
-    return () => {
-      if (listener) {
-        scene.progress.next?.removeListener?.(listener);
-      }
-    };
-  }, [scene.progress.next]);
   const {
     presentation,
     animation,
@@ -189,72 +171,62 @@ function CardContainerInner({
     return undefined;
   }, [canGoBack, backTitle, href]);
   const animated = animation !== 'none';
-  return /*#__PURE__*/_jsx(CardA11yWrapper, {
-    ref: wrapperRef,
-    focused: focused,
-    active: active,
+  return /*#__PURE__*/_jsx(Card, {
     animated: animated,
-    isNextScreenTransparent: isNextScreenTransparent,
-    children: /*#__PURE__*/_jsx(Card, {
-      animated: animated,
-      interpolationIndex: interpolationIndex,
-      gestureDirection: gestureDirection,
-      layout: layout,
-      insets: insets,
-      direction: direction,
-      gesture: gesture,
-      current: scene.progress.current,
-      next: scene.progress.next,
-      opening: opening,
-      closing: closing,
-      onOpen: handleOpen,
-      onClose: handleClose,
-      overlay: cardOverlay,
-      overlayEnabled: cardOverlayEnabled,
-      shadowEnabled: cardShadowEnabled,
-      onTransition: handleTransition,
-      onGestureBegin: handleGestureBegin,
-      onGestureCanceled: handleGestureCanceled,
-      onGestureEnd: handleGestureEnd,
-      gestureEnabled: index === 0 ? false : gestureEnabled,
-      gestureResponseDistance: gestureResponseDistance,
-      gestureVelocityImpact: gestureVelocityImpact,
-      transitionSpec: transitionSpec,
-      styleInterpolator: cardStyleInterpolator,
-      pageOverflowEnabled: headerMode !== 'float' && presentation !== 'modal',
-      preloaded: preloaded,
-      containerStyle: hasAbsoluteFloatHeader && headerMode !== 'screen' ? {
-        marginTop: headerHeight
-      } : null,
-      contentStyle: [{
-        backgroundColor: presentation === 'transparentModal' ? 'transparent' : colors.background
-      }, cardStyle],
-      children: /*#__PURE__*/_jsx(View, {
-        style: styles.container,
-        children: /*#__PURE__*/_jsxs(ModalPresentationContext.Provider, {
-          value: modal,
-          children: [headerMode !== 'float' ? renderHeader({
-            mode: 'screen',
-            scenes: [previousScene, scene],
-            getPreviousScene,
-            getFocusedRoute,
-            contentHeight: headerHeight,
-            onContentHeightChange: onHeaderHeightChange,
-            style: styles.header
-          }) : null, /*#__PURE__*/_jsx(View, {
-            style: styles.scene,
-            children: /*#__PURE__*/_jsx(HeaderBackContext.Provider, {
-              value: headerBack,
-              children: /*#__PURE__*/_jsx(HeaderShownContext.Provider, {
-                value: isParentHeaderShown || headerShown !== false,
-                children: /*#__PURE__*/_jsx(HeaderHeightContext.Provider, {
-                  value: headerShown !== false ? headerHeight : parentHeaderHeight ?? 0,
-                  children: children
-                })
+    interpolationIndex: interpolationIndex,
+    gestureDirection: gestureDirection,
+    layout: layout,
+    insets: insets,
+    direction: direction,
+    gesture: gesture,
+    current: scene.progress.current,
+    next: scene.progress.next,
+    opening: opening,
+    closing: closing,
+    onOpen: handleOpen,
+    onClose: handleClose,
+    overlay: cardOverlay,
+    overlayEnabled: cardOverlayEnabled,
+    shadowEnabled: cardShadowEnabled,
+    onTransition: handleTransition,
+    onGestureBegin: handleGestureBegin,
+    onGestureCanceled: handleGestureCanceled,
+    onGestureEnd: handleGestureEnd,
+    gestureEnabled: index === 0 ? false : gestureEnabled,
+    gestureResponseDistance: gestureResponseDistance,
+    gestureVelocityImpact: gestureVelocityImpact,
+    transitionSpec: transitionSpec,
+    styleInterpolator: cardStyleInterpolator,
+    pageOverflowEnabled: headerMode !== 'float' && presentation !== 'modal',
+    preloaded: preloaded,
+    contentStyle: [{
+      backgroundColor: presentation === 'transparentModal' ? 'transparent' : colors.background
+    }, cardStyle],
+    children: /*#__PURE__*/_jsx(View, {
+      style: styles.container,
+      children: /*#__PURE__*/_jsxs(ModalPresentationContext.Provider, {
+        value: modal,
+        children: [headerMode !== 'float' ? renderHeader({
+          mode: 'screen',
+          scenes: [previousScene, scene],
+          getPreviousScene,
+          getFocusedRoute,
+          contentHeight: headerHeight,
+          onContentHeightChange: onHeaderHeightChange,
+          style: styles.header
+        }) : null, /*#__PURE__*/_jsx(View, {
+          style: styles.scene,
+          children: /*#__PURE__*/_jsx(HeaderBackContext.Provider, {
+            value: headerBack,
+            children: /*#__PURE__*/_jsx(HeaderShownContext.Provider, {
+              value: isParentHeaderShown || headerShown !== false,
+              children: /*#__PURE__*/_jsx(HeaderHeightContext.Provider, {
+                value: headerShown !== false ? headerHeight?.value ?? 0 : parentHeaderHeight ?? 0,
+                children: children
               })
             })
-          })]
-        })
+          })
+        })]
       })
     })
   });

package/lib/module/views/Stack/CardContainer.js.map

@@ -1 +1 @@
-{"version":3,"names":["getHeaderTitle","HeaderBackContext","HeaderHeightContext","HeaderShownContext","useLinkBuilder","useLocale","useTheme","React","StyleSheet","View","ModalPresentationContext","useKeyboardManager","Card","CardA11yWrapper","jsx","_jsx","jsxs","_jsxs","EPSILON","CardContainerInner","interpolationIndex","index","active","opening","closing","gesture","focused","modal","getPreviousScene","getFocusedRoute","hasAbsoluteFloatHeader","headerHeight","onHeaderHeightChange","isParentHeaderShown","isNextScreenTransparent","layout","onCloseRoute","onOpenRoute","onGestureCancel","onGestureEnd","onGestureStart","onTransitionEnd","onTransitionStart","preloaded","renderHeader","safeAreaInsetBottom","safeAreaInsetLeft","safeAreaInsetRight","safeAreaInsetTop","scene","children","wrapperRef","useRef","direction","parentHeaderHeight","use","options","descriptor","enabled","keyboardHandlingEnabled","onPageChangeStart","onPageChangeCancel","onPageChangeConfirm","handleOpen","route","handleClose","handleGestureBegin","handleGestureCanceled","handleGestureEnd","handleTransition","current","setInert","insets","top","right","bottom","left","colors","useEffect","listener","progress","next","addListener","value","removeListener","presentation","animation","cardOverlay","cardOverlayEnabled","cardShadowEnabled","cardStyle","cardStyleInterpolator","gestureDirection","gestureEnabled","gestureResponseDistance","gestureVelocityImpact","headerMode","headerShown","transitionSpec","buildHref","previousScene","backTitle","href","name","params","canGoBack","headerBack","useMemo","title","undefined","animated","ref","onOpen","onClose","overlay","overlayEnabled","shadowEnabled","onTransition","onGestureBegin","onGestureCanceled","styleInterpolator","pageOverflowEnabled","containerStyle","marginTop","contentStyle","backgroundColor","background","style","styles","container","Provider","mode","scenes","contentHeight","onContentHeightChange","header","CardContainer","memo","create","flex","zIndex"],"sourceRoot":"../../../../src","sources":["views/Stack/CardContainer.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getHeaderTitle","HeaderBackContext","HeaderHeightContext","HeaderShownContext","useLinkBuilder","useLocale","useTheme","React","StyleSheet","View","ModalPresentationContext","useKeyboardManager","Card","jsx","_jsx","jsxs","_jsxs","CardContainerInner","interpolationIndex","index","active","opening","closing","gesture","focused","modal","getPreviousScene","getFocusedRoute","headerHeight","onHeaderHeightChange","isParentHeaderShown","layout","onCloseRoute","onOpenRoute","onGestureCancel","onGestureEnd","onGestureStart","onTransitionEnd","onTransitionStart","preloaded","renderHeader","safeAreaInsetBottom","safeAreaInsetLeft","safeAreaInsetRight","safeAreaInsetTop","scene","children","direction","parentHeaderHeight","use","options","descriptor","enabled","keyboardHandlingEnabled","onPageChangeStart","onPageChangeCancel","onPageChangeConfirm","handleOpen","route","handleClose","handleGestureBegin","handleGestureCanceled","handleGestureEnd","handleTransition","insets","top","right","bottom","left","colors","presentation","animation","cardOverlay","cardOverlayEnabled","cardShadowEnabled","cardStyle","cardStyleInterpolator","gestureDirection","gestureEnabled","gestureResponseDistance","gestureVelocityImpact","headerMode","headerShown","transitionSpec","buildHref","previousScene","backTitle","href","name","params","canGoBack","headerBack","useMemo","title","undefined","animated","current","progress","next","onOpen","onClose","overlay","overlayEnabled","shadowEnabled","onTransition","onGestureBegin","onGestureCanceled","styleInterpolator","pageOverflowEnabled","contentStyle","backgroundColor","background","style","styles","container","Provider","value","mode","scenes","contentHeight","onContentHeightChange","header","CardContainer","memo","create","flex","zIndex"],"sourceRoot":"../../../../src","sources":["views/Stack/CardContainer.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/views/Stack/CardStack.js

@@ -28,6 +28,10 @@ const NAMED_TRANSITIONS_PRESETS = {
 const FALLBACK_DESCRIPTOR = Object.freeze({
   options: {}
 });
+const HIDDEN_HEADER_HEIGHT = {
+  measured: false,
+  value: 0
+};
 const getInterpolationIndex = (scenes, index) => {
   const {
     cardStyleInterpolator
@@ -67,14 +71,32 @@ const getHeaderHeights = (scenes, insets, isParentHeaderShown, isParentModal, la
       headerStyle
     } = curr.descriptor.options;
     const style = StyleSheet.flatten(headerStyle || {});
-    const height = 'height' in style && typeof style.height === 'number' ? style.height : previous[curr.route.key];
+    const height = 'height' in style && typeof style.height === 'number' ? style.height : undefined;
     const interpolationIndex = getInterpolationIndex(scenes, index);
     const isModal = getIsModal(curr, interpolationIndex, isParentModal);
-    acc[curr.route.key] = typeof height === 'number' ? height : getDefaultHeaderHeight({
-      landscape: layout.width > layout.height,
-      modalPresentation: isModal,
-      topInset: headerStatusBarHeight
-    });
+    if (typeof height === 'number') {
+      acc[curr.route.key] = {
+        measured: true,
+        value: height
+      };
+    } else {
+      const previousHeight = previous[curr.route.key];
+      const defaultHeight = getDefaultHeaderHeight({
+        landscape: layout.width > layout.height,
+        modalPresentation: isModal,
+        topInset: headerStatusBarHeight
+      });
+
+      // If we hadn't measured before, use re-computed default height
+      if (!previousHeight?.measured && defaultHeight !== previousHeight?.value) {
+        acc[curr.route.key] = {
+          measured: false,
+          value: defaultHeight
+        };
+      } else if (previousHeight) {
+        acc[curr.route.key] = previousHeight;
+      }
+    }
     return acc;
   }, {});
 };
@@ -259,13 +281,16 @@ export class CardStack extends React.Component {
       headerHeights
     }) => {
       const previousHeight = headerHeights[route.key];
-      if (previousHeight === height) {
+      if (previousHeight?.value === height) {
         return null;
       }
       return {
         headerHeights: {
           ...headerHeights,
-          [route.key]: height
+          [route.key]: {
+            measured: true,
+            value: height
+          }
         }
       };
     });
@@ -321,7 +346,12 @@ export class CardStack extends React.Component {
     } = this.state;
     const allRoutes = getAllRoutes(routes, state);
     const focusedRoute = state.routes[state.index];
-    const isFloatHeaderAbsolute = scenes.slice(-2).some(scene => {
+
+    // Render only two top-most active headers as a workaround for
+    // https://github.com/react-navigation/react-navigation/issues/12456.
+    // If the header is persisted, it might be placed incorrectly when navigating back
+    const activeHeaderScenes = scenes.filter(scene => !isInactiveRoute(scene.route, routes)).slice(-2);
+    const isFloatHeaderAbsolute = activeHeaderScenes.some(scene => {
       const options = scene.descriptor.options ?? {};
       const {
         headerMode,
@@ -334,11 +364,12 @@ export class CardStack extends React.Component {
       return false;
     });
     const isFloatHeaderFocused = scenes.findLast(scene => scene.route.key === focusedRoute.key)?.descriptor.options.headerMode === 'float';
+    const focusedHeaderHeight = headerHeights[focusedRoute.key];
     return /*#__PURE__*/_jsxs(View, {
       style: styles.container,
       children: [renderHeader({
         mode: 'float',
-        scenes,
+        scenes: activeHeaderScenes,
         getPreviousScene: this.getPreviousScene,
         getFocusedRoute: this.getFocusedRoute,
         contentHeight: headerHeights[focusedRoute.key],
@@ -347,7 +378,7 @@ export class CardStack extends React.Component {
         // The header title can't be found with maestro without this
         // In some cases, header buttons may not be touchable as well
         isFloatHeaderFocused && {
-          height: headerHeights[focusedRoute.key]
+          height: focusedHeaderHeight?.value
         }]]
       }), /*#__PURE__*/_jsx(View, {
         style: styles.container,
@@ -356,18 +387,18 @@ export class CardStack extends React.Component {
           const focused = focusedRoute.key === route.key;
           const gesture = gestures[route.key];
           const scene = scenes[index];
-          const isInactive = isInactiveRoute(route, this.props.routes);
           const {
             inactiveBehavior = 'pause',
             animation,
             headerShown = true,
+            headerMode,
             headerTransparent
           } = scene.descriptor.options;
           const safeAreaInsetTop = insets.top;
           const safeAreaInsetRight = insets.right;
           const safeAreaInsetBottom = insets.bottom;
           const safeAreaInsetLeft = insets.left;
-          const headerHeight = headerShown !== false ? headerHeights[route.key] : 0;
+          const headerHeight = headerShown !== false ? headerHeights[route.key] : HIDDEN_HEADER_HEIGHT;
 
           // Start from current card and count backwards the number of cards with same interpolation
           const interpolationIndex = getInterpolationIndex(scenes, index);
@@ -379,19 +410,28 @@ export class CardStack extends React.Component {
           const isNextScreenTransparent = scenes[index + 1]?.descriptor.options.presentation === 'transparentModal';
           const isRemoving = replacingRouteKeys.includes(route.key) || closingRouteKeys.includes(route.key);
           const isFocusing = openingRouteKeys.includes(route.key) || [...closingRouteKeys, ...replacingRouteKeys].includes(self[index + 1]?.key);
+          const isInactive = isInactiveRoute(route, this.props.routes);
+          const isRetained = state.retainedRouteKeys?.includes(route.key);
+          const isPreloaded = isInactive && !isRetained;
+          const isTopmost = index === routes.length - 1;
           const isBeforeLast = index === routes.length - 2;
 
           // Keep animating and the last two rendered routes visible for smoother transitions
           const isVisible = focused || isNextScreenTransparent ||
+          // React native destroys the view when hidden
+          // So we keep retained screens visible
+          // This makes sure any videos being played don't stop etc.
+          isRetained ||
           // We only need to keep other screens visible when animation is enabled
           isAnimationEnabled && (isFocusing || isRemoving ||
-          // Preloaded and retained screens should stay mounted, but remain hidden until focused
-          !isInactive && index >= routes.length - 2);
+          // Preloaded screens should stay mounted, but remain hidden until focused
+          !isPreloaded && index >= routes.length - 2);
           const activityMode =
           // Render focused and animating screens normally
           focused || isFocusing ? 'normal' : inactiveBehavior === 'none' ||
           // Unpause preloaded or retained screens so updates are visible
-          isInactive ||
+          // Handle retained explicitly as isInactive won't be updated until animation end
+          isInactive || isRetained ||
           // Keep the screen before transparent screen active
           // This lets the screen under the transparent screen update and animate
           isNextScreenTransparent ||
@@ -406,41 +446,52 @@ export class CardStack extends React.Component {
           if (activityMode === 'unmounted') {
             return null;
           }
-          return /*#__PURE__*/_jsx(CardContainer, {
-            index: index,
-            interpolationIndex: interpolationIndex,
-            modal: isModal,
-            active: index === routes.length - 1,
-            focused: focused,
-            opening: openingRouteKeys.includes(route.key),
-            closing: closingRouteKeys.includes(route.key),
-            layout: layout,
-            gesture: gesture,
-            scene: scene,
-            safeAreaInsetTop: safeAreaInsetTop,
-            safeAreaInsetRight: safeAreaInsetRight,
-            safeAreaInsetBottom: safeAreaInsetBottom,
-            safeAreaInsetLeft: safeAreaInsetLeft,
-            onGestureStart: onGestureStart,
-            onGestureCancel: onGestureCancel,
-            onGestureEnd: onGestureEnd,
-            headerHeight: headerHeight,
-            isParentHeaderShown: isParentHeaderShown,
-            onHeaderHeightChange: this.handleHeaderLayout,
-            getPreviousScene: this.getPreviousScene,
-            getFocusedRoute: this.getFocusedRoute,
-            hasAbsoluteFloatHeader: isFloatHeaderAbsolute && !headerTransparent,
-            renderHeader: renderHeader,
-            onOpenRoute: onOpenRoute,
-            onCloseRoute: onCloseRoute,
-            onTransitionStart: onTransitionStart,
-            onTransitionEnd: onTransitionEnd,
-            isNextScreenTransparent: isNextScreenTransparent,
-            preloaded: isInactive,
-            children: /*#__PURE__*/_jsx(ActivityView, {
-              mode: activityMode,
-              visible: isVisible,
-              style: StyleSheet.absoluteFill,
+          return /*#__PURE__*/_jsx(ActivityView, {
+            mode: activityMode,
+            visible: isVisible,
+            style: {
+              ...StyleSheet.absoluteFill,
+              // Avoid unfocused larger pages increasing scroll area
+              // e.g. when a smaller screen is pushed over a larger one on web
+              overflow: isTopmost ? undefined : 'hidden',
+              marginTop: headerTransparent || headerMode === 'screen' ? 0 :
+              // Add offset for non-transparent floating header
+              isFloatHeaderAbsolute ?
+              // If header is absolute, offset the card by the header height
+              headerHeight?.value :
+              // Otherwise, the in-flow float header already takes the
+              // focused header's space, so offset by the difference
+              headerHeight && focusedHeaderHeight ? headerHeight.value - focusedHeaderHeight.value : 0
+            },
+            children: /*#__PURE__*/_jsx(CardContainer, {
+              index: index,
+              interpolationIndex: interpolationIndex,
+              modal: isModal,
+              active: isTopmost,
+              focused: focused,
+              opening: openingRouteKeys.includes(route.key),
+              closing: closingRouteKeys.includes(route.key),
+              layout: layout,
+              gesture: gesture,
+              scene: scene,
+              safeAreaInsetTop: safeAreaInsetTop,
+              safeAreaInsetRight: safeAreaInsetRight,
+              safeAreaInsetBottom: safeAreaInsetBottom,
+              safeAreaInsetLeft: safeAreaInsetLeft,
+              onGestureStart: onGestureStart,
+              onGestureCancel: onGestureCancel,
+              onGestureEnd: onGestureEnd,
+              headerHeight: headerHeight,
+              isParentHeaderShown: isParentHeaderShown,
+              onHeaderHeightChange: this.handleHeaderLayout,
+              getPreviousScene: this.getPreviousScene,
+              getFocusedRoute: this.getFocusedRoute,
+              renderHeader: renderHeader,
+              onOpenRoute: onOpenRoute,
+              onCloseRoute: onCloseRoute,
+              onTransitionStart: onTransitionStart,
+              onTransitionEnd: onTransitionEnd,
+              preloaded: isInactive,
               children: scene.descriptor.render()
             })
           }, route.key);