Fix on restore focus ctx menu (#18434)

Co-authored-by: Pankaj Gaur <[email protected]>
microsoft · Jun 3, 2021 · 30fd711 · 30fd711
1 parent e42563e
commit 30fd711
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/change/@fluentui-react-0351eb0b-f667-4c0a-a6c7-9abe81e9dab8.json b/change/@fluentui-react-0351eb0b-f667-4c0a-a6c7-9abe81e9dab8.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fixing onRestoreFocus merge issue between v7/V8",
+  "packageName": "@fluentui/react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/react/src/components/ContextualMenu/ContextualMenu.base.tsx b/packages/react/src/components/ContextualMenu/ContextualMenu.base.tsx
@@ -513,7 +513,9 @@ class ContextualMenuInternal extends React.Component<IContextualMenuInternalProp
   }
 
   private _tryFocusPreviousActiveElement = (options: IPopupRestoreFocusParams) => {
-    if (options && options.documentContainsFocus && this._previousActiveElement) {
+    if (this.props.onRestoreFocus) {
+      this.props.onRestoreFocus(options);
+    } else if (options && options.documentContainsFocus && this._previousActiveElement) {
       // Make sure that the focus method actually exists
       // In some cases the object might exist but not be a real element.
       // This is primarily for IE 11 and should be removed once IE 11 is no longer in use.