@wordpress/edit-widgets 4.7.0 → 4.10.0

package/src/store/resolvers.js

@@ -27,78 +27,87 @@ import { transformWidgetToBlock } from './transformers';
  *
  * @return {Function} An action creator.
  */
-export const getWidgetAreas = () => async ( { dispatch, registry } ) => {
-	const query = buildWidgetAreasQuery();
-	const widgetAreas = await registry
-		.resolveSelect( coreStore )
-		.getEntityRecords( KIND, WIDGET_AREA_ENTITY_TYPE, query );
+export const getWidgetAreas =
+	() =>
+	async ( { dispatch, registry } ) => {
+		const query = buildWidgetAreasQuery();
+		const widgetAreas = await registry
+			.resolveSelect( coreStore )
+			.getEntityRecords( KIND, WIDGET_AREA_ENTITY_TYPE, query );
 
-	const widgetAreaBlocks = [];
-	const sortedWidgetAreas = widgetAreas.sort( ( a, b ) => {
-		if ( a.id === 'wp_inactive_widgets' ) {
-			return 1;
-		}
-		if ( b.id === 'wp_inactive_widgets' ) {
-			return -1;
-		}
-		return 0;
-	} );
-	for ( const widgetArea of sortedWidgetAreas ) {
-		widgetAreaBlocks.push(
-			createBlock( 'core/widget-area', {
-				id: widgetArea.id,
-				name: widgetArea.name,
-			} )
-		);
-
-		if ( ! widgetArea.widgets.length ) {
-			// If this widget area has no widgets, it won't get a post setup by
-			// the getWidgets resolver.
-			dispatch(
-				persistStubPost( buildWidgetAreaPostId( widgetArea.id ), [] )
+		const widgetAreaBlocks = [];
+		const sortedWidgetAreas = widgetAreas.sort( ( a, b ) => {
+			if ( a.id === 'wp_inactive_widgets' ) {
+				return 1;
+			}
+			if ( b.id === 'wp_inactive_widgets' ) {
+				return -1;
+			}
+			return 0;
+		} );
+		for ( const widgetArea of sortedWidgetAreas ) {
+			widgetAreaBlocks.push(
+				createBlock( 'core/widget-area', {
+					id: widgetArea.id,
+					name: widgetArea.name,
+				} )
 			);
+
+			if ( ! widgetArea.widgets.length ) {
+				// If this widget area has no widgets, it won't get a post setup by
+				// the getWidgets resolver.
+				dispatch(
+					persistStubPost(
+						buildWidgetAreaPostId( widgetArea.id ),
+						[]
+					)
+				);
+			}
 		}
-	}
 
-	const widgetAreasOpenState = {};
-	widgetAreaBlocks.forEach( ( widgetAreaBlock, index ) => {
-		// Defaults to open the first widget area.
-		widgetAreasOpenState[ widgetAreaBlock.clientId ] = index === 0;
-	} );
-	dispatch( setWidgetAreasOpenState( widgetAreasOpenState ) );
+		const widgetAreasOpenState = {};
+		widgetAreaBlocks.forEach( ( widgetAreaBlock, index ) => {
+			// Defaults to open the first widget area.
+			widgetAreasOpenState[ widgetAreaBlock.clientId ] = index === 0;
+		} );
+		dispatch( setWidgetAreasOpenState( widgetAreasOpenState ) );
 
-	dispatch( persistStubPost( buildWidgetAreasPostId(), widgetAreaBlocks ) );
-};
+		dispatch(
+			persistStubPost( buildWidgetAreasPostId(), widgetAreaBlocks )
+		);
+	};
 
 /**
  * Fetches all widgets from all widgets ares, and groups them by widget area Id.
  *
  * @return {Function} An action creator.
  */
-export const getWidgets = () => async ( { dispatch, registry } ) => {
-	const query = buildWidgetsQuery();
-	const widgets = await registry
-		.resolveSelect( coreStore )
-		.getEntityRecords( 'root', 'widget', query );
+export const getWidgets =
+	() =>
+	async ( { dispatch, registry } ) => {
+		const query = buildWidgetsQuery();
+		const widgets = await registry
+			.resolveSelect( coreStore )
+			.getEntityRecords( 'root', 'widget', query );
 
-	const groupedBySidebar = {};
+		const groupedBySidebar = {};
 
-	for ( const widget of widgets ) {
-		const block = transformWidgetToBlock( widget );
-		groupedBySidebar[ widget.sidebar ] =
-			groupedBySidebar[ widget.sidebar ] || [];
-		groupedBySidebar[ widget.sidebar ].push( block );
-	}
+		for ( const widget of widgets ) {
+			const block = transformWidgetToBlock( widget );
+			groupedBySidebar[ widget.sidebar ] =
+				groupedBySidebar[ widget.sidebar ] || [];
+			groupedBySidebar[ widget.sidebar ].push( block );
+		}
 
-	for ( const sidebarId in groupedBySidebar ) {
-		if ( groupedBySidebar.hasOwnProperty( sidebarId ) ) {
-			// Persist the actual post containing the widget block
-			dispatch(
-				persistStubPost(
-					buildWidgetAreaPostId( sidebarId ),
-					groupedBySidebar[ sidebarId ]
-				)
-			);
+		for ( const sidebarId in groupedBySidebar ) {
+			if ( groupedBySidebar.hasOwnProperty( sidebarId ) ) {
+				// Persist the actual post containing the widget block
+				dispatch(
+					persistStubPost(
+						buildWidgetAreaPostId( sidebarId ),
+						groupedBySidebar[ sidebarId ]
+					)
+				);
+			}
 		}
-	}
-};
+	};

package/src/store/selectors.js

@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { keyBy } from 'lodash';
-
 /**
  * WordPress dependencies
  */
@@ -36,7 +31,16 @@ export const getWidgets = createRegistrySelector( ( select ) => () => {
 		buildWidgetsQuery()
 	);
 
-	return keyBy( widgets, 'id' );
+	return (
+		// Key widgets by their ID.
+		widgets?.reduce(
+			( allWidgets, widget ) => ( {
+				...allWidgets,
+				[ widget.id ]: widget,
+			} ),
+			{}
+		) || {}
+	);
 } );
 
 /**
@@ -99,9 +103,8 @@ export const getWidgetAreaForWidgetId = createRegistrySelector(
  */
 export const getParentWidgetAreaBlock = createRegistrySelector(
 	( select ) => ( state, clientId ) => {
-		const { getBlock, getBlockName, getBlockParents } = select(
-			blockEditorStore
-		);
+		const { getBlock, getBlockName, getBlockParents } =
+			select( blockEditorStore );
 		const blockParents = getBlockParents( clientId );
 		const widgetAreaClientId = blockParents.find(
 			( parentClientId ) =>
@@ -152,28 +155,29 @@ export const getEditedWidgetAreas = createRegistrySelector(
  * @return {Array}  List of all blocks representing reference widgets
  */
 export const getReferenceWidgetBlocks = createRegistrySelector(
-	( select ) => ( state, referenceWidgetName = null ) => {
-		const results = [];
-		const widgetAreas = select( editWidgetsStoreName ).getWidgetAreas();
-		for ( const _widgetArea of widgetAreas ) {
-			const post = select( coreStore ).getEditedEntityRecord(
-				KIND,
-				POST_TYPE,
-				buildWidgetAreaPostId( _widgetArea.id )
-			);
-			for ( const block of post.blocks ) {
-				if (
-					block.name === 'core/legacy-widget' &&
-					( ! referenceWidgetName ||
-						block.attributes?.referenceWidgetName ===
-							referenceWidgetName )
-				) {
-					results.push( block );
+	( select ) =>
+		( state, referenceWidgetName = null ) => {
+			const results = [];
+			const widgetAreas = select( editWidgetsStoreName ).getWidgetAreas();
+			for ( const _widgetArea of widgetAreas ) {
+				const post = select( coreStore ).getEditedEntityRecord(
+					KIND,
+					POST_TYPE,
+					buildWidgetAreaPostId( _widgetArea.id )
+				);
+				for ( const block of post.blocks ) {
+					if (
+						block.name === 'core/legacy-widget' &&
+						( ! referenceWidgetName ||
+							block.attributes?.referenceWidgetName ===
+								referenceWidgetName )
+					) {
+						results.push( block );
+					}
 				}
 			}
+			return results;
 		}
-		return results;
-	}
 );
 
 /**