From c39f8df89305ccd2a48a3cf573ff786fc4b2092b Mon Sep 17 00:00:00 2001 From: Lion Huang Date: Fri, 23 Mar 2018 15:36:21 -0700 Subject: [PATCH 1/2] In Panel, a true value of isClickableOutsideFocusTrap prop in focusTrapZoneProps should not be overriden. --- .../office-ui-fabric-react/src/components/Panel/Panel.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/office-ui-fabric-react/src/components/Panel/Panel.tsx b/packages/office-ui-fabric-react/src/components/Panel/Panel.tsx index f92ad0e198c542..5e3827cf3e26be 100644 --- a/packages/office-ui-fabric-react/src/components/Panel/Panel.tsx +++ b/packages/office-ui-fabric-react/src/components/Panel/Panel.tsx @@ -174,7 +174,9 @@ export class Panel extends BaseComponent implements IP ) } style={ customWidthStyles } elementToFocusOnDismiss={ elementToFocusOnDismiss } - isClickableOutsideFocusTrap={ isLightDismiss || isHiddenOnDismiss } + isClickableOutsideFocusTrap={ + isLightDismiss || isHiddenOnDismiss || (focusTrapZoneProps && focusTrapZoneProps.isClickableOutsideFocusTrap) + } >
{ onRenderNavigation(renderProps, this._onRenderNavigation) } From f032ca11ebb514e9fe321c1fb08d646b41eef3db Mon Sep 17 00:00:00 2001 From: Lion Huang Date: Fri, 23 Mar 2018 15:39:53 -0700 Subject: [PATCH 2/2] Add change file. --- .../master_2018-03-23-22-38.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/office-ui-fabric-react/master_2018-03-23-22-38.json diff --git a/common/changes/office-ui-fabric-react/master_2018-03-23-22-38.json b/common/changes/office-ui-fabric-react/master_2018-03-23-22-38.json new file mode 100644 index 00000000000000..ea48fc2e304f16 --- /dev/null +++ b/common/changes/office-ui-fabric-react/master_2018-03-23-22-38.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "office-ui-fabric-react", + "comment": "In Panel component, isClickableOutsideFocusTrap should not be overriden back to false if it's already set to true in focusTrapZoneProps.", + "type": "patch" + } + ], + "packageName": "office-ui-fabric-react", + "email": "lianhu@microsoft.com" +} \ No newline at end of file