Fix submenu layout in navigation page list. (#34342)

* Fix submenu layout in navigation page list. * Update parent status before component renders.
WordPress · Aug 30, 2021 · ec62e53 · ec62e53
1 parent b4e74b7
commit ec62e53
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/packages/block-library/src/page-list/edit.js b/packages/block-library/src/page-list/edit.js
@@ -2,7 +2,6 @@
  * External dependencies
  */
 import classnames from 'classnames';
-import { isEmpty } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -70,11 +69,6 @@ export default function PageListEdit( {
 		context.customOverlayBackgroundColor,
 	] );
 
-	useEffect( () => {
-		const isNavigationChild = isEmpty( context ) ? false : true;
-		setAttributes( { isNavigationChild } );
-	}, [] );
-
 	const { textColor, backgroundColor, showSubmenuIcon, style } =
 		context || {};
 
@@ -105,6 +99,10 @@ export default function PageListEdit( {
 		[ clientId ]
 	);
 
+	useEffect( () => {
+		setAttributes( { isNavigationChild: isParentNavigation } );
+	}, [] );
+
 	useEffect( () => {
 		if ( isParentNavigation ) {
 			apiFetch( {
@@ -127,6 +125,12 @@ export default function PageListEdit( {
 	const openModal = () => setOpen( true );
 	const closeModal = () => setOpen( false );
 
+	// Update parent status before component first renders.
+	const attributesWithParentStatus = {
+		...attributes,
+		isNavigationChild: isParentNavigation,
+	};
+
 	return (
 		<>
 			{ allowConvertToLinks && (
@@ -145,7 +149,7 @@ export default function PageListEdit( {
 			<div { ...blockProps }>
 				<ServerSideRender
 					block="core/page-list"
-					attributes={ attributes }
+					attributes={ attributesWithParentStatus }
 				/>
 			</div>
 		</>