From 0812e3dbf25da31915b3d263c27fd6266f413154 Mon Sep 17 00:00:00 2001 From: "REDMOND\\jspurlin" Date: Wed, 20 Mar 2019 07:29:21 -0700 Subject: [PATCH 1/2] FocusTrapZone: Make sure to call passed in focus and blur handlers --- .../src/components/FocusTrapZone/FocusTrapZone.tsx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/office-ui-fabric-react/src/components/FocusTrapZone/FocusTrapZone.tsx b/packages/office-ui-fabric-react/src/components/FocusTrapZone/FocusTrapZone.tsx index 90dfda30003e62..54c6a4d68ac0f5 100644 --- a/packages/office-ui-fabric-react/src/components/FocusTrapZone/FocusTrapZone.tsx +++ b/packages/office-ui-fabric-react/src/components/FocusTrapZone/FocusTrapZone.tsx @@ -127,10 +127,18 @@ export class FocusTrapZone extends BaseComponent implem } private _onRootFocus = (ev: React.FocusEvent) => { + if (this.props.onFocus) { + this.props.onFocus(ev); + } + this._hasFocus = true; }; private _onRootBlur = (ev: React.FocusEvent) => { + 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 From fc2d9d818ce1dc5bb41c40a963449cf811ed3c3d Mon Sep 17 00:00:00 2001 From: "REDMOND\\jspurlin" Date: Wed, 20 Mar 2019 07:30:39 -0700 Subject: [PATCH 2/2] rush change --- ...rlin-FTZFocusBlurCallbackFix_2019-03-20-14-30.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/office-ui-fabric-react/jspurlin-FTZFocusBlurCallbackFix_2019-03-20-14-30.json diff --git a/common/changes/office-ui-fabric-react/jspurlin-FTZFocusBlurCallbackFix_2019-03-20-14-30.json b/common/changes/office-ui-fabric-react/jspurlin-FTZFocusBlurCallbackFix_2019-03-20-14-30.json new file mode 100644 index 00000000000000..34b465613026a4 --- /dev/null +++ b/common/changes/office-ui-fabric-react/jspurlin-FTZFocusBlurCallbackFix_2019-03-20-14-30.json @@ -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" +} \ No newline at end of file