From 1865eb1de3a1fc07f54f171453eafabddb3df1f0 Mon Sep 17 00:00:00 2001 From: Roman Rizzi Date: Wed, 14 Jun 2023 12:18:17 -0300 Subject: [PATCH] FIX: Don't add the no-text class if translatedLabel is present (#22111) --- app/assets/javascripts/discourse/app/widgets/button.js | 2 +- .../tests/integration/components/widgets/button-test.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/app/widgets/button.js b/app/assets/javascripts/discourse/app/widgets/button.js index 83b9e0505e1..fc23dbf6331 100644 --- a/app/assets/javascripts/discourse/app/widgets/button.js +++ b/app/assets/javascripts/discourse/app/widgets/button.js @@ -10,7 +10,7 @@ export const ButtonClass = { buildClasses(attrs) { let className = this.attrs.className || ""; - let hasText = attrs.label || attrs.contents; + let hasText = attrs.translatedLabel || attrs.label || attrs.contents; if (!hasText) { className += " no-text"; diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js index 81bfad21ccb..0b9fdebede3 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/button-test.js @@ -63,4 +63,12 @@ module("Integration | Component | Widget | button", function (hooks) { assert.strictEqual(query("button").title, "foo bar"); }); + + test("translatedLabel skips no-text class in icon", async function (assert) { + this.set("args", { icon: "plus", translatedLabel: "foo bar" }); + + await render(hbs``); + + assert.ok(!exists("button.btn.btn-icon.no-text"), "skips no-text class"); + }); });