Switch dimensions inspector controls slot to bubble virtually

packages/block-editor/src/components/block-inspector/index.js

@@ -131,7 +131,7 @@ const BlockInspectorSingleBlock = ( {
 			<InspectorControls.Slot bubblesVirtually={ bubblesVirtually } />
 			<InspectorControls.Slot
 				__experimentalGroup="dimensions"
-				bubblesVirtually={ false }
+				bubblesVirtually={ bubblesVirtually }
 				label={ __( 'Dimensions' ) }
 			/>
 			<div>

packages/block-editor/src/components/inspector-controls/block-support-slot-container.js

@@ -0,0 +1,10 @@
+/**
+ * WordPress dependencies
+ */
+import { __experimentalToolsPanelContext as ToolsPanelContext } from '@wordpress/components';
+import { useContext } from '@wordpress/element';
+
+export default function BlockSupportSlotContainer( { Slot, ...props } ) {
+	const toolsPanelContext = useContext( ToolsPanelContext );
+	return <Slot { ...props } fillProps={ toolsPanelContext } />;
+}

packages/block-editor/src/components/inspector-controls/fill.js

@@ -1,7 +1,15 @@
+/**
+ * External dependencies
+ */
+import { isEmpty } from 'lodash';
+
 /**
  * WordPress dependencies
  */
-import { __experimentalStyleProvider as StyleProvider } from '@wordpress/components';
+import {
+	__experimentalStyleProvider as StyleProvider,
+	__experimentalToolsPanelContext as ToolsPanelContext,
+} from '@wordpress/components';
 import warning from '@wordpress/warning';
 
 /**
@@ -26,7 +34,20 @@ export default function InspectorControlsFill( {
 
 	return (
 		<StyleProvider document={ document }>
-			<Fill>{ children }</Fill>
+			<Fill>
+				{ ( fillProps ) => {
+					// Children passed to InspectorControlsFill will not have
+					// access to any React Context whose Provider is part of
+					// the InspectorControlsSlot tree. So we re-create the
+					// Provider in this subtree.
+					const value = ! isEmpty( fillProps ) ? fillProps : null;
+					return (
+						<ToolsPanelContext.Provider value={ value }>
+							{ children }
+						</ToolsPanelContext.Provider>
+					);
+				} }
+			</Fill>
 		</StyleProvider>
 	);
 }

packages/block-editor/src/components/inspector-controls/slot.js

@@ -8,6 +8,7 @@ import warning from '@wordpress/warning';
  * Internal dependencies
  */
 import BlockSupportToolsPanel from './block-support-tools-panel';
+import BlockSupportSlotContainer from './block-support-slot-container';
 import groups from './groups';
 
 export default function InspectorControlsSlot( {
@@ -31,7 +32,11 @@ export default function InspectorControlsSlot( {
 	if ( label ) {
 		return (
 			<BlockSupportToolsPanel group={ group } label={ label }>
-				<Slot { ...props } bubblesVirtually={ bubblesVirtually } />
+				<BlockSupportSlotContainer
+					{ ...props }
+					bubblesVirtually={ bubblesVirtually }
+					Slot={ Slot }
+				/>
 			</BlockSupportToolsPanel>
 		);
 	}