Skip to content
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

Jump to bottom

[CM-1243] Support for reduce motion accessibility. #15

Merged
merged 4 commits into from
Mar 23, 2023
Merged

[CM-1243] Support for reduce motion accessibility. #15

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10d933f
[CM-1243] Support for reduce motion accessibility.
devyml Mar 23, 2023
b61fa45
[CM-1243] Comments updated.
devyml Mar 23, 2023
7b7619e
Expand unit test coverage
Mar 23, 2023
c7a6855
Update dependencies
Mar 23, 2023
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
7 changes: 7 additions & 0 deletions Sources/YBottomSheet/Animation/BottomSheetAnimator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ class BottomSheetAnimator: NSObject {
/// Bottom sheet controller.
let sheetViewController: BottomSheetController

/// Accessibility reduce motion is enabled or not.
var isReduceMotionEnabled: Bool {
get {
UIAccessibility.isReduceMotionEnabled
mpospese marked this conversation as resolved.
Show resolved Hide resolved
}
}

/// Initializes a bottom sheet animator.
/// - Parameter sheetViewController: the sheet being animated.
init(sheetViewController: BottomSheetController) {
Expand Down
4 changes: 3 additions & 1 deletion Sources/YBottomSheet/Animation/BottomSheetDismissAnimator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ class BottomSheetDismissAnimator: BottomSheetAnimator {
delay: .zero,
options: [.beginFromCurrentState, sheet.appearance.dismissAnimationCurve]
) {
sheet.sheetView.frame = sheetFrame
if !self.isReduceMotionEnabled {
sheet.sheetView.frame = sheetFrame
}
mpospese marked this conversation as resolved.
Show resolved Hide resolved
} completion: { _ in
if !transitionContext.transitionWasCancelled {
fromViewController.view.removeFromSuperview()
Expand Down
12 changes: 7 additions & 5 deletions Sources/YBottomSheet/Animation/BottomSheetPresentAnimator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ class BottomSheetPresentAnimator: BottomSheetAnimator {
sheet.view.layoutSubviews()
sheet.dimmerView.alpha = 0

let toFinalFrame = transitionContext.finalFrame(for: toViewController)
var sheetFrame = sheet.sheetView.frame
sheetFrame.origin.y = toFinalFrame.maxY + (sheet.appearance.elevation?.extent.top ?? 0)
sheet.sheetView.frame = sheetFrame
sheet.view.setNeedsLayout()
if !isReduceMotionEnabled {
let toFinalFrame = transitionContext.finalFrame(for: toViewController)
var sheetFrame = sheet.sheetView.frame
sheetFrame.origin.y = toFinalFrame.maxY + (sheet.appearance.elevation?.extent.top ?? 0)
sheet.sheetView.frame = sheetFrame
sheet.view.setNeedsLayout()
}
mpospese marked this conversation as resolved.
Show resolved Hide resolved

let duration = transitionDuration(using: transitionContext)

Expand Down