ContextMenu: setOpened(true) calls dynamic content handler

mvysny · Aug 7, 2024 · 293e4d9 · 293e4d9
1 parent 00f0d3c
commit 293e4d9
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 10 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
@@ -366,6 +366,28 @@ internal fun DynaNodeGroup.contextMenuTestbatch() {
             expect(true) { called }
         }
 
+        test("setOpened(true) calls dynamic handler") {
+            var called = 0
+            lateinit var cm: GridContextMenu<String>
+            UI.getCurrent().grid<String> {
+                cm = gridContextMenu {
+                    item("click me")
+                    setDynamicContentHandler { item ->
+                        expect("foo") { item }
+                        expect(0) { called }
+                        called = 1
+                        true
+                    }
+                }
+            }
+            cm.addGridContextMenuOpenedListener { e ->
+                expect(1) { called }
+                called = 2
+            }
+            cm.setOpened(true, "foo")
+            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
@@ -19,7 +19,7 @@ import kotlin.test.fail
  */
 public fun HasMenuItems._clickItemMatching(searchSpec: SearchSpec<MenuItemBase<*, *, *>>) {
     // fires ContextMenuOpenedListener to simulate menu opening
-    (this as Component).element.setProperty("opened", true)
+    (this as? ContextMenu)?.setOpened(true)
 
     val parentMap: Map<MenuItemBase<*, *, *>, Component> = (this as Component).getParentMap()
     val predicate = searchSpec.toPredicate()
@@ -28,7 +28,7 @@ public fun HasMenuItems._clickItemMatching(searchSpec: SearchSpec<MenuItemBase<*
     (item as MenuItem)._click(parentMap)
 
     // fires ContextMenuOpenedListener to simulate menu closing
-    (this as Component).element.setProperty("opened", false)
+    (this as? ContextMenu)?.setOpened(false)
 }
 
 /**
@@ -107,14 +107,6 @@ public fun <T> GridContextMenu<T>._clickItemMatching(searchSpec: SearchSpec<Menu
     // fires ContextMenuOpenedListener to simulate menu opening
     setOpened(true, gridItem)
 
-    // notify the context menu dynamic item generator
-    dynamicContentHandler?.also {
-        val openMenu: Boolean = it.test(gridItem)
-        if (!openMenu) {
-            fail("The dynamic content handler returned false signalling the menu should not open:\n${toPrettyTree()}")
-        }
-    }
-
     val parentMap: Map<MenuItemBase<*, *, *>, Component> = getParentMap()
     val predicate = searchSpec.toPredicate()
     val item: MenuItemBase<*, *, *> = parentMap.keys.firstOrNull(predicate)
@@ -276,5 +268,14 @@ public fun <T> GridContextMenu<T>.setOpened(opened: Boolean, gridItem: T?, colum
         require(id.isNotBlank()) { "Column $column must have an ID assigned in order to be identifiable in the event object" }
         target.element.setProperty("_contextMenuTargetColumnId", id)
     }
+    if (opened) {
+        // notify the context menu dynamic item generator
+        dynamicContentHandler?.also {
+            val openMenu: Boolean = it.test(gridItem)
+            if (!openMenu) {
+                fail("The dynamic content handler returned false signalling the menu should not open:\n${toPrettyTree()}")
+            }
+        }
+    }
     element.setProperty("opened", opened)
 }