Custom bottom content offset for BottomSheet

Sources/BottomSheet/BottomSheet.swift

@@ -17,9 +17,10 @@ public struct BottomSheet<HContent: View, MContent: View, V: View>: View {
     private let mainContent: MContent
 
     private let switchablePositions: [BottomSheetPosition]
+    private let bottomOffset: CGFloat
 
     // Configuration
-    internal let configuration: BottomSheetConfiguration = BottomSheetConfiguration()
+    internal let configuration: BottomSheetConfiguration
 
     public var body: some View {
         // ZStack for creating the overlay on the original view
@@ -41,27 +42,35 @@ public struct BottomSheet<HContent: View, MContent: View, V: View>: View {
     internal init(
         bottomSheetPosition: Binding<BottomSheetPosition>,
         switchablePositions: [BottomSheetPosition],
+        bottomOffset: CGFloat = 0,
         headerContent: HContent?,
         mainContent: MContent,
         view: V
     ) {
         self._bottomSheetPosition = bottomSheetPosition
         self.switchablePositions = switchablePositions
+        self.bottomOffset = bottomOffset
         self.headerContent = headerContent
         self.mainContent = mainContent
         self.view = view
+        self.configuration = BottomSheetConfiguration()
+        if bottomOffset > 0 {
+            self.configuration.customBottomOffset = bottomOffset
+        }
     }
 
     internal init(
         bottomSheetPosition: Binding<BottomSheetPosition>,
         switchablePositions: [BottomSheetPosition],
+        bottomOffset: CGFloat = 0,
         title: String?,
         content: MContent,
         view: V
     ) {
         self.init(
             bottomSheetPosition: bottomSheetPosition,
             switchablePositions: switchablePositions,
+            bottomOffset: bottomOffset,
             headerContent: {
                 if let title = title {
                     return Text(title)
@@ -94,6 +103,7 @@ public extension View {
     func bottomSheet<HContent: View, MContent: View>(
         bottomSheetPosition: Binding<BottomSheetPosition>,
         switchablePositions: [BottomSheetPosition],
+        bottomOffset: CGFloat = 0,
         @ViewBuilder headerContent: () -> HContent? = {
             return nil
         },
@@ -102,6 +112,7 @@ public extension View {
         BottomSheet(
             bottomSheetPosition: bottomSheetPosition,
             switchablePositions: switchablePositions,
+            bottomOffset: bottomOffset,
             headerContent: headerContent(),
             mainContent: mainContent(),
             view: self
@@ -123,12 +134,14 @@ public extension View {
     func bottomSheet<MContent: View>(
         bottomSheetPosition: Binding<BottomSheetPosition>,
         switchablePositions: [BottomSheetPosition],
+        bottomOffset: CGFloat = 0,
         title: String? = nil,
         @ViewBuilder content: () -> MContent
     ) -> BottomSheet<TitleContent, MContent, Self> {
         BottomSheet(
             bottomSheetPosition: bottomSheetPosition,
             switchablePositions: switchablePositions,
+            bottomOffset: bottomOffset,
             title: title,
             content: content(),
             view: self

Sources/BottomSheet/BottomSheetView/BottomSheetView+Calculations.swift

@@ -61,10 +61,13 @@
     // The height of the spacer when position is bottom
     var bottomPositionSpacerHeight: CGFloat? {
         // Only limit height when dynamic
-        if self.bottomSheetPosition.isDynamic {
+        if self.bottomSheetPosition.isDynamic && self.bottomSheetPosition == .dynamicBottom {
             // When dynamic return safe area and header height
             return self.bottomPositionSafeAreaHeight + self.headerContentHeight
-        } else {
+        } else if self.bottomSheetPosition.isDynamic && self.bottomSheetPosition == .dynamic {
+            return self.bottomPositionSafeAreaHeight + self.headerContentHeight + self.dynamicMainContentHeight
+        }
+        else {
             // When not dynamic let it take all available space
             return nil
         }
@@ -75,6 +78,10 @@
         // Only add safe area when `dynamicBottom` and not on iPad floating or Mac
         if self.bottomSheetPosition == .dynamicBottom && !self.isIPadFloatingOrMac {
 #if !os(macOS)
+            // use custom offset for `dynamic` modes
+            if let customOffset = self.configuration.customBottomOffset {
+                return customOffset
+            }
             // Safe area as height (iPhone)
             return UIApplication.shared.windows.first?.safeAreaInsets.bottom ?? 20
 #else

Sources/BottomSheet/Models/BottomSheetConfiguration.swift

@@ -28,7 +28,8 @@
         lhs.isTapToDismissEnabled == rhs.isTapToDismissEnabled &&
         lhs.iPadFloatingSheet == rhs.iPadFloatingSheet &&
         lhs.sheetWidth == rhs.sheetWidth &&
-        lhs.accountForKeyboardHeight == rhs.accountForKeyboardHeight
+        lhs.accountForKeyboardHeight == rhs.accountForKeyboardHeight &&
+        lhs.customBottomOffset == rhs.customBottomOffset
     }
 
     var animation: Animation? = .spring(
@@ -61,4 +62,5 @@
     var iPadFloatingSheet: Bool = true
     var sheetWidth: BottomSheetWidth = .platformDefault
     var accountForKeyboardHeight: Bool = false
+    var customBottomOffset: CGFloat? = nil
 }