Skip to content

FocusTrapZone: Fix focus and blur callbacks #8404

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
JasonGore merged 2 commits into from
Mar 20, 2019
Merged

FocusTrapZone: Fix focus and blur callbacks #8404

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
0812e3d
FocusTrapZone: Make sure to call passed in focus and blur handlers
jspurlin Mar 20, 2019
fc2d9d8
rush change
jspurlin Mar 20, 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/jspurlin-FTZFocusBlurCallbackFix_2019-03-20-14-30.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": "FocusTrapZone: Make sure to call passed in focus and blur handlers",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "jspurlin@microsoft.com"
}
8 changes: 8 additions & 0 deletions 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 @@ -127,10 +127,18 @@ export class FocusTrapZone extends BaseComponent<IFocusTrapZoneProps, {}> implem
}

private _onRootFocus = (ev: React.FocusEvent<HTMLDivElement>) => {
if (this.props.onFocus) {
this.props.onFocus(ev);
}

this._hasFocus = true;
};

private _onRootBlur = (ev: React.FocusEvent<HTMLDivElement>) => {
if (this.props.onBlur) {
this.props.onBlur(ev);
}

let relatedTarget = ev.relatedTarget;
if (ev.relatedTarget === null) {
// In IE11, due to lack of support, event.relatedTarget is always
Expand Down