From d0a6aeeadd40030fcf9dae7251c6a14d710c4532 Mon Sep 17 00:00:00 2001
From: Ivan Skorupan <skorupan.ivan@gmail.com>
Date: Fri, 2 Aug 2024 14:03:45 +0200
Subject: [PATCH 1/2] Fix calendar overlay requiring double click on date to
 select a value when mask is present

---
 components/lib/calendar/Calendar.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/lib/calendar/Calendar.js b/components/lib/calendar/Calendar.js
index 9b840541c9..eeaf23ffae 100644
--- a/components/lib/calendar/Calendar.js
+++ b/components/lib/calendar/Calendar.js
@@ -3046,8 +3046,10 @@ export const Calendar = React.memo(
         }, [props.view]);
 
         useUpdateEffect(() => {
-            focusToFirstCell();
-        }, [currentView]);
+            if (visible) {
+                focusToFirstCell();
+            }
+        }, [visible, currentView]);
 
         useUpdateEffect(() => {
             if (!props.onViewDateChange && !viewStateChanged.current) {

From 63b8754582c588b8f139f202de855ec94d497b65 Mon Sep 17 00:00:00 2001
From: Ivan Skorupan <skorupan.ivan@gmail.com>
Date: Fri, 2 Aug 2024 14:24:11 +0200
Subject: [PATCH 2/2] Don't focus the overlay if inline is set

---
 components/lib/calendar/Calendar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/lib/calendar/Calendar.js b/components/lib/calendar/Calendar.js
index eeaf23ffae..4aadf402cd 100644
--- a/components/lib/calendar/Calendar.js
+++ b/components/lib/calendar/Calendar.js
@@ -3046,10 +3046,10 @@ export const Calendar = React.memo(
         }, [props.view]);
 
         useUpdateEffect(() => {
-            if (visible) {
+            if (visible && !props.inline) {
                 focusToFirstCell();
             }
-        }, [visible, currentView]);
+        }, [visible, currentView, props.inline]);
 
         useUpdateEffect(() => {
             if (!props.onViewDateChange && !viewStateChanged.current) {