mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2025-12-24 00:07:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Prevent message list jumping during pagination updates (#3829)

Browse Source
This commit is contained in:
Mac DeCourcy
2025-11-26 17:05:38 -08:00
committed by GitHub
parent 7d9762f99e
commit 9bc1b87e75
1 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
feature/messaging/src/main/kotlin/org/meshtastic/feature/messaging/MessageListPaged.kt
View File

@@ -128,6 +128,9 @@ internal fun MessageListPaged(
val coroutineScope = rememberCoroutineScope()
// Disable auto-scroll when any dialog is open to prevent list jumping
val hasDialogOpen = showStatusDialog != null || showReactionDialog != null
// Track unread count based on scroll position
UpdateUnreadCountPaged(listState = listState, messages = state.messages, onUnreadChange = handlers.onUnreadChanged)
@@ -136,6 +139,7 @@ internal fun MessageListPaged(
listState = listState,
messages = state.messages,
hasUnreadMessages = state.hasUnreadMessages,
hasDialogOpen = hasDialogOpen,
)
MessageListPagedContent(
@@ -272,24 +276,52 @@ private fun LazyItemScope.renderPagedChatMessageRow(
)
}
@Suppress("CyclomaticComplexMethod")
@Composable
private fun AutoScrollToBottomPaged(
listState: LazyListState,
messages: LazyPagingItems<Message>,
hasUnreadMessages: Boolean,
hasDialogOpen: Boolean = false,
itemThreshold: Int = 3,
) = with(listState) {
val shouldAutoScroll by
remember(hasUnreadMessages) {
val shouldStickToBottom by
remember(hasUnreadMessages, hasDialogOpen) {
derivedStateOf {
val isAtBottom =
firstVisibleItemIndex == 0 &&
firstVisibleItemScrollOffset <= UnreadUiDefaults.AUTO_SCROLL_BOTTOM_OFFSET_TOLERANCE
val isNearBottom = firstVisibleItemIndex <= itemThreshold
isAtBottom || (!hasUnreadMessages && isNearBottom)
if (hasDialogOpen) {
false
} else {
val isAtBottom =
firstVisibleItemIndex == 0 &&
firstVisibleItemScrollOffset <= UnreadUiDefaults.AUTO_SCROLL_BOTTOM_OFFSET_TOLERANCE
val isNearBottom = firstVisibleItemIndex <= itemThreshold
isAtBottom || (!hasUnreadMessages && isNearBottom)
}
}
}
if (shouldAutoScroll) {
val isRefreshing by remember { derivedStateOf { messages.loadState.refresh is LoadState.Loading } }
var wasPreviouslyRefreshing by remember { mutableStateOf(false) }
// Maintain scroll position during and after refresh
LaunchedEffect(isRefreshing, shouldStickToBottom) {
if (!shouldStickToBottom) return@LaunchedEffect
if (isRefreshing) {
wasPreviouslyRefreshing = true
if (!isScrollInProgress && messages.itemCount > 0) {
scrollToItem(0)
}
} else if (wasPreviouslyRefreshing) {
wasPreviouslyRefreshing = false
if (messages.itemCount > 0) {
scrollToItem(0)
}
}
}
// Normal auto-scroll for new messages (when not refreshing)
if (shouldStickToBottom && !isRefreshing) {
LaunchedEffect(messages.itemCount) {
if (!isScrollInProgress && messages.itemCount > 0) {
scrollToItem(0)