Instead of ignoring safe area in the bottom of the screen, add paddin…

…g (solves danielsaidi#2)
digitalheir · Aug 2, 2021 · 7a0bb56 · 7a0bb56
1 parent ac54479
commit 7a0bb56
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Sources/BottomSheet/BottomSheet.swift b/Sources/BottomSheet/BottomSheet.swift
@@ -64,13 +64,15 @@ public struct BottomSheet<Content: View>: BottomSheetView {
         GeometryReader { geo in
             VStack(spacing: 0) {
                 handle.padding()
-                content
+                // Add padding to content so that content does not go into safe area
+                content.padding(.bottom, geo.safeAreaInsets.bottom)
             }
             .frame(width: geo.size.width, height: maxHeight(in: geo), alignment: .top)
             .background(style.color)
             .cornerRadius(style.cornerRadius)
             .modified(with: style.modifier)
-            .frame(height: geo.size.height, alignment: .bottom)
+                    // Add safe area inset to frame height in order to 'overflow' to the bottom of the screen
+            .frame(height: geo.size.height + geo.safeAreaInsets.bottom, alignment: .bottom)
             .offset(y: max(offset(for: geo) + translation, 0))
             .animation(.interactiveSpring())
             .gesture(
@@ -84,7 +86,7 @@ public struct BottomSheet<Content: View>: BottomSheetView {
                     isExpanded = value.translation.height < 0
                 }
             )
-        }.edgesIgnoringSafeArea(.bottom)
+        }
     }
 }