From 5b1a229d54f1576b731544d9a14067961ce4fc25 Mon Sep 17 00:00:00 2001
From: Alexandre Fauquette <alex.fauquette@gmail.com>
Date: Tue, 27 Sep 2022 11:57:26 +0200
Subject: [PATCH] [CalendarPicker] Prevent getting focus when `autoFocus=false`

---
 .../x-date-pickers/src/CalendarPicker/CalendarPicker.tsx     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/x-date-pickers/src/CalendarPicker/CalendarPicker.tsx b/packages/x-date-pickers/src/CalendarPicker/CalendarPicker.tsx
index 4ff41f2058dd..5cc24d3fc00d 100644
--- a/packages/x-date-pickers/src/CalendarPicker/CalendarPicker.tsx
+++ b/packages/x-date-pickers/src/CalendarPicker/CalendarPicker.tsx
@@ -437,8 +437,13 @@ export const CalendarPicker = React.forwardRef(function CalendarPicker<TDate>(
     },
   );
 
+  const prevOpenViewRef = React.useRef(openView);
   React.useEffect(() => {
     // Set focus to the button when switching from a view to another
+    if (prevOpenViewRef.current === openView) {
+      return;
+    }
+    prevOpenViewRef.current = openView;
     handleFocusedViewChange(openView)(true);
   }, [openView, handleFocusedViewChange]);