Issue-64: extract pre_render_block logic #78
Merged
Conversation
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
kevinfodness
approved these changes
Apr 30, 2024
| @@ -27,36 +32,10 @@ function wp_conditional_blocks_is_false_block_init(): void { | |||
| * Short-circuit the display of blocks inside if the outer condition isn't false. | |||
| * | |||
| * @param string|null $pre_render The pre-rendered content. Default null. | |||
| * @param WP_Block $parsed_block The block being rendered. | |||
| * @param mixed[] $parsed_block The block being rendered. | |||
There was a problem hiding this comment.
Can $parsed_block contain other items in the array besides WP_Block objects? What are they?
There was a problem hiding this comment.
Parsed block is an array containing (at times) the blockName, attrs, innerBlocks, innerHTML, and innerContent of the block we are rendering. Its never a WP_Block object, as far as I can tell.
Comment on lines
+21
to
+25
| if ( ! isset( $parsed_block['blockName'] ) ) { | ||
| return false; | ||
| } | ||
|
|
||
| return $block_name === $parsed_block['blockName']; |
There was a problem hiding this comment.
Suggested change
| if ( ! isset( $parsed_block['blockName'] ) ) { | |
| return false; | |
| } | |
| return $block_name === $parsed_block['blockName']; | |
| return isset( $parsed_block['blockName'] ) && $block_name === $parsed_block['blockName']; |
Comment on lines
+37
to
+41
| if ( ! ( $parent_block instanceof WP_Block ) ) { | ||
| return false; | ||
| } | ||
|
|
||
| return is_active_block( $block_name, $parent_block->parsed_block ); |
There was a problem hiding this comment.
Suggested change
| if ( ! ( $parent_block instanceof WP_Block ) ) { | |
| return false; | |
| } | |
| return is_active_block( $block_name, $parent_block->parsed_block ); | |
| return $parent_block instanceof WP_Block && is_active_block( $block_name, $parent_block->parsed_block ); |
| $context['postId'] = $parent_block->context['postId']; | ||
| } | ||
|
|
||
| if ( wp_conditional_blocks_condition_block_result( $parent_block->parsed_block, $context ) !== $bool ) { // @phpstan-ignore-line |
There was a problem hiding this comment.
Why is PHPStan unhappy here?
There was a problem hiding this comment.
Its not able to tell that $parent_block is an object because the check happens in a function.
anubisthejackle
deleted the
feature/issue-64/extract-pre-render-block-logic
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
This pull request addresses the issue described in #64. It aims to refactor the pre_render_block filter logic used in both is-false and is-true blocks into reusable functions to adhere to the DRY (Don't Repeat Yourself) principle.
Fixes #64
Changes
Testing
Documentation
Notes