ContextMenu: improve compatibility

mvysny · Aug 7, 2024 · fa348a7 · fa348a7
1 parent 4ffe24a
commit fa348a7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/...ing-v10/kt10-tests/src/main/kotlin/com/github/mvysny/kaributesting/v10/ContextMenuTest.kt b/...ing-v10/kt10-tests/src/main/kotlin/com/github/mvysny/kaributesting/v10/ContextMenuTest.kt
@@ -388,6 +388,28 @@ internal fun DynaNodeGroup.contextMenuTestbatch() {
             expect(2) { called }
         }
 
+        test("setOpened(true) succeeds on null item") {
+            var called = 0
+            lateinit var cm: GridContextMenu<String>
+            UI.getCurrent().grid<String> {
+                cm = gridContextMenu {
+                    item("click me")
+                    setDynamicContentHandler { item ->
+                        expect(null) { item }
+                        expect(0) { called }
+                        called = 1
+                        true
+                    }
+                }
+            }
+            cm.addGridContextMenuOpenedListener { e ->
+                expect(1) { called }
+                called = 2
+            }
+            cm.setOpened(true, null)
+            expect(2) { called }
+        }
+
         test("setOpened(false) fires GridContextMenuOpenedEvent") {
             var called = false
             lateinit var cm: GridContextMenu<String>

diff --git a/karibu-testing-v10/src/main/kotlin/com/github/mvysny/kaributesting/v10/ContextMenu.kt b/karibu-testing-v10/src/main/kotlin/com/github/mvysny/kaributesting/v10/ContextMenu.kt
@@ -268,8 +268,8 @@ private val __ContextMenuBase_onBeforeOpenMenu: Method by lazy {
 
 private fun ContextMenuBase<*, *, *>.invokeOnBeforeOpenMenu(itemKey: String?, columnId: String?): Boolean {
     val json = Json.createObject().apply {
-        if (itemKey != null) put("key", itemKey)
-        if (columnId != null) put("columnId", columnId)
+        put("key", itemKey ?: "")
+        put("columnId", columnId ?: "")
     }
     val obj = __ContextMenuBase_onBeforeOpenMenu.invoke(this, json) as Boolean
     return obj