[Navigation] Makes URL dynamic for pages and posts #21050
+83
−52
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,9 +12,6 @@ | |
| "type": "boolean", | ||
| "default": false | ||
| }, | ||
| "description": { | ||
| "type": "string" | ||
| }, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -94,6 +94,22 @@ function block_core_navigation_link_render_submenu_icon() { | |||
| return '<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" transform="rotate(90)"><path d="M8 5v14l11-7z"/><path d="M0 0h24v24H0z" fill="none"/></svg>'; | ||||
| } | ||||
|
|
||||
| /** | ||||
| * Returns the link for the one nav iteem or false | ||||
| * | ||||
| * @param array $attrs The Navigation Link block attributes. | ||||
| * | ||||
| * @return string|bool Returns the determined link or false. | ||||
| */ | ||||
| function block_core_navigation_link_get_url( $attrs ) { | ||||
| if ( isset( $attrs['id'] ) ) { | ||||
| return esc_url( get_permalink( $attrs['id'] ) ); | ||||
| } elseif ( isset( $attrs['url'] ) ) { | ||||
| return esc_url( $attrs['url'] ); | ||||
| } | ||||
| return false; | ||||
|
There was a problem hiding this comment.
Suggested change
|
||||
| } | ||||
|
|
||||
| /** | ||||
| * Renders the `core/navigation-link` block. | ||||
| * | ||||
|
|
@@ -128,16 +144,23 @@ function render_block_core_navigation_link( $attributes, $content, $block ) { | |||
| $css_classes .= ' ' . $class_name; | ||||
| }; | ||||
|
|
||||
| $item_url = block_core_navigation_link_get_url( $attributes ); | ||||
| $item_tag = $item_url ? 'a' : 'span'; | ||||
|
|
||||
| $html = '<li class="' . esc_attr( $css_classes . ( $has_submenu ? ' has-child' : '' ) ) . | ||||
| ( $is_active ? ' current-menu-item' : '' ) . '"' . $style_attribute . '>' . | ||||
| '<' . $item_tag . ' class="wp-block-navigation-link__content"'; | ||||
|
|
||||
| // Start appending HTML attributes to anchor tag. | ||||
| if ( $item_url ) { | ||||
| $html .= ' href="' . esc_url( $item_url ) . '"'; | ||||
| } | ||||
|
|
||||
| if ( | ||||
| $item_url && | ||||
| isset( $attributes['opensInNewTab'] ) && | ||||
| true === $attributes['opensInNewTab'] | ||||
| ) { | ||||
| $html .= ' target="_blank" '; | ||||
| } | ||||
| // End appending HTML attributes to anchor tag. | ||||
|
|
@@ -171,10 +194,10 @@ function render_block_core_navigation_link( $attributes, $content, $block ) { | |||
|
|
||||
| $html .= '</span>'; | ||||
|
|
||||
| $html .= '</' . $item_tag . '>'; | ||||
| // End anchor tag content. | ||||
|
|
||||
| if ( isset( $block->context['showSubmenuIcon'] ) && $block->context['showSubmenuIcon'] && $has_submenu ) { | ||||
|
There was a problem hiding this comment. This change seems unrelated. Is it needed? There was a problem hiding this comment. It was a suggestion from @adamziel to make sure we don't get PHP Notices sometimes. |
||||
| // The submenu icon can be hidden by a CSS rule on the Navigation Block. | ||||
| $html .= '<span class="wp-block-navigation-link__submenu-icon">' . block_core_navigation_link_render_submenu_icon() . '</span>'; | ||||
| } | ||||
|
|
||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this part probably needs some design influence, would be good to address as a follow-up.
