Skip to content
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.

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

Block API: Block Context: Filter content, prepare attributes at render, pass block to render #21925

Merged
merged 18 commits into from
May 5, 2020
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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
171 changes: 171 additions & 0 deletions lib/class-wp-block-list.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
<?php
/**
* Blocks API: WP_Block_List class
*
* @package Gutenberg
*/

/**
* Class representing a list of block instances.
*/
class WP_Block_List implements Iterator, ArrayAccess {

/**
* Original array of parsed block data.
*
* @var array|WP_Block[]
* @access protected
*/
protected $blocks;

/**
* All available context of the current hierarchy.
*
* @var array
* @access protected
*/
protected $available_context;

/**
* Block type registry to use in constructing block instances.
*
* @var WP_Block_Type_Registry
* @access protected
*/
protected $registry;

/**
* Constructor.
*
* Populates object properties from the provided block instance argument.
*
* @param array|WP_Block[] $blocks Array of parsed block data, or block instances.
* @param array $available_context Optional array of ancestry context values.
* @param WP_Block_Type_Registry $registry Optional block type registry.
*/
public function __construct( $blocks, $available_context = array(), $registry = null ) {
$this->blocks = $blocks;
$this->available_context = $available_context;
$this->registry = is_null( $registry ) ?
WP_Block_Type_Registry::get_instance() :
$registry;
}

/*
* ArrayAccess interface methods.
*/

/**
* Returns true if a block exists by the specified block index, or false
* otherwise.
*
* @link https://www.php.net/manual/en/arrayaccess.offsetexists.php
*
* @param string $index Index of block to check.
*
* @return bool Whether block exists.
*/
public function offsetExists( $index ) {
return isset( $this->blocks[ $index ] );
}

/**
* Returns the value by the specified block index.
*
* @link https://www.php.net/manual/en/arrayaccess.offsetget.php
*
* @param string $index Index of block value to retrieve.
*
* @return mixed|null Block value if exists, or null.
*/
public function offsetGet( $index ) {
$block = $this->blocks[ $index ];

if ( isset( $block ) && is_array( $block ) ) {
$block = new WP_Block( $block, $this->available_context, $this->registry );
aduth marked this conversation as resolved.
Show resolved Hide resolved
}

return $block;
}

/**
* Assign a block value by the specified block index.
*
* @link https://www.php.net/manual/en/arrayaccess.offsetset.php
*
* @param string $index Index of block value to set.
epiqueras marked this conversation as resolved.
Show resolved Hide resolved
* @param mixed $value Block value.
*/
public function offsetSet( $index, $value ) {
if ( is_null( $index ) ) {
$this->blocks[] = $value;
} else {
$this->blocks[ $index ] = $value;
}
}

/**
* Unset a block.
*
* @link https://www.php.net/manual/en/arrayaccess.offsetunset.php
*
* @param string $index Index of block value to unset.
*/
public function offsetUnset( $index ) {
unset( $this->blocks[ $index ] );
}

/*
* Iterator interface methods.
*/

/**
* Rewinds back to the first element of the Iterator.
*
* @link https://www.php.net/manual/en/iterator.rewind.php
*/
public function rewind() {
reset( $this->blocks );
}

/**
* Returns the current element of the block list.
*
* @link https://www.php.net/manual/en/iterator.current.php
*
* @return mixed Current element.
*/
public function current() {
return $this->offsetGet( $this->key() );
}

/**
* Returns the key of the current element of the block list.
*
* @link https://www.php.net/manual/en/iterator.key.php
*
* @return mixed Key of the current element.
*/
public function key() {
return key( $this->blocks );
}

/**
* Moves the current position of the block list to the next element.
*
* @link https://www.php.net/manual/en/iterator.next.php
*/
public function next() {
next( $this->blocks );
}

/**
* Checks if current position is valid.
*
* @link https://www.php.net/manual/en/iterator.valid.php
*/
public function valid() {
return null !== key( $this->blocks );
}

}
74 changes: 44 additions & 30 deletions lib/class-wp-block.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
*/
class WP_Block {

/**
* Original parsed array representation of block.
*
* @var array
*/
public $parsed_block;

/**
* Name of block.
*
Expand Down Expand Up @@ -41,13 +48,6 @@ class WP_Block {
*/
protected $available_context;

/**
* Block attribute values.
*
* @var array
*/
public $attributes = array();

/**
* List of inner blocks (of this same class)
*
Expand Down Expand Up @@ -94,22 +94,15 @@ class WP_Block {
* @param WP_Block_Type_Registry $registry Optional block type registry.
*/
public function __construct( $block, $available_context = array(), $registry = null ) {
$this->name = $block['blockName'];
$this->parsed_block = $block;
$this->name = $block['blockName'];

if ( is_null( $registry ) ) {
$registry = WP_Block_Type_Registry::get_instance();
}

$this->block_type = $registry->get_registered( $this->name );

if ( ! empty( $block['attrs'] ) ) {
$this->attributes = $block['attrs'];
}

if ( ! is_null( $this->block_type ) ) {
$this->attributes = $this->block_type->prepare_attributes_for_render( $this->attributes );
}

$this->available_context = $available_context;

if ( ! empty( $this->block_type->context ) ) {
Expand All @@ -133,12 +126,7 @@ public function __construct( $block, $available_context = array(), $registry = n
}
/* phpcs:enable */

$this->inner_blocks = array_map(
function( $inner_block ) use ( $child_context, $registry ) {
return new WP_Block( $inner_block, $child_context, $registry );
},
$block['innerBlocks']
);
$this->inner_blocks = new WP_Block_List( $block['innerBlocks'], $child_context, $registry );
}

if ( ! empty( $block['innerHTML'] ) ) {
Expand All @@ -150,13 +138,41 @@ function( $inner_block ) use ( $child_context, $registry ) {
}
}

/**
* Returns a value from an inaccessible property.
*
* This is used to lazily initialize the `attributes` property of a block,
* such that it is only prepared with default attributes at the time that
* the property is accessed. For all other inaccessible properties, a `null`
* value is returned.
*
* @param string $name Property name.
*
* @return array|null Prepared attributes, or null.
*/
public function __get( $name ) {
if ( 'attributes' === $name && ! isset( $this->attributes ) ) {
aduth marked this conversation as resolved.
Show resolved Hide resolved
$this->attributes = isset( $this->parsed_block['attrs'] ) ?
$this->parsed_block['attrs'] :
array();

if ( ! is_null( $this->block_type ) ) {
$this->attributes = $this->block_type->prepare_attributes_for_render( $this->attributes );
}

return $this->attributes;
}

return null;
}

/**
* Generates the render output for the block.
*
* @return string Rendered block output.
*/
public function render() {
global $post, $_experimental_block;
global $post;

$is_dynamic = $this->name && null !== $this->block_type && $this->block_type->is_dynamic();
$block_content = '';
Expand All @@ -169,15 +185,13 @@ public function render() {
}

if ( $is_dynamic ) {
$global_post = $post;
$global_block = $_experimental_block;
$_experimental_block = $this;
$block_content = (string) call_user_func( $this->block_type->render_callback, $this->attributes, $block_content );
$_experimental_block = $global_block;
$post = $global_post;
$global_post = $post;
$block_content = (string) call_user_func( $this->block_type->render_callback, $this->attributes, $block_content, $this );
$post = $global_post;
}

return $block_content;
/** This filter is documented in src/wp-includes/blocks.php */
return apply_filters( 'render_block', $block_content, $this->parsed_block );
}

}
33 changes: 33 additions & 0 deletions lib/compat.php
Original file line number Diff line number Diff line change
Expand Up @@ -175,3 +175,36 @@ function gutenberg_get_post_from_context() {
}
return get_post();
}

