Skip to content

feat: calendar add prop for custom date render #72

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions src/Calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ export default function Calendar({
onDayHover,
onDayClick,
weekdayFormat,
touchDragEnabled
touchDragEnabled,
renderDay
}) {
const [month, setMonth] = useControllableState(receivedMonth, onMonthChange, startOfMonth(new Date()))

Expand Down Expand Up @@ -48,6 +49,7 @@ export default function Calendar({
onDayHover={onDayHover}
onDayClick={onDayClick}
touchDragEnabled={touchDragEnabled}
renderDay={renderDay}
/>
</div>
)
Expand All @@ -64,5 +66,6 @@ Calendar.propTypes = {
onDayHover: func,
onDayClick: func,
weekdayFormat: string,
touchDragEnabled: bool
touchDragEnabled: bool,
renderDay: func
}
35 changes: 30 additions & 5 deletions src/CalendarDay.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ export default function CalendarDay({
modifiers: receivedModifiers,
modifiersClassNames: receivedModifiersClassNames,
onClick,
onHover
onHover,
renderDay
}) {
const dayOfMonth = getDate(date)
const dayClassNames = {}
Expand All @@ -45,9 +46,11 @@ export default function CalendarDay({
onHover(null)
}

return (
const rootClassName = classNames('nice-dates-day', dayClassNames)

const defaultDay = (
<span
className={classNames('nice-dates-day', dayClassNames)}
className={rootClassName}
onClick={handleClick}
onMouseEnter={handleMouseEnter}
onMouseLeave={handleMouseLeave}
Expand All @@ -60,6 +63,26 @@ export default function CalendarDay({
<span className='nice-dates-day_date'>{dayOfMonth}</span>
</span>
)

const day = renderDay
? renderDay({
dayClassNames,
handleClick,
handleMouseEnter,
handleMouseLeave,
height,
dayOfMonth,
date,
locale,
rootClassName
})
: defaultDay

return (
<>
{day}
</>
)
}

CalendarDay.propTypes = {
Expand All @@ -69,11 +92,13 @@ CalendarDay.propTypes = {
modifiers: objectOf(bool),
modifiersClassNames: objectOf(string),
onHover: func,
onClick: func
onClick: func,
renderDay: func
}

CalendarDay.defaultProps = {
modifiers: {},
onHover: () => {},
onClick: () => {}
onClick: () => {},
renderDay: null
}
7 changes: 5 additions & 2 deletions src/CalendarGrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ export default function CalendarGrid({
onDayHover,
onDayClick,
transitionDuration,
touchDragEnabled
touchDragEnabled,
renderDay
}) {
const grid = useGrid({ locale, month: startOfMonth(month), onMonthChange, transitionDuration, touchDragEnabled })
const { startDate, endDate, cellHeight, containerElementRef, isWide, offset, origin, transition } = grid
Expand All @@ -48,6 +49,7 @@ export default function CalendarGrid({
modifiersClassNames={modifiersClassNames}
onHover={onDayHover}
onClick={onDayClick}
renderDay={renderDay}
/>
)
})
Expand Down Expand Up @@ -82,7 +84,8 @@ CalendarGrid.propTypes = {
onDayHover: func,
onDayClick: func,
transitionDuration: number.isRequired,
touchDragEnabled: bool
touchDragEnabled: bool,
renderDay: func
}

CalendarGrid.defaultProps = {
Expand Down
7 changes: 5 additions & 2 deletions src/DatePickerCalendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ export default function DatePickerCalendar({
modifiers: receivedModifiers,
modifiersClassNames,
weekdayFormat,
touchDragEnabled
touchDragEnabled,
renderDay
}) {
const isSelected = date => isSameDay(date, selectedDate) && isSelectable(date, { minimumDate, maximumDate })
const modifiers = mergeModifiers({ selected: isSelected, disabled: isSelected }, receivedModifiers)
Expand All @@ -38,6 +39,7 @@ export default function DatePickerCalendar({
modifiersClassNames={modifiersClassNames}
weekdayFormat={weekdayFormat}
touchDragEnabled={touchDragEnabled}
renderDay={renderDay}
/>
)
}
Expand All @@ -53,5 +55,6 @@ DatePickerCalendar.propTypes = {
modifiers: objectOf(func),
modifiersClassNames: objectOf(string),
weekdayFormat: string,
touchDragEnabled: bool
touchDragEnabled: bool,
renderDay: func
}