From 8611748753aee0483efbc7263fb231413e30f6f2 Mon Sep 17 00:00:00 2001 From: Chitlange Sahas Date: Tue, 4 Jul 2023 13:56:26 -0700 Subject: [PATCH] fix: panGestureShouldBegin should be checked first --- FittedSheets/SheetViewController.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/FittedSheets/SheetViewController.swift b/FittedSheets/SheetViewController.swift index e7b6b3e..0d72a0a 100644 --- a/FittedSheets/SheetViewController.swift +++ b/FittedSheets/SheetViewController.swift @@ -715,12 +715,13 @@ extension SheetViewController: UIGestureRecognizerDelegate { } public func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool { - guard let panGestureRecognizer = gestureRecognizer as? InitialTouchPanGestureRecognizer, let childScrollView = self.childScrollView, let point = panGestureRecognizer.initialTouchLocation else { return true } - if let pan = gestureRecognizer as? UIPanGestureRecognizer, let closure = panGestureShouldBegin, let should = closure(pan) { return should } + guard let panGestureRecognizer = gestureRecognizer as? InitialTouchPanGestureRecognizer, let childScrollView = self.childScrollView, let point = panGestureRecognizer.initialTouchLocation else { return true } + + let pointInChildScrollView = self.view.convert(point, to: childScrollView).y - childScrollView.contentOffset.y let velocity = panGestureRecognizer.velocity(in: panGestureRecognizer.view?.superview)