Skip to content

Fix IndexOutOfBoundsException in MultiSelectionLayout when a new seletion starts past every selectable #3215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bitsy (bitsycore) wants to merge 1 commit into
base: jb-main
Choose a base branch
from
+6 −7
Open

Fix IndexOutOfBoundsException in MultiSelectionLayout when a new seletion starts past every selectable #3215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions ...ation/src/commonMain/kotlin/androidx/compose/foundation/text/selection/SelectionLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,9 @@ private class MultiSelectionLayout(
when {
startSlot < endSlot -> CrossStatus.NOT_CROSSED
startSlot > endSlot -> CrossStatus.CROSSED
// because one of the slots is not-dragging, it must be on a text directly
// because one of the slots is on a text directly and the start/end slots are equal,
// they both must be odd. Given this, dividing the slot by 2 should give us the
// correct
// info index.
else -> infoList[startSlot / 2].rawCrossStatus
// Clamp: when the gesture starts past every selectable, both slots default
// to lastSlot = 2 * infoList.size, so slot / 2 would be out of bounds.
else -> infoList[(startSlot / 2).coerceAtMost(infoList.lastIndex)].rawCrossStatus
}

override val startInfo: SelectableInfo
Expand Down Expand Up @@ -303,7 +300,9 @@ private class MultiSelectionLayout(

private fun slotToIndex(slot: Int, isMinimumSlot: Boolean): Int {
val slotAdjustment = if (isMinimumSlot) 0 else 1
return (slot - slotAdjustment) / 2
// Clamp: when the gesture starts past every selectable, slots default
// to lastSlot = 2 * infoList.size, so slot / 2 would be out of bounds.
return ((slot - slotAdjustment) / 2).coerceIn(0, infoList.lastIndex)
}

private fun getInfoListIndexBySelectableId(id: Long): Int =
Expand Down