From bd74e634c8cef82e9d49064ba9162bcfe53ac86c Mon Sep 17 00:00:00 2001
From: Vitaly Rtishchev <rtivital@gmail.com>
Date: Mon, 26 Feb 2024 20:18:17 +0400
Subject: [PATCH] [@mantine/dates] Fix `popoverProps.onClose` overriding
 original component value in DatePickerInput and other similar components
 (#4105)

---
 .../components/DatePickerInput/DatePickerInput.story.tsx   | 6 +++++-
 .../src/components/PickerInputBase/PickerInputBase.tsx     | 7 +++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/@mantine/dates/src/components/DatePickerInput/DatePickerInput.story.tsx b/packages/@mantine/dates/src/components/DatePickerInput/DatePickerInput.story.tsx
index 9869d05e0ad..3f3b4bf351f 100644
--- a/packages/@mantine/dates/src/components/DatePickerInput/DatePickerInput.story.tsx
+++ b/packages/@mantine/dates/src/components/DatePickerInput/DatePickerInput.story.tsx
@@ -9,7 +9,11 @@ export default { title: 'DatePickerInput' };
 export function Usage() {
   return (
     <div style={{ padding: 40, maxWidth: 400 }}>
-      <DatePickerInput placeholder="Date picker input" />
+      <DatePickerInput
+        placeholder="Date picker input"
+        // eslint-disable-next-line no-console
+        popoverProps={{ onClose: () => console.log('close') }}
+      />
     </div>
   );
 }
diff --git a/packages/@mantine/dates/src/components/PickerInputBase/PickerInputBase.tsx b/packages/@mantine/dates/src/components/PickerInputBase/PickerInputBase.tsx
index 6772bc55c2a..b93ea533884 100644
--- a/packages/@mantine/dates/src/components/PickerInputBase/PickerInputBase.tsx
+++ b/packages/@mantine/dates/src/components/PickerInputBase/PickerInputBase.tsx
@@ -161,12 +161,15 @@ export const PickerInputBase = factory<PickerInputBaseFactory>((_props, ref) =>
         <Popover
           position="bottom-start"
           opened={dropdownOpened}
-          onClose={handleClose}
-          disabled={dropdownType === 'modal' || readOnly}
           trapFocus
           returnFocus
           unstyled={unstyled}
           {...popoverProps}
+          disabled={popoverProps?.disabled || dropdownType === 'modal' || readOnly}
+          onClose={() => {
+            popoverProps?.onClose?.();
+            handleClose();
+          }}
         >
           <Popover.Target>
             <Input