react-native-terra-ui 0.8.1 → 0.9.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [0.9.1](https://github.com/earthlin9/react-native-terra-ui/compare/v0.9.0...v0.9.1) (2026-09-07)
+
+### Bug Fixes
+
+* **ui:** [screen] hand vertical insets to UIKit on header-less screens ([4f1a95c](https://github.com/earthlin9/react-native-terra-ui/commit/4f1a95c31bfbcf6d8424095b3961ee28ea1743ab))
+* **ui:** [screen] require both vertical edges before handing insets over ([f135e01](https://github.com/earthlin9/react-native-terra-ui/commit/f135e010c372b0812171bd6b9771503acf094f47))
+
+## [0.9.0](https://github.com/earthlin9/react-native-terra-ui/compare/v0.8.1...v0.9.0) (2026-09-07)
+
+### ⚠ BREAKING CHANGES
+
+* **ui:** scroll content draws beneath the bottom safe area instead
+  of stopping above it. A screen that added its own bottom clearance for a
+  tab bar should drop it, or the allowance is counted twice. Omit "bottom"
+  from `safeArea` to reserve no room for the bar at all and supply clearance
+  through `extraBottomPadding`.
+
+### Features
+
+* **showcase:** add native tab bar for components and blocks ([8e7f07f](https://github.com/earthlin9/react-native-terra-ui/commit/8e7f07f92b8a0eec76545ad6827ce2a6f04e5357))
+* **ui:** [screen] hand the bottom safe area to the scroll container ([844869b](https://github.com/earthlin9/react-native-terra-ui/commit/844869b02f5488c8d545aab8c7e60dbf0e065a1a))
+
 ## [0.8.1](https://github.com/earthlin9/react-native-terra-ui/compare/v0.8.0...v0.8.1) (2026-09-07)
 
 ### Features

package/lib/module/components/screen/Screen.js

@@ -2,7 +2,8 @@
 
 import { View } from "react-native-unistyles/components/native/View";
 import { Children, Fragment, forwardRef, isValidElement, useMemo } from "react";
-import { StyleSheet, useUnistyles } from "react-native-unistyles";
+import { Platform } from "react-native";
+import { useUnistyles } from "react-native-unistyles";
 import { resolveThemeColor } from "../../utils/resolve-theme-color.js";
 import { PortalProvider } from "../portal/index.js";
 import { ScreenFrame } from "./parts/ScreenFrame.js";
@@ -42,6 +43,40 @@ function ScreenHeader({
 }
 ScreenHeader.displayName = "Screen.Header";
 
+/**
+ * Whether this child is a vertical scroll container that can pad its own bottom
+ * inset. A horizontal one cannot: bottom padding does nothing for it, so the
+ * frame keeps that edge.
+ */
+function ownsBottomInset(child) {
+  if (child.props.horizontal) return false;
+  if (child.type === ScreenScrollView || child.type === ScreenList) return true;
+  // Fast Refresh can retain an older function identity in existing child elements.
+  const {
+    displayName
+  } = child.type;
+  return displayName === "Screen.ScrollView" || displayName === "Screen.List";
+}
+
+/**
+ * Whether the screen has such a container among its children. Inspects fragments,
+ * but does not execute arbitrary child components — a container nested inside one
+ * is not found, and the frame keeps the bottom edge.
+ */
+function hasScrollContainerOwningBottom(children) {
+  let found = false;
+  Children.forEach(children, child => {
+    if (found) return;
+    if (! /*#__PURE__*/isValidElement(child)) return;
+    if (child.type === Fragment) {
+      found = hasScrollContainerOwningBottom(child.props.children);
+      return;
+    }
+    found = ownsBottomInset(child);
+  });
+  return found;
+}
+
 /** Inspect fragments, but do not execute arbitrary child components. */
 function hasScreenHeader(children) {
   let found = false;
@@ -71,29 +106,108 @@ const ScreenBase = /*#__PURE__*/forwardRef(function Screen({
   const hasHeader = useMemo(() => hasScreenHeader(children), [children]);
   const resolvedMargins = contentPadding ?? margins ?? (hasMargins === false ? "none" : "all");
   const edges = useMemo(() => resolveSafeAreaEdges(safeArea), [safeArea]);
+  const hasVerticalScrollContainer = useMemo(() => hasScrollContainerOwningBottom(children), [children]);
+  /*
+    A screen with no `Screen.Header` wears UIKit's own navigation bar, and only
+    UIKit can inset a scroll view for one.
+     A native large title changes height on every frame of its collapse, and the
+    bar is a sibling view this screen cannot measure — so an inset computed in JS
+    is always a frame late and always the wrong size. Worse, UIKit will not
+    collapse the title at all unless the scroll view it finds fills the screen:
+    padding the top edge on the frame starts that view 168pt down (measured on an
+    iPhone 17, expanded title), and the title then stays full size while rows
+    scroll up and overprint it.
+     So the frame keeps no vertical edge on such a screen, the container turns
+    UIKit's `contentInsetAdjustmentBehavior` back on, and UIKit pays the top and
+    the bottom both — which is why `ScreenBottomInset` stands down here rather
+    than paying that edge a second time. iOS only: this is UIKit's mechanism, and
+    Android has no navigation bar to track.
+     Both vertical edges have to be protected to hand them over, because UIKit
+    adjusts for both or for neither. A policy that asks for one and not the other
+    cannot be expressed this way, so it keeps the ordinary treatment below and
+    is honoured exactly as written — at the cost of the title collapse, which is
+    the better trade: an edge list is an explicit instruction, and silently
+    insetting an edge the caller excluded would be the worse surprise.
+  */
+  const platformInsetsEligible = Platform.OS === "ios" && !hasHeader && edges.top && edges.bottom;
+  const platformAdjustsInsets = platformInsetsEligible && hasVerticalScrollContainer;
+  /*
+    Otherwise the bottom edge goes to the scroll container when there is one to
+    take it.
+     Applied to the frame, the bottom inset shrinks the scroll viewport, so content
+    stops above a tab bar rather than passing beneath it — and on iOS that inset
+    includes the bar itself, which UIKit folds into a tab screen's safe area. The
+    container reaches the same resting position by padding the end of its content
+    instead, which is how the platform's own content-inset adjustment behaves.
+  */
+  const contentOwnsBottomInset = !platformAdjustsInsets && edges.bottom && hasVerticalScrollContainer;
+  const frameEdges = useMemo(() => platformAdjustsInsets ? {
+    ...edges,
+    top: false,
+    bottom: false
+  } : contentOwnsBottomInset ? {
+    ...edges,
+    bottom: false
+  } : edges, [platformAdjustsInsets, contentOwnsBottomInset, edges]);
   const {
     theme
   } = useUnistyles();
   const resolvedBackground = resolveThemeColor(background, theme) ?? theme.color["surface.canvas"];
-  return /*#__PURE__*/_jsx(View, {
-    ref: ref,
-    style: [styles.container(resolvedBackground), style],
-    ...rest,
-    children: /*#__PURE__*/_jsx(ScreenScrollProvider, {
-      background: resolvedBackground,
-      contentPadding: resolvedMargins,
-      safeArea: safeArea,
-      hasHeader: hasHeader,
-      children: /*#__PURE__*/_jsx(ScreenHeaderAppearanceProvider, {
-        children: /*#__PURE__*/_jsx(ScreenFrame, {
-          edges: edges,
-          children: /*#__PURE__*/_jsx(PortalProvider, {
-            children: children
+  /*
+    A plain object, not a Unistyles stylesheet, and the background belongs in it
+    rather than arriving later.
+     Unistyles applies a dynamic function's style after mount. UIKit resolves a
+    screen's scroll view once, while it is being presented, and a scroll area
+    that was not yet the size of the screen at that moment never drives the
+    navigation bar afterwards — the large title stays expanded for the rest of
+    the screen's life.
+  */
+  const rootStyle = useMemo(() => ({
+    flex: 1,
+    backgroundColor: resolvedBackground
+  }), [resolvedBackground]);
+  return (
+    /*#__PURE__*/
+    /*
+      `collapsable={false}`, because a background colour alone is the worst of
+      both worlds here.
+       Fabric decides two things separately: whether a view is mounted at all, and
+      whether it *keeps* its children. A `View` with only layout styles is
+      dropped and its children are re-parented to its own parent — harmless. Give
+      it a background and it is mounted, but it still does not form a stacking
+      context, so the children are mounted *beside* it instead of inside it. The
+      screen's view then begins with an empty full-screen view, and UIKit — which
+      finds the scroll view by walking first subviews down from the view
+      controller (`RNSScrollViewFinder` mirrors the same walk) — reaches that dead
+      end and finds nothing. Measured on an iPhone 17: no content-inset
+      adjustment and no large-title collapse at all.
+       `collapsable={false}` forms the stacking context, so the frame, the safe
+      areas, and the scroll container stay in one unbroken first-subview chain.
+    */
+    _jsx(View, {
+      collapsable: false,
+      ref: ref,
+      style: [rootStyle, style],
+      ...rest,
+      children: /*#__PURE__*/_jsx(ScreenScrollProvider, {
+        background: resolvedBackground,
+        contentPadding: resolvedMargins,
+        safeArea: safeArea,
+        contentOwnsBottomInset: contentOwnsBottomInset,
+        platformAdjustsInsets: platformAdjustsInsets,
+        platformInsetsEligible: platformInsetsEligible,
+        hasHeader: hasHeader,
+        children: /*#__PURE__*/_jsx(ScreenHeaderAppearanceProvider, {
+          children: /*#__PURE__*/_jsx(ScreenFrame, {
+            edges: frameEdges,
+            children: /*#__PURE__*/_jsx(PortalProvider, {
+              children: children
+            })
           })
         })
       })
     })
-  });
+  );
 });
 ScreenBase.Header = ScreenHeader;
 ScreenBase.ScrollView = ScreenScrollView;
@@ -104,9 +218,11 @@ ScreenBase.List = ScreenList;
  * Themed screen root with shared scroll state and a local header portal.
  *
  * Pair a `Screen.Header` child with one primary `Screen.ScrollView`
- * or `Screen.List`. The root applies safe-area clearance to all children;
- * scroll containers add themed content padding and header clearance. The ref targets
- * the root View, not the scroll container.
+ * or `Screen.List`. The root applies safe-area clearance to all children, except
+ * the bottom edge when that primary container is vertical — it pads that inset
+ * into the end of its own content instead, so content scrolls under a bottom bar
+ * rather than stopping above it. Scroll containers add themed content padding and
+ * header clearance. The ref targets the root View, not the scroll container.
  *
  * @example
  * ```tsx
@@ -117,10 +233,4 @@ ScreenBase.List = ScreenList;
  * ```
  */
 export const Screen = ScreenBase;
-const styles = StyleSheet.create(() => ({
-  container: backgroundColor => ({
-    flex: 1,
-    backgroundColor
-  })
-}));
 //# sourceMappingURL=Screen.js.map

package/lib/module/components/screen/Screen.js.map

@@ -1 +1 @@
-{"version":3,"names":["Children","Fragment","forwardRef","isValidElement","useMemo","StyleSheet","useUnistyles","resolveThemeColor","PortalProvider","ScreenFrame","ScreenHeaderAppearanceProvider","ScreenHeaderAppearanceSlot","ScreenScrollProvider","ScreenFlatList","ScreenList","ScreenScrollView","resolveSafeAreaEdges","jsx","_jsx","ScreenHeader","children","as","rest","Component","displayName","hasScreenHeader","found","forEach","child","type","props","ScreenBase","Screen","background","contentPadding","safeArea","margins","hasMargins","inTabView","_inTabView","style","ref","hasHeader","resolvedMargins","edges","theme","resolvedBackground","color","View","styles","container","Header","ScrollView","FlatList","List","create","backgroundColor","flex"],"sourceRoot":"../../../../src","sources":["components/screen/Screen.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Children","Fragment","forwardRef","isValidElement","useMemo","Platform","useUnistyles","resolveThemeColor","PortalProvider","ScreenFrame","ScreenHeaderAppearanceProvider","ScreenHeaderAppearanceSlot","ScreenScrollProvider","ScreenFlatList","ScreenList","ScreenScrollView","resolveSafeAreaEdges","jsx","_jsx","ScreenHeader","children","as","rest","Component","displayName","ownsBottomInset","child","props","horizontal","type","hasScrollContainerOwningBottom","found","forEach","hasScreenHeader","ScreenBase","Screen","background","contentPadding","safeArea","margins","hasMargins","inTabView","_inTabView","style","ref","hasHeader","resolvedMargins","edges","hasVerticalScrollContainer","platformInsetsEligible","OS","top","bottom","platformAdjustsInsets","contentOwnsBottomInset","frameEdges","theme","resolvedBackground","color","rootStyle","flex","backgroundColor","View","collapsable","Header","ScrollView","FlatList","List"],"sourceRoot":"../../../../src","sources":["components/screen/Screen.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/screen/ScreenContext.js

@@ -23,6 +23,9 @@ export function ScreenScrollProvider({
   children,
   contentPadding = "all",
   safeArea = "auto",
+  contentOwnsBottomInset = false,
+  platformAdjustsInsets = false,
+  platformInsetsEligible = false,
   hasHeader = false
 }) {
   const scrollY = useSharedValue(0);
@@ -43,6 +46,9 @@ export function ScreenScrollProvider({
     background,
     contentPadding,
     safeArea,
+    contentOwnsBottomInset,
+    platformAdjustsInsets,
+    platformInsetsEligible,
     margins: contentPadding,
     hasHeader,
     scrollY,
@@ -51,7 +57,7 @@ export function ScreenScrollProvider({
     setHeaderCollapseHeight,
     scrollRef,
     scrollHandler
-  }), [background, contentPadding, safeArea, hasHeader, scrollY, headerCollapseHeight, headerSnapOffsets, setHeaderCollapseHeight, scrollRef, scrollHandler]);
+  }), [background, contentPadding, safeArea, contentOwnsBottomInset, platformAdjustsInsets, platformInsetsEligible, hasHeader, scrollY, headerCollapseHeight, headerSnapOffsets, setHeaderCollapseHeight, scrollRef, scrollHandler]);
   return /*#__PURE__*/_jsx(ScreenContext.Provider, {
     value: value,
     children: children

package/lib/module/components/screen/ScreenContext.js.map

@@ -1 +1 @@
-{"version":3,"names":["createContext","useCallback","useContext","useMemo","useState","useAnimatedRef","useAnimatedScrollHandler","useSharedValue","jsx","_jsx","SCREEN_HEADER_PORTAL_HOST","ScreenContext","ScreenScrollProvider","background","children","contentPadding","safeArea","hasHeader","scrollY","headerCollapseHeight","headerSnapOffsets","setHeaderSnapOffsets","scrollRef","setHeaderCollapseHeight","height","rounded","Math","round","value","undefined","scrollHandler","onScroll","event","contentOffset","y","margins","Provider","useScreen","context","Error"],"sourceRoot":"../../../../src","sources":["components/screen/ScreenContext.tsx"],"mappings":";;AAAA,SAASA,aAAa,EAAkBC,WAAW,EAAEC,UAAU,EAAEC,OAAO,EAAEC,QAAQ,QAAQ,OAAO;AAEjG,SAIEC,cAAc,EACdC,wBAAwB,EACxBC,cAAc,QACT,yBAAyB;;AAIhC;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAGA;AACA,OAAO,MAAMC,yBAAyB,GAAG,eAAe;;AAExD;;AAwCA,OAAO,MAAMC,aAAa,gBAAGX,aAAa,CAA4B,IAAI,CAAC;;AAE3E;;AAaA;AACA;AACA;AACA;AACA,OAAO,SAASY,oBAAoBA,CAAC;EACnCC,UAAU,GAAG,aAAa;EAC1BC,QAAQ;EACRC,cAAc,GAAG,KAAK;EACtBC,QAAQ,GAAG,MAAM;EACjBC,SAAS,GAAG;AACa,CAAC,EAAE;EAC5B,MAAMC,OAAO,GAAGX,cAAc,CAAC,CAAC,CAAC;EACjC,MAAMY,oBAAoB,GAAGZ,cAAc,CAAC,CAAC,CAAC;EAC9C,MAAM,CAACa,iBAAiB,EAAEC,oBAAoB,CAAC,GAAGjB,QAAQ,CAAW,CAAC;EACtE,MAAMkB,SAAS,GAAGjB,cAAc,CAAsB,CAAC;EAEvD,MAAMkB,uBAAuB,GAAGtB,WAAW,CACxCuB,MAAc,IAAK;IAClB,MAAMC,OAAO,GAAGC,IAAI,CAACC,KAAK,CAACH,MAAM,CAAC;IAClCL,oBAAoB,CAACS,KAAK,GAAGH,OAAO;IACpCJ,oBAAoB,CAACI,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAEA,OAAO,CAAC,GAAGI,SAAS,CAAC;EAC9D,CAAC,EACD,CAACV,oBAAoB,CACvB,CAAC;EAED,MAAMW,aAAa,GAAGxB,wBAAwB,CAAC;IAC7CyB,QAAQ,EAAGC,KAAK,IAAK;MACnBd,OAAO,CAACU,KAAK,GAAGI,KAAK,CAACC,aAAa,CAACC,CAAC;IACvC;EACF,CAAC,CAAC;EAEF,MAAMN,KAAK,GAAGzB,OAAO,CACnB,OAAO;IACLU,UAAU;IACVE,cAAc;IACdC,QAAQ;IACRmB,OAAO,EAAEpB,cAAc;IACvBE,SAAS;IACTC,OAAO;IACPC,oBAAoB;IACpBC,iBAAiB;IACjBG,uBAAuB;IACvBD,SAAS;IACTQ;EACF,CAAC,CAAC,EACF,CACEjB,UAAU,EACVE,cAAc,EACdC,QAAQ,EACRC,SAAS,EACTC,OAAO,EACPC,oBAAoB,EACpBC,iBAAiB,EACjBG,uBAAuB,EACvBD,SAAS,EACTQ,aAAa,CAEjB,CAAC;EAED,oBAAOrB,IAAA,CAACE,aAAa,CAACyB,QAAQ;IAACR,KAAK,EAAEA,KAAM;IAAAd,QAAA,EAAEA;EAAQ,CAAyB,CAAC;AAClF;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASuB,SAASA,CAAA,EAAuB;EAC9C,MAAMC,OAAO,GAAGpC,UAAU,CAACS,aAAa,CAAC;EACzC,IAAI,CAAC2B,OAAO,EAAE;IACZ,MAAM,IAAIC,KAAK,CAAC,kDAAkD,CAAC;EACrE;EACA,OAAOD,OAAO;AAChB","ignoreList":[]}
+{"version":3,"names":["createContext","useCallback","useContext","useMemo","useState","useAnimatedRef","useAnimatedScrollHandler","useSharedValue","jsx","_jsx","SCREEN_HEADER_PORTAL_HOST","ScreenContext","ScreenScrollProvider","background","children","contentPadding","safeArea","contentOwnsBottomInset","platformAdjustsInsets","platformInsetsEligible","hasHeader","scrollY","headerCollapseHeight","headerSnapOffsets","setHeaderSnapOffsets","scrollRef","setHeaderCollapseHeight","height","rounded","Math","round","value","undefined","scrollHandler","onScroll","event","contentOffset","y","margins","Provider","useScreen","context","Error"],"sourceRoot":"../../../../src","sources":["components/screen/ScreenContext.tsx"],"mappings":";;AAAA,SAASA,aAAa,EAAkBC,WAAW,EAAEC,UAAU,EAAEC,OAAO,EAAEC,QAAQ,QAAQ,OAAO;AAEjG,SAIEC,cAAc,EACdC,wBAAwB,EACxBC,cAAc,QACT,yBAAyB;;AAIhC;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAGA;AACA,OAAO,MAAMC,yBAAyB,GAAG,eAAe;;AAExD;;AAyEA,OAAO,MAAMC,aAAa,gBAAGX,aAAa,CAA4B,IAAI,CAAC;;AAE3E;;AAmBA;AACA;AACA;AACA;AACA,OAAO,SAASY,oBAAoBA,CAAC;EACnCC,UAAU,GAAG,aAAa;EAC1BC,QAAQ;EACRC,cAAc,GAAG,KAAK;EACtBC,QAAQ,GAAG,MAAM;EACjBC,sBAAsB,GAAG,KAAK;EAC9BC,qBAAqB,GAAG,KAAK;EAC7BC,sBAAsB,GAAG,KAAK;EAC9BC,SAAS,GAAG;AACa,CAAC,EAAE;EAC5B,MAAMC,OAAO,GAAGd,cAAc,CAAC,CAAC,CAAC;EACjC,MAAMe,oBAAoB,GAAGf,cAAc,CAAC,CAAC,CAAC;EAC9C,MAAM,CAACgB,iBAAiB,EAAEC,oBAAoB,CAAC,GAAGpB,QAAQ,CAAW,CAAC;EACtE,MAAMqB,SAAS,GAAGpB,cAAc,CAAsB,CAAC;EAEvD,MAAMqB,uBAAuB,GAAGzB,WAAW,CACxC0B,MAAc,IAAK;IAClB,MAAMC,OAAO,GAAGC,IAAI,CAACC,KAAK,CAACH,MAAM,CAAC;IAClCL,oBAAoB,CAACS,KAAK,GAAGH,OAAO;IACpCJ,oBAAoB,CAACI,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAEA,OAAO,CAAC,GAAGI,SAAS,CAAC;EAC9D,CAAC,EACD,CAACV,oBAAoB,CACvB,CAAC;EAED,MAAMW,aAAa,GAAG3B,wBAAwB,CAAC;IAC7C4B,QAAQ,EAAGC,KAAK,IAAK;MACnBd,OAAO,CAACU,KAAK,GAAGI,KAAK,CAACC,aAAa,CAACC,CAAC;IACvC;EACF,CAAC,CAAC;EAEF,MAAMN,KAAK,GAAG5B,OAAO,CACnB,OAAO;IACLU,UAAU;IACVE,cAAc;IACdC,QAAQ;IACRC,sBAAsB;IACtBC,qBAAqB;IACrBC,sBAAsB;IACtBmB,OAAO,EAAEvB,cAAc;IACvBK,SAAS;IACTC,OAAO;IACPC,oBAAoB;IACpBC,iBAAiB;IACjBG,uBAAuB;IACvBD,SAAS;IACTQ;EACF,CAAC,CAAC,EACF,CACEpB,UAAU,EACVE,cAAc,EACdC,QAAQ,EACRC,sBAAsB,EACtBC,qBAAqB,EACrBC,sBAAsB,EACtBC,SAAS,EACTC,OAAO,EACPC,oBAAoB,EACpBC,iBAAiB,EACjBG,uBAAuB,EACvBD,SAAS,EACTQ,aAAa,CAEjB,CAAC;EAED,oBAAOxB,IAAA,CAACE,aAAa,CAAC4B,QAAQ;IAACR,KAAK,EAAEA,KAAM;IAAAjB,QAAA,EAAEA;EAAQ,CAAyB,CAAC;AAClF;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAAS0B,SAASA,CAAA,EAAuB;EAC9C,MAAMC,OAAO,GAAGvC,UAAU,CAACS,aAAa,CAAC;EACzC,IAAI,CAAC8B,OAAO,EAAE;IACZ,MAAM,IAAIC,KAAK,CAAC,kDAAkD,CAAC;EACrE;EACA,OAAOD,OAAO;AAChB","ignoreList":[]}

package/lib/module/components/screen/ScreenList.js

@@ -7,8 +7,10 @@ import Animated from "react-native-reanimated";
 import { StyleSheet } from "react-native-unistyles";
 import { resolveScreenPadding } from "../../theme/screen-padding.js";
 import { PortalHost } from "../portal/index.js";
+import { useNestedContainerWarning } from "./hooks/use-nested-container-warning.js";
 import { useScreenRef } from "./hooks/use-screen-ref.js";
 import { useScreenScrollHandler } from "./hooks/use-screen-scroll-handler.js";
+import { ScreenBottomInset } from "./parts/ScreenBottomInset";
 import { renderScreenPlaceholder } from "./parts/ScreenPlaceholder.js";
 import { SCREEN_HEADER_PORTAL_HOST, useScreen } from "./ScreenContext.js";
 import { hasHorizontalPadding, hasVerticalPadding, renderListComponent } from "./utils.js";
@@ -59,8 +61,14 @@ const ScreenListBase = /*#__PURE__*/forwardRef(function ScreenList({
     scrollHandler,
     headerSnapOffsets,
     contentPadding: screenPadding,
-    hasHeader
+    hasHeader,
+    contentOwnsBottomInset,
+    platformAdjustsInsets
   } = useScreen();
+  // The root yields the bottom edge only to a vertical container, so a horizontal
+  // one here is a secondary container and must not pay the inset a second time.
+  const ownsBottomInset = contentOwnsBottomInset && !horizontal;
+  useNestedContainerWarning("Screen.List", horizontal);
   const mergedRef = useScreenRef(isDefaultFlatList ? scrollRef : undefined, ref);
   const resolvedPadding = contentPadding ?? margins ?? screenPadding;
   const resolvedLoading = isLoading ?? loading;
@@ -79,6 +87,9 @@ const ScreenListBase = /*#__PURE__*/forwardRef(function ScreenList({
       })
     }), renderListComponent(ListHeaderComponent)]
   });
+  const footer = ownsBottomInset ? /*#__PURE__*/_jsxs(_Fragment, {
+    children: [renderListComponent(ListFooterComponent), /*#__PURE__*/_jsx(ScreenBottomInset, {})]
+  }) : ListFooterComponent;
   return /*#__PURE__*/_jsx(AnimatedComponent, {
     ref: mergedRef,
     data: resolvedLoading ? [] : data,
@@ -86,13 +97,18 @@ const ScreenListBase = /*#__PURE__*/forwardRef(function ScreenList({
     style: [{
       backgroundColor: background
     }, style],
-    horizontal: horizontal,
-    contentInsetAdjustmentBehavior: "never",
+    horizontal: horizontal
+    /*
+      UIKit owns the vertical insets on a header-less iOS screen — see
+      `platformAdjustsInsets`. Everywhere else the frame has already paid them,
+      so a second adjustment here would count them twice.
+    */,
+    contentInsetAdjustmentBehavior: platformAdjustsInsets ? "automatic" : "never",
     automaticallyAdjustContentInsets: false,
     automaticallyAdjustsScrollIndicatorInsets: false,
     contentContainerStyle: [styles.content(resolvedPadding, hasHeader, bottomInset, extraBottomPadding), contentContainerStyle],
     ListHeaderComponent: header,
-    ListFooterComponent: ListFooterComponent,
+    ListFooterComponent: footer,
     ListEmptyComponent: placeholder ?? ListEmptyComponent,
     showsVerticalScrollIndicator: false,
     scrollEventThrottle: 16,

package/lib/module/components/screen/ScreenList.js.map

@@ -1 +1 @@
-{"version":3,"names":["forwardRef","useMemo","Animated","StyleSheet","resolveScreenPadding","PortalHost","useScreenRef","useScreenScrollHandler","renderScreenPlaceholder","SCREEN_HEADER_PORTAL_HOST","useScreen","hasHorizontalPadding","hasVerticalPadding","renderListComponent","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","ScreenListBase","ScreenList","as","data","renderItem","style","contentContainerStyle","ListHeaderComponent","ListFooterComponent","ListEmptyComponent","horizontal","isLoading","loading","loadingContent","LoadingComponent","emptyContent","EmptyComponent","contentPadding","margins","bottomInset","extraBottomPadding","scrollHandler","externalScrollHandler","onScroll","rest","ref","isDefaultFlatList","undefined","FlatList","Component","AnimatedComponent","createAnimatedComponent","background","scrollRef","headerSnapOffsets","screenPadding","hasHeader","mergedRef","resolvedPadding","resolvedLoading","placeholder","isEmpty","length","composedScrollHandler","header","children","View","styles","headerWrapper","name","backgroundColor","contentInsetAdjustmentBehavior","automaticallyAdjustContentInsets","automaticallyAdjustsScrollIndicatorInsets","content","showsVerticalScrollIndicator","scrollEventThrottle","snapToOffsets","displayName","create","theme","runtime","padding","x","y","breakpoint","flexGrow","paddingTop","layout","height","paddingHorizontal","paddingBottom","uni__dependencies","marginHorizontal"],"sourceRoot":"../../../../src","sources":["components/screen/ScreenList.tsx"],"mappings":";;;;AAAA,SAKEA,UAAU,EAIVC,OAAO,QACF,OAAO;AAGd,OAAOC,QAAQ,MAAM,yBAAyB;AAC9C,SAASC,UAAU,QAAQ,wBAAwB;AAEnD,SAASC,oBAAoB;AAC7B,SAASC,UAAU;AACnB,SAASC,YAAY;AACrB,SAASC,sBAAsB;AAC/B,SAASC,uBAAuB;AAChC,SAASC,yBAAyB,EAAEC,SAAS;AAE7C,SAASC,oBAAoB,EAAEC,kBAAkB,EAAEC,mBAAmB;;AAEtE;;AAKA;;AAgBA;;AAyBA;;AA+BA;;AAiBA;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,QAAA,IAAAC,SAAA,EAAAC,IAAA,IAAAC,KAAA;AAiBA,MAAMC,cAAc,gBAAGpB,UAAU,CAAC,SAASqB,UAAUA,CACnD;EACEC,EAAE;EACFC,IAAI;EACJC,UAAU;EACVC,KAAK;EACLC,qBAAqB;EACrBC,mBAAmB;EACnBC,mBAAmB;EACnBC,kBAAkB;EAClBC,UAAU,GAAG,KAAK;EAClBC,SAAS;EACTC,OAAO,GAAG,KAAK;EACfC,cAAc;EACdC,gBAAgB;EAChBC,YAAY;EACZC,cAAc;EACdC,cAAc;EACdC,OAAO;EACPC,WAAW;EACXC,kBAAkB,GAAG,CAAC;EACtBC,aAAa,EAAEC,qBAAqB;EACpCC,QAAQ;EACR,GAAGC;AACgB,CAAC,EACtBC,GAAiB,EACjB;EACA,MAAMC,iBAAiB,GAAGxB,EAAE,KAAKyB,SAAS,IAAIzB,EAAE,KAAK0B,QAAQ;EAC7D,MAAMC,SAAS,GAAI3B,EAAE,IAAI0B,QAAmD;EAC5E;EACA,MAAME,iBAAiB,GAAGjD,OAAO,CAAC,MAAMC,QAAQ,CAACiD,uBAAuB,CAACF,SAAS,CAAC,EAAE,CAACA,SAAS,CAAC,CAAC;EACjG,MAAM;IACJG,UAAU;IACVC,SAAS;IACTZ,aAAa;IACba,iBAAiB;IACjBjB,cAAc,EAAEkB,aAAa;IAC7BC;EACF,CAAC,GAAG9C,SAAS,CAAC,CAAC;EACf,MAAM+C,SAAS,GAAGnD,YAAY,CAACwC,iBAAiB,GAAGO,SAAS,GAAGN,SAAS,EAAEF,GAAG,CAAC;EAC9E,MAAMa,eAAe,GAAGrB,cAAc,IAAIC,OAAO,IAAIiB,aAAa;EAClE,MAAMI,eAAe,GAAG5B,SAAS,IAAIC,OAAO;EAC5C,MAAM4B,WAAW,GAAGpD,uBAAuB,CAAC;IAC1CuB,SAAS,EAAE4B,eAAe;IAC1B1B,cAAc,EAAEA,cAAc,KAAKc,SAAS,GAAGd,cAAc,GAAIC,gBAAgB,IAAIa,SAAU;IAC/FZ,YAAY,EAAEA,YAAY,KAAKY,SAAS,GAAGZ,YAAY,GAAGC,cAAc;IACxEyB,OAAO,EAAE,CAACtC,IAAI,IAAIA,IAAI,CAACuC,MAAM,KAAK;EACpC,CAAC,CAAC;EACF,MAAMC,qBAAqB,GAAGxD,sBAAsB,CAACkC,aAAa,EAAEE,QAAQ,EAAED,qBAAqB,CAAC;EACpG,MAAMsB,MAAM,gBACV7C,KAAA,CAAAF,SAAA;IAAAgD,QAAA,gBACElD,IAAA,CAACmD,IAAI;MAACzC,KAAK,EAAE0C,MAAM,CAACC,aAAa,CAACV,eAAe,CAAE;MAAAO,QAAA,eACjDlD,IAAA,CAACV,UAAU;QAACgE,IAAI,EAAE5D;MAA0B,CAAE;IAAC,CAC3C,CAAC,EACNI,mBAAmB,CAACc,mBAAmB,CAAC;EAAA,CACzC,CACH;EAED,oBACEZ,IAAA,CAACmC,iBAAiB;IAChBL,GAAG,EAAEY,SAAU;IACflC,IAAI,EAAEoC,eAAe,GAAG,EAAE,GAAGpC,IAAK;IAClCC,UAAU,EAAEA,UAAW;IACvBC,KAAK,EAAE,CAAC;MAAE6C,eAAe,EAAElB;IAAW,CAAC,EAAE3B,KAAK,CAAE;IAChDK,UAAU,EAAEA,UAAW;IACvByC,8BAA8B,EAAC,OAAO;IACtCC,gCAAgC,EAAE,KAAM;IACxCC,yCAAyC,EAAE,KAAM;IACjD/C,qBAAqB,EAAE,CACrByC,MAAM,CAACO,OAAO,CAAChB,eAAe,EAAEF,SAAS,EAAEjB,WAAW,EAAEC,kBAAkB,CAAC,EAC3Ed,qBAAqB,CACrB;IACFC,mBAAmB,EAAEqC,MAAO;IAC5BpC,mBAAmB,EAAEA,mBAAoB;IACzCC,kBAAkB,EAAE+B,WAAW,IAAI/B,kBAAmB;IACtD8C,4BAA4B,EAAE,KAAM;IACpCC,mBAAmB,EAAE,EAAG;IACxBC,aAAa,EAAEvB,iBAAkB;IAAA,GAC7BV,IAAI;IACRD,QAAQ,EAAEoB;EAAsB,CACjC,CAAC;AAEN,CAAC,CAAC;;AAEF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAM1C,UAAU,GAAGD,cAAqC;AAC/DC,UAAU,CAACyD,WAAW,GAAG,aAAa;AAEtC,MAAMX,MAAM,GAAGhE,UAAU,CAAC4E,MAAM,CAAC,CAACC,KAAK,EAAEC,OAAO,MAAM;EACpDP,OAAO,EAAEA,CACPQ,OAA6B,EAC7B1B,SAAkB,EAClBjB,WAA+B,EAC/BC,kBAA0B,KACvB;IACH,MAAM;MAAE2C,CAAC;MAAEC;IAAE,CAAC,GAAGhF,oBAAoB,CAAC4E,KAAK,EAAEC,OAAO,CAACI,UAAU,CAAC;IAChE,OAAO;MACLC,QAAQ,EAAE,CAAC;MACXC,UAAU,EAAE,CAAC/B,SAAS,GAAGwB,KAAK,CAACQ,MAAM,CAACxB,MAAM,CAACyB,MAAM,GAAG,CAAC,KAAK7E,kBAAkB,CAACsE,OAAO,CAAC,GAAGE,CAAC,GAAG,CAAC,CAAC;MAChGM,iBAAiB,EAAE/E,oBAAoB,CAACuE,OAAO,CAAC,GAAGC,CAAC,GAAG,CAAC;MACxDQ,aAAa,EAAE,CAACpD,WAAW,KAAK3B,kBAAkB,CAACsE,OAAO,CAAC,GAAGE,CAAC,GAAG,CAAC,CAAC,IAAI5C,kBAAkB;MAAAoD,iBAAA;IAC5F,CAAC;EACH,CAAC;EACDxB,aAAa,EAAGc,OAA6B,KAAM;IACjDW,gBAAgB,EAAElF,oBAAoB,CAACuE,OAAO,CAAC,GAAG,CAAC9E,oBAAoB,CAAC4E,KAAK,EAAEC,OAAO,CAACI,UAAU,CAAC,CAACF,CAAC,GAAG,CAAC;IAAAS,iBAAA;EAC1G,CAAC;AACH,CAAC,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["forwardRef","useMemo","Animated","StyleSheet","resolveScreenPadding","PortalHost","useNestedContainerWarning","useScreenRef","useScreenScrollHandler","ScreenBottomInset","renderScreenPlaceholder","SCREEN_HEADER_PORTAL_HOST","useScreen","hasHorizontalPadding","hasVerticalPadding","renderListComponent","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","ScreenListBase","ScreenList","as","data","renderItem","style","contentContainerStyle","ListHeaderComponent","ListFooterComponent","ListEmptyComponent","horizontal","isLoading","loading","loadingContent","LoadingComponent","emptyContent","EmptyComponent","contentPadding","margins","bottomInset","extraBottomPadding","scrollHandler","externalScrollHandler","onScroll","rest","ref","isDefaultFlatList","undefined","FlatList","Component","AnimatedComponent","createAnimatedComponent","background","scrollRef","headerSnapOffsets","screenPadding","hasHeader","contentOwnsBottomInset","platformAdjustsInsets","ownsBottomInset","mergedRef","resolvedPadding","resolvedLoading","placeholder","isEmpty","length","composedScrollHandler","header","children","View","styles","headerWrapper","name","footer","backgroundColor","contentInsetAdjustmentBehavior","automaticallyAdjustContentInsets","automaticallyAdjustsScrollIndicatorInsets","content","showsVerticalScrollIndicator","scrollEventThrottle","snapToOffsets","displayName","create","theme","runtime","padding","x","y","breakpoint","flexGrow","paddingTop","layout","height","paddingHorizontal","paddingBottom","uni__dependencies","marginHorizontal"],"sourceRoot":"../../../../src","sources":["components/screen/ScreenList.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/screen/ScreenScrollView.js

@@ -6,8 +6,10 @@ import Animated from "react-native-reanimated";
 import { StyleSheet } from "react-native-unistyles";
 import { resolveScreenPadding } from "../../theme/screen-padding.js";
 import { PortalHost } from "../portal/index.js";
+import { useNestedContainerWarning } from "./hooks/use-nested-container-warning.js";
 import { useScreenRef } from "./hooks/use-screen-ref.js";
 import { useScreenScrollHandler } from "./hooks/use-screen-scroll-handler.js";
+import { ScreenBottomInset } from "./parts/ScreenBottomInset";
 import { renderScreenPlaceholder } from "./parts/ScreenPlaceholder.js";
 import { SCREEN_HEADER_PORTAL_HOST, useScreen } from "./ScreenContext.js";
 import { hasHorizontalPadding, hasVerticalPadding } from "./utils.js";
@@ -56,8 +58,14 @@ export const ScreenScrollView = /*#__PURE__*/forwardRef(function ScreenScrollVie
     scrollHandler,
     contentPadding: screenPadding,
     hasHeader,
-    background
+    background,
+    contentOwnsBottomInset,
+    platformAdjustsInsets
   } = useScreen();
+  // The root yields the bottom edge only to a vertical container, so a horizontal
+  // one here is a secondary container and must not pay the inset a second time.
+  const ownsBottomInset = contentOwnsBottomInset && !horizontal;
+  useNestedContainerWarning("Screen.ScrollView", horizontal);
   const resolvedPadding = contentPadding ?? margins ?? screenPadding;
   const mergedRef = useScreenRef(scrollRef, ref);
   const placeholder = renderScreenPlaceholder({
@@ -72,8 +80,13 @@ export const ScreenScrollView = /*#__PURE__*/forwardRef(function ScreenScrollVie
     style: [{
       backgroundColor: background
     }, style],
-    horizontal: horizontal,
-    contentInsetAdjustmentBehavior: "never",
+    horizontal: horizontal
+    /*
+      UIKit owns the vertical insets on a header-less iOS screen — see
+      `platformAdjustsInsets`. Everywhere else the frame has already paid
+      them, so a second adjustment here would count them twice.
+    */,
+    contentInsetAdjustmentBehavior: platformAdjustsInsets ? "automatic" : "never",
     automaticallyAdjustContentInsets: false,
     automaticallyAdjustsScrollIndicatorInsets: false,
     showsVerticalScrollIndicator: false,
@@ -89,9 +102,10 @@ export const ScreenScrollView = /*#__PURE__*/forwardRef(function ScreenScrollVie
     }), /*#__PURE__*/_jsx(View, {
       style: [styles.content(horizontal), contentStyle],
       children: placeholder ?? children
-    })]
+    }), ownsBottomInset && /*#__PURE__*/_jsx(ScreenBottomInset, {})]
   });
 });
+ScreenScrollView.displayName = "Screen.ScrollView";
 const styles = StyleSheet.create((theme, runtime) => ({
   scrollContent: (hasHeader, padding, extraBottomPadding) => {
     const {

package/lib/module/components/screen/ScreenScrollView.js.map

@@ -1 +1 @@
-{"version":3,"names":["Children","forwardRef","Animated","StyleSheet","resolveScreenPadding","PortalHost","useScreenRef","useScreenScrollHandler","renderScreenPlaceholder","SCREEN_HEADER_PORTAL_HOST","useScreen","hasHorizontalPadding","hasVerticalPadding","jsx","_jsx","jsxs","_jsxs","ScreenScrollView","children","style","contentContainerStyle","contentStyle","scrollHandler","externalScrollHandler","onScroll","horizontal","isLoading","loading","loadingContent","LoadingComponent","emptyContent","EmptyComponent","contentPadding","margins","extraBottomPadding","isEmpty","rest","ref","scrollRef","screenPadding","hasHeader","background","resolvedPadding","mergedRef","placeholder","undefined","toArray","length","composedScrollHandler","ScrollView","backgroundColor","contentInsetAdjustmentBehavior","automaticallyAdjustContentInsets","automaticallyAdjustsScrollIndicatorInsets","showsVerticalScrollIndicator","scrollEventThrottle","styles","scrollContent","View","headerWrapper","name","content","create","theme","runtime","padding","x","y","breakpoint","flexGrow","paddingTop","layout","header","height","paddingHorizontal","paddingBottom","uni__dependencies","marginHorizontal","flexDirection"],"sourceRoot":"../../../../src","sources":["components/screen/ScreenScrollView.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Children","forwardRef","Animated","StyleSheet","resolveScreenPadding","PortalHost","useNestedContainerWarning","useScreenRef","useScreenScrollHandler","ScreenBottomInset","renderScreenPlaceholder","SCREEN_HEADER_PORTAL_HOST","useScreen","hasHorizontalPadding","hasVerticalPadding","jsx","_jsx","jsxs","_jsxs","ScreenScrollView","children","style","contentContainerStyle","contentStyle","scrollHandler","externalScrollHandler","onScroll","horizontal","isLoading","loading","loadingContent","LoadingComponent","emptyContent","EmptyComponent","contentPadding","margins","extraBottomPadding","isEmpty","rest","ref","scrollRef","screenPadding","hasHeader","background","contentOwnsBottomInset","platformAdjustsInsets","ownsBottomInset","resolvedPadding","mergedRef","placeholder","undefined","toArray","length","composedScrollHandler","ScrollView","backgroundColor","contentInsetAdjustmentBehavior","automaticallyAdjustContentInsets","automaticallyAdjustsScrollIndicatorInsets","showsVerticalScrollIndicator","scrollEventThrottle","styles","scrollContent","View","headerWrapper","name","content","displayName","create","theme","runtime","padding","x","y","breakpoint","flexGrow","paddingTop","layout","header","height","paddingHorizontal","paddingBottom","uni__dependencies","marginHorizontal","flexDirection"],"sourceRoot":"../../../../src","sources":["components/screen/ScreenScrollView.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/screen/hooks/use-nested-container-warning.js

@@ -0,0 +1,39 @@
+"use strict";
+
+import { useEffect } from "react";
+import { useScreen } from "../ScreenContext.js";
+
+/**
+ * Warns, in development, when this container is the one the screen root failed
+ * to find.
+ *
+ * The root inspects its own children and fragments but does not execute
+ * component children, so a container rendered inside one is invisible to it (see
+ * `hasScrollContainerOwningBottom`). On a header-less iOS screen that changes
+ * behaviour rather than just bookkeeping: the frame pads the top edge, the scroll
+ * view no longer fills the screen, and UIKit stops collapsing the native large
+ * title — silently, with the screen otherwise looking correct.
+ *
+ * The container is the only place that can tell. `platformInsetsEligible` says
+ * the screen qualified; a container mounting while `platformAdjustsInsets` is
+ * false says the root never saw it. Both true together mean exactly this mistake,
+ * so there is nothing here to false-positive on: a screen with no scroll
+ * container at all never runs this hook, and a deliberate `safeArea` opt-out is
+ * not eligible in the first place.
+ *
+ * @param container Name to report, e.g. `"Screen.List"`.
+ * @param horizontal Whether this container scrolls horizontally; those are never
+ *   candidates for the vertical insets and never warn.
+ */
+export function useNestedContainerWarning(container, horizontal) {
+  const {
+    platformAdjustsInsets,
+    platformInsetsEligible
+  } = useScreen();
+  const isNested = platformInsetsEligible && !platformAdjustsInsets && !horizontal;
+  useEffect(() => {
+    if (!__DEV__ || !isNested) return;
+    console.warn(`[react-native-terra-ui] ${container} is nested inside another component, so its Screen could not find it. ` + "On iOS a Screen with no Screen.Header hands its vertical insets to UIKit, but only when the scroll " + "container is among its own children — nested, the frame pads the top instead and a native large title " + `will not collapse. Render ${container} as a direct child of Screen; fragments are fine.`);
+  }, [container, isNested]);
+}
+//# sourceMappingURL=use-nested-container-warning.js.map

package/lib/module/components/screen/hooks/use-nested-container-warning.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["useEffect","useScreen","useNestedContainerWarning","container","horizontal","platformAdjustsInsets","platformInsetsEligible","isNested","__DEV__","console","warn"],"sourceRoot":"../../../../../src","sources":["components/screen/hooks/use-nested-container-warning.ts"],"mappings":";;AAAA,SAASA,SAAS,QAAQ,OAAO;AAEjC,SAASC,SAAS;;AAElB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,yBAAyBA,CAACC,SAAiB,EAAEC,UAAmB,EAAQ;EACtF,MAAM;IAAEC,qBAAqB;IAAEC;EAAuB,CAAC,GAAGL,SAAS,CAAC,CAAC;EACrE,MAAMM,QAAQ,GAAGD,sBAAsB,IAAI,CAACD,qBAAqB,IAAI,CAACD,UAAU;EAEhFJ,SAAS,CAAC,MAAM;IACd,IAAI,CAACQ,OAAO,IAAI,CAACD,QAAQ,EAAE;IAC3BE,OAAO,CAACC,IAAI,CACV,2BAA2BP,SAAS,wEAAwE,GAC1G,qGAAqG,GACrG,wGAAwG,GACxG,6BAA6BA,SAAS,mDAC1C,CAAC;EACH,CAAC,EAAE,CAACA,SAAS,EAAEI,QAAQ,CAAC,CAAC;AAC3B","ignoreList":[]}

package/lib/module/components/screen/parts/ScreenBottomInset.android.js

@@ -0,0 +1,42 @@
+"use strict";
+
+import { StyleSheet } from "react-native-unistyles";
+
+// Keep native codegen declarations outside the library's generated public types.
+import { jsx as _jsx } from "react/jsx-runtime";
+const {
+  SafeAreaView
+} = require("react-native-screens/src/components/safe-area");
+const BOTTOM_EDGE = {
+  top: false,
+  bottom: true,
+  left: false,
+  right: false
+};
+
+/**
+ * Android's bottom safe area as scroll content — see the iOS file for why this
+ * is a native view rather than a measured inset.
+ *
+ * `insetType: "all"` is the same combination the Screen frame uses: system insets
+ * plus native interface insets, which is what carries a native tab bar. The frame
+ * leaves the bottom edge unconsumed when the content owns it, so this view still
+ * sees the inset and is the one to consume it.
+ */
+export function ScreenBottomInset() {
+  return /*#__PURE__*/_jsx(SafeAreaView, {
+    edges: BOTTOM_EDGE,
+    insetType: "all",
+    style: styles.spacer
+  });
+}
+const styles = StyleSheet.create(() => ({
+  // `flex: 0` cancels the `flex: 1` this SafeAreaView sets on itself, which would
+  // otherwise let the spacer eat the content container's growth.
+  spacer: {
+    flex: 0,
+    flexGrow: 0,
+    flexShrink: 0
+  }
+}));
+//# sourceMappingURL=ScreenBottomInset.android.js.map

package/lib/module/components/screen/parts/ScreenBottomInset.android.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["StyleSheet","jsx","_jsx","SafeAreaView","require","BOTTOM_EDGE","top","bottom","left","right","ScreenBottomInset","edges","insetType","style","styles","spacer","create","flex","flexGrow","flexShrink"],"sourceRoot":"../../../../../src","sources":["components/screen/parts/ScreenBottomInset.android.tsx"],"mappings":";;AAGA,SAASA,UAAU,QAAQ,wBAAwB;;AAEnD;AAAA,SAAAC,GAAA,IAAAC,IAAA;AACA,MAAM;EAAEC;AAAa,CAAC,GAAGC,OAAO,CAAC,+CAA+C,CAO/E;AAED,MAAMC,WAAW,GAAG;EAAEC,GAAG,EAAE,KAAK;EAAEC,MAAM,EAAE,IAAI;EAAEC,IAAI,EAAE,KAAK;EAAEC,KAAK,EAAE;AAAM,CAAC;;AAE3E;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAAA,EAAG;EAClC,oBAAOR,IAAA,CAACC,YAAY;IAACQ,KAAK,EAAEN,WAAY;IAACO,SAAS,EAAC,KAAK;IAACC,KAAK,EAAEC,MAAM,CAACC;EAAO,CAAE,CAAC;AACnF;AAEA,MAAMD,MAAM,GAAGd,UAAU,CAACgB,MAAM,CAAC,OAAO;EACtC;EACA;EACAD,MAAM,EAAE;IAAEE,IAAI,EAAE,CAAC;IAAEC,QAAQ,EAAE,CAAC;IAAEC,UAAU,EAAE;EAAE;AAChD,CAAC,CAAC,CAAC","ignoreList":[]}

package/lib/module/components/screen/parts/ScreenBottomInset.js

@@ -0,0 +1,37 @@
+"use strict";
+
+import { SafeAreaView } from "react-native-safe-area-context";
+import { StyleSheet } from "react-native-unistyles";
+import { jsx as _jsx } from "react/jsx-runtime";
+const BOTTOM_EDGE = ["bottom"];
+
+/**
+ * The bottom safe area as a piece of scroll content rather than frame padding.
+ *
+ * A scroll container that yields its bottom edge to the content (see
+ * `contentOwnsBottomInset`) keeps a full-bleed viewport, so its rows pass under
+ * a tab bar or home indicator instead of stopping above one. This spacer is what
+ * keeps the *end* of that content clear of the bar: an empty safe-area view whose
+ * own padding is its whole height.
+ *
+ * Deliberately a native safe-area view rather than a measured number. The inset
+ * that matters here includes bars this screen does not own — a native tab bar is
+ * a sibling view, not a window inset — and asking the platform for padding gets
+ * the same answer the frame would have applied, on both platforms, without a JS
+ * round trip through a value that lands a frame late.
+ */
+export function ScreenBottomInset() {
+  return /*#__PURE__*/_jsx(SafeAreaView, {
+    edges: BOTTOM_EDGE,
+    style: styles.spacer
+  });
+}
+const styles = StyleSheet.create(() => ({
+  // Height comes entirely from the inset, so the spacer must not flex with the
+  // content container's `flexGrow: 1`.
+  spacer: {
+    flexGrow: 0,
+    flexShrink: 0
+  }
+}));
+//# sourceMappingURL=ScreenBottomInset.js.map

package/lib/module/components/screen/parts/ScreenBottomInset.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["SafeAreaView","StyleSheet","jsx","_jsx","BOTTOM_EDGE","ScreenBottomInset","edges","style","styles","spacer","create","flexGrow","flexShrink"],"sourceRoot":"../../../../../src","sources":["components/screen/parts/ScreenBottomInset.tsx"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,gCAAgC;AAC7D,SAASC,UAAU,QAAQ,wBAAwB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEpD,MAAMC,WAAW,GAAG,CAAC,QAAQ,CAAU;;AAEvC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAAA,EAAG;EAClC,oBAAOF,IAAA,CAACH,YAAY;IAACM,KAAK,EAAEF,WAAY;IAACG,KAAK,EAAEC,MAAM,CAACC;EAAO,CAAE,CAAC;AACnE;AAEA,MAAMD,MAAM,GAAGP,UAAU,CAACS,MAAM,CAAC,OAAO;EACtC;EACA;EACAD,MAAM,EAAE;IAAEE,QAAQ,EAAE,CAAC;IAAEC,UAAU,EAAE;EAAE;AACvC,CAAC,CAAC,CAAC","ignoreList":[]}

package/lib/module/components/screen/parts/ScreenFrame.js

@@ -21,6 +21,7 @@ export function ScreenFrame({
     children: [/*#__PURE__*/_jsx(ScreenSafeArea, {
       edges: edges,
       children: /*#__PURE__*/_jsx(View, {
+        collapsable: false,
         style: styles.content,
         onLayout: onLayout,
         children: children