IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: correctly display label (#31282)

Browse Source 
A regression introduced in 32c8aa0aad
incorrectly passes label to the trigger component, but also passes
translatedLabel instead of label to the menu.

The existing test was checking for the presence of "label", but it was
actually returning true because the test was showing "en.label". The
test has been modified in consequences.
This commit is contained in:
Joffrey JAFFEUX 2025-02-11 20:11:04 +01:00 committed by GitHub
parent 4db3389f3d
commit 24b2e353a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ module("Integration | Component | FloatKit | d-menu", function (hooks) {
test("@label", async function (assert) { test("@label", async function (assert) {
await render(hbs`<DMenu @inline={{true}} @label="label" />`); await render(hbs`<DMenu @inline={{true}} @label="label" />`);
assert.dom(".fk-d-menu__trigger").containsText("label"); assert.dom(".fk-d-menu__trigger .d-button-label").hasText(/^label$/);
}); });
test("@icon", async function (assert) { test("@icon", async function (assert) {

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

@ -85,11 +85,8 @@ export default class DMenu extends Component {
get icon() { get icon() {
return instance.args.icon; return instance.args.icon;
}, },
get label() {
return instance.args.label;
},
get translatedLabel() { get translatedLabel() {
return instance.args.translatedLabel; return instance.args.label;
}, },
get translatedAriaLabel() { get translatedAriaLabel() {
return instance.args.ariaLabel; return instance.args.ariaLabel;