Remove context usage; Pass only small subset of settings from the ser…

…ver.

lib/widgets-page.php

@@ -29,13 +29,37 @@ function gutenberg_widgets_init( $hook ) {
 			return;
 	}
 
-	$block_editor_settings = apply_filters( 'block_editor_settings', $editor_settings, $post );
+	// Media settings.
+	$max_upload_size = wp_max_upload_size();
+	if ( ! $max_upload_size ) {
+		$max_upload_size = 0;
+	}
+
+	$color_palette = current( (array) get_theme_support( 'editor-color-palette' ) );
+	$font_sizes    = current( (array) get_theme_support( 'editor-font-sizes' ) );
+
+	$settings = array_merge(
+		array(
+			'disableCustomColors'    => get_theme_support( 'disable-custom-colors' ),
+			'disableCustomFontSizes' => get_theme_support( 'disable-custom-font-sizes' ),
+			'maxUploadFileSize'      => $max_upload_size,
+		),
+		gutenberg_get_legacy_widget_settings()
+	);
+
+	if ( false !== $color_palette ) {
+		$settings['colors'] = $color_palette;
+	}
+
+	if ( false !== $font_sizes ) {
+		$settings['fontSizes'] = $font_sizes;
+	}
 
 	wp_add_inline_script(
 		'wp-edit-widgets',
 		sprintf(
 			'wp.editWidgets.initialize( "widgets-editor", %s );',
-			wp_json_encode( $block_editor_settings )
+			wp_json_encode( $settings )
 		)
 	);
 	// Preload server-registered block schemas.

lib/widgets.php

@@ -55,14 +55,14 @@ function gutenberg_block_editor_admin_footer() {
 }
 add_action( 'admin_footer', 'gutenberg_block_editor_admin_footer' );
 
+
 /**
- * Extends default editor settings with values supporting legacy widgets.
- *
- * @param array $settings Default editor settings.
+ * Returns the settings required by legacy widgets blocks.
  *
- * @return array Filtered editor settings.
+ * @return array Legacy widget settings.
  */
-function gutenberg_legacy_widget_settings( $settings ) {
+function gutenberg_get_legacy_widget_settings() {
+	$settings = array();
 	/**
 	 * TODO: The hardcoded array should be replaced with a mechanism to allow
 	 * core and third party blocks to specify they already have equivalent
@@ -125,6 +125,17 @@ function gutenberg_legacy_widget_settings( $settings ) {
 
 	return $settings;
 }
+
+/**
+ * Extends default editor settings with values supporting legacy widgets.
+ *
+ * @param array $settings Default editor settings.
+ *
+ * @return array Filtered editor settings.
+ */
+function gutenberg_legacy_widget_settings( $settings ) {
+	return array_merge( $settings, gutenberg_get_legacy_widget_settings() );
+}
 add_filter( 'block_editor_settings', 'gutenberg_legacy_widget_settings' );
 
 /**

packages/edit-widgets/src/components/edit-widgets-initializer/index.js

@@ -1,52 +1,23 @@
-/**
- * External dependencies
- */
-import { pick } from 'lodash';
-
 /**
  * WordPress dependencies
  */
 import { compose } from '@wordpress/compose';
-import { useEffect, useMemo } from '@wordpress/element';
+import { useEffect } from '@wordpress/element';
 import { withDispatch } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
 import Layout from '../layout';
-import WidgetBlockEditorSettings from '../widget-block-editor-settings';
 
 function EditWidgetsInitializer( { setupWidgetAreas, settings } ) {
 	useEffect( () => {
 		setupWidgetAreas();
 	}, [] );
-	const blockEditorSettings = useMemo(
-		() => (
-			pick( settings, [
-				'allowedBlockTypes',
-				'availableLegacyWidgets',
-				'bodyPlaceholder',
-				'colors',
-				'disableCustomColors',
-				'disableCustomFontSizes',
-				'focusMode',
-				'fontSizes',
-				'hasFixedToolbar',
-				'hasPermissionsToManageWidgets',
-				'imageSizes',
-				'isRTL',
-				'maxWidth',
-				'styles',
-			] )
-		),
-		[ settings ]
-	);
 	return (
-		<WidgetBlockEditorSettings.Provider
-			value={ blockEditorSettings }
-		>
-			<Layout />
-		</WidgetBlockEditorSettings.Provider>
+		<Layout
+			blockEditorSettings={ settings }
+		/>
 	);
 }
 

packages/edit-widgets/src/components/layout/index.js

@@ -11,7 +11,7 @@ import Header from '../header';
 import Sidebar from '../sidebar';
 import WidgetAreas from '../widget-areas';
 
-function Layout() {
+function Layout( { blockEditorSettings } ) {
 	return (
 		<>
 			<Header />
@@ -22,7 +22,9 @@ function Layout() {
 				aria-label={ __( 'Widgets screen content' ) }
 				tabIndex="-1"
 			>
-				<WidgetAreas />
+				<WidgetAreas
+					blockEditorSettings={ blockEditorSettings }
+				/>
 			</div>
 		</>
 	);

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

@@ -9,12 +9,8 @@ import {
 } from '@wordpress/block-editor';
 import { withDispatch, withSelect } from '@wordpress/data';
 
-/**
- * Internal dependencies
- */
-import WidgetBlockEditorSettings from '../widget-block-editor-settings';
-
 function WidgetArea( {
+	blockEditorSettings,
 	blocks,
 	initialOpen,
 	updateBlocks,
@@ -26,21 +22,14 @@ function WidgetArea( {
 				title={ widgetAreaName }
 				initialOpen={ initialOpen }
 			>
-				<WidgetBlockEditorSettings.Consumer>
-					{
-						( value ) => (
-							<BlockEditorProvider
-								value={ blocks }
-								onInput={ updateBlocks }
-								onChange={ updateBlocks }
-								settings={ value }
-							>
-								<BlockList />
-							</BlockEditorProvider>
-						)
-					}
-				</WidgetBlockEditorSettings.Consumer>
-
+				<BlockEditorProvider
+					value={ blocks }
+					onInput={ updateBlocks }
+					onChange={ updateBlocks }
+					settings={ blockEditorSettings }
+				>
+					<BlockList />
+				</BlockEditorProvider>
 			</PanelBody>
 		</Panel>
 	);

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

@@ -9,9 +9,10 @@ import { withSelect } from '@wordpress/data';
  */
 import WidgetArea from '../widget-area';
 
-function WidgetAreas( { areas } ) {
+function WidgetAreas( { areas, blockEditorSettings } ) {
 	return areas.map( ( { id }, index ) => (
 		<WidgetArea
+			blockEditorSettings={ blockEditorSettings }
 			key={ id }
 			id={ id }
 			initialOpen={ index === 0 }