Remove lock features. Opt to alter heights instead

Author: maustinstar

Sources/Drawer/Drawer+Computed.swift

@@ -16,22 +16,12 @@ extension Drawer {
     }
 
     internal var activeBound: ClosedRange<CGFloat> {
-        let height = lockedHeight(restingHeight)
-        return locked
-            ? height...height
-            : heights.min()!...heights.max()!
+        return heights.min()!...heights.max()!
     }
 
     // MARK: View
 
     private var offset: CGFloat {
-        if locked && !dragging {
-            DispatchQueue.main.async {
-                let newHeight = self.lockedHeight(self.restingHeight)
-                self.restingHeight = newHeight
-                self.height = newHeight
-            }
-        }
         if !dragging && !heights.contains(restingHeight) {
             DispatchQueue.main.async {
                 let newHeight = Drawer.closest(self.restingHeight, markers: self.heights)

Sources/Drawer/Drawer+Drag.swift

@@ -33,11 +33,6 @@ internal extension Drawer {
 
     func dragEnded(_ value: DragGesture.Value) {
         dragging = false
-        if locked {
-            height = restingHeight
-            animation = Animation.spring()
-            return
-        }
 
         let change = value.startLocation.y
             - value.predictedEndLocation.y + restingHeight

Sources/Drawer/Drawer+Modifiers.swift

@@ -9,10 +9,8 @@ import SwiftUI
 
 public extension Drawer {
 
-    /// Locks the drawer in a controlled position
-    /// - Parameters:
-    ///   - locked: Indicates if the drawer is locked
-    ///   - height: A function reading the current resting height of the drawer and returning the height to lock the drawer
+    /// Sets the resting heights of the drawer
+    /// - Parameter heights: Possible resting heights for the drawer
     /// - Returns: Drawer
     func rest(at heights: Binding<[CGFloat]>) -> Drawer {
         return Drawer(
@@ -23,27 +21,6 @@ public extension Drawer {
             didRest: didRest,
             didLayoutForSizeClass: didLayoutForSizeClass,
             impactGenerator: impactGenerator,
-            locked: $locked,
-            lockedHeight: lockedHeight,
-            content: content)
-    }
-    
-    /// Locks the drawer in a controlled position
-    /// - Parameters:
-    ///   - locked: Indicates if the drawer is locked
-    ///   - height: A function reading the current resting height of the drawer and returning the height to lock the drawer
-    /// - Returns: Drawer
-    func locked(_ locked: Binding<Bool>, to height: @escaping (_ restingHeight: CGFloat) -> CGFloat) -> Drawer {
-        return Drawer(
-            heights: $heights,
-            height: self.height,
-            restingHeight: restingHeight,
-            springHeight: springHeight,
-            didRest: didRest,
-            didLayoutForSizeClass: didLayoutForSizeClass,
-            impactGenerator: impactGenerator,
-            locked: locked,
-            lockedHeight: height,
             content: content)
     }
 
@@ -59,8 +36,6 @@ public extension Drawer {
             didRest: didRest,
             didLayoutForSizeClass: didLayoutForSizeClass,
             impactGenerator: impactGenerator,
-            locked: $locked,
-            lockedHeight: lockedHeight,
             content: content)
     }
 
@@ -77,8 +52,6 @@ public extension Drawer {
             didRest: didRest,
             didLayoutForSizeClass: didLayoutForSizeClass,
             impactGenerator: impactGenerator,
-            locked: $locked,
-            lockedHeight: lockedHeight,
             content: content)
     }
 
@@ -94,8 +67,6 @@ public extension Drawer {
             didRest: didRest,
             didLayoutForSizeClass: didLayoutForSizeClass,
             impactGenerator: impactGenerator,
-            locked: $locked,
-            lockedHeight: lockedHeight,
             content: content)
     }
 
@@ -112,8 +83,6 @@ public extension Drawer {
             didRest: didRest,
             didLayoutForSizeClass: didLayoutForSizeClass,
             impactGenerator: impactGenerator,
-            locked: $locked,
-            lockedHeight: lockedHeight,
             content: content)
     }
 }

Sources/Drawer/Drawer.swift

@@ -28,10 +28,6 @@ public struct Drawer<Content>: View where Content: View {
     /// A callback executed when the drawer reaches a restingHeight
     internal var didRest: ((_ height: CGFloat) -> ())? = nil
 
-    @Binding internal var locked: Bool
-    
-    internal var lockedHeight: (_ restingHeight: CGFloat) -> CGFloat
-    
     // MARK: Orientation
 
     public struct SizeClass: Equatable {
@@ -88,8 +84,6 @@ public extension Drawer {
         self._height = .init(initialValue: startingHeight ?? heights.wrappedValue.first!)
         self._restingHeight = .init(initialValue: startingHeight ?? heights.wrappedValue.first!)
         self.content = content()
-        self._locked = .constant(false)
-        self.lockedHeight = { _ in return CGFloat.zero }
     }
 
     /// A bottom-up view that conforms to multiple heights
@@ -107,8 +101,6 @@ public extension Drawer {
         self._height = .init(initialValue: startingHeight ?? heights.first!)
         self._restingHeight = .init(initialValue: startingHeight ?? heights.first!)
         self.content = content()
-        self._locked = .constant(false)
-        self.lockedHeight = { _ in return CGFloat.zero }
     }
 
     // MARK: Deprecated Inits
@@ -132,11 +124,11 @@ public extension Drawer {
         if let impact = impact {
             self.impactGenerator = UIImpactFeedbackGenerator(style: impact)
         }
-        self._locked = .constant(false)
-        self.lockedHeight = { _ in return CGFloat.zero }
     }
 }
 
+// MARK: Internal Init
+
 internal extension Drawer {
     init(
         heights: Binding<[CGFloat]>,
@@ -146,8 +138,6 @@ internal extension Drawer {
         didRest: ((_ height: CGFloat) -> ())?,
         didLayoutForSizeClass: ((SizeClass) -> ())?,
         impactGenerator: UIImpactFeedbackGenerator?,
-        locked: Binding<Bool>,
-        lockedHeight: @escaping (CGFloat) -> CGFloat,
         content: Content
     ) {
         self._heights = heights
@@ -158,9 +148,6 @@ internal extension Drawer {
         self.didLayoutForSizeClass = didLayoutForSizeClass
         self.content = content
         self.impactGenerator = impactGenerator
-        self.lockedHeight = lockedHeight
-        self._locked = locked
-        
     }
 }