Try single placeholder for Navigation block (#36023)

* Try single placeholder for Navigation block * Fix extra space caused by responsive container * Separate menus from classic menus and add labels. * Add popover prop. * Don't render responsive wrapper with placeholder. * Fix all pages button type logic. * Consolidate loading states and improve nesting.
WordPress · Nov 1, 2021 · 8709795 · 8709795
1 parent 0b609cf
commit 8709795
Show file tree

Hide file tree

Showing 4 changed files with 230 additions and 287 deletions.
diff --git a/packages/block-library/src/navigation/edit/index.js b/packages/block-library/src/navigation/edit/index.js
@@ -425,23 +425,27 @@ function Navigation( {
 							}
 						/>
 					) }
-					<ResponsiveWrapper
-						id={ clientId }
-						onToggle={ setResponsiveMenuVisibility }
-						isOpen={ isResponsiveMenuOpen }
-						isResponsive={ 'never' !== overlayMenu }
-						isHiddenByDefault={ 'always' === overlayMenu }
-					>
-						{ isEntityAvailable && (
-							<NavigationInnerBlocks
-								isVisible={ ! isPlaceholderShown }
-								clientId={ clientId }
-								appender={ CustomAppender }
-								hasCustomPlaceholder={ !! CustomPlaceholder }
-								orientation={ orientation }
-							/>
-						) }
-					</ResponsiveWrapper>
+					{ ! isPlaceholderShown && (
+						<ResponsiveWrapper
+							id={ clientId }
+							onToggle={ setResponsiveMenuVisibility }
+							isOpen={ isResponsiveMenuOpen }
+							isResponsive={ 'never' !== overlayMenu }
+							isHiddenByDefault={ 'always' === overlayMenu }
+						>
+							{ isEntityAvailable && (
+								<NavigationInnerBlocks
+									isVisible={ ! isPlaceholderShown }
+									clientId={ clientId }
+									appender={ CustomAppender }
+									hasCustomPlaceholder={
+										!! CustomPlaceholder
+									}
+									orientation={ orientation }
+								/>
+							) }
+						</ResponsiveWrapper>
+					) }
 				</nav>
 			</RecursionProvider>
 		</EntityProvider>

diff --git a/packages/block-library/src/navigation/edit/placeholder/create-inner-blocks-step.js b/packages/block-library/src/navigation/edit/placeholder/create-inner-blocks-step.js