From d16b7d93867f6fbb906b9a30a53e0df4e571a717 Mon Sep 17 00:00:00 2001
From: Vincent Baaij <vnbaaij@outlook.com>
Date: Tue, 21 May 2024 14:22:03 +0200
Subject: [PATCH] [Dialog] Use FluentTooltip for close button (a11y)

---
 src/Core/Components/Dialog/FluentDialog.razor       | 3 ++-
 src/Core/Components/Dialog/FluentDialogHeader.razor | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Core/Components/Dialog/FluentDialog.razor b/src/Core/Components/Dialog/FluentDialog.razor
index 4ec6547332..f4706f91c2 100644
--- a/src/Core/Components/Dialog/FluentDialog.razor
+++ b/src/Core/Components/Dialog/FluentDialog.razor
@@ -13,7 +13,8 @@
                    aria-describedby=@(_parameters.AriaDescribedby ?? AriaDescribedby)
                    aria-labelledby=@(_parameters.AriaLabelledby ?? AriaLabelledby)
                    aria-label=@(_parameters.AriaLabel ?? AriaLabel)
-                   @attributes=@AdditionalAttributes>
+                   @attributes=@AdditionalAttributes
+                   tabindex="-1">
 
         @* Default Header *@
         @if (HasDefaultDialogHeader)
diff --git a/src/Core/Components/Dialog/FluentDialogHeader.razor b/src/Core/Components/Dialog/FluentDialogHeader.razor
index 2ca3f29111..fce7d9c9c8 100644
--- a/src/Core/Components/Dialog/FluentDialogHeader.razor
+++ b/src/Core/Components/Dialog/FluentDialogHeader.razor
@@ -24,6 +24,7 @@
             <FluentButton Id="dialog_close" Appearance="Appearance.Stealth" OnClick="@(() => Dialog.CancelAsync())" aria-label="@Dialog.Instance?.Parameters?.DismissTitle">
                 <FluentIcon Value="@(new CoreIcons.Regular.Size24.Dismiss())" Width="16px" />
             </FluentButton>
+            <FluentTooltip Anchor="dialog_close" Placement="Placement.Bottom">@Dialog.Instance?.Parameters?.DismissTitle</FluentTooltip>
         }
     </FluentStack>
 }