Further improve scroll gesture handling

Closes #580
LeoNatan · Sep 26, 2024 · 6cce812 · 6cce812
1 parent bcc42fe
commit 6cce812
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/LNPopupController/LNPopupController/Private/LNPopupController.mm b/LNPopupController/LNPopupController/Private/LNPopupController.mm
@@ -843,15 +843,33 @@ - (void)_popupBarPresentationByUserPanGestureHandler_changed:(UIPanGestureRecogn
 	}
 }
 
-- (void)_popupBarPresentationByUserPanGestureHandler_endedOrCancelled:(UIPanGestureRecognizer*)pgr
+- (BOOL)_shouldStopEndOrCancelledOnUnknownGestureRecognizerOrHorizontalScroll:(UIPanGestureRecognizer*)pgr
 {
-	if(_dismissGestureStarted == true && pgr != _popupContentView.popupInteractionGestureRecognizer)
+	if(pgr == _popupContentView.popupInteractionGestureRecognizer)
 	{
-		return;
+		return NO;
+	}
+
+	UIScrollView* possibleScrollView = (id)pgr.view;
+	if([possibleScrollView isKindOfClass:UIScrollView.class] == NO)
+	{
+		return YES;
 	}
 
+	return possibleScrollView._ln_hasHorizontalContent;
+}
+
+- (void)_popupBarPresentationByUserPanGestureHandler_endedOrCancelled:(UIPanGestureRecognizer*)pgr
+{
 	LNPopupInteractionStyle resolvedStyle = _LNPopupResolveInteractionStyleFromInteractionStyle(_containerController.popupInteractionStyle);
 
+	if(_dismissGestureStarted == true && [self _shouldStopEndOrCancelledOnUnknownGestureRecognizerOrHorizontalScroll:pgr])
+	{
+		_dismissGestureStarted = NO;
+
+		return;
+	}
+
 	if(_dismissGestureStarted == YES)
 	{
 		LNPopupPresentationState targetState = _stateBeforeDismissStarted;

diff --git a/LNPopupController/LNPopupController/Private/LNPopupInteractionPanGestureRecognizer.m b/LNPopupController/LNPopupController/Private/LNPopupInteractionPanGestureRecognizer.m
@@ -88,7 +88,7 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecogni
 		return YES;
 	}
 
-	if([otherGestureRecognizer.view isKindOfClass:UIScrollView.class] && [(UIScrollView*)otherGestureRecognizer.view _ln_hasVerticalContent] == NO)
+	if([otherGestureRecognizer.view isKindOfClass:UIScrollView.class] && [(UIScrollView*)otherGestureRecognizer.view _ln_hasVerticalContent] == NO && [(UIScrollView*)otherGestureRecognizer.view _ln_hasHorizontalContent] == NO)
 	{
 		return YES;
 	}