Skip to content

Test phpcs #53

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

Draft
mukeshpanchal27 wants to merge 3 commits into
base: trunk
Choose a base branch
from
Draft

Test phpcs #53

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5ed201
Test phpcs
mukeshpanchal27 Oct 14, 2024
e4d2a95
Update class-wp-block.php
mukeshpanchal27 Oct 16, 2024
4456c24
Apply suggestions from code review
mukeshpanchal27 Oct 16, 2024
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
73 changes: 62 additions & 11 deletions src/wp-includes/class-wp-block.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class WP_Block {
* @var array
* @access protected
*/
protected $available_context;
protected $available_context = array();

/**
* Block type registry.
Expand Down Expand Up @@ -140,6 +140,33 @@ public function __construct( $block, $available_context = array(), $registry = n

$this->available_context = $available_context;

$this->refresh_context_dependents();
$this->refresh_parsed_block_dependents();
}

/**
* Updates the context for the current block and its inner blocks.
*
* This method updates the block's `context` property by merging the available context from ancestor blocks
* with the block's own context values. It removes specific context keys (`postId` and `postType`) that should
* not be carried over. The block only consumes the context keys specified in its registered block type (`uses_context`).
*
* After updating its own context, the method also updates the context of inner blocks, if any, by passing down
* any context values the block provides (`provides_context`).
*
* If the block has inner blocks, the method recursively processes them by creating new instances of `WP_Block`
* for each inner block and updating their context based on the block's `provides_context` property.
*
* @since 6.7.0
*/
public function refresh_context_dependents() {
$this->context = $this->available_context;

// Remove "postId" and "postType" keys.
if ( isset( $this->context['postId'] ) || isset( $this->context['postType'] ) ) {
unset( $this->context['postId'], $this->context['postType'] );
}

if ( ! empty( $this->block_type->uses_context ) ) {
foreach ( $this->block_type->uses_context as $context_name ) {
if ( array_key_exists( $context_name, $this->available_context ) ) {
Expand All @@ -148,26 +175,40 @@ public function __construct( $block, $available_context = array(), $registry = n
}
}

if ( ! empty( $block['innerBlocks'] ) ) {
$child_context = $this->available_context;

if ( ! empty( $this->parsed_block['innerBlocks'] ) ) {
if ( ! empty( $this->block_type->provides_context ) ) {
foreach ( $this->block_type->provides_context as $context_name => $attribute_name ) {
if ( array_key_exists( $attribute_name, $this->attributes ) ) {
$child_context[ $context_name ] = $this->attributes[ $attribute_name ];
$this->available_context[ $context_name ] = $this->attributes[ $attribute_name ];
}
}
}
}
}

$this->inner_blocks = new WP_Block_List( $block['innerBlocks'], $child_context, $registry );
/**
* Updates the parsed block content for the current block and its inner blocks.
*
* This method sets the `inner_html` and `inner_content` properties of the block based on the parsed
* block content provided during initialization. It ensures that the block instance reflects the
* most up-to-date content for both the inner HTML and any string fragments around inner blocks.
*
* If the block has inner blocks, this method initializes a new `WP_Block_List` for them, ensuring the
* correct content and context are updated for each nested block.
*
* @since 6.7.0
*/
public function refresh_parsed_block_dependents() {
if ( ! empty( $this->parsed_block['innerBlocks'] ) ) {
$this->inner_blocks = new WP_Block_List( $this->parsed_block['innerBlocks'], $this->available_context, $this->registry );
}

if ( ! empty( $block['innerHTML'] ) ) {
$this->inner_html = $block['innerHTML'];
if ( ! empty( $this->parsed_block['innerHTML'] ) ) {
$this->inner_html = $this->parsed_block['innerHTML'];
}

if ( ! empty( $block['innerContent'] ) ) {
$this->inner_content = $block['innerContent'];
if ( ! empty( $this->parsed_block['innerContent'] ) ) {
$this->inner_content = $this->parsed_block['innerContent'];
}
}

Expand Down Expand Up @@ -506,14 +547,24 @@ public function render( $options = array() ) {
if ( ! is_null( $pre_render ) ) {
$block_content .= $pre_render;
} else {
$source_block = $inner_block->parsed_block;
$source_block = $inner_block->parsed_block;
$inner_block_context = $inner_block->context;

/** This filter is documented in wp-includes/blocks.php */
$inner_block->parsed_block = apply_filters( 'render_block_data', $inner_block->parsed_block, $source_block, $parent_block );

/** This filter is documented in wp-includes/blocks.php */
$inner_block->context = apply_filters( 'render_block_context', $inner_block->context, $inner_block->parsed_block, $parent_block );

if ( $inner_block->context !== $inner_block_context ) {
$inner_block->available_context = array_merge( $this->available_context, $inner_block->context );
$inner_block->refresh_context_dependents();
}

if ( $inner_block->parsed_block !== $source_block ) {
$inner_block->refresh_parsed_block_dependents();
}

$block_content .= $inner_block->render();
}

Expand Down