Skip to content

Use first non-empty Nav post as primary fallback for Nav block #36740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
getdave merged 16 commits into from
Nov 24, 2021
Merged

Use first non-empty Nav post as primary fallback for Nav block #36740

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
33995bc
Use non-empty Nav post as fallback
getdave Nov 22, 2021
3a4e549
Remove code duplication
getdave Nov 23, 2021
098f453
Extract finding non empty nav block to function
getdave Nov 23, 2021
d466c2b
Extract process of getting fallback to dedicated function
getdave Nov 23, 2021
5e75bb5
Apply block prefix to functions
getdave Nov 23, 2021
d952588
Add additional safety check around parsing Nav blocks
getdave Nov 23, 2021
d15df93
Extract function for removing null blocks and apply
getdave Nov 23, 2021
cdaaf5e
Check for empty parsed Nav blocks
getdave Nov 23, 2021
d6d1e25
Improve function comment
getdave Nov 23, 2021
2831ff3
Amend ordering params to approximate current wp_nav_menus behaviour
getdave Nov 23, 2021
5f8263b
Fetch Nav posts in query rather than filtering in memory
getdave Nov 24, 2021
7ff837e
Improve comments
getdave Nov 24, 2021
81bf76a
Spacing
getdave Nov 24, 2021
ead6d3c
Limit Nav Posts query to a single item
getdave Nov 24, 2021
b0c80aa
Fix linting
getdave Nov 24, 2021
4dbb220
Improve function naming
getdave Nov 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Check for empty parsed Nav blocks
  • Loading branch information
@getdave
getdave committed Nov 23, 2021
commit cdaaf5e60e992d1a206b3deab057087ddcdb33b1
6 changes: 5 additions & 1 deletion packages/block-library/src/navigation/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,11 @@ function block_core_navigation_get_fallback() {

// Prefer using the first non-empty Navigation as fallback if available.
if ( $navigation_post ) {
$fallback_blocks = block_core_navigation_normalize_parsed_blocks( parse_blocks( $navigation_post->post_content ) );
$maybe_fallback = block_core_navigation_normalize_parsed_blocks( parse_blocks( $navigation_post->post_content ) );

// Normalizing blocks may result in an empty array of blocks if they were all `null` blocks.
// In this case default to the (Page List) fallback.
$fallback_blocks = ! empty( $maybe_fallback ) ? $maybe_fallback : $fallback_blocks;
}

return $fallback_blocks;
Expand Down