@wordpress/editor 12.21.0 → 13.0.0

package/src/components/provider/use-block-editor-settings.js

@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { pick } from 'lodash';
-
 /**
  * WordPress dependencies
  */
@@ -12,6 +7,7 @@ import {
 	store as coreStore,
 	__experimentalFetchLinkSuggestions as fetchLinkSuggestions,
 	__experimentalFetchUrlData as fetchUrlData,
+	__experimentalFetchMedia as fetchMedia,
 } from '@wordpress/core-data';
 import { __ } from '@wordpress/i18n';
 
@@ -21,6 +17,8 @@ import { __ } from '@wordpress/i18n';
 import { mediaUpload } from '../../utils';
 import { store as editorStore } from '../../store';
 
+const EMPTY_BLOCKS_LIST = [];
+
 /**
  * React hook used to compute the block editor settings to use for the post editor.
  *
@@ -55,7 +53,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 						'wp_block',
 						{ per_page: -1 }
 				  )
-				: [], // Reusable blocks are fetched in the native version of this hook.
+				: EMPTY_BLOCKS_LIST, // Reusable blocks are fetched in the native version of this hook.
 			hasUploadPermissions: canUser( 'create', 'media' ) ?? true,
 			userCanCreatePages: canUser( 'create', 'pages' ),
 			pageOnFront: siteSettings?.page_on_front,
@@ -133,56 +131,64 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 
 	return useMemo(
 		() => ( {
-			...pick( settings, [
-				'__experimentalBlockDirectory',
-				'__experimentalDiscussionSettings',
-				'__experimentalFeatures',
-				'__experimentalPreferredStyleVariations',
-				'__experimentalSetIsInserterOpened',
-				'__unstableGalleryWithImageBlocks',
-				'alignWide',
-				'allowedBlockTypes',
-				'bodyPlaceholder',
-				'canLockBlocks',
-				'codeEditingEnabled',
-				'colors',
-				'disableCustomColors',
-				'disableCustomFontSizes',
-				'disableCustomSpacingSizes',
-				'disableCustomGradients',
-				'disableLayoutStyles',
-				'enableCustomLineHeight',
-				'enableCustomSpacing',
-				'enableCustomUnits',
-				'focusMode',
-				'fontSizes',
-				'gradients',
-				'generateAnchors',
-				'hasFixedToolbar',
-				'isDistractionFree',
-				'hasInlineToolbar',
-				'imageDefaultSize',
-				'imageDimensions',
-				'imageEditing',
-				'imageSizes',
-				'isRTL',
-				'keepCaretInsideBlock',
-				'maxWidth',
-				'onUpdateDefaultBlockStyles',
-				'styles',
-				'template',
-				'templateLock',
-				'titlePlaceholder',
-				'supportsLayout',
-				'widgetTypesToHideFromLegacyWidgetBlock',
-				'__unstableResolvedAssets',
-			] ),
+			...Object.fromEntries(
+				Object.entries( settings ).filter( ( [ key ] ) =>
+					[
+						'__experimentalBlockDirectory',
+						'__experimentalBlockInspectorTabs',
+						'__experimentalDiscussionSettings',
+						'__experimentalFeatures',
+						'__experimentalPreferredStyleVariations',
+						'__experimentalSetIsInserterOpened',
+						'__unstableGalleryWithImageBlocks',
+						'alignWide',
+						'allowedBlockTypes',
+						'bodyPlaceholder',
+						'canLockBlocks',
+						'codeEditingEnabled',
+						'colors',
+						'disableCustomColors',
+						'disableCustomFontSizes',
+						'disableCustomSpacingSizes',
+						'disableCustomGradients',
+						'disableLayoutStyles',
+						'enableCustomLineHeight',
+						'enableCustomSpacing',
+						'enableCustomUnits',
+						'focusMode',
+						'fontSizes',
+						'gradients',
+						'generateAnchors',
+						'hasFixedToolbar',
+						'isDistractionFree',
+						'hasInlineToolbar',
+						'imageDefaultSize',
+						'imageDimensions',
+						'imageEditing',
+						'imageSizes',
+						'isRTL',
+						'keepCaretInsideBlock',
+						'maxWidth',
+						'onUpdateDefaultBlockStyles',
+						'styles',
+						'template',
+						'templateLock',
+						'titlePlaceholder',
+						'supportsLayout',
+						'widgetTypesToHideFromLegacyWidgetBlock',
+						'__unstableResolvedAssets',
+					].includes( key )
+				)
+			),
 			mediaUpload: hasUploadPermissions ? mediaUpload : undefined,
 			__experimentalReusableBlocks: reusableBlocks,
 			__experimentalBlockPatterns: blockPatterns,
 			__experimentalBlockPatternCategories: blockPatternCategories,
 			__experimentalFetchLinkSuggestions: ( search, searchOptions ) =>
 				fetchLinkSuggestions( search, searchOptions, settings ),
+			// TODO: We should find a proper way to consolidate similar cases
+			// like reusable blocks, fetch entities, etc.
+			__unstableFetchMedia: fetchMedia,
 			__experimentalFetchRichUrlData: fetchUrlData,
 			__experimentalCanUserUseUnfilteredHTML: canUseUnfilteredHTML,
 			__experimentalUndo: undo,

package/src/components/provider/use-block-editor-settings.native.js

@@ -11,6 +11,8 @@ import { store as coreStore } from '@wordpress/core-data';
 import useBlockEditorSettings from './use-block-editor-settings.js';
 import { store as editorStore } from '../../store';
 
+const EMPTY_BLOCKS_LIST = [];
+
 function useNativeBlockEditorSettings( settings, hasTemplate ) {
 	const capabilities = settings.capabilities ?? {};
 	const editorSettings = useBlockEditorSettings( settings, hasTemplate );
@@ -27,7 +29,7 @@ function useNativeBlockEditorSettings( settings, hasTemplate ) {
 							// Related issue: https://github.com/wordpress-mobile/gutenberg-mobile/issues/2661
 							{ per_page: 100 }
 					  )
-					: [],
+					: EMPTY_BLOCKS_LIST,
 				isTitleSelected: select( editorStore ).isPostTitleSelected(),
 			};
 		},