fix: pop back when we can

Author: isekovanic

examples/SampleApp/src/screens/ChannelScreen.tsx

@@ -33,6 +33,7 @@ import { useStreamChatContext } from '../context/StreamChatContext.tsx';
 import { CustomAttachmentPickerSelectionBar } from '../components/AttachmentPickerSelectionBar.tsx';
 import { MessageInfoBottomSheet } from '../components/MessageInfoBottomSheet.tsx';
 import { CustomAttachmentPickerContent } from '../components/AttachmentPickerContent.tsx';
+import { ThreadType } from 'stream-chat-react-native-core';
 
 export type ChannelScreenNavigationProp = NativeStackNavigationProp<
   StackNavigatorParamList,
@@ -195,7 +196,29 @@ export const ChannelScreen: React.FC<ChannelScreenProps> = ({
       }
       setSelectedThread(parentMessage);
       setThread(parentMessage);
-      navigation.navigate('ThreadScreen', { channel, thread: parentMessage, targetedMessageId });
+      const params: StackNavigatorParamList['ThreadScreen'] = {
+        channel,
+        targetedMessageId,
+        thread: parentMessage,
+      };
+      const hasThreadInStack = navigation.getState().routes.some((route) => {
+        if (route.name !== 'ThreadScreen') {
+          return false;
+        }
+        const routeParams = route.params as StackNavigatorParamList['ThreadScreen'] | undefined;
+        const routeThreadId =
+          (routeParams?.thread as LocalMessage)?.id ??
+          (routeParams?.thread as ThreadType)?.thread?.id;
+        const routeChannelId = routeParams?.channel?.id;
+        return routeThreadId === parentMessage.id && routeChannelId === channel.id;
+      });
+
+      if (hasThreadInStack) {
+        navigation.popTo('ThreadScreen', params);
+        return;
+      }
+
+      navigation.navigate('ThreadScreen', params);
     },
     [channel, navigation, setThread],
   );

examples/SampleApp/src/screens/ThreadScreen.tsx

@@ -119,7 +119,27 @@ export const ThreadScreen: React.FC<ThreadScreenProps> = ({
 
   const onAlsoSentToChannelHeaderPress = useCallback(
     ({ targetedMessageId }: AlsoSentToChannelHeaderPressPayload) => {
-      navigation.navigate('ChannelScreen', { channel, messageId: targetedMessageId });
+      const params: StackNavigatorParamList['ChannelScreen'] = {
+        channel,
+        messageId: targetedMessageId,
+      };
+      const hasChannelInStack = navigation
+        .getState()
+        .routes.some((route) => {
+          if (route.name !== 'ChannelScreen') {
+            return false;
+          }
+          const routeParams = route.params as StackNavigatorParamList['ChannelScreen'] | undefined;
+          const routeChannelId = routeParams?.channel?.id ?? routeParams?.channelId;
+          return routeChannelId === channel.id;
+        });
+
+      if (hasChannelInStack) {
+        navigation.popTo('ChannelScreen', params);
+        return;
+      }
+
+      navigation.navigate('ChannelScreen', params);
     },
     [channel, navigation],
   );