Skip to content

fixes "shake to undo" gesture bug. #64

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
esemusa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixes "shake to undo" gesture bug. #64

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
16 changes: 15 additions & 1 deletion Sources/KeyboardAvoiding.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import UIKit
private static var avoidingViewUsesAutoLayout = false
private static var triggerViews = [UIView]()
private static var showingAnimationCount = 0
private static var waitForAnimation: (isWaiting: Bool, notification: Notification?) = (false, nil)

public private(set) static var isKeyboardVisible = false
public static var buffer: CGFloat = 0.0
Expand Down Expand Up @@ -222,6 +223,7 @@ import UIKit
}
self.avoidingView!.superview!.setNeedsUpdateConstraints()
}
waitForAnimation.isWaiting = true
UIView.animate(withDuration: TimeInterval(animationDuration + CGFloat(0.075)), delay: 0, options: UIView.AnimationOptions(rawValue: UInt(animationOptions)), animations: {() -> Void in
if self.avoidingViewUsesAutoLayout {
self.avoidingView!.superview!.layoutIfNeeded()
Expand All @@ -233,6 +235,12 @@ import UIKit
if self.showingAnimationCount <= 0 {
self.updatedConstraints.removeAll()
self.updatedConstraintConstants.removeAll()
// All animations are done, perform queued keyboard events if any are present
waitForAnimation.isWaiting = false
if let notification = waitForAnimation.1 {
waitForAnimation.notification = nil
self.didChange(notification)
}
}
})
}
Expand Down Expand Up @@ -291,7 +299,13 @@ import UIKit
UIApplication.shared.windows.first?.rootViewController?.view.endEditing(true)
})
NotificationCenter.default.addObserver(forName: UIResponder.keyboardWillChangeFrameNotification, object: nil, queue: OperationQueue.main, using: { notification in
self.didChange(notification)
// If avoiding view is still in animation from previous keyboard events it cannot be changed right now
// Store notification so it can be fire again, when all animations are finished
if !waitForAnimation.isWaiting {
self.didChange(notification)
} else {
waitForAnimation.notification = notification
}
})
}
}
Expand Down