From 0786687daaca62cf2247493c513a76666429536f Mon Sep 17 00:00:00 2001
From: emyarod <afw5059@gmail.com>
Date: Fri, 29 May 2020 03:56:28 -0500
Subject: [PATCH] chore(OverflowMenuItem): deprecate `primaryFocus`

---
 .../components/OverflowMenu/OverflowMenu-story.js   | 13 ++-----------
 .../src/components/OverflowMenu/OverflowMenu.js     |  2 +-
 .../components/OverflowMenuItem/OverflowMenuItem.js | 11 ++++++++++-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/react/src/components/OverflowMenu/OverflowMenu-story.js b/packages/react/src/components/OverflowMenu/OverflowMenu-story.js
index 036dcf5ff017..4c2c7e9a7732 100644
--- a/packages/react/src/components/OverflowMenu/OverflowMenu-story.js
+++ b/packages/react/src/components/OverflowMenu/OverflowMenu-story.js
@@ -55,11 +55,7 @@ storiesOf('OverflowMenu', module)
     'basic',
     withReadme(OverflowREADME, () => (
       <OverflowMenu {...props.menu()}>
-        <OverflowMenuItem
-          {...props.menuItem()}
-          itemText="Option 1"
-          primaryFocus
-        />
+        <OverflowMenuItem {...props.menuItem()} itemText="Option 1" />
         <OverflowMenuItem
           {...props.menuItem()}
           itemText="Option 2 is an example of a really long string and how we recommend handling this"
@@ -94,7 +90,6 @@ storiesOf('OverflowMenu', module)
             href: 'https://www.ibm.com',
           }}
           itemText="Option 1"
-          primaryFocus
         />
         <OverflowMenuItem
           {...{
@@ -150,11 +145,7 @@ storiesOf('OverflowMenu', module)
           style: { width: 'auto' },
           renderIcon: () => <div style={{ padding: '0 1rem' }}>Menu</div>,
         }}>
-        <OverflowMenuItem
-          {...props.menuItem()}
-          itemText="Option 1"
-          primaryFocus
-        />
+        <OverflowMenuItem {...props.menuItem()} itemText="Option 1" />
         <OverflowMenuItem
           {...props.menuItem()}
           itemText="Option 2 is an example of a really long string and how we recommend handling this"
diff --git a/packages/react/src/components/OverflowMenu/OverflowMenu.js b/packages/react/src/components/OverflowMenu/OverflowMenu.js
index 1e1153f83e1c..d97f12fed37d 100644
--- a/packages/react/src/components/OverflowMenu/OverflowMenu.js
+++ b/packages/react/src/components/OverflowMenu/OverflowMenu.js
@@ -429,7 +429,7 @@ class OverflowMenu extends Component {
       iconClass,
       onClick, // eslint-disable-line
       onOpen, // eslint-disable-line
-      selectorPrimaryFocus, // eslint-disable-line
+      selectorPrimaryFocus = '[data-floating-menu-primary-focus]', // eslint-disable-line
       renderIcon: IconElement,
       innerRef: ref,
       menuOptionsClass,
diff --git a/packages/react/src/components/OverflowMenuItem/OverflowMenuItem.js b/packages/react/src/components/OverflowMenuItem/OverflowMenuItem.js
index f973532e2abd..bba575ce3149 100644
--- a/packages/react/src/components/OverflowMenuItem/OverflowMenuItem.js
+++ b/packages/react/src/components/OverflowMenuItem/OverflowMenuItem.js
@@ -11,6 +11,7 @@ import classNames from 'classnames';
 import warning from 'warning';
 import { settings } from 'carbon-components';
 import { match, keys } from '../../internal/keyboard';
+import deprecate from '../../prop-types/deprecate.js';
 
 const { prefix } = settings;
 
@@ -72,7 +73,13 @@ export default class OverflowMenuItem extends React.Component {
     /**
      * `true` if this menu item should get focus when the menu gets open.
      */
-    primaryFocus: PropTypes.bool,
+    primaryFocus: deprecate(
+      PropTypes.bool,
+      'The `primaryFocus` prop has been deprecated as it is no longer used. ' +
+        'Feel free to remove this prop from <OverflowMenuItem>. This prop will ' +
+        'be removed in the next major release of `carbon-components-react`. ' +
+        'Opt for `selectorPrimaryFocus` in `<OverflowMenu>` instead'
+    ),
 
     /**
      * `true` if this menu item has long text and requires a browser tooltip
@@ -120,6 +127,7 @@ export default class OverflowMenuItem extends React.Component {
       onClick, // eslint-disable-line
       handleOverflowMenuItemFocus, // eslint-disable-line
       onKeyDown,
+      primaryFocus,
       wrapperClassName,
       requireTitle,
       index,
@@ -163,6 +171,7 @@ export default class OverflowMenuItem extends React.Component {
       <li className={overflowMenuItemClasses} role="menuitem">
         <TagToUse
           {...other}
+          {...{ 'data-floating-menu-primary-focus': primaryFocus || null }}
           href={href}
           className={overflowMenuBtnClasses}
           disabled={disabled}