Skip to content

Change Navigation block markup on front end only #30551

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
draganescu merged 6 commits into from
Jul 7, 2021
Merged

Change Navigation block markup on front end only #30551

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eeb888f
Change markup on front end
tellthemachines Apr 7, 2021
9661375
Fix rendering issue with responsive wrapper
tellthemachines May 28, 2021
2ecb7a6
Use divs in Nav link; remove Spacer from lists
tellthemachines Jun 24, 2021
221bdca
lint php
tellthemachines Jun 24, 2021
877162b
Update e2e test selectors
tellthemachines Jun 28, 2021
3e7d0fb
Update Home Link semantics
tellthemachines Jun 29, 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
Fix rendering issue with responsive wrapper
  • Loading branch information
@tellthemachines
tellthemachines committed Jun 24, 2021
commit 96613753f217afe086078b652c7b8f359eadc05c
6 changes: 4 additions & 2 deletions packages/block-library/src/navigation/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,15 @@ function Navigation( {
</PanelBody>
) }
</InspectorControls>
<nav { ...innerBlocksProps }>
<nav { ...blockProps }>
<ResponsiveWrapper
id={ clientId }
onToggle={ setResponsiveMenuVisibility }
isOpen={ isResponsiveMenuOpen }
isResponsive={ attributes.isResponsive }
></ResponsiveWrapper>
>
<div { ...innerBlocksProps }></div>
</ResponsiveWrapper>
</nav>
</>
);
Expand Down
4 changes: 2 additions & 2 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 @@ -202,7 +202,7 @@ function render_block_core_navigation( $attributes, $content, $block ) {
// return early if they don't.
if ( ! isset( $attributes['isResponsive'] ) || false === $attributes['isResponsive'] ) {
return sprintf(
'<nav %1$s><ul class="wp-block-navigation__container">%2$s</ul></nav>',
'<nav %1$s>%2$s</nav>',
$wrapper_attributes,
$inner_blocks_html
);
Expand All @@ -215,7 +215,7 @@ function render_block_core_navigation( $attributes, $content, $block ) {
<div class="wp-block-navigation__responsive-dialog" role="dialog" aria-modal="true" aria-labelledby="modal-%1$s-title" >
<button aria-label="%4$s" data-micromodal-close class="wp-block-navigation__responsive-container-close"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" role="img" aria-hidden="true" focusable="false"><path d="M13 11.8l6.1-6.3-1-1-6.1 6.2-6.1-6.2-1 1 6.1 6.3-6.5 6.7 1 1 6.5-6.6 6.5 6.6 1-1z"></path></svg></button>
<div class="wp-block-navigation__responsive-container-content" id="modal-%1$s-content">
<ul class="wp-block-navigation__container">%2$s</ul>
%2$s
</div>
</div>
</div>
Expand Down