Skip to content

Commit a906114

Browse files
author
Huong Do
committed
Separate modalCloseHandler from dismissHandler (to fix issue #70)
1 parent b588b94 commit a906114

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

Source/DateTimePicker.swift

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ public protocol DateTimePickerDelegate {
177177
private var separatorTopView: UIView!
178178
private var separatorBottomView: UIView!
179179

180+
private var modalCloseHandler: (() -> Void)?
181+
180182
internal var minimumDate: Date!
181183
internal var maximumDate: Date!
182184

@@ -232,14 +234,15 @@ public protocol DateTimePickerDelegate {
232234
self.resetTime()
233235
})
234236

235-
dismissHandler = {
237+
modalCloseHandler = {
236238
contentViewBottomConstraint.constant = self.contentHeight
237-
UIView.animate(withDuration: 0.3, delay: 0.1, options: UIViewAnimationOptions.curveEaseOut, animations: {
239+
UIView.animate(withDuration: 0.5, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 0.8, options: .curveLinear, animations: {
238240
// animate to hide pickerView
239241
self.layoutIfNeeded()
240242
}, completion: { (completed) in
241243
self.removeFromSuperview()
242244
shadowView.removeFromSuperview()
245+
243246
})
244247
};
245248
}
@@ -634,13 +637,15 @@ public protocol DateTimePickerDelegate {
634637

635638
@objc
636639
public func dismissView(sender: UIButton?=nil) {
637-
self.dismissHandler?()
640+
modalCloseHandler?()
641+
dismissHandler?()
638642
}
639643

640644
@objc
641645
public func donePicking(sender: UIButton?=nil) {
642-
self.completionHandler?(selectedDate)
643-
self.dismissHandler?()
646+
completionHandler?(selectedDate)
647+
modalCloseHandler?()
648+
dismissHandler?()
644649
}
645650
}
646651

0 commit comments

Comments
 (0)