From 1097e202de98f555e318c1b04edcef3578baa496 Mon Sep 17 00:00:00 2001
From: "mikerodonnell89@gmail.com" <mikerodonnell89@gmail.com>
Date: Tue, 17 Sep 2024 15:17:06 -0400
Subject: [PATCH 1/2] fix(core): more customization of aria attributes for
 multi-input

---
 .../src/lib/multi-input/multi-input.component.html     |  4 +++-
 libs/core/src/lib/multi-input/multi-input.component.ts | 10 +++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/libs/core/src/lib/multi-input/multi-input.component.html b/libs/core/src/lib/multi-input/multi-input.component.html
index 927b19d4903..d028d0edcfd 100644
--- a/libs/core/src/lib/multi-input/multi-input.component.html
+++ b/libs/core/src/lib/multi-input/multi-input.component.html
@@ -49,9 +49,10 @@
             [isExpanded]="open && !mobile && viewModel.displayedOptions.length > 0"
             [isControl]="true"
             [glyph]="showAddonButton ? glyph : ''"
-            [addonButtonAriaHidden]="!!title"
+            [addonButtonAriaHidden]="addonButtonAriaHidden"
             (addOnButtonClicked)="_addOnButtonClicked($event)"
             [iconTitle]="addonIconTitle"
+            [glyphAriaLabel]="addOnButtonAriaLabel"
         >
             <span [attr.id]="tokenHiddenId" aria-hidden="true" class="fd-multi-input__invisible-text">{{
                 'coreMultiInput.tokensCountText' | fdTranslate : { length: selected.length }
@@ -100,6 +101,7 @@
                     [attr.id]="inputId"
                     (focus)="tokenizer._showAllTokens()"
                     (blur)="tokenizer._hideTokens()"
+                    [attr.title]="title"
                 />
             </fd-tokenizer>
         </fd-input-group>
diff --git a/libs/core/src/lib/multi-input/multi-input.component.ts b/libs/core/src/lib/multi-input/multi-input.component.ts
index 554a30fd1d8..c705b7b6984 100644
--- a/libs/core/src/lib/multi-input/multi-input.component.ts
+++ b/libs/core/src/lib/multi-input/multi-input.component.ts
@@ -338,10 +338,18 @@ export class MultiInputComponent<ItemType = any, ValueType = any>
     @Input()
     open = false;
 
-    /** Whether or not to display the addon button. */
+    /** Whether to display the addon button. */
     @Input()
     displayAddonButton = true;
 
+    /** Whether to hide the addon button from the screenreader. */
+    @Input()
+    addonButtonAriaHidden = false;
+
+    /** Aria-label for the addon button. */
+    @Input()
+    addOnButtonAriaLabel: Nullable<string>;
+
     /** @hidden */
     private _tokenCountHiddenLabel = `fd-multi-input-token-count-id-${uniqueHiddenLabel++}`;
 

From 3b4ab71417429d6f21d2a91c305bced651543920 Mon Sep 17 00:00:00 2001
From: "mikerodonnell89@gmail.com" <mikerodonnell89@gmail.com>
Date: Thu, 19 Sep 2024 11:26:31 -0400
Subject: [PATCH 2/2] fix: do not set aria-hidden on focusable elements

---
 libs/core/src/lib/multi-input/multi-input.component.html | 1 -
 libs/core/src/lib/multi-input/multi-input.component.ts   | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/libs/core/src/lib/multi-input/multi-input.component.html b/libs/core/src/lib/multi-input/multi-input.component.html
index d028d0edcfd..b4f96fa44ae 100644
--- a/libs/core/src/lib/multi-input/multi-input.component.html
+++ b/libs/core/src/lib/multi-input/multi-input.component.html
@@ -49,7 +49,6 @@
             [isExpanded]="open && !mobile && viewModel.displayedOptions.length > 0"
             [isControl]="true"
             [glyph]="showAddonButton ? glyph : ''"
-            [addonButtonAriaHidden]="addonButtonAriaHidden"
             (addOnButtonClicked)="_addOnButtonClicked($event)"
             [iconTitle]="addonIconTitle"
             [glyphAriaLabel]="addOnButtonAriaLabel"
diff --git a/libs/core/src/lib/multi-input/multi-input.component.ts b/libs/core/src/lib/multi-input/multi-input.component.ts
index c705b7b6984..7bf1d3be501 100644
--- a/libs/core/src/lib/multi-input/multi-input.component.ts
+++ b/libs/core/src/lib/multi-input/multi-input.component.ts
@@ -342,10 +342,6 @@ export class MultiInputComponent<ItemType = any, ValueType = any>
     @Input()
     displayAddonButton = true;
 
-    /** Whether to hide the addon button from the screenreader. */
-    @Input()
-    addonButtonAriaHidden = false;
-
     /** Aria-label for the addon button. */
     @Input()
     addOnButtonAriaLabel: Nullable<string>;