github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-08 00:27:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: ensures close arg from d-menu/:content works (#23773)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2023-10-04 19:58:17 +02:00
committed by GitHub
parent 8447928840
commit 35d2426b42
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/tests/integration/components/float-kit/d-menu-test.js
View File

@ -183,4 +183,15 @@ module("Integration | Component | FloatKit | d-menu", function (hooks) {
assert.dom(".fk-d-menu").hasAttribute("style", /left: /); assert.dom(".fk-d-menu").hasAttribute("style", /left: /);
assert.ok(find(".fk-d-menu").getAttribute("style").includes("top: ")); 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();
});
}); });

2
app/assets/javascripts/float-kit/addon/components/d-menu.gjs
View File

@ -97,7 +97,7 @@ export default class DMenu extends Component {
get componentArgs() { get componentArgs() {
return { return {
close: this.menu.close, close: this.menuInstance.close,
data: this.options.data, data: this.options.data,
}; };
} }