From 03211d04c90e0f6dfcede4e915d36d2bd9f75ee3 Mon Sep 17 00:00:00 2001
From: Matt Driscoll <mdriscoll@esri.com>
Date: Wed, 3 Apr 2024 09:41:11 -0700
Subject: [PATCH 1/2] fix(action): maintain equal height when text is not
 enabled in a small scale. #8900

---
 .../src/components/action/action.scss              |  2 +-
 .../src/components/action/action.stories.ts        | 14 ++++++++++++++
 .../src/components/action/action.tsx               |  5 ++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/packages/calcite-components/src/components/action/action.scss b/packages/calcite-components/src/components/action/action.scss
index 54f7d2e3c9d..13a84c1324d 100755
--- a/packages/calcite-components/src/components/action/action.scss
+++ b/packages/calcite-components/src/components/action/action.scss
@@ -68,7 +68,7 @@
       items-center
       justify-center;
     min-inline-size: theme("spacing.4");
-    min-block-size: theme("spacing.4");
+    min-block-size: theme("spacing.6");
   }
 
   .text-container {
diff --git a/packages/calcite-components/src/components/action/action.stories.ts b/packages/calcite-components/src/components/action/action.stories.ts
index c0f74125226..439bb66871e 100644
--- a/packages/calcite-components/src/components/action/action.stories.ts
+++ b/packages/calcite-components/src/components/action/action.stories.ts
@@ -210,6 +210,20 @@ export const indicatorNoTextEnabledNoIcon_TestOnly = (): string => html`
   <calcite-action indicator active text="click-me"></calcite-action>
 `;
 
+export const noTextHeight_TestOnly = (): string =>
+  html`<h2>All actions should be the same height</h2>
+    <div style="width: min-content">
+      <div style="border: solid 1px">
+        <calcite-action text="hello" text-enabled icon="home" scale="s"></calcite-action>
+      </div>
+      <div style="border: solid 1px">
+        <calcite-action text="hello" icon="home" scale="s"></calcite-action>
+      </div>
+      <div style="border: solid 1px">
+        <calcite-action icon="home" scale="s"></calcite-action>
+      </div>
+    </div>`;
+
 export const arabicLocale_TestOnly = (): string => html`
   <calcite-action
     dir="rtl"
diff --git a/packages/calcite-components/src/components/action/action.tsx b/packages/calcite-components/src/components/action/action.tsx
index e32b50045fc..adc715338c9 100644
--- a/packages/calcite-components/src/components/action/action.tsx
+++ b/packages/calcite-components/src/components/action/action.tsx
@@ -299,7 +299,10 @@ export class Action
       buttonId,
       messages,
     } = this;
-    const ariaLabel = `${label || text}${indicator ? ` (${messages.indicator})` : ""}`;
+    const labelFallback = label || text;
+    const ariaLabel = labelFallback
+      ? `${labelFallback}${indicator ? ` (${messages.indicator})` : ""}`
+      : "";
 
     const buttonClasses = {
       [CSS.button]: true,

From 881ff2cf2701e6453dbf4cbde8d6cbe30a6b5627 Mon Sep 17 00:00:00 2001
From: Matt Driscoll <mdriscoll@esri.com>
Date: Wed, 3 Apr 2024 10:01:23 -0700
Subject: [PATCH 2/2] fix test

---
 .../src/components/navigation/navigation.e2e.ts               | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/calcite-components/src/components/navigation/navigation.e2e.ts b/packages/calcite-components/src/components/navigation/navigation.e2e.ts
index dd1071a8f43..87767553490 100755
--- a/packages/calcite-components/src/components/navigation/navigation.e2e.ts
+++ b/packages/calcite-components/src/components/navigation/navigation.e2e.ts
@@ -37,7 +37,9 @@ describe("calcite-navigation", () => {
 
   describe("accessible", () => {
     accessible(
-      html`<calcite-navigation navigation-action><calcite-navigation-logo heading="Test" /></calcite-navigation>`,
+      html`<calcite-navigation label="test" navigation-action
+        ><calcite-navigation-logo heading="Test"
+      /></calcite-navigation>`,
     );
   });