Address feedback left in review

Props to @youknowriad.
WordPress · Feb 18, 2021 · 21a4059 · 21a4059
1 parent 54708a4
commit 21a4059
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
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
@@ -54,7 +54,9 @@ import { ComplementaryAreaMoreMenuItem } from '@wordpress/interface';
 export default function PluginSidebarMoreMenuItem( props ) {
 	return (
 		<ComplementaryAreaMoreMenuItem
-			__unstableInitSource="plugin"
+			// Menu item is marked with unstable prop for backward compatibility.
+			// @see https://github.com/WordPress/gutenberg/issues/14457
+			__unstableExplicitMenuItem
 			scope="core/edit-post"
 			{ ...props }
 		/>

diff --git a/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js b/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js
@@ -92,7 +92,6 @@ export default function PluginSidebarEditPost( { className, ...props } ) {
 	} );
 	return (
 		<ComplementaryArea
-			__unstableInitSource="sidebar"
 			panelClassName={ className }
 			className="edit-post-sidebar"
 			smallScreenTitle={ postTitle || __( '(no title)' ) }

diff --git a/packages/edit-post/src/components/sidebar/settings-sidebar/index.js b/packages/edit-post/src/components/sidebar/settings-sidebar/index.js
@@ -59,7 +59,6 @@ const SettingsSidebar = () => {
 
 	return (
 		<PluginSidebarEditPost
-			__unstableInitSource="core"
 			identifier={ sidebarName }
 			header={ <SettingsHeader sidebarName={ sidebarName } /> }
 			closeLabel={ __( 'Close settings' ) }

diff --git a/packages/interface/src/components/action-item/index.js b/packages/interface/src/components/action-item/index.js
@@ -37,19 +37,16 @@ function ActionItemSlot( {
 				Children.forEach(
 					fills,
 					( {
-						props: { __unstableInitSource, __unstableTarget },
+						props: { __unstableExplicitMenuItem, __unstableTarget },
 					} ) => {
-						if (
-							__unstableTarget &&
-							__unstableInitSource === 'plugin'
-						) {
+						if ( __unstableTarget && __unstableExplicitMenuItem ) {
 							initializedByPlugins.push( __unstableTarget );
 						}
 					}
 				);
 				const children = Children.map( fills, ( child ) => {
 					if (
-						child.props.__unstableInitSource === 'sidebar' &&
+						! child.props.__unstableExplicitMenuItem &&
 						initializedByPlugins.includes(
 							child.props.__unstableTarget
 						)

diff --git a/packages/interface/src/components/complementary-area-more-menu-item/index.js b/packages/interface/src/components/complementary-area-more-menu-item/index.js
@@ -11,15 +11,17 @@ import ActionItem from '../action-item';
 export default function ComplementaryAreaMoreMenuItem( {
 	scope,
 	target,
-	__unstableInitSource,
+	__unstableExplicitMenuItem,
 	...props
 } ) {
 	return (
 		<ComplementaryAreaToggle
 			as={ ( toggleProps ) => {
 				return (
 					<ActionItem
-						__unstableInitSource={ __unstableInitSource }
+						__unstableExplicitMenuItem={
+							__unstableExplicitMenuItem
+						}
 						__unstableTarget={ `${ scope }/${ target }` }
 						name={ `${ scope }/plugin-more-menu` }
 						{ ...toggleProps }

diff --git a/packages/interface/src/components/complementary-area/index.js b/packages/interface/src/components/complementary-area/index.js
@@ -97,7 +97,6 @@ function ComplementaryArea( {
 	toggleShortcut,
 	isActiveByDefault,
 	showIconLabels = false,
-	__unstableInitSource,
 } ) {
 	const { isActive, isPinned, activeArea, isSmall, isLarge } = useSelect(
 		( select ) => {
@@ -155,9 +154,8 @@ function ComplementaryArea( {
 					) }
 				</PinnedItems>
 			) }
-			{ __unstableInitSource !== 'core' && isPinnable && (
+			{ name && isPinnable && (
 				<ComplementaryAreaMoreMenuItem
-					__unstableInitSource={ __unstableInitSource }
 					target={ name }
 					scope={ scope }
 					icon={ icon }