Fixes #254 - SelectableLazyColumn multi selection bug

JetBrains · Nov 26, 2023 · 0e6b986 · 0e6b986
1 parent 07dd720
commit 0e6b986
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/foundation/api/foundation.api b/foundation/api/foundation.api
@@ -382,7 +382,7 @@ public class org/jetbrains/jewel/foundation/lazy/tree/DefaultSelectableLazyColum
 	public fun <init> ()V
 	public fun handlePointerEventPress (Landroidx/compose/ui/input/pointer/PointerEvent;Lorg/jetbrains/jewel/foundation/lazy/SelectableColumnKeybindings;Lorg/jetbrains/jewel/foundation/lazy/SelectableLazyListState;Lorg/jetbrains/jewel/foundation/lazy/SelectionMode;Ljava/util/List;Ljava/lang/Object;)V
 	public fun onExtendSelectionToKey (Ljava/lang/Object;Ljava/util/List;Lorg/jetbrains/jewel/foundation/lazy/SelectableLazyListState;Lorg/jetbrains/jewel/foundation/lazy/SelectionMode;)V
-	public fun toggleKeySelection (Ljava/lang/Object;Ljava/util/List;Lorg/jetbrains/jewel/foundation/lazy/SelectableLazyListState;)V
+	public fun toggleKeySelection (Ljava/lang/Object;Ljava/util/List;Lorg/jetbrains/jewel/foundation/lazy/SelectableLazyListState;Lorg/jetbrains/jewel/foundation/lazy/SelectionMode;)V
 }
 
 public class org/jetbrains/jewel/foundation/lazy/tree/DefaultSelectableLazyColumnKeyActions : org/jetbrains/jewel/foundation/lazy/tree/KeyActions {
@@ -470,7 +470,7 @@ public final class org/jetbrains/jewel/foundation/lazy/tree/KeyActionsKt {
 public abstract interface class org/jetbrains/jewel/foundation/lazy/tree/PointerEventActions {
 	public abstract fun handlePointerEventPress (Landroidx/compose/ui/input/pointer/PointerEvent;Lorg/jetbrains/jewel/foundation/lazy/SelectableColumnKeybindings;Lorg/jetbrains/jewel/foundation/lazy/SelectableLazyListState;Lorg/jetbrains/jewel/foundation/lazy/SelectionMode;Ljava/util/List;Ljava/lang/Object;)V
 	public abstract fun onExtendSelectionToKey (Ljava/lang/Object;Ljava/util/List;Lorg/jetbrains/jewel/foundation/lazy/SelectableLazyListState;Lorg/jetbrains/jewel/foundation/lazy/SelectionMode;)V
-	public abstract fun toggleKeySelection (Ljava/lang/Object;Ljava/util/List;Lorg/jetbrains/jewel/foundation/lazy/SelectableLazyListState;)V
+	public abstract fun toggleKeySelection (Ljava/lang/Object;Ljava/util/List;Lorg/jetbrains/jewel/foundation/lazy/SelectableLazyListState;Lorg/jetbrains/jewel/foundation/lazy/SelectionMode;)V
 }
 
 public final class org/jetbrains/jewel/foundation/lazy/tree/Tree {

diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/KeyActions.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/KeyActions.kt
@@ -48,6 +48,7 @@ public interface PointerEventActions {
         key: Any,
         allKeys: List<SelectableLazyListKey>,
         selectableLazyListState: SelectableLazyListState,
+        selectionMode: SelectionMode,
     )
 
     public fun onExtendSelectionToKey(
@@ -83,7 +84,7 @@ public open class DefaultSelectableLazyColumnEventAction : PointerEventActions {
 
                 pointerEvent.keyboardModifiers.isMultiSelectionKeyPressed -> {
                     Log.i("ctrl pressed on click")
-                    toggleKeySelection(key, allKeys, selectableLazyListState)
+                    toggleKeySelection(key, allKeys, selectableLazyListState, selectionMode)
                 }
 
                 else -> {
@@ -99,13 +100,23 @@ public open class DefaultSelectableLazyColumnEventAction : PointerEventActions {
         key: Any,
         allKeys: List<SelectableLazyListKey>,
         selectableLazyListState: SelectableLazyListState,
+        selectionMode: SelectionMode,
     ) {
-        if (selectableLazyListState.selectedKeys.contains(key)) {
-            selectableLazyListState.selectedKeys =
-                selectableLazyListState.selectedKeys.toMutableList().also { it.remove(key) }
-        } else {
-            selectableLazyListState.selectedKeys =
-                selectableLazyListState.selectedKeys.toMutableList().also { it.add(key) }
+        when (selectionMode) {
+            SelectionMode.None -> return
+            SelectionMode.Single -> {
+                selectableLazyListState.selectedKeys = listOf(key)
+            }
+
+            SelectionMode.Multiple -> {
+                if (selectableLazyListState.selectedKeys.contains(key)) {
+                    selectableLazyListState.selectedKeys =
+                        selectableLazyListState.selectedKeys.toMutableList().also { it.remove(key) }
+                } else {
+                    selectableLazyListState.selectedKeys =
+                        selectableLazyListState.selectedKeys.toMutableList().also { it.add(key) }
+                }
+            }
         }
         selectableLazyListState.lastActiveItemIndex = allKeys.indexOfFirst { it == key }
     }
@@ -171,7 +182,7 @@ public class DefaultTreeViewPointerEventAction(
                 pointerEvent.keyboardModifiers.isMultiSelectionKeyPressed -> {
                     Log.t("multi selection pressed")
                     selectableLazyListState.lastKeyEventUsedMouse = false
-                    super.toggleKeySelection(key, allKeys, selectableLazyListState)
+                    super.toggleKeySelection(key, allKeys, selectableLazyListState, selectionMode)
                 }
 
                 else -> {

diff --git a/...one/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/ChipsAndTree.kt b/...one/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/ChipsAndTree.kt
@@ -26,6 +26,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import org.jetbrains.jewel.foundation.lazy.SelectableLazyColumn
+import org.jetbrains.jewel.foundation.lazy.SelectionMode
 import org.jetbrains.jewel.foundation.lazy.rememberSelectableLazyListState
 import org.jetbrains.jewel.foundation.lazy.tree.buildTree
 import org.jetbrains.jewel.foundation.theme.JewelTheme
@@ -70,6 +71,7 @@ fun SelectableLazyColumnSample() {
         modifier = Modifier.size(200.dp, 200.dp),
     ) {
         SelectableLazyColumn(
+            selectionMode = SelectionMode.Multiple,
             modifier = Modifier.focusable(interactionSource = interactionSource),
             state = state,
             content = {

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Link.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Link.kt
@@ -260,7 +260,6 @@ private fun LinkImpl(
             .clickable(
                 onClick = {
                     linkState = linkState.copy(visited = true)
-                    println("clicked Link")
                     onClick()
                 },
                 enabled = enabled,