@momo-kits/native-kits 0.167.1-duo.1-debug → 0.167.1-duo.10-debug

package/ios/Layout/ScreenLayout.swift

@@ -0,0 +1,312 @@
+//
+//  ScreenLayout.swift
+//  MoMoUIKits
+//
+//  Port of momo-kits RN `useScreenLayout` (Layout/utils.ts) and `Application/device.ts`:
+//  window size, safe-area insets, content width, header geometry and the iPhone Duo side bar.
+//
+
+import SwiftUI
+import UIKit
+
+public enum SideBarEdge: Equatable {
+    case left, right
+}
+
+public struct SideBarLayout: Equatable {
+    public let edge: SideBarEdge
+    public let width: CGFloat
+    /// Preferred window y of the first control; StackScreen still keeps the column above the bottom bars.
+    public let top: CGFloat
+    /// Room kept free above the window bottom, clear of a camera at the bottom end of the strip.
+    public let bottom: CGFloat
+}
+
+public struct ScreenLayout: Equatable {
+    public let width: CGFloat
+    public let height: CGFloat
+    public let isIPhoneDuo: Bool
+    public let insets: EdgeInsets
+    public let insetLeft: CGFloat
+    public let insetRight: CGFloat
+    public let contentWidth: CGFloat
+    public let headerHeight: CGFloat
+    /// 0 when the status bar is off the top edge, so the bar row fills the header and keeps the title centered.
+    public let headerStatusBarHeight: CGFloat
+    /// iPhone Duo moves back and toolkit into a column in the side safe area; nil while they stay in the bar.
+    public let sideBar: SideBarLayout?
+
+    public var headerBarHeight: CGFloat { headerHeight - headerStatusBarHeight }
+}
+
+// Measured by momo-kits RN (Layout/utils.ts) on the iOS 27.1 iPhone Duo simulator; keep both in sync.
+enum DuoMetrics {
+    // Inner display is ~1.42, outer ~1.45; every slab iPhone is 1.77 or taller.
+    static let maxAspectRatio: CGFloat = 1.6
+    // Outer display is 466pt tall in landscape, inner 669pt.
+    static let innerMinHeight: CGFloat = 600
+    static let controlSize: CGFloat = 48
+    static let itemPitch: CGFloat = 50
+    static let firstItemTop: CGFloat = 170
+    static let firstItemTopLandscape: CGFloat = 120
+    // Outer display in portrait: the header is 4pt taller than the iPhone floor and its title
+    // lines up with the camera punchout (y 24–66 at the top of the strip).
+    static let outerHeaderHeight: CGFloat = 76
+    static let outerCameraCenterY: CGFloat = 45
+    // Outer display in landscape has no status bar in the strip: controls keep this far from
+    // both ends unless a reserved region (the camera at either end) asks for more.
+    static let edgeInset: CGFloat = 24
+    // Widest short side of any single-display iPhone.
+    static let iPhoneMaxShortSide: CGFloat = 440
+}
+
+enum HeaderMetrics {
+    static let barHeight: CGFloat = HEADER_HEIGHT
+    static let iPhoneMinHeight: CGFloat = 72
+    // A smaller top inset means the status bar is not on the top edge.
+    static let statusBarMinInset: CGFloat = 20
+}
+
+private var isPhoneIdiom: Bool { UIDevice.current.userInterfaceIdiom == .phone }
+
+private var keyWindow: UIWindow? {
+    UIApplication.shared.connectedScenes
+        .compactMap { ($0 as? UIWindowScene)?.keyWindow }
+        .first
+}
+
+extension ScreenLayout {
+    /// Snapshot of the key window; not reactive, so views read `\.screenLayout` instead.
+    public static var current: ScreenLayout {
+        guard let window = keyWindow else {
+            return make(size: UIScreen.main.bounds.size, insets: EdgeInsets())
+        }
+        let inset = window.safeAreaInsets
+        return make(
+            size: window.bounds.size,
+            insets: EdgeInsets(top: inset.top, leading: inset.left, bottom: inset.bottom, trailing: inset.right)
+        )
+    }
+
+    static func make(
+        size: CGSize,
+        insets: EdgeInsets,
+        reservedRegions: [CGRect] = ReservedRegions.current,
+        isPhone: Bool = isPhoneIdiom
+    ) -> ScreenLayout {
+        let width = size.width
+        let height = size.height
+        var (headerHeight, headerStatusBarHeight) = headerGeometry(topInset: insets.top, isPhone: isPhone)
+        let isDuo = isPhone && isIPhoneDuoWindow(width: width, height: height, insets: insets)
+        guard isDuo else {
+            return ScreenLayout(
+                width: width, height: height, isIPhoneDuo: false, insets: insets,
+                insetLeft: 0, insetRight: 0, contentWidth: width,
+                headerHeight: headerHeight, headerStatusBarHeight: headerStatusBarHeight, sideBar: nil
+            )
+        }
+
+        var sideBar: SideBarLayout?
+        let sideInset = max(insets.leading, insets.trailing)
+        // narrower strips cannot host a control 12pt from the inner edge
+        if sideInset >= DuoMetrics.controlSize + Spacing.M {
+            var top = insets.top + HeaderMetrics.barHeight + Spacing.M
+            if insets.top < HeaderMetrics.statusBarMinInset {
+                // status bar lives in the strip: start under its cluster, as the native bar does
+                if width <= height {
+                    top = DuoMetrics.firstItemTop
+                } else if height >= DuoMetrics.innerMinHeight {
+                    top = DuoMetrics.firstItemTopLandscape
+                } else {
+                    // outer display in landscape: no status bar in the strip
+                    top = DuoMetrics.edgeInset
+                }
+
+                if height > width && width < DuoMetrics.innerMinHeight {
+                    // outer display: the row starts below the top so the title centers on the camera
+                    headerHeight = DuoMetrics.outerHeaderHeight
+                    headerStatusBarHeight = DuoMetrics.outerCameraCenterY * 2 - DuoMetrics.outerHeaderHeight
+                }
+            }
+
+            let edge: SideBarEdge = insets.trailing >= insets.leading ? .right : .left
+            let stripLeft = edge == .right ? width - sideInset : 0
+            // clear of the camera and of the status bar cluster, which grows for calls and Live
+            // Activities; region frames already include the system's margin
+            let occlusion = stripOcclusion(reservedRegions, stripLeft: stripLeft, stripRight: stripLeft + sideInset, windowHeight: height)
+            sideBar = SideBarLayout(
+                edge: edge,
+                width: sideInset,
+                top: max(top, occlusion.top),
+                bottom: max(DuoMetrics.edgeInset, occlusion.bottom)
+            )
+        }
+
+        return ScreenLayout(
+            width: width, height: height, isIPhoneDuo: true, insets: insets,
+            insetLeft: insets.leading, insetRight: insets.trailing,
+            contentWidth: width - insets.leading - insets.trailing,
+            headerHeight: headerHeight, headerStatusBarHeight: headerStatusBarHeight, sideBar: sideBar
+        )
+    }
+
+    private static func headerGeometry(topInset: CGFloat, isPhone: Bool) -> (CGFloat, CGFloat) {
+        let height = topInset + HeaderMetrics.barHeight
+        guard isPhone else { return (height, topInset) }
+        return (
+            max(height, HeaderMetrics.iPhoneMinHeight),
+            topInset < HeaderMetrics.statusBarMinInset ? 0 : topInset
+        )
+    }
+
+    /// How far system regions reach into a side strip from its top and from its bottom end
+    /// (e.g. the camera, which sits at either end depending on the rotation).
+    private static func stripOcclusion(
+        _ regions: [CGRect],
+        stripLeft: CGFloat,
+        stripRight: CGFloat,
+        windowHeight: CGFloat
+    ) -> (top: CGFloat, bottom: CGFloat) {
+        regions.reduce(into: (top: CGFloat(0), bottom: CGFloat(0))) { occlusion, region in
+            guard region.minX < stripRight && region.maxX > stripLeft else { return }
+            if region.midY < windowHeight / 2 {
+                occlusion.top = max(occlusion.top, region.maxY)
+            } else {
+                occlusion.bottom = max(occlusion.bottom, windowHeight - region.minY)
+            }
+        }
+    }
+
+    // Slab iPhones report equal side insets in landscape; iPhone Duo moves the status bar to one side.
+    private static func isIPhoneDuoWindow(width: CGFloat, height: CGFloat, insets: EdgeInsets) -> Bool {
+        let shortSide = min(width, height)
+        let isSquare = shortSide > 0 && max(width, height) / shortSide < DuoMetrics.maxAspectRatio
+        return isSquare || insets.leading != insets.trailing
+    }
+
+    /// Below the side status bar: in portrait it is about twice as tall as its inset is wide.
+    public var duoTopInset: CGFloat {
+        max(insets.top, height > width ? max(insets.leading, insets.trailing) * 2 : 0)
+    }
+}
+
+/// Port of RN `device.ts` `isIPhoneDuo()`: UIScreen stays on the outer display, so this
+/// still matches when Split View narrows the window. Used by popups and overlays.
+public func isIPhoneDuoDevice(windowSize: CGSize? = nil) -> Bool {
+    guard isPhoneIdiom else { return false }
+    let screen = UIScreen.main.bounds.size
+    let window = windowSize ?? keyWindow?.bounds.size ?? screen
+    return max(min(screen.width, screen.height), min(window.width, window.height)) > DuoMetrics.iPhoneMaxShortSide
+}
+
+// MARK: - Reserved regions
+
+/// System occlusion regions (iOS 27.1+) in window coordinates: the iPhone Duo camera, and the
+/// status bar cluster as it grows for a call or a Live Activity. Empty before iOS 27.1.
+enum ReservedRegions {
+    // last report of the probe, so `ScreenLayout.current` includes it
+    static var current: [CGRect] = []
+}
+
+/// Invisible probe: reading the regions in layoutSubviews makes UIKit run it again when they
+/// change, so nothing polls. Port of RN `@momo-kits/reserved-regions`.
+private final class ReservedRegionsProbe: UIView {
+    var onChange: (() -> Void)?
+    private var last: [CGRect]?
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        isUserInteractionEnabled = false
+    }
+
+    required init?(coder: NSCoder) { nil }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        let regions = occlusionRegions()
+        guard regions != last else { return }
+        last = regions
+        ReservedRegions.current = regions
+        // layout pass: publish on the next turn instead of mutating SwiftUI state mid-update
+        DispatchQueue.main.async { [weak self] in self?.onChange?() }
+    }
+
+    override func didMoveToWindow() {
+        super.didMoveToWindow()
+        setNeedsLayout()
+    }
+
+    // The API is newer than the SDKs hosts may build with, so it is reached through the runtime.
+    private func occlusionRegions() -> [CGRect] {
+        let regionsOfKind = NSSelectorFromString("reservedRegionsOfKind:")
+        guard window != nil, responds(to: regionsOfKind),
+              let kindType = NSClassFromString("UIViewReservedRegionKind") as? NSObject.Type,
+              let kind = (kindType as AnyObject).perform(NSSelectorFromString("occlusionRegionKind"))?.takeUnretainedValue(),
+              let regions = perform(regionsOfKind, with: kind)?.takeUnretainedValue() as? [NSObject]
+        else { return [] }
+        return regions.compactMap { ($0.value(forKey: "frame") as? NSValue)?.cgRectValue }
+            .map { convert($0, to: nil) }
+    }
+}
+
+private struct ReservedRegionsProbeView: UIViewRepresentable {
+    let onChange: () -> Void
+
+    func makeUIView(context: Context) -> ReservedRegionsProbe {
+        let probe = ReservedRegionsProbe()
+        probe.onChange = onChange
+        return probe
+    }
+
+    func updateUIView(_ probe: ReservedRegionsProbe, context: Context) {
+        probe.onChange = onChange
+    }
+}
+
+// MARK: - Environment
+
+private struct ScreenLayoutKey: EnvironmentKey {
+    // Computed so an un-injected subtree (bare UIHostingController) still reads the live window.
+    static var defaultValue: ScreenLayout { .current }
+}
+
+public extension EnvironmentValues {
+    var screenLayout: ScreenLayout {
+        get { self[ScreenLayoutKey.self] }
+        set { self[ScreenLayoutKey.self] = newValue }
+    }
+}
+
+/// Re-reads the window whenever this view's size changes (rotation, fold/unfold, Split View).
+private struct ScreenLayoutReader: ViewModifier {
+    @State private var layout: ScreenLayout = .current
+
+    func body(content: Content) -> some View {
+        content
+            .environment(\.screenLayout, layout)
+            .background(
+                GeometryReader { proxy in
+                    Color.clear
+                        .onAppear { refresh() }
+                        .onChange(of: proxy.size) { _ in refresh() }
+                        .onChange(of: proxy.safeAreaInsets) { _ in refresh() }
+                }
+            )
+            .background(ReservedRegionsProbeView { refresh() }.ignoresSafeArea())
+            .onReceive(NotificationCenter.default.publisher(for: UIDevice.orientationDidChangeNotification)) { _ in
+                refresh()
+            }
+    }
+
+    private func refresh() {
+        let next = ScreenLayout.current
+        if next != layout { layout = next }
+    }
+}
+
+public extension View {
+    /// Provides `\.screenLayout`; NavigationContainer applies it, a bare UIHostingController root should too.
+    func momoScreenLayout() -> some View {
+        modifier(ScreenLayoutReader())
+    }
+}

