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

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.167.1-duo.10-debug"
+        version = "0.167.1-duo.11-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

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/package.json

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