Merge remote-tracking branch 'refs/remotes/origin/master'

maustinstar · maustinstar · commit 17ff2de472f9 · 2020-08-21T11:56:31.000-04:00
diff --git a/Package.swift b/Package.swift
@@ -6,8 +6,7 @@ import PackageDescription
 let package = Package(
     name: "Drawer",
     platforms: [
-        .iOS(.v13),
-        .macOS(.v10_15)
+        .iOS(.v13)
     ],
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
diff --git a/Sources/Drawer/Drawer+Computed.swift b/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)
@@ -54,25 +44,18 @@ extension Drawer {
             }
         }
         
-        return VStack {
-            Spacer()
-                .frame(height:
-                    UIScreen.main.bounds.height + fullHeight
-                        /*+ (landscape ? 20 : 0)*/)
-            
-            HStack {
-                if (alignment == .trailing || alignment == .center) {
-                    Spacer().animation(.default)
-                }
-                content
-                    .frame(height: fullHeight)
-                    .offset(y: offset)
-                    .animation(animation)
-                    .gesture(dragGesture)
-                    .frame(width: alignment == .fullscreen ? nil : fixedWidth)
-                if (alignment == .leading || alignment == .center) {
-                    Spacer().animation(.default)
-                }
+        return GeometryReader { (proxy) in
+            VStack {
+                Spacer()
+                    .frame(height:
+                        proxy.frame(in: .global).height + self.fullHeight
+                            /*+ (landscape ? 20 : 0)*/)
+
+                self.content
+                    .frame(height: self.fullHeight)
+                    .offset(y: self.offset)
+                    .animation(self.animation)
+                    .gesture(self.dragGesture)
             }
         }
     }
diff --git a/Sources/Drawer/Drawer+Drag.swift b/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
diff --git a/Sources/Drawer/Drawer+Modifiers.swift b/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(
@@ -22,32 +20,7 @@ public extension Drawer {
             springHeight: springHeight,
             didRest: didRest,
             didLayoutForSizeClass: didLayoutForSizeClass,
-            alignment: $alignment,
-            width: $fixedWidth,
             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,
-            alignment: $alignment,
-            width: $fixedWidth,
-            impactGenerator: impactGenerator,
-            locked: locked,
-            lockedHeight: height,
             content: content)
     }
     
@@ -62,11 +35,7 @@ public extension Drawer {
             springHeight: max(spring, 0),
             didRest: didRest,
             didLayoutForSizeClass: didLayoutForSizeClass,
-            alignment: $alignment,
-            width: $fixedWidth,
             impactGenerator: impactGenerator,
-            locked: $locked,
-            lockedHeight: lockedHeight,
             content: content)
     }
     
@@ -82,11 +51,7 @@ public extension Drawer {
             springHeight: springHeight,
             didRest: didRest,
             didLayoutForSizeClass: didLayoutForSizeClass,
-            alignment: $alignment,
-            width: $fixedWidth,
             impactGenerator: impactGenerator,
-            locked: $locked,
-            lockedHeight: lockedHeight,
             content: content)
     }
     
@@ -101,11 +66,7 @@ public extension Drawer {
             springHeight: springHeight,
             didRest: didRest,
             didLayoutForSizeClass: didLayoutForSizeClass,
-            alignment: $alignment,
-            width: $fixedWidth,
             impactGenerator: impactGenerator,
-            locked: $locked,
-            lockedHeight: lockedHeight,
             content: content)
     }
     
@@ -121,49 +82,7 @@ public extension Drawer {
             springHeight: springHeight,
             didRest: didRest,
             didLayoutForSizeClass: didLayoutForSizeClass,
-            alignment: $alignment,
-            width: $fixedWidth,
-            impactGenerator: impactGenerator,
-            locked: $locked,
-            lockedHeight: lockedHeight,
-            content: content)
-    }
-    
-    /// Defines a width for the drawer when not in fullscreen alignment
-    /// - Parameter width: Width for the drawer when not in fullscreen alignment
-    /// - Returns: Drawer
-    func width(_ width: Binding<CGFloat?>) -> Drawer {
-        return Drawer(
-            heights: $heights,
-            height: height,
-            restingHeight: restingHeight,
-            springHeight: springHeight,
-            didRest: didRest,
-            didLayoutForSizeClass: didLayoutForSizeClass,
-            alignment: $alignment,
-            width: width,
-            impactGenerator: impactGenerator,
-            locked: $locked,
-            lockedHeight: lockedHeight,
-            content: content)
-    }
-    
-    /// Defines the alignment for the drawer
-    /// - Parameter alignment: `leading`, `trailing`, `center`, or `fullscreen`
-    /// - Returns: Drawer
-    func alignment(_ alignment: Binding<DrawerAlignment>) -> Drawer {
-        return Drawer(
-            heights: $heights,
-            height: height,
-            restingHeight: restingHeight,
-            springHeight: springHeight,
-            didRest: didRest,
-            didLayoutForSizeClass: didLayoutForSizeClass,
-            alignment: alignment,
-            width: $fixedWidth,
             impactGenerator: impactGenerator,
-            locked: $locked,
-            lockedHeight: lockedHeight,
             content: content)
     }
 }