package/ios/Layout/Section.swift

@@ -1,8 +1,8 @@
 import SwiftUI
 
-/// 12-column section container: horizontal margin, optional background image, and a
-/// wrapping row of children that read their span size from `\.gridContext`.
-/// Mirrors `vn.momo.kits.layout.Section`.
+/// Grid section container (12 columns, 24 when the content is wider than 600pt): horizontal
+/// margin, optional background image, and a wrapping row of children that read their span
+/// size from `\.gridContext`. Mirrors `vn.momo.kits.layout.Section`.
 public struct SectionView<Content: View>: View {
     // MARK: Lifecycle
 
@@ -19,116 +19,20 @@ public struct SectionView<Content: View>: View {
     // MARK: Public
 
     public var body: some View {
-        flow
-            .environment(\.gridContext, grid)
-            .frame(maxWidth: .infinity, alignment: .topLeading)
-            .background(widthReader)
+        GridFlow(gutter: Spacing.M, content: content)
             .background(background)
             .padding(.horizontal, useMargin ? Spacing.M : 0)
     }
 
     // MARK: Private
 
-    private static var columns: Int { 12 }
-    private static var gutter: CGFloat { Spacing.M }
-
     private let useMargin: Bool
     private let backgroundImage: String?
     private let content: () -> Content
 
-    /// Width available *inside* the horizontal margin — the Compose `BoxWithConstraints` equivalent.
-    @State private var availableWidth: CGFloat = 0
-
-    private var grid: GridContext {
-        let columns = CGFloat(Self.columns)
-        // The trailing `- 1 / columns` mirrors Compose: it absorbs rounding so 12 spans
-        // plus their gutters never overflow the row by a sub-point.
-        let sizePerSpan = (availableWidth - Self.gutter * (columns - 1)) / columns - 1 / columns
-        return GridContext(numberOfColumns: Self.columns, gutter: Self.gutter, sizePerSpan: max(0, sizePerSpan))
-    }
-
-    @ViewBuilder private var flow: some View {
-        if #available(iOS 16.0, *) {
-            FlowRowLayout(gutter: Self.gutter) { content() }
-        } else {
-            // No `Layout` protocol before iOS 16: children stack instead of wrapping.
-            // Full-width (span 12) items — the common case — look identical.
-            VStack(alignment: .leading, spacing: Self.gutter) { content() }
-        }
-    }
-
     @ViewBuilder private var background: some View {
         if let backgroundImage {
             ImageView(backgroundImage, contentMode: .fill).clipped()
         }
     }
-
-    private var widthReader: some View {
-        GeometryReader { proxy in
-            Color.clear.preference(key: SectionWidthKey.self, value: proxy.size.width)
-        }
-        .onPreferenceChange(SectionWidthKey.self) { availableWidth = $0 }
-    }
-}
-
-private struct SectionWidthKey: PreferenceKey {
-    static var defaultValue: CGFloat = 0
-
-    static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
-        value = max(value, nextValue())
-    }
-}
-
-/// Wrapping row with equal horizontal/vertical spacing — the Compose `FlowRow` equivalent.
-@available(iOS 16.0, *)
-private struct FlowRowLayout: Layout {
-    struct Row {
-        var items: [(index: Int, size: CGSize)] = []
-        var width: CGFloat = 0
-        var height: CGFloat = 0
-    }
-
-    let gutter: CGFloat
-
-    func sizeThatFits(proposal: ProposedViewSize, subviews: Subviews, cache: inout Void) -> CGSize {
-        let maxWidth = proposal.width ?? .infinity
-        let rows = rows(for: subviews, maxWidth: maxWidth)
-        let height = rows.reduce(0) { $0 + $1.height } + gutter * CGFloat(max(0, rows.count - 1))
-        return CGSize(width: proposal.width ?? rows.map(\.width).max() ?? 0, height: height)
-    }
-
-    func placeSubviews(in bounds: CGRect, proposal: ProposedViewSize, subviews: Subviews, cache: inout Void) {
-        var y = bounds.minY
-        for row in rows(for: subviews, maxWidth: bounds.width) {
-            var x = bounds.minX
-            for item in row.items {
-                subviews[item.index].place(
-                    at: CGPoint(x: x, y: y),
-                    anchor: .topLeading,
-                    proposal: ProposedViewSize(item.size)
-                )
-                x += item.size.width + gutter
-            }
-            y += row.height + gutter
-        }
-    }
-
-    private func rows(for subviews: Subviews, maxWidth: CGFloat) -> [Row] {
-        var rows: [Row] = []
-        var current = Row()
-        for index in subviews.indices {
-            let size = subviews[index].sizeThatFits(ProposedViewSize(width: maxWidth, height: nil))
-            let widthIfAppended = current.items.isEmpty ? size.width : current.width + gutter + size.width
-            // Sub-point tolerance: spans are computed to land exactly on `maxWidth`.
-            if !current.items.isEmpty, widthIfAppended > maxWidth + 0.5 {
-                rows.append(current)
-                current = Row()
-            }
-            current.width = current.items.isEmpty ? size.width : current.width + gutter + size.width
-            current.height = max(current.height, size.height)
-            current.items.append((index, size))
-        }
-        if !current.items.isEmpty { rows.append(current) }
-        return rows
-    }
 }

