Refactor slot

WordPress · May 13, 2020 · 7d1b948 · 7d1b948
1 parent 0348ba7
commit 7d1b948
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/packages/edit-post/src/components/header/index.js b/packages/edit-post/src/components/header/index.js
@@ -8,7 +8,7 @@ import { useSelect, useDispatch } from '@wordpress/data';
 import { cog } from '@wordpress/icons';
 import {
 	PinnedItems,
-	__experimentalCloseButtonSlot as CloseButtonSlot,
+	__experimentalMainDashboardButton as MainDashboardButton,
 } from '@wordpress/interface';
 
 /**
@@ -69,9 +69,9 @@ function Header( {
 
 	return (
 		<div className="edit-post-header">
-			<CloseButtonSlot>
+			<MainDashboardButton.Slot>
 				<FullscreenModeClose />
-			</CloseButtonSlot>
+			</MainDashboardButton.Slot>
 			<div className="edit-post-header__toolbar">
 				<HeaderToolbar
 					onToggleInserter={ onToggleInserter }

diff --git a/packages/edit-site/src/components/header/index.js b/packages/edit-site/src/components/header/index.js
@@ -11,7 +11,7 @@ import {
 import { useSelect, useDispatch } from '@wordpress/data';
 import {
 	PinnedItems,
-	__experimentalCloseButtonSlot as CloseButtonSlot,
+	__experimentalMainDashboardButton as MainDashboardButton,
 } from '@wordpress/interface';
 
 /**
@@ -67,9 +67,9 @@ export default function Header( { openEntitiesSavedStates } ) {
 
 	return (
 		<div className="edit-site-header">
-			<CloseButtonSlot>
+			<MainDashboardButton.Slot>
 				<FullscreenModeClose />
-			</CloseButtonSlot>
+			</MainDashboardButton.Slot>
 			<div className="edit-site-header__toolbar">
 				<Inserter
 					position="bottom right"

diff --git a/packages/interface/src/components/index.js b/packages/interface/src/components/index.js
@@ -2,7 +2,4 @@ export { default as ComplementaryArea } from './complementary-area';
 export { default as FullscreenMode } from './fullscreen-mode';
 export { default as InterfaceSkeleton } from './interface-skeleton';
 export { default as PinnedItems } from './pinned-items';
-export {
-	default as __experimentalMainDashboardButton,
-	CloseButtonSlot as __experimentalCloseButtonSlot,
-} from './main-dashboard-button';
+export { default as __experimentalMainDashboardButton } from './main-dashboard-button';
diff --git a/packages/interface/src/components/main-dashboard-button/index.js b/packages/interface/src/components/main-dashboard-button/index.js
@@ -6,23 +6,23 @@ import {
 	createSlotFill,
 } from '@wordpress/components';
 
-const name = '__experimentalMainDashboardButton';
+const slotName = '__experimentalMainDashboardButton';
 
-const { Fill, Slot } = createSlotFill( name );
+const { Fill, Slot: MainDashboardButtonSlot } = createSlotFill( slotName );
 
 const MainDashboardButton = Fill;
-MainDashboardButton.Slot = Slot;
-MainDashboardButton.slotName = name;
 
-export const CloseButtonSlot = ( { children } ) => {
-	const slot = useSlot( MainDashboardButton.slotName );
+const Slot = ( { children } ) => {
+	const slot = useSlot( slotName );
 	const hasFills = Boolean( slot.fills && slot.fills.length );
 
 	if ( ! hasFills ) {
 		return children;
 	}
 
-	return <MainDashboardButton.Slot bubblesVirtually />;
+	return <MainDashboardButtonSlot bubblesVirtually />;
 };
 
+MainDashboardButton.Slot = Slot;
+
 export default MainDashboardButton;