Skip to content

feat: allow any view to be dropped #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbertix merged 1 commit into from
Dec 4, 2022
Merged

feat: allow any view to be dropped #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions Sources/DropView/View Modifiers/ItemDropViewPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import SwiftUI

/// A `struct` defining a view modifier
/// tasked with overlaying the drop view.
private struct ItemDropViewPresenter<Item: Identifiable, C: View, L: View, R: View>: ViewModifier {
private struct ItemDropViewPresenter<Item: Identifiable, C: View>: ViewModifier {
/// The drag gesture translation.
@GestureState var translation: CGFloat = 0

Expand All @@ -21,8 +21,10 @@ private struct ItemDropViewPresenter<Item: Identifiable, C: View, L: View, R: Vi
let alignment: VerticalAlignment
/// The auto-dismiss time interval.
let timer: TimeInterval
/// Whether it should dismiss the drop view on drag or not.
let shouldDismissOnDrag: Bool
/// The drop view factory.
let dropView: (Item) -> DropView<C, L, R>
let dropView: (Item) -> C

/// The associated transition edge.
private var edge: Edge {
Expand All @@ -49,7 +51,9 @@ private struct ItemDropViewPresenter<Item: Identifiable, C: View, L: View, R: Vi
)
.gesture(
// Drag-to-dismiss.
DragGesture()
!shouldDismissOnDrag
? nil
: DragGesture()
.updating($translation) { change, state, _ in
switch alignment {
case .center: state = min(change.translation.width, 0)
Expand Down Expand Up @@ -83,18 +87,21 @@ public extension View {
/// - isPresented: An optional `Identifiable` binding.
/// - alignment: A valid `VerticalAlignment`. Defaults to `.top`.
/// - timer: The time before it gets autodismissed. Defaults to `2`.
/// - shouldDismissOnDrag: Whether dragging the drop view should dismiss it or not. Defaults to `true`.
/// - content: The drop view factory.
/// - returns: Some `View`.
@ViewBuilder func drop<I: Identifiable, C: View, L: View, T: View>(
@ViewBuilder func drop<I: Identifiable, C: View>(
item: Binding<I?>,
alignment: VerticalAlignment = .top,
dismissingAfter timer: TimeInterval = 2,
@ViewBuilder content: @escaping (I) -> DropView<C, L, T>
dismissingOnDrag shouldDismissOnDrag: Bool = true,
@ViewBuilder content: @escaping (I) -> C
) -> some View {
modifier(ItemDropViewPresenter(
item: item,
alignment: alignment,
timer: timer,
shouldDismissOnDrag: shouldDismissOnDrag,
dropView: content
))
}
Expand Down
17 changes: 12 additions & 5 deletions Sources/DropView/View Modifiers/ToggleDropViewPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import SwiftUI

/// A `struct` defining a view modifier
/// tasked with overlaying the drop view.
private struct ToggleDropViewPresenter<C: View, L: View, R: View>: ViewModifier {
private struct ToggleDropViewPresenter<C: View>: ViewModifier {
/// The drag gesture translation.
@GestureState var translation: CGFloat = 0

Expand All @@ -21,8 +21,10 @@ private struct ToggleDropViewPresenter<C: View, L: View, R: View>: ViewModifier
let alignment: VerticalAlignment
/// The auto-dismiss time interval.
let timer: TimeInterval
/// Whether it should dismiss the drop view on drag or not.
let shouldDismissOnDrag: Bool
/// The drop view factory.
let dropView: () -> DropView<C, L, R>
let dropView: () -> C

/// The associated transition edge.
private var edge: Edge {
Expand All @@ -49,7 +51,9 @@ private struct ToggleDropViewPresenter<C: View, L: View, R: View>: ViewModifier
)
.gesture(
// Drag-to-dismiss.
DragGesture()
!shouldDismissOnDrag
? nil
: DragGesture()
.updating($translation) { change, state, _ in
switch alignment {
case .center: state = min(change.translation.width, 0)
Expand Down Expand Up @@ -78,18 +82,21 @@ public extension View {
/// - isPresented: An optional `Bool` binding.
/// - alignment: A valid `VerticalAlignment`. Defaults to `.top`.
/// - timer: The time before it gets autodismissed. Defaults to `2`.
/// - shouldDismissOnDrag: Whether dragging the drop view should dismiss it or not. Defaults to `true`.
/// - content: The drop view factory.
/// - returns: Some `View`.
@ViewBuilder func drop<C: View, L: View, T: View>(
@ViewBuilder func drop<C: View>(
isPresented: Binding<Bool>,
alignment: VerticalAlignment = .top,
dismissingAfter timer: TimeInterval = 2,
@ViewBuilder content: @escaping () -> DropView<C, L, T>
dismissingOnDrag shouldDismissOnDrag: Bool = true,
@ViewBuilder content: @escaping () -> C
) -> some View {
modifier(ToggleDropViewPresenter(
isPresented: isPresented,
alignment: alignment,
timer: timer,
shouldDismissOnDrag: shouldDismissOnDrag,
dropView: content
))
}
Expand Down