package/ios/Loader/Loader.swift

@@ -12,8 +12,7 @@ public enum LoaderType {
 /// Mirrors Compose `Loader(type:, tintColor:, modifier:)` which delegates to
 /// `DotLoader` / `SpinnerLoader`. Both variants render Lottie animations
 /// (`files/dot_loading` and `files/lottie_circle_loader`) and optionally tint
-/// the fill/stroke. The tint is reproduced here by masking a solid color rect
-/// with the (monochrome) Lottie animation.
+/// the fill/stroke through a Lottie color value provider.
 public struct Loader: View {
     private let type: LoaderType
     private let tintColor: Color?
@@ -97,17 +96,14 @@ public struct ProgressBar: View {
     }
 }
 
-/// Renders a looping Lottie animation, optionally recolored via a mask.
+// Tinted inside Lottie, as Compose does: SwiftUI masks/color effects over a UIKit-backed view aren't reliable.
 private struct TintedLottie: View {
     let name: String
     let tintColor: Color?
 
     var body: some View {
-        if let tintColor = tintColor {
-            tintColor
-                .mask(LottieView(name: name, loopMode: .loop))
-        } else {
-            LottieView(name: name, loopMode: .loop)
-        }
+        LottieView(name: name, loopMode: .loop, tintColor: tintColor.map { UIColor($0) })
+            // The tint is applied once in makeUIView; a new tint needs a new view.
+            .id(tintColor)
     }
 }

package/ios/Lottie/LottieView.swift

@@ -15,6 +15,8 @@ struct LottieView: UIViewRepresentable {
   var loopMode: LottieLoopMode = .playOnce
   var contentMode : UIView.ContentMode  = .scaleAspectFit
   var onDone: (() -> Void)?
+  // Recolors every fill and stroke, as Compose's iOS LottieAnimation does; nil keeps the file's colors.
+  var tintColor: UIColor?
 
   // Add static cache for animations
   private static var animationCache = NSCache<NSString, LottieAnimation>()
@@ -36,7 +38,8 @@ struct LottieView: UIViewRepresentable {
         animationView.animation = cachedAnimation
         setupAnimationView(animationView, view)
       } else {
-        LottieAnimation.loadedFrom(url: URL(string: url)!, closure: { animation in
+        guard let animationURL = URL(string: url) else { return view }
+        LottieAnimation.loadedFrom(url: animationURL, closure: { animation in
           if let animation = animation {
             Self.animationCache.setObject(animation, forKey: url as NSString)
             animationView.animation = animation
@@ -49,7 +52,8 @@ struct LottieView: UIViewRepresentable {
       if let cachedAnimation = Self.animationCache.object(forKey: name as NSString) {
         animationView.animation = cachedAnimation
         setupAnimationView(animationView, view)
-      } else if let animation = LottieAnimation.named(name) {
+      } else if let animation = LottieAnimation.named(name, bundle: MoMoUIKitsResources.bundle)
+                  ?? LottieAnimation.named(name) {
         Self.animationCache.setObject(animation, forKey: name as NSString)
         animationView.animation = animation
         setupAnimationView(animationView, view)
@@ -62,6 +66,12 @@ struct LottieView: UIViewRepresentable {
   private func setupAnimationView(_ animationView: LottieAnimationView, _ containerView: UIView) {
     animationView.contentMode = contentMode
     animationView.loopMode = loopMode
+    if let tintColor {
+      animationView.setValueProvider(
+        ColorValueProvider(tintColor.lottieColorValue),
+        keypath: AnimationKeypath(keypath: "**.Color")
+      )
+    }
     animationView.backgroundBehavior = loopMode == .loop ? .pauseAndRestore : .pause
 
     // Optimize rendering
@@ -71,6 +81,8 @@ struct LottieView: UIViewRepresentable {
     containerView.addSubview(animationView)
 
     NSLayoutConstraint.activate([
+      animationView.centerXAnchor.constraint(equalTo: containerView.centerXAnchor),
+      animationView.centerYAnchor.constraint(equalTo: containerView.centerYAnchor),
       animationView.widthAnchor.constraint(equalTo: containerView.widthAnchor),
       animationView.heightAnchor.constraint(equalTo: containerView.heightAnchor)
     ])

package/ios/{Application/Navigation/Overplay → Navigation}/BottomSheet.swift

@@ -2,7 +2,7 @@
 //  BottomSheet.swift
 //  MoMoUIKits
 //
-//  SwiftUI mirror of Compose's `BottomSheet` (navigation/BottomSheet.kt).
+//  SwiftUI mirror of Compose's `navigation/BottomSheet.kt`.
 //  A sheet that slides up from the bottom over a dimmed scrim, with a drag
 //  handle, a header (title or custom), a divider and the content body.
 //  Dragging down past a threshold (or tapping the scrim) dismisses it.
@@ -40,11 +40,16 @@ struct BottomSheetView<Content: View>: View {
     let header: BottomSheetHeader
     let isSurface: Bool
     let barrierDismissible: Bool
+    var draggable: Bool = true
+    /// Keeps the content above the home indicator (Compose `AppNavigationBar` padding).
+    var useBottomInset: Bool = true
+    var footer: (() -> AnyView)? = nil
     let content: () -> Content
 
     @EnvironmentObject private var navigator: Navigator
     @Environment(\.appTheme) private var theme
     @Environment(\.applicationEnvironment) private var appEnv
+    @Environment(\.screenLayout) private var layout
 
     /// Vertical translation of the sheet; starts off-screen and animates to 0.
     @State private var sheetOffset: CGFloat = UIScreen.main.bounds.height
@@ -66,8 +71,36 @@ struct BottomSheetView<Content: View>: View {
     /// steady-state (fully open) scrim peaks at 0.6, matching ModalScreen's peak.
     private let maxDynamicAlpha: CGFloat = 0.3
 
-    private var screenHeight: CGFloat { UIScreen.main.bounds.height }
-    private var bottomInset: CGFloat { safeAreaBottomInset() }
+    // UIScreen stays on the outer display on iPhone Duo, even when unfolded
+    private var screenHeight: CGFloat { isDuo ? layout.height : UIScreen.main.bounds.height }
+
+    private var isDuo: Bool { layout.isDuoDevice }
+    // iPhone Duo inner display: center the sheet instead of spanning the width
+    private var isDuoCentered: Bool { isDuo && layout.width >= 600 }
+
+    /// Keeps the portrait width in landscape, like system sheets.
+    private var duoCenteredWidth: CGFloat {
+        min(
+            min(layout.width, layout.height) - Spacing.L * 2,
+            layout.width - max(layout.insets.leading, layout.insets.trailing, Spacing.L) * 2
+        )
+    }
+
+    /// Landscape side buttons span the full height, so the content is inset; in portrait the
+    /// side status bar only covers the top corner.
+    private var sideInsetLeading: CGFloat {
+        isDuo && !isDuoCentered && layout.width > layout.height ? layout.insets.leading : 0
+    }
+
+    private var sideInsetTrailing: CGFloat {
+        isDuo && !isDuoCentered && layout.width > layout.height ? layout.insets.trailing : 0
+    }
+
+    /// The keyboard filler is part of the sheet, so capping the sheet shrinks the content by it.
+    private var maxHeight: CGFloat {
+        isDuo ? layout.height - max(layout.duoTopInset, Spacing.XL) : screenHeight - 90
+    }
+    private var bottomInset: CGFloat { useBottomInset ? safeAreaBottomInset() : 0 }
     /// While the keyboard is up, it already covers the home-indicator area, so it
     /// replaces (rather than adds to) the usual bottom-inset filler.
     private var effectiveBottomInset: CGFloat { keyboardHeight > 0 ? keyboardHeight : bottomInset }
@@ -110,7 +143,7 @@ struct BottomSheetView<Content: View>: View {
         .onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardWillChangeFrameNotification)) { notification in
             guard let endFrame = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect else { return }
             withAnimation(.easeOut(duration: 0.25)) {
-                keyboardHeight = UIScreen.main.bounds.height - endFrame.origin.y
+                keyboardHeight = screenHeight - endFrame.origin.y
             }
         }
         .onAppear {
@@ -138,23 +171,34 @@ struct BottomSheetView<Content: View>: View {
                 headerView
                     .frame(height: 56)
                     .padding(.horizontal, Spacing.M)
+                    .padding(.leading, sideInsetLeading)
+                    .padding(.trailing, sideInsetTrailing)
             }
             .frame(maxWidth: .infinity)
             .frame(height: 72)
             .contentShape(Rectangle())
-            .gesture(dragGesture)
+            .gesture(dragGesture, including: draggable ? .all : .subviews)
 
             Rectangle()
                 .fill(theme.colors.border.default)
                 .frame(height: 1)
 
             content()
+                .padding(.leading, sideInsetLeading)
+                .padding(.trailing, sideInsetTrailing)
+                // a tall sheet keeps its header (and footer) and gives the content what is left
+                .layoutPriority(-1)
+
+            if let footer {
+                BottomSheetFooter(content: footer)
+            }
 
-            backgroundColor
+            (footer != nil ? theme.colors.background.surface : backgroundColor)
                 .frame(height: effectiveBottomInset)
         }
-        .frame(maxWidth: .infinity)
-        .frame(alignment: .bottom)
+        .frame(maxWidth: isDuoCentered ? duoCenteredWidth : .infinity)
+        .modifier(CapHeight(maxHeight: maxHeight))
+        .clipped()
         .background(
             GeometryReader { geo in
                 Color.clear.onAppear { sheetHeight = geo.size.height }
@@ -247,6 +291,51 @@ struct BottomSheetView<Content: View>: View {
     }
 }
 
+/// Compose's `heightIn(max:)`: caps the sheet but keeps it hugging its content, which
+/// `.frame(maxHeight:)` would not — a flexible frame grows to the cap.
+@available(iOS 16.0, *)
+private struct CapHeight: ViewModifier {
+    let maxHeight: CGFloat
+
+    func body(content: Content) -> some View {
+        CapHeightLayout(maxHeight: maxHeight) { content }
+    }
+}
+
+@available(iOS 16.0, *)
+private struct CapHeightLayout: Layout {
+    let maxHeight: CGFloat
+
+    func sizeThatFits(proposal: ProposedViewSize, subviews: Subviews, cache: inout ()) -> CGSize {
+        let height = min(proposal.height ?? .infinity, maxHeight)
+        return subviews.first?.sizeThatFits(ProposedViewSize(width: proposal.width, height: height)) ?? .zero
+    }
+
+    func placeSubviews(in bounds: CGRect, proposal: ProposedViewSize, subviews: Subviews, cache: inout ()) {
+        subviews.first?.place(at: bounds.origin, proposal: ProposedViewSize(bounds.size))
+    }
+}
+
+/// Mirrors Compose's `BottomSheetFooter`: a surface band with a soft shadow cast on the content.
+private struct BottomSheetFooter: View {
+    let content: () -> AnyView
+
+    @Environment(\.appTheme) private var theme
+
+    var body: some View {
+        content()
+            .frame(maxWidth: .infinity)
+            .padding(.vertical, Spacing.S)
+            .background(theme.colors.background.surface)
+            .overlay(alignment: .top) {
+                LinearGradient(colors: [.clear, Color.black.opacity(0.05)], startPoint: .top, endPoint: .bottom)
+                    .frame(height: 6)
+                    .offset(y: -6)
+                    .allowsHitTesting(false)
+            }
+    }
+}
+
 @available(iOS 16.0, *)
 private func safeAreaBottomInset() -> CGFloat {
     let bottomInset = UIApplication.shared.connectedScenes