Adjust some more

Author: laevandus

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageContainerView.swift

@@ -331,8 +331,10 @@ public struct MessageContainerView<Factory: ViewFactory>: View {
             setOffsetX(value: 0)
             return
         }
-        // The view is moving during the swipe handling, therefore we skip the contains check if it is in progress
-        guard offsetX > 0 || geometry.frame(in: .global).contains(messageListSwipe.startLocation) else { return }
+        if utils.messageCachingUtils.swipeToReplyId == nil, geometry.frame(in: .global).contains(messageListSwipe.startLocation) {
+            utils.messageCachingUtils.swipeToReplyId = message.id
+        }
+        guard utils.messageCachingUtils.swipeToReplyId == message.id else { return }
         if messageListSwipe.horizontalOffset == 0 {
             setOffsetX(value: 0)
         } else {

Sources/StreamChatSwiftUI/ChatChannel/MessageList/MessageListView.swift

@@ -326,6 +326,7 @@ public struct MessageListView<Factory: ViewFactory>: View, KeyboardReadable {
                         }
                         .onEnded { _ in
                             guard let offset = messageListSwipe?.horizontalOffset, offset != 0 else { return }
+                            utils.messageCachingUtils.swipeToReplyId = nil
                             messageListSwipe = nil
                         }
                     )

Sources/StreamChatSwiftUI/Utils/MessageCachingUtils.swift

@@ -19,11 +19,14 @@ class MessageCachingUtils {
     }
 
     var jumpToReplyId: String?
+    
+    var swipeToReplyId: MessageId?
 
     func clearCache() {
         log.debug("Clearing cached message data")
         scrollOffset = 0
         messageThreadShown = false
+        swipeToReplyId = nil
     }
 }