Move inline rich popover into header if top toolbar slot is available

WordPress · Nov 2, 2023 · 20ce22b · 20ce22b
1 parent 3a3420f
commit 20ce22b
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/packages/block-editor/src/components/block-tools/index.js b/packages/block-editor/src/components/block-tools/index.js
@@ -212,7 +212,20 @@ export default function BlockTools( {
 				) }
 
 				{ /* Used for the inline rich text toolbar. */ }
-				<Popover.Slot name="block-toolbar" ref={ blockToolbarRef } />
+				{ /* If there is no slot available, such as in the standalone block editor, render within the editor */ }
+				{ blockToolsSlot?.ref?.current ? (
+					<Fill name="__experimentalSelectedBlockTools">
+						<Popover.Slot
+							name="block-toolbar"
+							ref={ blockToolbarRef }
+						/>
+					</Fill>
+				) : (
+					<Popover.Slot
+						name="block-toolbar"
+						ref={ blockToolbarRef }
+					/>
+				) }
 				{ children }
 				{ /* Used for inline rich text popovers. */ }
 				<Popover.Slot