From 18d0e04c967a524b72b2adbfabc925c1c6e48e0c Mon Sep 17 00:00:00 2001 From: Segun Famisa Date: Tue, 16 Jun 2026 17:24:08 +0200 Subject: [PATCH] Bug 2039860 - Only apply `selected` semantics to bookmark items when in selection mode. --- .../org/mozilla/fenix/bookmarks/BookmarksScreen.kt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksScreen.kt index 2cb2f5264525c..58434eee17810 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksScreen.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/bookmarks/BookmarksScreen.kt @@ -387,6 +387,7 @@ private fun BookmarksList( ) return@Scaffold } + val inSelectionMode = state.selectedItems.isNotEmpty() saveableStateHolder.SaveableStateProvider(state.currentFolder.guid) { LazyColumn( @@ -418,7 +419,9 @@ private fun BookmarksList( beforeIconPainter = painterResource(iconsR.drawable.mozac_ic_folder_24), modifier = Modifier .semantics(mergeDescendants = true) { - selected = isSelected + if (inSelectionMode) { + selected = isSelected + } collectionItemInfo = CollectionItemInfo( rowIndex = index, rowSpan = 1, @@ -442,7 +445,9 @@ private fun BookmarksList( beforeIconPainter = painterResource(iconsR.drawable.mozac_ic_folder_24), modifier = Modifier .semantics(mergeDescendants = true) { - selected = isSelected + if (inSelectionMode) { + selected = isSelected + } collectionItemInfo = CollectionItemInfo( rowIndex = index, rowSpan = 1, @@ -498,7 +503,9 @@ private fun BookmarksList( onLongClick = { store.dispatch(BookmarkLongClicked(item)) }, modifier = Modifier .semantics(mergeDescendants = true) { - selected = isSelected + if (inSelectionMode) { + selected = isSelected + } collectionItemInfo = CollectionItemInfo( rowIndex = index, rowSpan = 1,