Skip to content

Add custom animation config #3

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

Open
tuannguyenanh177 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add custom animation config #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88c7097
add custom animation config
tuannguyenanh177 Oct 14, 2022
d264370
update
tuannguyenanh177 Oct 15, 2022
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
13 changes: 8 additions & 5 deletions SwiftUIBottomSheet/Classes/BottomSheet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ public struct BottomSheetConfig {
handleColor: Color = .init(.lightGray),
handlePosition: HandlePosition = .inside,
topBarCornerRadius: CGFloat? = nil,
sizeChangeRequest: Binding<CGFloat> = .constant(0)) {
sizeChangeRequest: Binding<CGFloat> = .constant(0),
animation: Animation = .interactiveSpring()) {
self.maxHeight = maxHeight
self.kind = kind
self.overlayColor = overlayColor
Expand All @@ -39,6 +40,7 @@ public struct BottomSheetConfig {
self.handlePosition = handlePosition
self.topBarCornerRadius = topBarCornerRadius
self.sizeChangeRequest = sizeChangeRequest
self.animation = animation
}

public enum Kind: Int, CaseIterable, Equatable {
Expand All @@ -63,6 +65,7 @@ public struct BottomSheetConfig {
public var handlePosition: HandlePosition
public var topBarCornerRadius: CGFloat?
public var sizeChangeRequest: Binding<CGFloat>
public var animation: Animation
}

public extension BottomSheetConfig {
Expand Down Expand Up @@ -245,12 +248,12 @@ private struct BottomSheetContainer<Content: View>: View {
}
}
.offset(y: offset)
.animation(shown ? .interactiveSpring() : nil, value: height)
.animation(.interactiveSpring(), value: dragEnded)
.animation(.interactiveSpring(), value: config.handlePosition)
.animation(shown ? config.animation : nil, value: height)
.animation(config.animation, value: dragEnded)
.animation(config.animation, value: config.handlePosition)
.transaction {
if dragStart != nil {
$0.animation = .interactiveSpring()
$0.animation = config.animation
}
}
}
Expand Down