Fix nested listbox selection behavior (#851)

* Fix nested listbox selection behavior * Implement review feedback
jwstegemann · Jan 25, 2024 · 6aa2c1e · 6aa2c1e
1 parent 3f29115
commit 6aa2c1e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/headless/src/jsMain/kotlin/dev/fritz2/headless/components/listbox.kt b/headless/src/jsMain/kotlin/dev/fritz2/headless/components/listbox.kt
@@ -281,7 +281,7 @@ class Listbox<T, C : HTMLElement>(tag: Tag<C>, id: String?) : Tag<C> by tag, Ope
 
                 value.handler?.invoke(
                     this,
-                    mousedowns.mapNotNull { e ->
+                    clicks.mapNotNull { e ->
                         e.preventDefault()
                         e.stopImmediatePropagation()
                         entries.current[index].let {

diff --git a/headless/src/jsMain/kotlin/dev/fritz2/headless/foundation/OpenClose.kt b/headless/src/jsMain/kotlin/dev/fritz2/headless/foundation/OpenClose.kt
@@ -48,7 +48,7 @@ abstract class OpenClose: WithJob {
         return if (domNode is HTMLButtonElement) {
             clicks
         } else {
-            keydowns.filter { shortcutOf(it) in listOf(Keys.Space, Keys.Enter) }
+            merge(clicks, keydowns.filter { shortcutOf(it) in setOf(Keys.Space, Keys.Enter) })
         }
     }
 }