Iterate on onSelectedItem in ListComboBox (#702)

iterate on onSelectedItem in ListComboBox Fixes #701 Signed-off-by: Ivan Morgillo <[email protected]>
JetBrains · Nov 25, 2024 · 8c1676e · 8c1676e
1 parent af43be4
commit 8c1676e
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/ListComboBox.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/ListComboBox.kt
@@ -85,13 +85,10 @@ public fun ListComboBox(
         }
     }
 
-    fun onSelectedIndexesChange() = { selectedItems: List<Int> ->
-        if (selectedItems.isNotEmpty()) {
-            val selectedItemIndex = selectedItems.first()
-            selectedItem = selectedItemIndex
-            inputTextFieldState.setTextAndPlaceCursorAtEnd(items[selectedItemIndex])
-            onSelectedItemChange(items[selectedItemIndex])
-        }
+    fun onSelectedIndexChange(selectedItemIndex: Int) {
+        selectedItem = selectedItemIndex
+        inputTextFieldState.setTextAndPlaceCursorAtEnd(items[selectedItemIndex])
+        onSelectedItemChange(items[selectedItemIndex])
     }
 
     fun contentItems(
@@ -147,7 +144,11 @@ public fun ListComboBox(
                 modifier = Modifier.fillMaxWidth().heightIn(max = popupMaxHeight).padding(contentPadding),
                 selectionMode = SelectionMode.Single,
                 state = scrollState,
-                onSelectedIndexesChange = onSelectedIndexesChange(),
+                onSelectedIndexesChange = { selectedItemsIndexes ->
+                    if (selectedItemsIndexes.isEmpty()) return@SelectableLazyColumn
+                    if (selectedItemsIndexes.first() == selectedItem) return@SelectableLazyColumn
+                    onSelectedIndexChange(selectedItemsIndexes.first())
+                },
                 content = contentItems(items, onHoverItemChange, listItemContent),
             )
         }