Accurate sizes: Use block context approach #1625
Conversation
mukeshpanchal27
added
[Type] Enhancement
…ors' into update/use-filter-approach
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message. To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
Co-authored-by: Weston Ruter <[email protected]>
Co-authored-by: Weston Ruter <[email protected]>
| * @param array{ attrs?: array{ align?: string, width?: string } } $parsed_block The parsed block. | ||
| * @return string The updated block content. | ||
| * @param string|mixed $content The HTML content. | ||
| * @param string $context Optional. Additional context to pass to the filters. |
There was a problem hiding this comment.
| * @param string $context Optional. Additional context to pass to the filters. | |
| * @param string|null $context Optional. Additional context to pass to the filters. |
There was a problem hiding this comment.
Or per below:
| * @param string $context Optional. Additional context to pass to the filters. |
| */ | ||
| function auto_sizes_filter_image_tag( string $content, array $parsed_block ): string { | ||
| function auto_sizes_prime_attachment_caches( $content, string $context = null ): string { |
There was a problem hiding this comment.
| function auto_sizes_prime_attachment_caches( $content, string $context = null ): string { | |
| function auto_sizes_prime_attachment_caches( $content, ?string $context = null ): string { |
There was a problem hiding this comment.
Or per below:
| function auto_sizes_prime_attachment_caches( $content, string $context = null ): string { | |
| function auto_sizes_prime_attachment_caches( $content ): string { |
| if ( null === $context ) { | ||
| $context = current_filter(); | ||
| } |
There was a problem hiding this comment.
Perhaps my above comments should be adjusted to delete the $context param altogether because actually the variable isn't being used at all. So should it just be removed?
| if ( null === $context ) { | |
| $context = current_filter(); | |
| } | |
| if ( null === $context ) { | |
| $context = current_filter(); | |
| } |
There was a problem hiding this comment.
Also, as it stands right now, the 2nd parameter is never passed in anyway:
add_filter( 'the_content', 'auto_sizes_prime_attachment_caches', 6 );
| // Resize image width. | ||
| if ( isset( $parsed_block['attrs']['width'] ) ) { | ||
| $processor->set_attribute( 'data-resize-width', $parsed_block['attrs']['width'] ); | ||
| if ( preg_match( '/wp-image-([0-9]+)/i', $class, $class_id ) === 1 ) { |
There was a problem hiding this comment.
This should ensure that integers starting at 1 are only considered and that the class wp-image-123 class is only considered, not my-wp-image-123. Granted, this is very unlikely. Also, there doesn't seem to be a need to do a case-insensitive check.
| if ( preg_match( '/wp-image-([0-9]+)/i', $class, $class_id ) === 1 ) { | |
| if ( preg_match( '/(?:^|\s)wp-image-([1-9][0-9]*)(?:\s|$)/', $class, $class_id ) === 1 ) { |
| if ( isset( $parsed_block['attrs']['width'] ) ) { | ||
| $processor->set_attribute( 'data-resize-width', $parsed_block['attrs']['width'] ); | ||
| if ( preg_match( '/wp-image-([0-9]+)/i', $class, $class_id ) === 1 ) { | ||
| $attachment_id = absint( $class_id[1] ); |
There was a problem hiding this comment.
Since a negative will never be encountered anyway, seems we can just cast this here:
| $attachment_id = absint( $class_id[1] ); | |
| $attachment_id = (int) $class_id[1]; |
Summary
These PR updates the existing code to use the new block context approach that we discussed in #1511 (comment)