Skip to content

chore: use hook data from useDate*Picker to apply calendar props #8649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 22, 2025
Merged

chore: use hook data from useDate*Picker to apply calendar props #8649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25b1891
chore: update datepickers now that hook api does more
snowystinger Jul 29, 2025
3b77c7e
Merge branch 'main' into no-longer-pass-calendar-props-explicitly
snowystinger Jul 29, 2025
11645cf
fix lint
snowystinger Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions packages/@react-spectrum/datepicker/src/DatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ export const DatePicker = React.forwardRef(function DatePicker<T extends DateVal
isQuiet,
isDisabled,
placeholderValue,
maxVisibleMonths = 1,
pageBehavior,
firstDayOfWeek
maxVisibleMonths = 1
} = props;
let {hoverProps, isHovered} = useHover({isDisabled});
let targetRef = useRef<HTMLDivElement | null>(null);
Expand Down Expand Up @@ -171,8 +169,6 @@ export const DatePicker = React.forwardRef(function DatePicker<T extends DateVal
<Calendar
{...calendarProps}
visibleMonths={visibleMonths}
pageBehavior={pageBehavior}
firstDayOfWeek={firstDayOfWeek}
createCalendar={props.createCalendar}
UNSAFE_className={classNames(datepickerStyles, 'react-spectrum-Datepicker-calendar', {'is-invalid': isInvalid})} />
{showTimeField &&
Expand Down
6 changes: 1 addition & 5 deletions packages/@react-spectrum/datepicker/src/DateRangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@ export const DateRangePicker = React.forwardRef(function DateRangePicker<T exten
isDisabled,
autoFocus,
placeholderValue,
maxVisibleMonths = 1,
pageBehavior,
firstDayOfWeek
maxVisibleMonths = 1
} = props;
let {hoverProps, isHovered} = useHover({isDisabled});
let targetRef = useRef<HTMLDivElement | null>(null);
Expand Down Expand Up @@ -189,8 +187,6 @@ export const DateRangePicker = React.forwardRef(function DateRangePicker<T exten
<RangeCalendar
{...calendarProps}
visibleMonths={visibleMonths}
pageBehavior={pageBehavior}
firstDayOfWeek={firstDayOfWeek}
createCalendar={props.createCalendar}
UNSAFE_className={classNames(datepickerStyles, 'react-spectrum-Datepicker-calendar', {'is-invalid': validationState === 'invalid'})} />
{showTimeField &&
Expand Down
8 changes: 1 addition & 7 deletions packages/@react-spectrum/s2/src/DatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,7 @@ export const DatePicker = /*#__PURE__*/ (forwardRef as forwardRefType)(function
styles,
placeholderValue,
maxVisibleMonths = 1,
firstDayOfWeek,
createCalendar,
pageBehavior,
isDateUnavailable,
...dateFieldProps
} = props;
let formContext = useContext(FormContext);
Expand Down Expand Up @@ -206,10 +203,7 @@ export const DatePicker = /*#__PURE__*/ (forwardRef as forwardRefType)(function
<CalendarPopover>
<Calendar
visibleMonths={maxVisibleMonths}
createCalendar={createCalendar}
firstDayOfWeek={firstDayOfWeek}
isDateUnavailable={isDateUnavailable}
pageBehavior={pageBehavior} />
createCalendar={createCalendar} />
{showTimeField && (
<div className={style({display: 'flex', gap: 16, contain: 'inline-size'})}>
<TimeField
Expand Down
8 changes: 1 addition & 7 deletions packages/@react-spectrum/s2/src/DateRangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,7 @@ export const DateRangePicker = /*#__PURE__*/ (forwardRef as forwardRefType)(func
styles,
placeholderValue,
maxVisibleMonths = 1,
firstDayOfWeek,
createCalendar,
pageBehavior,
isDateUnavailable,
...dateFieldProps
} = props;
let formContext = useContext(FormContext);
Expand Down Expand Up @@ -145,10 +142,7 @@ export const DateRangePicker = /*#__PURE__*/ (forwardRef as forwardRefType)(func
<CalendarPopover>
<RangeCalendar
visibleMonths={maxVisibleMonths}
createCalendar={createCalendar}
firstDayOfWeek={firstDayOfWeek}
isDateUnavailable={isDateUnavailable}
pageBehavior={pageBehavior} />
createCalendar={createCalendar} />
{showTimeField && (
<div className={style({display: 'flex', gap: 16, contain: 'inline-size', marginTop: 24})}>
<TimeField
Expand Down
Loading