dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-04-26 23:55:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

android, desktop: don't load new messages when pressing quote while searching (#5315)

Browse Source
This commit is contained in:
Stanislav Dmitrenko
2024-12-04 23:33:14 +07:00
committed by GitHub
parent 89f380400e
commit 219381f941
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+4 -1
View File
@@ -1001,7 +1001,7 @@ fun BoxScope.ChatItemsList(
val chatInfoUpdated = rememberUpdatedState(chatInfo) val chatInfoUpdated = rememberUpdatedState(chatInfo)
val highlightedItems = remember { mutableStateOf(setOf<Long>()) } val highlightedItems = remember { mutableStateOf(setOf<Long>()) }
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
val scrollToItem: (Long) -> Unit = remember { scrollToItem(loadingMoreItems, highlightedItems, chatInfoUpdated, maxHeight, scope, reversedChatItems, mergedItems, listState, loadMessages) } val scrollToItem: (Long) -> Unit = remember { scrollToItem(searchValue, loadingMoreItems, highlightedItems, chatInfoUpdated, maxHeight, scope, reversedChatItems, mergedItems, listState, loadMessages) }
val scrollToQuotedItemFromItem: (Long) -> Unit = remember { findQuotedItemFromItem(remoteHostIdUpdated, chatInfoUpdated, scope, scrollToItem) } val scrollToQuotedItemFromItem: (Long) -> Unit = remember { findQuotedItemFromItem(remoteHostIdUpdated, chatInfoUpdated, scope, scrollToItem) }
LoadLastItems(loadingMoreItems, remoteHostId, chatInfo) LoadLastItems(loadingMoreItems, remoteHostId, chatInfo)
@@ -1834,6 +1834,7 @@ private fun lastFullyVisibleIemInListState(topPaddingToContentPx: State<Int>, de
} }
private fun scrollToItem( private fun scrollToItem(
searchValue: State<String>,
loadingMoreItems: MutableState<Boolean>, loadingMoreItems: MutableState<Boolean>,
highlightedItems: MutableState<Set<Long>>, highlightedItems: MutableState<Set<Long>>,
chatInfo: State<ChatInfo>, chatInfo: State<ChatInfo>,
@@ -1847,6 +1848,8 @@ private fun scrollToItem(
withApi { withApi {
try { try {
var index = mergedItems.value.indexInParentItems[itemId] ?: -1 var index = mergedItems.value.indexInParentItems[itemId] ?: -1
// Don't try to load messages while in search
if (index == -1 && searchValue.value.isNotBlank()) return@withApi
// setting it to 'loading' even if the item is loaded because in rare cases when the resulting item is near the top, scrolling to // setting it to 'loading' even if the item is loaded because in rare cases when the resulting item is near the top, scrolling to
// it will trigger loading more items and will scroll to incorrect position (because of trimming) // it will trigger loading more items and will scroll to incorrect position (because of trimming)
loadingMoreItems.value = true loadingMoreItems.value = true