Also use bottom safe area inset for computing height (danielsaidi#2)

digitalheir · Aug 2, 2021 · 7b6101c · 7b6101c
1 parent 66401a5
commit 7b6101c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Sources/BottomSheet/BottomSheet.swift b/Sources/BottomSheet/BottomSheet.swift
@@ -94,8 +94,8 @@ private extension BottomSheet {
 
     func height(of height: BottomSheetHeight, in geo: GeometryProxy) -> CGFloat {
         switch height {
-        case .available: return geo.size.height
-        case .percentage(let ratio): return ratio * geo.size.height
+        case .available: return geo.size.height + geo.safeAreaInsets.bottom
+        case .percentage(let ratio): return ratio * (geo.size.height + geo.safeAreaInsets.bottom)
         case .points(let points): return points
         }
     }
@@ -155,7 +155,7 @@ struct BottomSheet_Previews: PreviewProvider {
             //
             // ScrollView
             if #available(iOS 14.0, *) {
-                BottomSheet(isExpanded: .constant(true), maxHeight: .percentage(0.6)) {
+                BottomSheet(isExpanded: .constant(true), maxHeight: .available) {
                     ScrollViewReader { scroll in
                         ScrollView {
                             twentyItems.onAppear {
@@ -167,7 +167,7 @@ struct BottomSheet_Previews: PreviewProvider {
                     }
                 }
             }
-            BottomSheet(isExpanded: .constant(true), maxHeight: .percentage(0.6)) {
+            BottomSheet(isExpanded: .constant(true), maxHeight: .percentage(1)) {
                 ScrollView {
                     twentyItems
                 }