From 35d2426b42f59f7d86c78bf0832c987e08a5b44e Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 4 Oct 2023 19:58:17 +0200
Subject: [PATCH] FIX: ensures close arg from d-menu/:content works (#23773)

---
 .../integration/components/float-kit/d-menu-test.js   | 11 +++++++++++
 .../javascripts/float-kit/addon/components/d-menu.gjs |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js b/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js
index af526d3377d..2cf0f113302 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js
+++ b/app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js
@@ -183,4 +183,15 @@ module("Integration | Component | FloatKit | d-menu", function (hooks) {
     assert.dom(".fk-d-menu").hasAttribute("style", /left: /);
     assert.ok(find(".fk-d-menu").getAttribute("style").includes("top: "));
   });
+
+  test("content close argument", async function (assert) {
+    await render(
+      hbs`<DMenu @inline={{true}}><:trigger>test</:trigger><:content as |args|><DButton @icon="times" @action={{args.close}} /></:content></DMenu>`
+    );
+    await open();
+
+    await click(".d-icon-times");
+
+    assert.dom(".fk-d-menu").doesNotExist();
+  });
 });
diff --git a/app/assets/javascripts/float-kit/addon/components/d-menu.gjs b/app/assets/javascripts/float-kit/addon/components/d-menu.gjs
index abfc1e490b0..362b3104847 100644
--- a/app/assets/javascripts/float-kit/addon/components/d-menu.gjs
+++ b/app/assets/javascripts/float-kit/addon/components/d-menu.gjs
@@ -97,7 +97,7 @@ export default class DMenu extends Component {
 
   get componentArgs() {
     return {
-      close: this.menu.close,
+      close: this.menuInstance.close,
       data: this.options.data,
     };
   }