Improve fix for interactive dismiss cancellation bug

rusik · rusik · commit 5831743aa910 · 2022-09-29T16:33:44.000+08:00
diff --git a/Sources/BottomSheet/Core/Presentation/BottomSheetPresentationController.swift b/Sources/BottomSheet/Core/Presentation/BottomSheetPresentationController.swift
@@ -535,8 +535,10 @@ extension BottomSheetPresentationController: UIViewControllerAnimatedTransitioni
         let completion = { (completed: Bool) in
             transitionContext.completeTransition(completed && !transitionContext.transitionWasCancelled)
             // For fix bug: https://openradar.appspot.com/FB9075949
-            if transitionContext.transitionWasCancelled {
+            if #available(iOS 13, *), transitionContext.transitionWasCancelled {
+                let sourceViewFrame = sourceView.frame
                 sourceView.frame = .zero
+                sourceView.frame = sourceViewFrame
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -535,8 +535,10 @@ extension BottomSheetPresentationController: UIViewControllerAnimatedTransitioni`
`535`	`535`	`let completion = { (completed: Bool) in`
`536`	`536`	`transitionContext.completeTransition(completed && !transitionContext.transitionWasCancelled)`
`537`	`537`	`// For fix bug: https://openradar.appspot.com/FB9075949`
`538`		`- if transitionContext.transitionWasCancelled {`
	`538`	`+ if #available(iOS 13, *), transitionContext.transitionWasCancelled {`
	`539`	`+ let sourceViewFrame = sourceView.frame`
`539`	`540`	`sourceView.frame = .zero`
	`541`	`+ sourceView.frame = sourceViewFrame`
`540`	`542`	`}`
`541`	`543`	`}`
`542`	`544`