diff --git a/Sources/Drawer/Drawer.swift b/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 {
@@ -50,12 +46,6 @@ public struct Drawer<Content>: View where Content: View {
     /// A callback executed when the drawer is layed out for a new size class
     internal var didLayoutForSizeClass: ((SizeClass) -> ())? = nil
     
-    // MARK: Width
-    
-    @Binding internal var alignment: DrawerAlignment
-    
-    @Binding internal var fixedWidth: CGFloat?
-    
     // MARK: Gestures
     
     @State internal var dragging: Bool = false
@@ -94,61 +84,11 @@ 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 }
-        self._alignment = .constant(.fullscreen)
-        self._fixedWidth = .constant(nil)
-    }
-    
-    /// A bottom-up view that conforms to multiple heights
-    /// - Parameters:
-    ///   - heights: The possible resting heights of the drawer
-    ///   - startingHeight: The starting height of the drawer. Defaults to the first height marker if not specified
-    ///   - content: The view that defines the drawer
-    @available(*, deprecated)
-    init(
-        heights: [CGFloat],
-        startingHeight: CGFloat? = nil,
-        @ViewBuilder _ content: () -> Content
-    ) {
-        self._heights = .constant(heights)
-        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 }
-        self._alignment = .constant(.fullscreen)
-        self._fixedWidth = .constant(nil)
-    }
-    
-    // MARK: Deprecated Inits
-    
-    /// A bottom-up view that conforms to multiple heights
-    /// - Parameters:
-    ///   - heights: The possible resting heights of the drawer
-    ///   - startingHeight: The starting height of the drawer. Defaults to the first height marker if not specified
-    ///   - content: The view that defines the drawer
-    @available(*, deprecated)
-    init(
-        heights: [CGFloat],
-        startingHeight: CGFloat? = nil,
-        impact: UIImpactFeedbackGenerator.FeedbackStyle?,
-        @ViewBuilder _ content: () -> Content
-    ) {
-        self._heights = .constant(heights)
-        self._height = .init(initialValue: startingHeight ?? heights.first!)
-        self._restingHeight = .init(initialValue: startingHeight ?? heights.first!)
-        self.content = content()
-        if let impact = impact {
-            self.impactGenerator = UIImpactFeedbackGenerator(style: impact)
-        }
-        self._locked = .constant(false)
-        self.lockedHeight = { _ in return CGFloat.zero }
-        self._alignment = .constant(.fullscreen)
-        self._fixedWidth = .constant(nil)
     }
 }
 
+// MARK: Internal Init
+
 internal extension Drawer {
     init(
         heights: Binding<[CGFloat]>,
@@ -157,11 +97,7 @@ internal extension Drawer {
         springHeight: CGFloat,
         didRest: ((_ height: CGFloat) -> ())?,
         didLayoutForSizeClass: ((SizeClass) -> ())?,
-        alignment: Binding<DrawerAlignment>,
-        width: Binding<CGFloat?>,
         impactGenerator: UIImpactFeedbackGenerator?,
-        locked: Binding<Bool>,
-        lockedHeight: @escaping (CGFloat) -> CGFloat,
         content: Content
     ) {
         self._heights = heights
@@ -170,13 +106,8 @@ internal extension Drawer {
         self.springHeight = springHeight
         self.didRest = didRest
         self.didLayoutForSizeClass = didLayoutForSizeClass
-        self._fixedWidth = width
-        self._alignment = alignment
         self.content = content
         self.impactGenerator = impactGenerator
-        self.lockedHeight = lockedHeight
-        self._locked = locked
-        
     }
 }
 
diff --git a/Sources/Drawer/SwiftUIView.swift b/Sources/Drawer/SwiftUIView.swift
@@ -0,0 +1,20 @@
+//
+//  SwiftUIView.swift
+//  
+//
+//  Created by Michael Verges on 7/20/20.
+//
+
+import SwiftUI
+
+#if DEBUG
+struct SwiftUIView_Previews: PreviewProvider {
+    static var previews: some View {
+        Drawer {
+            Color.blue
+        }
+        .rest(at: .constant([100, 340]))
+        .edgesIgnoringSafeArea(.vertical)
+    }
+}
+#endif
