@momo-kits/native-kits 0.162.47 → 0.162.48

package/CLAUDE.md

@@ -71,7 +71,7 @@ Publishing is automated (`publish.sh` + GitLab CI on `[ci build]` / `main`). Do
 ## Screen layout / iPhone Duo (port of RN `useScreenLayout`, momo-kits !664)
 
 - `layout/ScreenLayout.kt`: `getScreenLayout()` returns window size, raw top/bottom + side insets, `contentWidth`, header geometry, the iPhone Duo `sideBar` and `duoTopInset`. `NavigationContainer` computes it once and provides `LocalScreenLayout`; reactive to fold/unfold and rotation (window size + `WindowInsets`). Metrics (`DuoMetrics`, 72pt iPhone header floor, 20pt status-bar threshold) mirror RN `Layout/utils.ts` — change both together.
-- iPhone-only: everything gates on `isPhoneIdiom()` (`platform/`), never on "iOS", so iPad windows keep the regular layout. Two detectors, as in RN: `isIPhoneDuo` (window aspect < 1.6 or asymmetric side insets) drives layout; `isIPhoneDuoDevice` (short side of screen or window > 440, RN `device.ts`) drives popups, modal and bottom sheet.
+- iPhone-only: everything gates on `isPhoneIdiom()` (`platform/`), never on "iOS", so iPad windows keep the regular layout. Two detectors, as in RN: `isIPhoneDuo` (window aspect < 1.6 or asymmetric side insets) drives layout; `isIPhoneDuoDevice` (Apple's foldable check: a `.division` reserved region, queried with include-inactive; Swift also latches on `UIHingeInteraction`) drives popups, modal and bottom sheet.
 - Header height is `headerHeight` (not `AppStatusBar + HEADER_HEIGHT`); the bar row is `headerBarHeight` and starts `headerStatusBarHeight` below the window top. When the status bar is off the top edge (iPhone landscape, iPhone Duo) `headerStatusBarHeight` is 0 so the title stays centered — except on the Duo outer display: in portrait the header is 76pt and the row starts at 14pt so the title centers on the camera punchout; in landscape the row centers on the camera when it sits at the top end of the strip (else on the back button) and the header reaches 8pt below the back button.
 - iPhone Duo inner display in portrait (status bar on top): the header row shares the status bar band — `headerHeight` 94pt (2 × the clock digits' y 47), `headerStatusBarHeight` 0 — and `ScreenLayout.statusBarClearance` keeps it between the clock / battery clusters (from reserved regions, else 128pt on the right). Back and toolkit use the 48pt side bar controls laid out horizontally (`ToolkitLayout.SideBarRow`); the collapsed search and a centered title stay clear of the clusters. Port of momo-kits `90af33ba2`.
 - iPhone Duo with a side strip ≥ 60pt: back + toolkit leave the bar for `HeaderSideBar` (`navigation/component/SideBar.kt`, 48pt glass controls); custom header-right stays in the bar. `sideBar.top` is 170pt in portrait, 120pt on the inner display in landscape (height ≥ 600), 24pt on the outer display in landscape, or below the header when the status bar is on top; UIKit's `statusBarFrame` is useless on Duo. Unlike RN the column is clamped above footer (24pt gap) / rail (12pt gap).

package/ios/Layout/ScreenLayout.swift

@@ -32,6 +32,8 @@ public struct ScreenLayout: Equatable {
     public let width: CGFloat
     public let height: CGFloat
     public let isIPhoneDuo: Bool
+    /// The device has a hinge, folded or not, whatever the window size; drives popups, modal and bottom sheet.
+    public let isDuoDevice: Bool
     public let insets: EdgeInsets
     public let insetLeft: CGFloat
     public let insetRight: CGFloat
@@ -73,8 +75,6 @@ enum DuoMetrics {
     static let floatingTabBarHeight: CGFloat = 62
     static let floatingTabBarMargin: CGFloat = 20
     static let floatingTabBarInsetOverlap: CGFloat = 13
-    // Widest short side of any single-display iPhone.
-    static let iPhoneMaxShortSide: CGFloat = 440
 }
 
 enum HeaderMetrics {
@@ -109,15 +109,17 @@ extension ScreenLayout {
         size: CGSize,
         insets: EdgeInsets,
         reservedRegions: [CGRect] = ReservedRegions.current,
-        isPhone: Bool = isPhoneIdiom
+        isPhone: Bool = isPhoneIdiom,
+        isFoldable: Bool = FoldableDevice.isFoldable(measuredIn: keyWindow)
     ) -> ScreenLayout {
         let width = size.width
         let height = size.height
+        let isDuoDevice = isPhone && isFoldable
         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,
+                width: width, height: height, isIPhoneDuo: false, isDuoDevice: isDuoDevice, insets: insets,
                 insetLeft: 0, insetRight: 0, contentWidth: width,
                 headerHeight: headerHeight, headerStatusBarHeight: headerStatusBarHeight, sideBar: nil,
                 statusBarClearance: nil
@@ -177,7 +179,7 @@ extension ScreenLayout {
         }
 
         return ScreenLayout(
-            width: width, height: height, isIPhoneDuo: true, insets: insets,
+            width: width, height: height, isIPhoneDuo: true, isDuoDevice: isDuoDevice, insets: insets,
             insetLeft: insets.leading, insetRight: insets.trailing,
             contentWidth: width - insets.leading - insets.trailing,
             headerHeight: headerHeight, headerStatusBarHeight: headerStatusBarHeight, sideBar: sideBar,
@@ -256,13 +258,40 @@ extension ScreenLayout {
     }
 }
 
-/// 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.
+/// Snapshot for call sites without `\.screenLayout`; not reactive. `windowSize` is ignored,
+/// kept for host call sites.
 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
+    isPhoneIdiom && FoldableDevice.isFoldable(measuredIn: keyWindow)
+}
+
+/// Apple's foldable check (as the host's `SideTabRailView.isFoldableDevice`): only a device with a
+/// hinge reports a `.division` region, inactive while flat but still there. Screen size cannot tell
+/// it apart from a large iPhone in landscape or a narrowed window.
+enum FoldableDevice {
+    // a hinge never goes away, so a positive answer is kept
+    private static var isKnownFoldable = false
+
+    static func isFoldable(measuredIn view: UIView?) -> Bool {
+        if isKnownFoldable { return true }
+        // compiled out on SDKs older than iOS 27.1 (UIKit 9127.0.85.28)
+        #if canImport(UIKit, _version: 9127.0.85.28)
+        guard #available(iOS 27.1, *), let view, view.window != nil || view is UIWindow else { return false }
+        isKnownFoldable = !view.reservedRegions(kind: .division, options: .includeInactive).isEmpty
+        #endif
+        return isKnownFoldable
+    }
+
+    /// Catches the hinge when the regions were read too early (before the window had them).
+    static func observe(in view: UIView) {
+        #if canImport(UIKit, _version: 9127.0.85.28)
+        guard #available(iOS 27.1, *) else { return }
+        view.addInteraction(UIHingeInteraction { _, update in
+            guard update.hinge != nil, !isKnownFoldable else { return }
+            isKnownFoldable = true
+            NotificationCenter.default.post(name: ReservedRegions.didChange, object: nil)
+        })
+        #endif
+    }
 }
 
 // MARK: - Reserved regions
@@ -287,6 +316,7 @@ private final class ReservedRegionsProbe: UIView {
     override init(frame: CGRect) {
         super.init(frame: frame)
         isUserInteractionEnabled = false
+        FoldableDevice.observe(in: self)
     }
 
     required init?(coder: NSCoder) { nil }

package/ios/Popup/PopupLayout.swift

@@ -5,8 +5,6 @@ import SwiftUI
 private let duoPopupMaxWidth: CGFloat = 440
 
 extension ScreenLayout {
-    var isDuoDevice: Bool { isIPhoneDuoDevice(windowSize: CGSize(width: width, height: height)) }
-
     /// Card width cap (Compose `popupMaxWidth`); unbounded off iPhone Duo, where the popup's own padding sets the width.
     var popupMaxWidth: CGFloat {
         isDuoDevice ? duoPopupMaxWidth : .infinity

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.162.47",
+  "version": "0.162.48",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},