[@mantine/dates] PickerInputBase: Fix for input focus on label click

mantinedev · Aug 9, 2023 · 6b57c64 · 6b57c64
1 parent b8456b9
commit 6b57c64
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/mantine-dates/src/components/PickerInputBase/PickerInputBase.tsx b/src/mantine-dates/src/components/PickerInputBase/PickerInputBase.tsx
@@ -133,6 +133,8 @@ export const PickerInputBase = forwardRef<HTMLButtonElement, PickerInputBaseProp
     dropdownHandlers.close();
   };
 
+  const hasLabel = wrapperProps.label;
+
   return (
     <>
       {dropdownType === 'modal' && !readOnly && (
@@ -155,12 +157,12 @@ export const PickerInputBase = forwardRef<HTMLButtonElement, PickerInputBaseProp
           opened={dropdownOpened}
           onClose={handleClose}
           disabled={dropdownType === 'modal' || readOnly}
-          trapFocus
+          trapFocus={!hasLabel}
           returnFocus
           unstyled={unstyled}
           {...popoverProps}
         >
-          <Popover.Target>
+          <Popover.Target shouldOverrideDefaultTargetId={!hasLabel}>
             <Input
               data-dates-input
               data-read-only={readOnly || undefined}