Remove subregistry as it's baked in now

packages/block-editor/README.md

@@ -348,10 +348,6 @@ The default editor settings
 
 Undocumented declaration.
 
-<a name="storeConfig" href="#storeConfig">#</a> **storeConfig**
-
-Internal dependencies
-
 <a name="URLInput" href="#URLInput">#</a> **URLInput**
 
 Undocumented declaration.

packages/block-editor/src/index.js

@@ -9,7 +9,7 @@ import '@wordpress/viewport';
 /**
  * Internal dependencies
  */
-export { storeConfig } from './store';
+import './store';
 import './hooks';
 
 export * from './components';

packages/edit-widgets/src/components/layout/style.scss

@@ -1,5 +1,5 @@
 .edit-widgets-layout__content {
-	height: 100%;
+	min-height: 100%;
 	background: $light-gray-300;
 	padding: 30px 0;
 

packages/edit-widgets/src/components/widget-area/index.js

@@ -5,51 +5,28 @@ import { Panel, PanelBody } from '@wordpress/components';
 import {
 	BlockEditorProvider,
 	BlockList,
-	storeConfig,
 } from '@wordpress/block-editor';
-import { useState, useEffect } from '@wordpress/element';
-import {
-	RegistryProvider,
-	withRegistry,
-	createRegistry,
-	plugins,
-} from '@wordpress/data';
+import { useState } from '@wordpress/element';
 
-function WidgetArea( { title, initialOpen, registry } ) {
-	// Disable reason, this rule conflicts with the React hooks rule (no conditionals)
-	// eslint-disable-next-line @wordpress/no-unused-vars-before-return
+function WidgetArea( { title, initialOpen } ) {
 	const [ blocks, updateBlocks ] = useState( [] );
-	const [ subRegistry, updateRegistry ] = useState( null );
-	useEffect( () => {
-		// TODO: This behavior should be embedded in the BlockEditorProvider
-		const newRegistry = createRegistry( {}, registry );
-		newRegistry.use( plugins.controls );
-		newRegistry.registerStore( 'core/block-editor', storeConfig );
-		updateRegistry( newRegistry );
-	}, [ registry ] );
-
-	if ( ! subRegistry ) {
-		return null;
-	}
 
 	return (
 		<Panel>
 			<PanelBody
 				title={ title }
 				initialOpen={ initialOpen }
 			>
-				<RegistryProvider value={ subRegistry }>
-					<BlockEditorProvider
-						value={ blocks }
-						onInput={ updateBlocks }
-						onChange={ updateBlocks }
-					>
-						<BlockList />
-					</BlockEditorProvider>
-				</RegistryProvider>
+				<BlockEditorProvider
+					value={ blocks }
+					onInput={ updateBlocks }
+					onChange={ updateBlocks }
+				>
+					<BlockList />
+				</BlockEditorProvider>
 			</PanelBody>
 		</Panel>
 	);
 }
 
-export default withRegistry( WidgetArea );
+export default WidgetArea;