Skip to content

Date picker: Ensure we use the new props when updating the weeks in the picker #1732

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
johannao76 merged 16 commits into from
May 8, 2017
Merged

Date picker: Ensure we use the new props when updating the weeks in the picker #1732

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6bdbba7
Support auto-navigation to next previous month when selected date cha…
johannao76 Apr 27, 2017
acd2361
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
johannao76 Apr 27, 2017
676a995
Fix a few small bugs
johannao76 Apr 27, 2017
ab1653b
change file
johannao76 Apr 27, 2017
ea804d3
Update Calendar.Inline.Example.tsx
micahgodbolt Apr 27, 2017
f18cb9d
Triple equals!
johannao76 Apr 28, 2017
fdaac8f
Revert "Triple equals!"
johannao76 Apr 28, 2017
3df45d6
Re-committing triple equals
johannao76 Apr 28, 2017
a0a0b4c
Update master_2017-04-27-00-31.json
dzearing May 2, 2017
21c030c
Pass in new props to _getWeeks so it properly renders when new date r…
johannao76 May 4, 2017
ca03506
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
johannao76 May 4, 2017
6063694
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
johannao76 May 5, 2017
bb03faf
Remove duplicate change file
johannao76 May 5, 2017
1bedcc7
PR feedback
johannao76 May 5, 2017
b50ba3b
PR feedback
johannao76 May 8, 2017
20cfe17
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
johannao76 May 8, 2017
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
10 changes: 10 additions & 0 deletions common/changes/minimonthfixes_2017-05-05-17-02.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Day picker: Ensure we use values from nextProps when props are updated when generating weeks",
"type": "patch"
}
],
"email": "johannao@microsoft.com"
}
7 changes: 3 additions & 4 deletions packages/office-ui-fabric-react/src/components/Calendar/CalendarDay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export class CalendarDay extends BaseComponent<ICalendarDayProps, ICalendarDaySt

this.state = {
activeDescendantId: getId('DatePickerDay-active'),
weeks: this._getWeeks(navigatedDate, selectedDate, today)
weeks: this._getWeeks(props.navigatedDate, props.selectedDate, props.dateRangeType, props.firstDayOfWeek, today)

@MLoughry MLoughry May 5, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why add the props. reference here, rather than using the destructive assignment above on line 67?

@johannao76 johannao76 May 5, 2017

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed

};

this._onSelectNextMonth = this._onSelectNextMonth.bind(this);
Expand All @@ -79,7 +79,7 @@ export class CalendarDay extends BaseComponent<ICalendarDayProps, ICalendarDaySt
const { navigatedDate, selectedDate, today } = nextProps;

this.setState({
weeks: this._getWeeks(navigatedDate, selectedDate, today)
weeks: this._getWeeks(nextProps.navigatedDate, nextProps.selectedDate, nextProps.dateRangeType, nextProps.firstDayOfWeek, today)

@MLoughry MLoughry May 5, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as above

@johannao76 johannao76 May 5, 2017

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed

});
}

Expand Down Expand Up @@ -251,8 +251,7 @@ export class CalendarDay extends BaseComponent<ICalendarDayProps, ICalendarDaySt
}
}

private _getWeeks(navigatedDate: Date, selectedDate: Date, todayDate: Date): IDayInfo[][] {
let { firstDayOfWeek, dateRangeType } = this.props;
private _getWeeks(navigatedDate: Date, selectedDate: Date, dateRangeType: DateRangeType, firstDayOfWeek: DayOfWeek, todayDate: Date): IDayInfo[][] {

@MLoughry MLoughry May 5, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just pass in the props object here, rather than 5 different arguments (all of which are sourced directly from a props object)?

@johannao76 johannao76 May 5, 2017

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Passing props

let date = new Date(navigatedDate.getFullYear(), navigatedDate.getMonth(), 1);
let today = todayDate || new Date();
let weeks = [];
Expand Down