Skip to content

Fix bug whereby events crossing year boundary could be hidden #9

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix bug whereby events crossing year boundary could be hidden #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2aff2e
Fix bug whereby events crossing year boundary could be hidden
optilude Nov 29, 2015
1635286
Properly fix the date logic
optilude Nov 30, 2015
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
11 changes: 7 additions & 4 deletions src/ReactEventCalendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,10 @@ class EventCalendar extends React.Component {
if (eventStartInView || eventEndInView) {
// Asserts event's first or last day is visible in this month view
eventMeta.isVisibleInView = true;
} else if (eventStart.month < this.props.month && eventEnd.month > this.props.month) {
} else if (
(eventStart.year < this.props.year || (eventStart.year === this.props.year && eventStart.month < this.props.month)) &&
(eventEnd.year > this.props.year || (eventEnd.year === this.props.year && eventEnd.month > this.props.month))
) {
// Asserts at least part of month is
eventMeta.isVisibleInView = true;
}
Expand Down Expand Up @@ -150,10 +153,10 @@ class EventCalendar extends React.Component {
getCalendarDayObject(date) {
const dateArray = date.split('-');
return {
year: dateArray[0],
year: parseInt(dateArray[0], 10),
// Subtract 1 from month to allow for human declared months
month: dateArray[1] - 1,
day: dateArray[2],
month: parseInt(dateArray[1], 10) - 1,
day: parseInt(dateArray[2], 10),
};
}

Expand Down