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" +} 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 = return (