feat: included support for out animation and optional selected detent (#21)

* feat: included support for out animation and optional selected detent

* feat: make header optional when initializing sheetPlus

* fix: prevent keyboard from closing the bottomsheet on open

Author: Wouter125

Example/BottomSheetExample/Apple Applications/StocksExample.swift

@@ -10,15 +10,21 @@ import BottomSheet
 
 struct StocksExample: View {
     @EnvironmentObject var settings: SheetSettings
-    
+
     var body: some View {
-        Color.clear
-            .navigationBarTitleDisplayMode(.inline)
-            .navigationTitle("\(settings.translation.rounded())")
-            .onAppear {
-                settings.isPresented = true
-                settings.activeSheetType = .stocks
+        VStack {
+            Button("Close") {
+                settings.isPresented.toggle()
             }
+
+            Color.clear
+                .navigationBarTitleDisplayMode(.inline)
+                .navigationTitle("\(settings.translation.rounded())")
+                .onAppear {
+                    settings.isPresented = true
+                    settings.activeSheetType = .stocks
+                }
+        }
     }
 }
 
@@ -51,6 +57,7 @@ struct StocksHeader: View {
 struct StocksMainContent: View {
     var body: some View {
         VStack(spacing: 0) {
+            TextField("Test", text: .constant(""))
             ScrollView {
                 ForEach(0..<5, id: \.self) { _ in
                     newsRow

Example/BottomSheetExample/ExampleOverview.swift

@@ -42,8 +42,7 @@ struct ExampleOverview: View {
             return AnyView(
                 StocksMainContent()
                     .presentationDetentsPlus(
-                        [.height(244), .medium, .large],
-                        selection: $settings.selectedDetent
+                        [.height(244), .medium, .large]
                     )
             )
         default:

Sources/BottomSheet/BottomSheet.swift

@@ -44,11 +44,9 @@ struct SheetPlus<HContent: View, MContent: View, Background: View>: ViewModifier
         ZStack() {
             content
 
-            if isPresented {
-                GeometryReader { geometry in
-                    VStack(spacing: 0) {
-                        Spacer()
-                        
+            VStack {
+                if isPresented {
+                    GeometryReader { geometry in
                         VStack(spacing: 0) {
                             hcontent
                                 .contentShape(Rectangle())
@@ -99,7 +97,7 @@ struct SheetPlus<HContent: View, MContent: View, Background: View>: ViewModifier
                                     ? limits.max - geometry.safeAreaInsets.top
                                     : limits.max
                         )
-                        .offset(y: limits.max - translation)
+                        .offset(y: UIScreen.main.bounds.height - translation)
                         .onChange(of: translation) { newValue in
                             if limits.max == 0 { return }
                             translation = min(limits.max, max(newValue, limits.min))
@@ -115,22 +113,44 @@ struct SheetPlus<HContent: View, MContent: View, Background: View>: ViewModifier
                             )
                         )
                         .onDisappear {
+                            translation = 0
+                            detents = []
+                            offset = 0
+                            newValue = 0
+                            limits = (min: 0, max: 0)
+                            
                             onDismiss()
                         }
                     }
                     .edgesIgnoringSafeArea([.bottom])
+                    .transition(.move(edge: .bottom))
                 }
             }
+            .animation(
+                .interpolatingSpring(
+                    mass: animationCurve.mass,
+                    stiffness: animationCurve.stiffness,
+                    damping: animationCurve.damping
+                )
+            )
         }
         .onPreferenceChange(SheetPlusTranslation.self) { value in
             self.translationKey = value
         }
         .onPreferenceChange(SheetPlusConfiguration.self) { value in
+            /// Quick hack to prevent the scrollview from resetting the height when keyboard shows up.
+            /// Replace if the root cause has been located.
+            if value.detents.count == 0 { return }
+            
             detents = value.detents
-            limits = detentLimits(detents: detents)
-            translation = value.$selection.wrappedValue.size
+            limits = detentLimits(detents: value.detents)
+            
+            if value.selection == .height(.zero) {
+                translation = limits.min
+            } else {
+                translation = value.$selection.wrappedValue.size
+            }
 
-            self.preferenceKey = value
         }
     }
 }

Sources/BottomSheet/Preference Keys/ConfigKey.swift

@@ -8,8 +8,9 @@
 import SwiftUI
 
 struct SheetPlusConfigKey: Equatable {
-    let detents: Set<PresentationDetent>
+    let id = UUID().uuidString
 
+    let detents: Set<PresentationDetent>
     @Binding var selection: PresentationDetent
 
     init(
@@ -21,7 +22,7 @@ struct SheetPlusConfigKey: Equatable {
     }
 
     static func == (lhs: SheetPlusConfigKey, rhs: SheetPlusConfigKey) -> Bool {
-        return lhs.selection == rhs.selection
+        return lhs.id == rhs.id
     }
 }
 

Sources/BottomSheet/View Modifiers/View+SheetPlus.swift

@@ -33,6 +33,29 @@ extension View {
         )
     }
 
+    public func sheetPlus<MContent: View, Background: View>(
+        isPresented: Binding<Bool>,
+        animationCurve: SheetAnimation = SheetAnimation(
+            mass: SheetAnimationDefaults.mass,
+            stiffness: SheetAnimationDefaults.stiffness,
+            damping: SheetAnimationDefaults.damping
+        ),
+        background: Background = Color(UIColor.systemBackground),
+        onDismiss: @escaping () -> Void = {},
+        main: () -> MContent
+    ) -> some View {
+        modifier(
+            SheetPlus(
+                isPresented: isPresented,
+                animationCurve: animationCurve,
+                background: background,
+                onDismiss: onDismiss,
+                hcontent: { EmptyView() },
+                mcontent: main
+            )
+        )
+    }
+    
     public func presentationDetentsPlus(
         _ detents: Set<PresentationDetent>
     ) -> some View {