Switching area pull in correct menu

WordPress · Oct 28, 2021 · 5e1a894 · 5e1a894
1 parent 6fa4577
commit 5e1a894
Showing 1 changed file with 51 additions and 42 deletions.
diff --git a/packages/block-library/src/navigation/edit/index.js b/packages/block-library/src/navigation/edit/index.js
@@ -117,9 +117,11 @@ function Navigation( {
 	const hasExistingNavItems = !! innerBlocks.length;
 	const { selectBlock } = useDispatch( blockEditorStore );
 
+	/* eslint-disable no-unused-vars */
 	const { editEntityRecord, saveEditedEntityRecord } = useDispatch(
 		coreStore
 	);
+	/* eslint-enable no-unused-vars */
 
 	const [ isPlaceholderShown, setIsPlaceholderShown ] = useState(
 		! hasExistingNavItems
@@ -134,8 +136,20 @@ function Navigation( {
 		isNavigationMenuMissing,
 		canSwitchNavigationMenu,
 		hasResolvedNavigationMenu,
+		navigationMenu,
 	} = useNavigationMenu( navigationMenuId, navigationAreaId );
 
+	useEffect( () => {
+		// If there is a area ID then the retrieved menu will be
+		// that which is associated with the area. Update the reference
+		// on the block to mirror that.
+		if ( navigationAreaId ) {
+			setAttributes( {
+				navigationMenuId: navigationMenu?.id,
+			} );
+		}
+	}, [ navigationMenu?.id ] );
+
 	const {
 		navigationAreas,
 		isRequestingAreas,
@@ -214,34 +228,31 @@ function Navigation( {
 	}, [ isEntityAvailable ] );
 
 	useEffect( () => {
-		const updateNavEntityArea = async () => {
-			const noTerms = [];
-
-			// navigationAreaId is of type "number". Therefore
-			// ID: 0 is used to represent a value of "none".
-			const maybeNewAreaTermId =
-				navigationAreaId > 0 ? [ navigationAreaId ] : noTerms;
-
-			// Toggle the active navigaiton area term.
-			await editEntityRecord(
-				'postType',
-				'wp_navigation',
-				navigationMenuId,
-				{
-					wp_navigation_area: maybeNewAreaTermId,
-				}
-			);
-
-			// Persist the change.
-			await saveEditedEntityRecord(
-				'postType',
-				'wp_navigation',
-				navigationMenuId
-			);
-		};
-		if ( isEntityAvailable ) {
-			updateNavEntityArea( navigationAreaId );
-		}
+		// const updateNavEntityArea = async () => {
+		// 	const noTerms = [];
+		// 	// navigationAreaId is of type "number". Therefore
+		// 	// ID: 0 is used to represent a value of "none".
+		// 	const maybeNewAreaTermId =
+		// 		navigationAreaId > 0 ? [ navigationAreaId ] : noTerms;
+		// 	// Toggle the active navigaiton area term.
+		// 	await editEntityRecord(
+		// 		'postType',
+		// 		'wp_navigation',
+		// 		navigationMenuId,
+		// 		{
+		// 			wp_navigation_area: maybeNewAreaTermId,
+		// 		}
+		// 	);
+		// 	// Persist the change.
+		// 	await saveEditedEntityRecord(
+		// 		'postType',
+		// 		'wp_navigation',
+		// 		navigationMenuId
+		// 	);
+		// };
+		// if ( isEntityAvailable ) {
+		// 	updateNavEntityArea( navigationAreaId );
+		// }
 	}, [ navigationAreaId ] );
 
 	// If the block has inner blocks, but no menu id, this was an older
@@ -363,20 +374,18 @@ function Navigation( {
 						</PanelBody>
 					) }
 
-					{ !! hasResolvedAreas && (
-						<PanelBody title={ __( 'Navigation Area' ) }>
-							<NavigationAreaSelector
-								navigationAreaId={ navigationAreaId }
-								navigationAreas={ navigationAreas }
-								isRequestingAreas={ isRequestingAreas }
-								onSelect={ ( _id ) => {
-									setAttributes( {
-										navigationAreaId: _id,
-									} );
-								} }
-							/>
-						</PanelBody>
-					) }
+					<PanelBody title={ __( 'Navigation Area' ) }>
+						<NavigationAreaSelector
+							navigationAreaId={ navigationAreaId }
+							navigationAreas={ navigationAreas }
+							isRequestingAreas={ isRequestingAreas }
+							onSelect={ ( _id ) => {
+								setAttributes( {
+									navigationAreaId: _id,
+								} );
+							} }
+						/>
+					</PanelBody>
 
 					{ hasSubmenuIndicatorSetting && (
 						<PanelBody title={ __( 'Display' ) }>