Update/menu item

packages/block-editor/src/components/block-settings-menu/block-convert-button.js

@@ -15,7 +15,6 @@ export default function BlockConvertButton( { shouldRender, onClick, small } ) {
 			className="editor-block-settings-menu__control"
 			onClick={ onClick }
 			icon="screenoptions"
-			label={ small ? label : undefined }
 		>
 			{ ! small && label }
 		</MenuItem>

packages/block-editor/src/components/block-settings-menu/block-mode-toggle.js

@@ -26,7 +26,6 @@ export function BlockModeToggle( { blockType, mode, onToggleMode, small = false
 			className="editor-block-settings-menu__control"
 			onClick={ onToggleMode }
 			icon="html"
-			label={ small ? label : undefined }
 		>
 			{ ! small && label }
 		</MenuItem>

packages/components/src/menu-item/README.md

@@ -34,15 +34,6 @@ Element to render as child of button.
 
 Element
 
-### `label`
-
-- Type: `string`
-- Required: No
-
-String to use as primary button label text, applied as `aria-label`. Useful in cases where an `info` prop is passed, where `label` should be the minimal text of the button, described in further detail by `info`.
-
-Defaults to the value of `children`, if `children` is passed as a string.
-
 ### `info`
 
 - Type: `string`

packages/components/src/menu-item/index.js

@@ -30,24 +30,17 @@ export function MenuItem( {
 	shortcut,
 	isSelected,
 	role = 'menuitem',
-	instanceId,
 	...props
 } ) {
 	className = classnames( 'components-menu-item__button', className, {
 		'has-icon': icon,
 	} );
 
 	if ( info ) {
-		const infoId = 'edit-post-feature-toggle__info-' + instanceId;
-
-		// Deconstructed props is scoped to the function; mutation is fine.
-		props[ 'aria-describedby' ] = infoId;
-
 		children = (
 			<span className="components-menu-item__info-wrapper">
 				{ children }
 				<span
-					id={ infoId }
 					className="components-menu-item__info">
 					{ info }
 				</span>

packages/components/src/menu-item/test/__snapshots__/index.js.snap

@@ -18,7 +18,6 @@ exports[`MenuItem should match snapshot when all props provided 1`] = `
 
 exports[`MenuItem should match snapshot when info is provided 1`] = `
 <ForwardRef(Button)
-  aria-describedby="edit-post-feature-toggle__info-1"
   className="components-menu-item__button"
   role="menuitem"
 >
@@ -28,7 +27,6 @@ exports[`MenuItem should match snapshot when info is provided 1`] = `
     My item
     <span
       className="components-menu-item__info"
-      id="edit-post-feature-toggle__info-1"
     >
       Extended description of My Item
     </span>

packages/components/src/menu-item/test/index.js

@@ -54,7 +54,7 @@ describe( 'MenuItem', () => {
 
 	it( 'should match snapshot when info is provided', () => {
 		const wrapper = shallow(
-			<MenuItem info="Extended description of My Item" instanceId={ 1 }>
+			<MenuItem info="Extended description of My Item">
 				My item
 			</MenuItem>
 		);

packages/edit-post/src/components/header/feature-toggle/index.js

@@ -26,7 +26,6 @@ function FeatureToggle( { onToggle, isActive, label, info, messageActivated, mes
 			isSelected={ isActive }
 			onClick={ flow( onToggle, speakMessage ) }
 			role="menuitemcheckbox"
-			label={ label }
 			info={ info }
 		>
 			{ label }

packages/edit-post/src/components/header/plugin-more-menu-item/test/__snapshots__/index.js.snap

@@ -18,6 +18,7 @@ exports[`PluginMoreMenuItem renders menu item as button properly 1`] = `
   >
     <button
       className="components-button components-icon-button components-menu-item__button has-icon has-text"
+      instanceId={0}
       onClick={[Function]}
       role="menuitem"
       type="button"

packages/edit-post/src/components/visual-editor/block-inspector-button.js

@@ -39,7 +39,6 @@ export function BlockInspectorButton( {
 			className="editor-block-settings-menu__control"
 			onClick={ flow( areAdvancedSettingsOpened ? closeSidebar : openEditorSidebar, speakMessage, onClick ) }
 			icon="admin-generic"
-			label={ small ? label : undefined }
 			shortcut={ shortcuts.toggleSidebar }
 		>
 			{ ! small && label }