-
Notifications
You must be signed in to change notification settings - Fork 4.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix applying bindings or pattern overrides to button blocks with empt…
…y text (#62220) * Dynamically check button text and avoid rendering a button when empty * Handle both anchor and button tags * Fix lint issues * Address review feedback * Simplify checks for empty content * Check for comment tokens * Update native test snapshots * Update initial HTML native test snippet ---- Co-authored-by: talldan <talldanwp@git.wordpress.org> Co-authored-by: dmsnell <dmsnell@git.wordpress.org> Co-authored-by: kevin940726 <kevin940726@git.wordpress.org> Co-authored-by: SantosGuillamot <santosguillamot@git.wordpress.org>
- Loading branch information
5 people
authored
Jun 10, 2024
1 parent
d751809
commit 9c3dabc
Showing
5 changed files
with
117 additions
and
19 deletions.
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 |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| <?php | ||
| /** | ||
| * Server-side rendering of the `core/button` block. | ||
| * | ||
| * @package WordPress | ||
| */ | ||
|
|
||
| /** | ||
| * Renders the `core/button` block on the server, | ||
| * | ||
| * @since 6.6.0 | ||
| * | ||
| * @param array $attributes The block attributes. | ||
| * @param string $content The block content. | ||
| * @param WP_Block $block The block object. | ||
| * | ||
| * @return string The block content. | ||
| */ | ||
| function render_block_core_button( $attributes, $content ) { | ||
| $p = new WP_HTML_Tag_Processor( $content ); | ||
|
|
||
| /* | ||
| * The button block can render an `<a>` or `<button>` and also has a | ||
| * `<div>` wrapper. Find the a or button tag. | ||
| */ | ||
| $tag = null; | ||
| while ( $p->next_tag() ) { | ||
| $tag = $p->get_tag(); | ||
| if ( 'A' === $tag || 'BUTTON' === $tag ) { | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| /* | ||
| * If this happens, the likelihood is there's no block content, | ||
| * or the block has been modified by a plugin. | ||
| */ | ||
| if ( null === $tag ) { | ||
| return $content; | ||
| } | ||
|
|
||
| // If the next token is the closing tag, the button is empty. | ||
| $is_empty = true; | ||
| while ( $p->next_token() && $tag !== $p->get_token_name() && $is_empty ) { | ||
| if ( '#comment' !== $p->get_token_type() ) { | ||
| /** | ||
| * Anything else implies this is not empty. | ||
| * This might include any text content (including a space), | ||
| * inline images or other HTML. | ||
| */ | ||
| $is_empty = false; | ||
| } | ||
| } | ||
|
|
||
| /* | ||
| * When there's no text, render nothing for the block. | ||
| * See https://github.com/WordPress/gutenberg/issues/17221 for the | ||
| * reasoning behind this. | ||
| */ | ||
| if ( $is_empty ) { | ||
| return ''; | ||
| } | ||
|
|
||
| return $content; | ||
| } | ||
|
|
||
| /** | ||
| * Registers the `core/button` block on server. | ||
| * | ||
| * @since 6.6.0 | ||
| */ | ||
| function register_block_core_button() { | ||
| register_block_type_from_metadata( | ||
| __DIR__ . '/button', | ||
| array( | ||
| 'render_callback' => 'render_block_core_button', | ||
| ) | ||
| ); | ||
| } | ||
| add_action( 'init', 'register_block_core_button' ); |
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
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
9c3dabcThere 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.
Flaky tests detected in 9c3dabc.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.
🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/9445595056
📝 Reported issues:
/test/e2e/specs/site-editor/dataviews-list-layout-keyboard.spec.js/test/e2e/specs/site-editor/command-center.spec.js