fix: unexpected scrolling on selected message [WPB-6932] (#2753)

wireapp · Mar 1, 2024 · 1265e6b · 1265e6b
1 parent a5ab875
commit 1265e6b
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt
@@ -838,12 +838,16 @@ fun MessageList(
     onLinkClick: (String) -> Unit,
     selectedMessageId: String?
 ) {
-    val mostRecentMessage = lazyPagingMessages.itemCount.takeIf { it > 0 }?.let { lazyPagingMessages[0] }
-
-    LaunchedEffect(mostRecentMessage) {
-        // Most recent message changed, if the user didn't scroll up, we automatically scroll down to reveal the new message
-        if (lazyListState.firstVisibleItemIndex < MAXIMUM_SCROLLED_MESSAGES_UNTIL_AUTOSCROLL_STOPS) {
-            lazyListState.animateScrollToItem(0)
+    val prevItemCount = remember { mutableStateOf(lazyPagingMessages.itemCount) }
+    LaunchedEffect(lazyPagingMessages.itemCount) {
+        if (lazyPagingMessages.itemCount > prevItemCount.value && selectedMessageId == null) {
+            if (prevItemCount.value > 0
+                && lazyListState.firstVisibleItemIndex > 0
+                && lazyListState.firstVisibleItemIndex <= MAXIMUM_SCROLLED_MESSAGES_UNTIL_AUTOSCROLL_STOPS
+            ) {
+                lazyListState.animateScrollToItem(0)
+            }
+            prevItemCount.value = lazyPagingMessages.itemCount
         }
     }