Add sheet-based previews

Author: danielsaidi

README.md

@@ -20,7 +20,7 @@ ScrollKit is a SwiftUI SDK that adds powerful scroll features, like offset track
     <img src="Resources/Demo.gif" width=425 />
 </p>
 
-ScrollKit works on all major Apple platforms and is designed to be easy to use. It current doesn't use the new `ScrollView` APIs for OS backwards compatibility reasons, but will eventually do so.
+ScrollKit works on all major Apple platforms and is designed to be easy to use. It doesn't use the new `ScrollView` APIs for backwards compatibility reasons, but will eventually do so.
 
 
 

Sources/ScrollKit/Examples/Spotify+PreviewScreen.swift

@@ -19,14 +19,14 @@ public extension Spotify {
 
         private var info: PreviewInfo
 
-        @State
-        private var scrollOffset: CGPoint = .zero
+        @Environment(\.dismiss)
+        private var dismiss
 
         @State
-        private var headerVisibleRatio: CGFloat = 1
+        private var headerVisibleRatio = 1.0
 
-        @Environment(\.dismiss)
-        private var dismiss
+        @State
+        private var scrollOffset = CGPoint.zero
 
         public var body: some View {
             ScrollViewWithStickyHeader(
@@ -90,7 +90,7 @@ private extension View {
     }
 }
 
-#Preview {
+#Preview("Navigation") {
 
     NavigationView {
         #if os(macOS)
@@ -104,3 +104,25 @@ private extension View {
     .navigationViewStyle(.stack)
     #endif
 }
+
+#Preview("Sheet") {
+    
+    struct Preview: View {
+        
+        @State var isPresented = false
+        
+        var body: some View {
+            Button("Present") {
+                isPresented.toggle()
+            }
+            .sheet(isPresented: $isPresented) {
+                NavigationView {
+                    Spotify.PreviewScreen(info: .regina)
+                }
+                .navigationViewStyle(.stack)
+            }
+        }
+    }
+    
+    return Preview()
+}

Sources/ScrollKit/ScrollKit.docc/ScrollKit.md

@@ -10,7 +10,7 @@ ScrollKit is a Swift SDK that lets adds powerful scroll features to SwiftUI.
 
 ScrollKit is a SwiftUI SDK that adds powerful scroll features, like offset tracking and a header view that stretches & transforms as you pull down, and sticks to the top when you scroll.
 
-ScrollKit works on all major Apple platforms and is designed to be easy to use. It current doesn't use the new `ScrollView` APIs for OS backwards compatibility reasons, but will eventually do so.
+ScrollKit works on all major Apple platforms and is designed to be easy to use. It doesn't use the new ScrollView APIs for backwards compatibility reasons, but will eventually do so.
 
 
 

Sources/ScrollKit/ScrollViewWithStickyHeader.swift

@@ -145,42 +145,58 @@ private extension ScrollViewWithStickyHeader {
     }
 }
 
-#Preview {
+private struct Preview: View {
 
-    struct Preview: View {
-        
-        @State
-        var selection = 0
-        
-        func header() -> some View {
-            #if canImport(UIKit)
-            TabView {
-                Color.red.tag(0)
-                Color.green.tag(1)
-                Color.blue.tag(2)
+    @State
+    var headerVisibleRatio = 0.0
+    
+    @State
+    var scrollOffset = CGPoint.zero
+    
+    func header() -> some View {
+        #if canImport(UIKit)
+        TabView {
+            Color.red.tag(0)
+            Color.green.tag(1)
+            Color.blue.tag(2)
+        }
+        .tabViewStyle(.page)
+        .overlay {
+            VStack {
+                Text("Offset: \(scrollOffset.y)")
+                Text("Ratio: \(headerVisibleRatio)")
             }
-            .tabViewStyle(.page)
-            #else
+        }
+        #else
+        VStack {
+            Color.blue
             Color.red
-            #endif
         }
-        
-        var body: some View {
-            ScrollViewWithStickyHeader(
-                .vertical,
-                header: header,
-                headerHeight: 250,
-                headerMinHeight: 150,
-                showsIndicators: false
-            ) {
-                LazyVStack {
-                    ForEach(1...100, id: \.self) {
-                        Text("\($0)")
-                    }
+        #endif
+    }
+    
+    var body: some View {
+        ScrollViewWithStickyHeader(
+            .vertical,
+            header: header,
+            headerHeight: 250,
+            headerMinHeight: 150,
+            showsIndicators: false,
+            onScroll: { offset, headerVisibleRatio in
+                self.scrollOffset = offset
+                self.headerVisibleRatio = headerVisibleRatio
+            }
+        ) {
+            LazyVStack {
+                ForEach(1...100, id: \.self) {
+                    Text("\($0)")
                 }
             }
         }
     }
+}
+
+#Preview("Navigation") {
 
     return NavigationView {
         #if os(macOS)
@@ -195,7 +211,35 @@ private extension ScrollViewWithStickyHeader {
     #endif
 }
 
+#Preview("Sheet") {
+ 
+    struct SheetPreview: View {
+        
+        @State var isPresented = true
+        
+        var body: some View {
+            Button("Present") {
+                isPresented.toggle()
+            }
+            .sheet(isPresented: $isPresented) {
+                Preview()
+            }
+        }
+    }
+    
+    return SheetPreview()
+}
+
 private extension View {
+    
+    func isInSheet(in geo: GeometryProxy) -> Bool {
+        #if os(iOS)
+        guard UIScreen.main.traitCollection.userInterfaceIdiom == .phone else { return false }
+        return geo.safeAreaInsets.top == 0
+        #else
+        return false
+        #endif
+    }
 
     @ViewBuilder
     func prefersNavigationBarHidden() -> some View {