stop overlay trigger state context in s2 calendar popover

Author: snowystinger

packages/@react-spectrum/s2/src/DatePicker.tsx

@@ -19,6 +19,7 @@ import {
   DateValue,
   Dialog,
   FormContext,
+  OverlayTriggerStateContext,
   Provider,
   TimeValue
 } from 'react-aria-components';
@@ -241,7 +242,12 @@ export function CalendarPopover(props: PropsWithChildren): ReactElement {
         gap: 16
       })}>
       <Dialog>
-        {props.children}
+        <Provider
+          values={[
+            [OverlayTriggerStateContext, null]
+          ]}>
+          {props.children}
+        </Provider>
       </Dialog>
     </PopoverBase>
   );

packages/react-aria-components/src/Calendar.tsx

@@ -507,7 +507,6 @@ export const CalendarCell = /*#__PURE__*/ (forwardRef as forwardRefType)(functio
   let state = calendarState ?? rangeCalendarState!;
   let {startDate: currentMonth} = useContext(InternalCalendarGridContext) ?? {startDate: state.visibleRange.start};
   let isOutsideMonth = !isSameMonth(currentMonth, date);
-  // TODO: check api with team, this seemed useful though
   let istoday = isToday(date, state.timeZone);
 
   let buttonRef = useRef<HTMLDivElement>(null);

packages/react-aria-components/src/DatePicker.tsx

@@ -74,7 +74,7 @@ export const DatePickerStateContext = createContext<DatePickerState | null>(null
 export const DateRangePickerStateContext = createContext<DateRangePickerState | null>(null);
 
 // Contexts to clear inside the popover.
-const CLEAR_CONTEXTS = [GroupContext, ButtonContext, LabelContext, TextContext, OverlayTriggerStateContext];
+const CLEAR_CONTEXTS = [GroupContext, ButtonContext, LabelContext, TextContext];
 
 /**
  * A date picker combines a DateField and a Calendar popover to allow users to enter or select a date and time value.
@@ -173,7 +173,7 @@ export const DatePicker = /*#__PURE__*/ (forwardRef as forwardRefType)(function
         data-focus-visible={isFocusVisible || undefined}
         data-disabled={props.isDisabled || undefined}
         data-open={state.isOpen || undefined} />
-      <HiddenDateInput 
+      <HiddenDateInput
         autoComplete={props.autoComplete}
         name={props.name}
         isDisabled={props.isDisabled}