Move components to edit-post

WordPress · Jul 26, 2018 · 398a9a8 · 398a9a8
1 parent 434f365
commit 398a9a8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 18 deletions.
diff --git a/edit-post/components/block-settings-menu/index.js b/edit-post/components/block-settings-menu/index.js
diff --git a/...menu/block-settings-menu-plugins-group.js → ...-menu/plugin-block-settings-menu-group.js b/...menu/block-settings-menu-plugins-group.js → ...-menu/plugin-block-settings-menu-group.js
@@ -10,9 +10,9 @@ import { createSlotFill } from '@wordpress/components';
 import { Fragment } from '@wordpress/element';
 import { withSelect } from '@wordpress/data';
 
-const { Fill: BlockSettingsMenuPluginsGroup, Slot } = createSlotFill( 'BlockSettingsMenuPluginsGroup' );
+const { Fill: PluginBlockSettingsMenuGroup, Slot } = createSlotFill( 'BlockSettingsMenuPluginsGroup' );
 
-const BlockSettingsMenuPluginsGroupSlot = ( { fillProps, selectedBlocks } ) => {
+const PluginBlockSettingsMenuGroupSlot = ( { fillProps, selectedBlocks } ) => {
 	selectedBlocks = map( selectedBlocks, ( block ) => block.name );
 	return (
 		<Slot fillProps={ { ...fillProps, selectedBlocks } } >
@@ -26,8 +26,8 @@ const BlockSettingsMenuPluginsGroupSlot = ( { fillProps, selectedBlocks } ) => {
 	);
 };
 
-BlockSettingsMenuPluginsGroup.Slot = withSelect( ( select, { fillProps: { clientIds } } ) => ( {
+PluginBlockSettingsMenuGroup.Slot = withSelect( ( select, { fillProps: { clientIds } } ) => ( {
 	selectedBlocks: select( 'core/editor' ).getBlocksByUID( clientIds ),
-} ) )( BlockSettingsMenuPluginsGroupSlot );
+} ) )( PluginBlockSettingsMenuGroupSlot );
 
-export default BlockSettingsMenuPluginsGroup;
+export default PluginBlockSettingsMenuGroup;
diff --git a/...-menu/block-settings-menu-plugins-item.js → ...s-menu/plugin-block-settings-menu-item.js b/...-menu/block-settings-menu-plugins-item.js → ...s-menu/plugin-block-settings-menu-item.js
@@ -12,7 +12,7 @@ import { compose } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import BlockSettingsMenuPluginsGroup from './block-settings-menu-plugins-group';
+import PluginBlockSettingsMenuGroup from './plugin-block-settings-menu-group';
 
 const isEverySelectedBlockAllowed = ( selected, allowed ) => difference( selected, allowed ).length === 0;
 
@@ -30,8 +30,8 @@ const isEverySelectedBlockAllowed = ( selected, allowed ) => difference( selecte
 const shouldRenderItem = ( selectedBlockNames, allowedBlockNames ) => ! Array.isArray( allowedBlockNames ) ||
 	isEverySelectedBlockAllowed( selectedBlockNames, allowedBlockNames );
 
-const BlockSettingsMenuPluginsItem = ( { allowedBlocks, icon, label, onClick, small, role } ) => (
-	<BlockSettingsMenuPluginsGroup>
+const PluginBlockSettingsMenuItem = ( { allowedBlocks, icon, label, onClick, small, role } ) => (
+	<PluginBlockSettingsMenuGroup>
 		{ ( { selectedBlocks, onClose } ) => {
 			if ( ! shouldRenderItem( selectedBlocks, allowedBlocks ) ) {
 				return null;
@@ -46,7 +46,7 @@ const BlockSettingsMenuPluginsItem = ( { allowedBlocks, icon, label, onClick, sm
 				{ ! small && label }
 			</IconButton> );
 		} }
-	</BlockSettingsMenuPluginsGroup>
+	</PluginBlockSettingsMenuGroup>
 );
 
-export default BlockSettingsMenuPluginsItem;
+export default PluginBlockSettingsMenuItem;
diff --git a/edit-post/index.js b/edit-post/index.js
@@ -88,7 +88,8 @@ export function initializeEditor( id, postType, postId, settings, overridePost )
 	};
 }
 
-export { default as PluginBlockSettingsMenuItem } from './components/block-settings-menu';
+export { default as PluginBlockSettingsMenuItem } from './components/block-settings-menu/plugin-block-settings-menu-item';
+export { default as PluginBlockSettingsMenuGroup } from './components/block-settings-menu/plugin-block-settings-menu-group';
 export { default as PluginPostPublishPanel } from './components/sidebar/plugin-post-publish-panel';
 export { default as PluginPostStatusInfo } from './components/sidebar/plugin-post-status-info';
 export { default as PluginPrePublishPanel } from './components/sidebar/plugin-pre-publish-panel';

diff --git a/editor/components/block-settings-menu/index.js b/editor/components/block-settings-menu/index.js
@@ -26,7 +26,6 @@ import BlockHTMLConvertButton from './block-html-convert-button';
 import BlockUnknownConvertButton from './block-unknown-convert-button';
 import _BlockSettingsMenuFirstItem from './block-settings-menu-first-item';
 import withDeprecatedUniqueId from '../with-deprecated-unique-id';
-import _BlockSettingsMenuPluginsGroup from './block-settings-menu-plugins-group';
 
 export class BlockSettingsMenu extends Component {
 	constructor() {
@@ -57,6 +56,7 @@ export class BlockSettingsMenu extends Component {
 			focus,
 			rootClientId,
 			isHidden,
+			PluginExtension,
 		} = this.props;
 		const { isFocused } = this.state;
 		const blockClientIds = castArray( clientIds );
@@ -128,7 +128,7 @@ export class BlockSettingsMenu extends Component {
 									itemsRole="menuitem"
 								/>
 							) }
-							<_BlockSettingsMenuPluginsGroup.Slot fillProps={ { clientIds, onClose } } />
+							{ PluginExtension && ( <PluginExtension fillProps={ { clientIds, onClose } } /> ) }
 							<div className="editor-block-settings-menu__separator" />
 							{ count === 1 && (
 								<SharedBlockDeleteButton

diff --git a/editor/components/index.js b/editor/components/index.js
@@ -83,7 +83,6 @@ export { default as BlockMover } from './block-mover';
 export { default as BlockSelectionClearer } from './block-selection-clearer';
 export { default as BlockSettingsMenu } from './block-settings-menu';
 export { default as _BlockSettingsMenuFirstItem } from './block-settings-menu/block-settings-menu-first-item';
-export { default as _BlockSettingsMenuPluginsItem } from './block-settings-menu/block-settings-menu-plugins-item';
 export { default as BlockTitle } from './block-title';
 export { default as BlockToolbar } from './block-toolbar';
 export { default as CopyHandler } from './copy-handler';