/**
* Shim that hooks into `pre_render_block` so as to override `render_block` with
* a function that assigns block context.
*
* This can be removed when plugin support requires WordPress 5.5.0+.
*
* @see https://core.trac.wordpress.org/ticket/49927
*
* @param string|null $pre_render The pre-rendered content. Defaults to null.
* @param array $parsed_block The parsed block being rendered.
*
* @return string String of rendered HTML.
*/
function gutenberg_render_block_with_assigned_block_context( $pre_render, $parsed_block ) {
global $post;

// If a non-null value is provided, a filter has run at an earlier priority
// and has already handled custom rendering and should take precedence.
if ( null !== $pre_render ) {
return $pre_render;
}

$source_block = $parsed_block;

/** This filter is documented in src/wp-includes/blocks.php */
$parsed_block = apply_filters( 'render_block_data', $parsed_block, $source_block );
$context = array( 'postId' => $post->ID );
aduth marked this conversation as resolved.
Show resolved Hide resolved
$block = new WP_Block( $parsed_block, $context );

return $block->render();
}
add_filter( 'pre_render_block', 'gutenberg_render_block_with_assigned_block_context', 9, 2 );
4 changes: 4 additions & 0 deletions lib/load.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ function gutenberg_is_experiment_enabled( $name ) {
require dirname( __FILE__ ) . '/class-wp-block.php';
}

if ( ! class_exists( 'WP_Block_List' ) ) {
require dirname( __FILE__ ) . '/class-wp-block-list.php';
}

require dirname( __FILE__ ) . '/compat.php';

require dirname( __FILE__ ) . '/blocks.php';
Expand Down
11 changes: 7 additions & 4 deletions packages/block-library/src/post-title/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,18 @@
/**
* Renders the `core/post-title` block on the server.
*
* @param array $attributes Block attributes.
* @param string $content Block default content.
* @param WP_Block $block Block instance.
*
* @return string Returns the filtered post title for the current post wrapped inside "h1" tags.
*/
function render_block_core_post_title() {
$post = gutenberg_get_post_from_context();
if ( ! $post ) {
function render_block_core_post_title( $attributes, $content, $block ) {
if ( ! isset( $block->context['postId'] ) ) {
return '';
}

return '<h1>' . get_the_title( $post ) . '</h1>';
return '<h1>' . get_the_title( $block->context['postId'] ) . '</h1>';
}

/**
Expand Down
11 changes: 10 additions & 1 deletion packages/e2e-tests/plugins/block-context.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,16 @@ function gutenberg_test_register_context_blocks() {
register_block_type(
'gutenberg/test-context-consumer',
array(
'context' => array( 'gutenberg/recordId' ),
'context' => array( 'gutenberg/recordId' ),
'render_callback' => function( $attributes, $content, $block ) {
$record_id = $block->context['gutenberg/recordId'];

if ( ! is_int( $record_id ) ) {
throw new Exception( 'Expected numeric recordId' );
}

return 'The record ID is: ' . filter_var( $record_id, FILTER_VALIDATE_INT );
},
)
);
}
Expand Down
Loading