Skip to content
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

Fix Calendar component PREV/NEXT month, year, and "Go to today" handlers firing twice #4662

Merged
merged 2 commits into from
Apr 25, 2018
Merged

Fix Calendar component PREV/NEXT month, year, and "Go to today" handlers firing twice #4662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbd5e85
Gate calendar month, year, and today keydowns for only ENTER as onCli…
KevinTCoughlin Apr 24, 2018
39d4f8f
+ changefile
KevinTCoughlin Apr 24, 2018
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: 11 additions & 0 deletions common/changes/office-ui-fabric-react/keco-calendar-keydown-regression_2018-04-24-15-57.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Gate calendar month, year, and today keydowns for only ENTER as onClick handles space with button nodes to fix double date change regression.",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "keco@microsoft.com"
}
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/Calendar/Calendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ export class Calendar extends BaseComponent<ICalendarProps, ICalendarState> impl
}

private _onGotoTodayKeyDown = (ev: React.KeyboardEvent<HTMLElement>): void => {
if (ev.which === KeyCodes.enter || ev.which === KeyCodes.space) {
if (ev.which === KeyCodes.enter) {
ev.preventDefault();
this._onGotoToday();
} else if (ev.which === KeyCodes.tab && !ev.shiftKey) {
Expand Down
8 changes: 6 additions & 2 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 @@ -566,11 +566,15 @@ export class CalendarDay extends BaseComponent<ICalendarDayProps, ICalendarDaySt
}

private _onPrevMonthKeyDown = (ev: React.KeyboardEvent<HTMLElement>): void => {
this._onKeyDown(this._onSelectPrevMonth, ev);
if (ev.which === KeyCodes.enter) {
this._onKeyDown(this._onSelectPrevMonth, ev);
}
}

private _onNextMonthKeyDown = (ev: React.KeyboardEvent<HTMLElement>): void => {
this._onKeyDown(this._onSelectNextMonth, ev);
if (ev.which === KeyCodes.enter) {
this._onKeyDown(this._onSelectNextMonth, ev);
}
}

private _getWeeks(propsToUse: ICalendarDayProps): IDayInfo[][] {
Expand Down
8 changes: 6 additions & 2 deletions packages/office-ui-fabric-react/src/components/Calendar/CalendarMonth.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,9 @@ export class CalendarMonth extends BaseComponent<ICalendarMonthProps, {}> {
}

private _onSelectNextYearKeyDown = (ev: React.KeyboardEvent<HTMLElement>): void => {
this._onKeyDown(this._onSelectNextYear, ev);
if (ev.which === KeyCodes.enter) {
this._onKeyDown(this._onSelectNextYear, ev);
}
}

private _onSelectPrevYear = (): void => {
Expand All @@ -187,7 +189,9 @@ export class CalendarMonth extends BaseComponent<ICalendarMonthProps, {}> {
}

private _onSelectPrevYearKeyDown = (ev: React.KeyboardEvent<HTMLElement>): void => {
this._onKeyDown(this._onSelectPrevYear, ev);
if (ev.which === KeyCodes.enter) {
this._onKeyDown(this._onSelectPrevYear, ev);
}
}

private _onSelectMonth = (newMonth: number): void => {
Expand Down