id instead of widgetAreaId + lint fix

WordPress · May 22, 2019 · 4f2c6cc · 4f2c6cc
1 parent fd920f2
commit 4f2c6cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/packages/edit-widgets/src/components/header/index.js b/packages/edit-widgets/src/components/header/index.js
@@ -6,7 +6,6 @@ import { Button } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { withDispatch } from '@wordpress/data';
 
-
 function Header( { saveWidgetAreas } ) {
 	return (
 		<div

diff --git a/packages/edit-widgets/src/components/widget-area/index.js b/packages/edit-widgets/src/components/widget-area/index.js
@@ -34,23 +34,23 @@ function WidgetArea( {
 }
 
 export default compose( [
-	withSelect( ( select, { widgetAreaId } ) => {
+	withSelect( ( select, { id } ) => {
 		const {
 			getBlocksFromWidgetArea,
 			getWidgetArea,
 		} = select( 'core/edit-widgets' );
-		const blocks = getBlocksFromWidgetArea( widgetAreaId );
-		const widgetAreaName = ( getWidgetArea( widgetAreaId ) || {} ).name;
+		const blocks = getBlocksFromWidgetArea( id );
+		const widgetAreaName = ( getWidgetArea( id ) || {} ).name;
 		return {
 			blocks,
 			widgetAreaName,
 		};
 	} ),
-	withDispatch( ( dispatch, { widgetAreaId } ) => {
+	withDispatch( ( dispatch, { id } ) => {
 		return {
 			updateBlocks( blocks ) {
 				const { updateBlocksInWidgetArea } = dispatch( 'core/edit-widgets' );
-				updateBlocksInWidgetArea( widgetAreaId, blocks );
+				updateBlocksInWidgetArea( id, blocks );
 			},
 		};
 	} ),

diff --git a/packages/edit-widgets/src/components/widget-areas/index.js b/packages/edit-widgets/src/components/widget-areas/index.js
@@ -13,7 +13,7 @@ function WidgetAreas( { areas } ) {
 	return areas.map( ( { id }, index ) => (
 		<WidgetArea
 			key={ id }
-			widgetAreaId={ id }
+			id={ id }
 			initialOpen={ index === 0 }
 		/>
 	) );