From 4021e7a32c524ee4e7a2e0ac929ca36e4351c64f Mon Sep 17 00:00:00 2001
From: Sarah Higley <sarah.higley@microsoft.com>
Date: Tue, 23 Jun 2026 20:26:32 -0700
Subject: [PATCH 1/2] fix(Calendar): year prev/next buttons don't lose focus
 when they become disabled

---
 .../library/src/components/CalendarYear/CalendarYear.tsx       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/react-components/react-calendar-compat/library/src/components/CalendarYear/CalendarYear.tsx b/packages/react-components/react-calendar-compat/library/src/components/CalendarYear/CalendarYear.tsx
index ffcf042561138..6de1b49c2d59f 100644
--- a/packages/react-components/react-calendar-compat/library/src/components/CalendarYear/CalendarYear.tsx
+++ b/packages/react-components/react-calendar-compat/library/src/components/CalendarYear/CalendarYear.tsx
@@ -245,11 +245,12 @@ const CalendarYearNavArrow: React.FunctionComponent<CalendarYearNavArrowProps> =
   return (
     <button
       className={mergeClasses(classNames.navigationButton, disabled && classNames.disabled)}
+      aria-disabled={disabled}
+      tabIndex={disabled ? -1 : undefined}
       onClick={!disabled ? onNavigate : undefined}
       onKeyDown={!disabled ? onKeyDown : undefined}
       type="button"
       title={ariaLabelString}
-      disabled={disabled}
     >
       {direction === CalendarYearNavDirection.Previous ? navigationIcons.upNavigation : navigationIcons.downNavigation}
     </button>

From eaf4ec538533dc0d33faac636cdbc95f7b968655 Mon Sep 17 00:00:00 2001
From: Sarah Higley <sarah.higley@microsoft.com>
Date: Tue, 23 Jun 2026 20:26:58 -0700
Subject: [PATCH 2/2] change file

---
 ...lendar-compat-0d9c3499-7ea6-4f4f-b600-420607d2c351.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 change/@fluentui-react-calendar-compat-0d9c3499-7ea6-4f4f-b600-420607d2c351.json

diff --git a/change/@fluentui-react-calendar-compat-0d9c3499-7ea6-4f4f-b600-420607d2c351.json b/change/@fluentui-react-calendar-compat-0d9c3499-7ea6-4f4f-b600-420607d2c351.json
new file mode 100644
index 0000000000000..735a72b680973
--- /dev/null
+++ b/change/@fluentui-react-calendar-compat-0d9c3499-7ea6-4f4f-b600-420607d2c351.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix(Calendar): year prev/next buttons don't lose focus when they become disabled",
+  "packageName": "@fluentui/react-calendar-compat",
+  "email": "sarah.higley@microsoft.com",
+  "dependentChangeType": "patch"
+}