Skip to content

Update focus handling in DatePicker and FocusTrapZone #8875

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
msft-github-bot merged 2 commits into from
May 2, 2019
Merged

Update focus handling in DatePicker and FocusTrapZone #8875

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
0e35794
Fix return focus handling in DatePicker and FocusTrapZone.
phtucker Apr 29, 2019
ffe0af0
Change request.
phtucker Apr 29, 2019
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/phtucker-focus_fix_2019-04-29-19-41.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": "Remove out-of-date IE focus handling work-around. Pass forceFocusInsideTrap={false} to DatePicker FocusTrapZone. Adjust FocusTrapZone return focus handling.",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "phtucker@microsoft.com"
}
7 changes: 1 addition & 6 deletions packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,6 @@ export class DatePickerBase extends BaseComponent<IDatePickerProps, IDatePickerS

public componentDidUpdate(prevProps: IDatePickerProps, prevState: IDatePickerState) {
if (prevState.isDatePickerShown && !this.state.isDatePickerShown) {
// In browsers like IE, textfield gets unfocused when datepicker is collapsed
if (this.props.allowTextInput) {
this._async.requestAnimationFrame(() => this.focus());
}

// If DatePicker's menu (Calendar) is closed, run onAfterMenuDismiss
if (this.props.onAfterMenuDismiss) {
this.props.onAfterMenuDismiss();
Expand Down Expand Up @@ -236,7 +231,7 @@ export class DatePickerBase extends BaseComponent<IDatePickerProps, IDatePickerS
onDismiss={this._calendarDismissed}
onPositioned={this._onCalloutPositioned}
>
<FocusTrapZone isClickableOutsideFocusTrap={true} disableFirstFocus={this.props.disableAutoFocus}>
<FocusTrapZone isClickableOutsideFocusTrap={true} disableFirstFocus={this.props.disableAutoFocus} forceFocusInsideTrap={false}>
<CalendarType
{...calendarProps}
onSelectDate={this._onSelectDate}
Expand Down
7 changes: 6 additions & 1 deletion packages/office-ui-fabric-react/src/components/FocusTrapZone/FocusTrapZone.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@ export class FocusTrapZone extends React.Component<IFocusTrapZoneProps, {}> impl
}

public componentWillUnmount(): void {
if (!this.props.disabled) {
// don't handle return focus unless forceFocusInsideTrap is true or focus is still within FocusTrapZone
if (
!this.props.disabled ||
this.props.forceFocusInsideTrap ||
!elementContains(this._root.current, document.activeElement as HTMLElement)
) {
this._returnFocusToInitiator();
}
}
Expand Down