Skip to content

Fix calendar month/current selection and clicking #555

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 2 commits into from
Oct 17, 2016
Merged

Fix calendar month/current selection and clicking #555

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df932d0
Ensure currentMonth is created in UTC and remove optional timezone co…
steven-supersolid Oct 17, 2016
b372646
currentMonth is now local time. Convert onChange date fired to timezo…
steven-supersolid Oct 17, 2016
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
12 changes: 7 additions & 5 deletions src/components/Calendar/Calendar.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export default class Calendar extends React.Component {
<div className={styles.month}>
<a href='javascript:;' role='button' onClick={this.handlePrev.bind(this)} />
<a href='javascript:;' role='button' onClick={this.handleNext.bind(this)} />
<div>{getMonth(this.state.currentMonth[getDateMethod(this.props.local, 'getMonth')]()) + ' ' + this.state.currentMonth[getDateMethod(this.props.local, 'getFullYear')]()}</div>
<div>{getMonth(this.state.currentMonth.getMonth()) + ' ' + this.state.currentMonth.getFullYear()}</div>
</div>
);
}
Expand All @@ -67,10 +67,10 @@ export default class Calendar extends React.Component {
renderDays() {
let isValueMonth = (
this.props.value &&
this.props.value[getDateMethod(this.props.local, 'getFullYear')]() === this.state.currentMonth[getDateMethod(this.props.local, 'getFullYear')]() &&
this.props.value[getDateMethod(this.props.local, 'getMonth')]() === this.state.currentMonth[getDateMethod(this.props.local, 'getMonth')]()
this.props.value[getDateMethod(this.props.local, 'getFullYear')]() === this.state.currentMonth.getFullYear() &&
this.props.value[getDateMethod(this.props.local, 'getMonth')]() === this.state.currentMonth.getMonth()
);
let offset = this.state.currentMonth[getDateMethod(this.props.local, 'getDay')]();
let offset = this.state.currentMonth.getDay();
let days = daysInMonth(this.state.currentMonth);
let labels = [];
for (let i = 0; i < offset; i++) {
Expand All @@ -81,7 +81,9 @@ export default class Calendar extends React.Component {
let className = isSelected ? styles.selected : '';
let onChange = this.props.onChange.bind(
null,
new Date(this.state.currentMonth[getDateMethod(this.props.local, 'getFullYear')](), this.state.currentMonth[getDateMethod(this.props.local, 'getMonth')](), i)
this.props.local ?
new Date(this.state.currentMonth.getFullYear(), this.state.currentMonth.getMonth(), i) :
new Date(Date.UTC(this.state.currentMonth.getFullYear(), this.state.currentMonth.getMonth(), i))
);
labels.push(
<a href='javascript:;' role='button' key={'day' + i} className={className} onClick={onChange}>{i}</a>
Expand Down