Refactor PluginSidebarMoreMenuItem to use PluginMoreMenuItem

WordPress · Nov 28, 2018 · f568fba · f568fba
1 parent 8a624e5
commit f568fba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/packages/edit-post/src/components/header/plugin-more-menu-item/index.js b/packages/edit-post/src/components/header/plugin-more-menu-item/index.js
@@ -15,12 +15,12 @@ import { withPluginContext } from '@wordpress/plugins';
  */
 import PluginsMoreMenuGroup from '../plugins-more-menu-group';
 
-const PluginMoreMenuItem = ( { children, icon, url, onClick = noop } ) => (
+const PluginMoreMenuItem = ( { children, url, onClick = noop, ...props } ) => (
 	<PluginsMoreMenuGroup>
 		{ ( fillProps ) => (
 			<MenuItem
+				{ ...props }
 				href={ url }
-				icon={ icon }
 				onClick={ compose( onClick, fillProps.onClose ) }
 			>
 				{ children }

diff --git a/packages/edit-post/src/components/header/plugin-sidebar-more-menu-item/index.js b/packages/edit-post/src/components/header/plugin-sidebar-more-menu-item/index.js
@@ -3,27 +3,22 @@
  */
 import { compose } from '@wordpress/compose';
 import { withSelect, withDispatch } from '@wordpress/data';
-import { MenuItem } from '@wordpress/components';
 import { withPluginContext } from '@wordpress/plugins';
 
 /**
  * Internal dependencies
  */
-import PluginsMoreMenuGroup from '../plugins-more-menu-group';
+import PluginMoreMenuItem from '../plugin-more-menu-item';
 
 const PluginSidebarMoreMenuItem = ( { children, icon, isSelected, onClick } ) => (
-	<PluginsMoreMenuGroup>
-		{ ( fillProps ) => (
-			<MenuItem
-				icon={ isSelected ? 'yes' : icon }
-				isSelected={ isSelected }
-				role="menuitemcheckbox"
-				onClick={ compose( onClick, fillProps.onClose ) }
-			>
-				{ children }
-			</MenuItem>
-		) }
-	</PluginsMoreMenuGroup>
+	<PluginMoreMenuItem
+		icon={ isSelected ? 'yes' : icon }
+		isSelected={ isSelected }
+		role="menuitemcheckbox"
+		onClick={ onClick }
+	>
+		{ children }
+	</PluginMoreMenuItem>
 );
 
 export default compose(