Skip to content

Navigation Block: Add submenu chevron w/ setting #19601

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
merged 17 commits into from
Jan 21, 2020
Merged

Navigation Block: Add submenu chevron w/ setting #19601

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
31c5008
Initialize setting in the nav block settings panel
WunderBart Jan 13, 2020
97c2675
Add submenu icon
WunderBart Jan 16, 2020
dec135b
Register "showSubmenuIcon" attributes
WunderBart Jan 16, 2020
2799273
Add submenu icon to front-end of the page
WunderBart Jan 16, 2020
1493b70
Update submenu icon setting description
WunderBart Jan 16, 2020
3511288
Don't use <span> for RichText element
WunderBart Jan 16, 2020
de772cb
Isolate NavigationLink icons
WunderBart Jan 16, 2020
b3ffd0c
Clean up a little
WunderBart Jan 16, 2020
c8092b8
Use <span> for NavigationLink contents
WunderBart Jan 17, 2020
b7bab04
Rename `$level_zero` to `$is_level_zero`
WunderBart Jan 21, 2020
41b1b49
Add missing spaces
WunderBart Jan 21, 2020
cfdf2ac
Update submenu icon selector in style.scss
WunderBart Jan 21, 2020
69778ae
Add comment about span-wrapping
WunderBart Jan 21, 2020
22b1f8c
Fix phpcs errors
WunderBart Jan 21, 2020
392fa7e
Remove unused styles
WunderBart Jan 21, 2020
f562b8a
Fix failing e2e tests
WunderBart Jan 21, 2020
5535d9b
Update failing snapshots
WunderBart Jan 21, 2020
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
Fix phpcs errors
  • Loading branch information
@WunderBart
WunderBart committed Jan 21, 2020
commit 22b1f8c74ae4280cb4259d386b8dc9feb1f3e1bc
17 changes: 9 additions & 8 deletions packages/block-library/src/navigation/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ function( $block ) {
return $blocks;
}

/*
/**
* Returns the top-level submenu SVG chevron icon.
*
* @return string
Expand Down Expand Up @@ -161,9 +161,10 @@ function render_block_navigation( $attributes, $content, $block ) {
/**
* Walks the inner block structure and returns an HTML list for it.
*
* @param array $block The block.
* @param array $colors Contains inline styles and CSS classes to apply to navigation item.
* @param array $font_sizes Contains inline styles and CSS classes to apply to navigation item.
* @param array $attributes The Navigation block attributes.
* @param array $block The NavigationItem block.
* @param array $colors Contains inline styles and CSS classes to apply to navigation item.
* @param array $font_sizes Contains inline styles and CSS classes to apply to navigation item.
* @param bool $is_level_zero True whether is main menu (level zero). Otherwise, False.
*
* @return string Returns an HTML list from innerBlocks.
Expand Down Expand Up @@ -229,7 +230,7 @@ function build_navigation_html( $attributes, $block, $colors, $font_sizes, $is_l

$html .= '</span>';

// Append submenu icon to top-level item
// Append submenu icon to top-level item.
if ( $attributes['showSubmenuIcon'] && $is_level_zero && $has_submenu ) {
$html .= '<span class="wp-block-navigation-link__submenu-icon">' . render_submenu_icon() . '</span>';
}
Expand Down Expand Up @@ -282,10 +283,10 @@ function register_block_core_navigation() {
'itemsJustification' => array(
'type' => 'string',
),
'showSubmenuIcon' => array(
'type' => 'boolean',
'showSubmenuIcon' => array(
'type' => 'boolean',
'default' => false,
)
),
),

'render_callback' => 'render_block_navigation',
Expand Down