@momo-kits/native-kits 0.167.1-duo.12 → 0.167.1-duo.13

package/ios/Layout/ScreenLayout.swift

@@ -219,16 +219,20 @@ public func isIPhoneDuoDevice(windowSize: CGSize? = nil) -> Bool {
 /// 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] = []
+    // last report of a probe, so `ScreenLayout.current` includes it
+    private(set) static var current: [CGRect] = []
+    static let didChange = Notification.Name("MoMoUIKitsReservedRegionsDidChange")
+
+    fileprivate static func publish(_ regions: [CGRect]) {
+        guard regions != current else { return }
+        current = regions
+        NotificationCenter.default.post(name: didChange, object: nil)
+    }
 }
 
 /// 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
@@ -238,12 +242,19 @@ private final class ReservedRegionsProbe: UIView {
 
     override func layoutSubviews() {
         super.layoutSubviews()
+        // read even when not publishing, so UIKit keeps re-running this when they change
         let regions = occlusionRegions()
-        guard regions != last else { return }
-        last = regions
-        ReservedRegions.current = regions
+        // every screen has a probe but the regions are window-wide: one sliding in on a push or
+        // a present, or off the window, would overwrite them with a partial read
+        guard spansWindow else { return }
         // layout pass: publish on the next turn instead of mutating SwiftUI state mid-update
-        DispatchQueue.main.async { [weak self] in self?.onChange?() }
+        DispatchQueue.main.async { ReservedRegions.publish(regions) }
+    }
+
+    private var spansWindow: Bool {
+        guard let window else { return false }
+        let frame = convert(bounds, to: nil)
+        return abs(frame.minX) < 1 && abs(frame.maxX - window.bounds.width) < 1 && abs(frame.minY) < 1
     }
 
     override func didMoveToWindow() {
@@ -265,17 +276,9 @@ private final class ReservedRegionsProbe: UIView {
 }
 
 private struct ReservedRegionsProbeView: UIViewRepresentable {
-    let onChange: () -> Void
+    func makeUIView(context: Context) -> ReservedRegionsProbe { ReservedRegionsProbe() }
 
-    func makeUIView(context: Context) -> ReservedRegionsProbe {
-        let probe = ReservedRegionsProbe()
-        probe.onChange = onChange
-        return probe
-    }
-
-    func updateUIView(_ probe: ReservedRegionsProbe, context: Context) {
-        probe.onChange = onChange
-    }
+    func updateUIView(_ probe: ReservedRegionsProbe, context: Context) {}
 }
 
 // MARK: - Environment
@@ -307,7 +310,11 @@ private struct ScreenLayoutReader: ViewModifier {
                         .onChange(of: proxy.safeAreaInsets) { _ in refresh() }
                 }
             )
-            .background(ReservedRegionsProbeView { refresh() }.ignoresSafeArea())
+            .background(ReservedRegionsProbeView().ignoresSafeArea())
+            // any screen's probe may report, so every reader follows the shared value
+            .onReceive(NotificationCenter.default.publisher(for: ReservedRegions.didChange)) { _ in
+                refresh()
+            }
             .onReceive(NotificationCenter.default.publisher(for: UIDevice.orientationDidChangeNotification)) { _ in
                 refresh()
             }

package/ios/Navigation/BottomSheet.swift

@@ -291,8 +291,9 @@ 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.
+/// Compose's `heightIn(max:)`. `.frame(maxHeight:)` grows to the cap whenever the proposal is
+/// larger, leaving a gap above the header; this sizes the sheet to its content and only caps it
+/// when taller.
 @available(iOS 16.0, *)
 private struct CapHeight: ViewModifier {
     let maxHeight: CGFloat
@@ -307,8 +308,11 @@ 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
+        guard let subview = subviews.first else { return .zero }
+        let cap = min(maxHeight, proposal.height ?? .infinity)
+        // ideal first: a scroll view would otherwise fill whatever height it is offered
+        let ideal = subview.sizeThatFits(ProposedViewSize(width: proposal.width, height: nil))
+        return subview.sizeThatFits(ProposedViewSize(width: proposal.width, height: min(ideal.height, cap)))
     }
 
     func placeSubviews(in bounds: CGRect, proposal: ProposedViewSize, subviews: Subviews, cache: inout ()) {

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.167.1-duo.12'
+  s.version          = '0.167.1-duo.13'
   s.summary          = 'MoMoUIKits for iOS'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/MoMoUIKitsDemo.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKitsDemo'
-  s.version          = '0.167.1-duo.12'
+  s.version          = '0.167.1-duo.13'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.167.1-duo.12",
+  "version": "0.167.1-duo.13",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},