diff --git a/common/changes/office-ui-fabric-react/chiechan-allowFocusToReturnInPopup_2018-05-07-22-58.json b/common/changes/office-ui-fabric-react/chiechan-allowFocusToReturnInPopup_2018-05-07-22-58.json new file mode 100644 index 00000000000000..5396b467e38a9e --- /dev/null +++ b/common/changes/office-ui-fabric-react/chiechan-allowFocusToReturnInPopup_2018-05-07-22-58.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "office-ui-fabric-react", + "comment": "Popup: Added check for onBlur to prevent focus setting focus to be disabled in chrome", + "type": "patch" + } + ], + "packageName": "office-ui-fabric-react", + "email": "chiechan@microsoft.com" +} \ No newline at end of file diff --git a/packages/office-ui-fabric-react/src/components/Popup/Popup.tsx b/packages/office-ui-fabric-react/src/components/Popup/Popup.tsx index 5c265313fb493a..2d4d3367697b47 100644 --- a/packages/office-ui-fabric-react/src/components/Popup/Popup.tsx +++ b/packages/office-ui-fabric-react/src/components/Popup/Popup.tsx @@ -141,7 +141,9 @@ export class Popup extends BaseComponent { this._containsFocus = true; } - private _onBlur(): void { - this._containsFocus = false; + private _onBlur(ev: React.FocusEvent): void { + if (this._root.value && this._root.value.contains(ev.relatedTarget as HTMLElement)) { + this._containsFocus = false; + } } }