Skip to content
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

Jump to bottom

[DateRangePicker] Fix props naming in DatePicker components #25504

Merged
merged 2 commits into from
Mar 25, 2021
Merged

[DateRangePicker] Fix props naming in DatePicker components #25504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8858ea
fix props naming in DatePicker components
callmeberzerker Mar 25, 2021
0da41e4
yarn proptypes && yarn docs:api && yarn docs:typescript:formatted
oliviertassinari Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/src/pages/components/date-picker/CustomDay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ export default function CustomDay() {
const classes = useStyles();
const [value, setValue] = React.useState(new Date());

const renderWeekPickerDay = (date, _selectedDates, PickersDayComponentProps) => {
const renderWeekPickerDay = (date, _selectedDates, pickersDayProps) => {
if (!value) {
return <PickersDay {...PickersDayComponentProps} />;
return <PickersDay {...pickersDayProps} />;
}

const start = startOfWeek(value);
Expand All @@ -48,7 +48,7 @@ export default function CustomDay() {

return (
<PickersDay
{...PickersDayComponentProps}
{...pickersDayProps}
disableMargin
className={clsx({
[classes.highlight]: dayIsBetween,
Expand Down
6 changes: 3 additions & 3 deletions docs/src/pages/components/date-picker/CustomDay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ export default function CustomDay() {
const renderWeekPickerDay = (
date: Date,
_selectedDates: Date[],
PickersDayComponentProps: PickersDayProps<Date>,
pickersDayProps: PickersDayProps<Date>,
) => {
if (!value) {
return <PickersDay {...PickersDayComponentProps} />;
return <PickersDay {...pickersDayProps} />;
}

const start = startOfWeek(value);
Expand All @@ -52,7 +52,7 @@ export default function CustomDay() {

return (
<PickersDay
{...PickersDayComponentProps}
{...pickersDayProps}
disableMargin
className={clsx({
[classes.highlight]: dayIsBetween,
Expand Down
2 changes: 1 addition & 1 deletion packages/material-ui-lab/src/DateRangePicker/DateRangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ DateRangePicker.propTypes /* remove-proptypes */ = {
reduceAnimations: PropTypes.bool,
/**
* Custom renderer for `<DateRangePicker />` days. @DateIOType
* @example (date, DateRangePickerDayProps) => <DateRangePickerDay {...DateRangePickerDayProps} />
* @example (date, dateRangePickerDayProps) => <DateRangePickerDay {...dateRangePickerDayProps} />
*/
renderDay: PropTypes.func,
/**
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/DateRangePicker/DateRangePickerViewDesktop.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ export interface ExportedDesktopDateRangeCalendarProps<TDate> {
calendars?: 1 | 2 | 3;
/**
* Custom renderer for `<DateRangePicker />` days. @DateIOType
* @example (date, DateRangePickerDayProps) => <DateRangePickerDay {...DateRangePickerDayProps} />
* @example (date, dateRangePickerDayProps) => <DateRangePickerDay {...dateRangePickerDayProps} />
*/
renderDay?: (date: TDate, DateRangePickerDayProps: DateRangePickerDayProps<TDate>) => JSX.Element;
renderDay?: (date: TDate, dateRangePickerDayProps: DateRangePickerDayProps<TDate>) => JSX.Element;
}

interface DesktopDateRangeCalendarProps<TDate>
Expand Down
10 changes: 5 additions & 5 deletions packages/material-ui-lab/src/DayPicker/PickersCalendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export interface ExportedCalendarProps<TDate>
renderDay?: (
day: TDate,
selectedDates: Array<TDate | null>,
DayComponentProps: PickersDayProps<TDate>,
pickersDayProps: PickersDayProps<TDate>,
) => JSX.Element;
/**
* Component displaying when passed `loading` true.
Expand Down Expand Up @@ -176,7 +176,7 @@ function PickersCalendar<TDate>(props: PickersCalendarProps<TDate> & WithStyles<
{utils.getWeekArray(currentMonth).map((week) => (
<div role="row" key={`week-${week[0]}`} className={classes.week}>
{week.map((day) => {
const dayProps: PickersDayProps<TDate> = {
const pickersDayProps: PickersDayProps<TDate> = {
key: (day as any)?.toString(),
day,
isAnimating: isMonthSwitchingAnimating,
Expand All @@ -199,10 +199,10 @@ function PickersCalendar<TDate>(props: PickersCalendarProps<TDate> & WithStyles<
};

return renderDay ? (
renderDay(day, selectedDates, dayProps)
renderDay(day, selectedDates, pickersDayProps)
) : (
<div role="cell" key={dayProps.key}>
<PickersDay {...dayProps} />
<div role="cell" key={pickersDayProps.key}>
<PickersDay {...pickersDayProps} />
</div>
);
})}
Expand Down
2 changes: 1 addition & 1 deletion packages/material-ui-lab/src/DesktopDateRangePicker/DesktopDateRangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ DesktopDateRangePicker.propTypes /* remove-proptypes */ = {
reduceAnimations: PropTypes.bool,
/**
* Custom renderer for `<DateRangePicker />` days. @DateIOType
* @example (date, DateRangePickerDayProps) => <DateRangePickerDay {...DateRangePickerDayProps} />
* @example (date, dateRangePickerDayProps) => <DateRangePickerDay {...dateRangePickerDayProps} />
*/
renderDay: PropTypes.func,
/**
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-lab/src/MobileDatePicker/MobileDatePicker.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,8 @@ describe('<MobileDatePicker />', () => {
open
value={adapterToUse.date('2018-01-01T00:00:00.000')}
onChange={() => {}}
renderDay={(day, _selected, DayComponentProps) => (
<PickersDay {...DayComponentProps} data-testid="test-day" />
renderDay={(day, _selected, pickersDayProps) => (
<PickersDay {...pickersDayProps} data-testid="test-day" />
)}
/>,
);
Expand Down
2 changes: 1 addition & 1 deletion packages/material-ui-lab/src/MobileDateRangePicker/MobileDateRangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ MobileDateRangePicker.propTypes /* remove-proptypes */ = {
reduceAnimations: PropTypes.bool,
/**
* Custom renderer for `<DateRangePicker />` days. @DateIOType
* @example (date, DateRangePickerDayProps) => <DateRangePickerDay {...DateRangePickerDayProps} />
* @example (date, dateRangePickerDayProps) => <DateRangePickerDay {...dateRangePickerDayProps} />
*/
renderDay: PropTypes.func,
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/material-ui-lab/src/StaticDateRangePicker/StaticDateRangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ StaticDateRangePicker.propTypes /* remove-proptypes */ = {
reduceAnimations: PropTypes.bool,
/**
* Custom renderer for `<DateRangePicker />` days. @DateIOType
* @example (date, DateRangePickerDayProps) => <DateRangePickerDay {...DateRangePickerDayProps} />
* @example (date, dateRangePickerDayProps) => <DateRangePickerDay {...dateRangePickerDayProps} />
*/
renderDay: PropTypes.func,
/**
Expand Down