Skip to content

Commit

Permalink
fixup! Add prop to render elements after calendar (mui#1795)
Browse files Browse the repository at this point in the history
  • Loading branch information
Julien Enselme committed Sep 8, 2020
1 parent 05d8a95 commit 3407770
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
15 changes: 12 additions & 3 deletions docs/pages/demo/daterangepicker/CustomCalendarRender.example.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
import * as React from 'react';
import { DateRangePicker, DateRange, DateRangeDelimiter, PickersCalendar, PickersCalendarProps } from '@material-ui/pickers';
import TextField from "@material-ui/core/TextField";
import {
DateRangePicker,
DateRange,
DateRangeDelimiter,
PickersCalendar,
PickersCalendarProps,
} from '@material-ui/pickers';
import TextField from '@material-ui/core/TextField';

interface CalendarWithValidationButtonProps extends PickersCalendarProps<Date> {
validateCustomPeriod: () => void;
}

function CalendarWithValidationButton ({ validateCustomPeriod, ...pickersCalendarProps }: CalendarWithValidationButtonProps) {
function CalendarWithValidationButton({
validateCustomPeriod,
...pickersCalendarProps
}: CalendarWithValidationButtonProps) {
return (
<React.Fragment>
<PickersCalendar {...pickersCalendarProps} />
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/demo/daterangepicker/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import * as MinMaxDateRangePicker from './MinMaxDateRangePicker.example';
import * as CalendarsDateRangePicker from './CalendarsDateRangePicker.example';
import * as StaticDateRangePicker from './StaticDateRangePicker.example';
import * as CustomRangeInputs from './CustomRangeInputs.example';
import * as CustomCalendarRender from "./CustomCalendarRender.example";
import * as CustomCalendarRender from './CustomCalendarRender.example';

<PageMeta component="DateRangePicker" />

Expand Down
2 changes: 1 addition & 1 deletion lib/src/DateRangePicker/DateRangePickerViewDesktop.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
isEndOfRange,
DateValidationProps,
} from '../_helpers/date-utils';
import { DayProps as CalendarDayProps } from "../views/Calendar/Day";
import { DayProps as CalendarDayProps } from '../views/Calendar/Day';

export interface ExportedDesktopDateRangeCalendarProps<TDate> {
/**
Expand Down
4 changes: 2 additions & 2 deletions lib/src/DateRangePicker/DateRangePickerViewMobile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
isEndOfRange,
DateValidationProps,
} from '../_helpers/date-utils';
import { DayProps as CalendarDayProps } from "../views/Calendar/Day";
import { DayProps as CalendarDayProps } from '../views/Calendar/Day';

export interface ExportedMobileDateRangeCalendarProps<TDate>
extends Pick<ExportedDesktopDateRangeCalendarProps<TDate>, 'renderDay'> {
Expand Down Expand Up @@ -81,7 +81,7 @@ export function DateRangePickerViewMobile<TDate>(props: DesktopDateRangeCalendar
isEndOfHighlighting: isEndOfRange(utils, day, date),
...DayProps,
}),
...slotProps.Calendar,
...slotProps.Calendar,
};

return (
Expand Down

0 comments on commit 3407770

Please sign in to comment.