IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Block Editor: Upgrade @WordPress packages to the latest versions.

Browse Source 
Updated packages:

- @wordpress/annotations@1.0.5
- @wordpress/api-fetch@2.2.7
- @wordpress/block-library@2.2.12
- @wordpress/block-serialization-default-parser@2.0.3
- @wordpress/blocks@6.0.5
- @wordpress/components@7.0.5
- @wordpress/core-data@2.0.16
- @wordpress/data@4.2.0
- @wordpress/deprecated@2.0.4
- @wordpress/dom@2.0.8
- @wordpress/edit-post@3.1.7
- @wordpress/editor@9.0.7
- @wordpress/format-library@1.2.10
- @wordpress/hooks@2.0.4
- @wordpress/list-reusable-blocks@1.1.18
- @wordpress/notices@1.1.2
- @wordpress/nux@3.0.6
- @wordpress/plugins@2.0.10
- @wordpress/rich-text@3.0.4
- @wordpress/url@2.3.3
- @wordpress/viewport@2.1.0

Props: youknowriad, gziolo, desrosj.

Fixes #45814.
Built from https://develop.svn.wordpress.org/trunk@44389


git-svn-id: http://core.svn.wordpress.org/trunk@44219 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
desrosj
2019-01-04 19:38:57 +00:00
parent 8ac2091f5d
commit 0ee1a0e4e1
37 changed files with 601 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
wp-includes/class-wp-block-parser.php
View File

@@ -1,4 +1,9 @@
<?php
/**
* Block Serialization Parser
*
* @package WordPress
*/
/**
* Class WP_Block_Parser_Block
@@ -62,6 +67,19 @@ class WP_Block_Parser_Block {
*/
public $innerContent;
/**
* Constructor.
*
* Will populate object properties from the provided arguments.
*
* @since 3.8.0
*
* @param string $name Name of block.
* @param array $attrs Optional set of attributes from block comment delimiters.
* @param array $innerBlocks List of inner blocks (of this same class).
* @param string $innerHTML Resultant HTML from inside block comment delimiters after removing inner blocks.
* @param array $innerContent List of string fragments and null markers where inner blocks were found.
*/
function __construct( $name, $attrs, $innerBlocks, $innerHTML, $innerContent ) {
$this->blockName = $name;
$this->attrs = $attrs;
@@ -121,6 +139,19 @@ class WP_Block_Parser_Frame {
*/
public $leading_html_start;
/**
* Constructor
*
* Will populate object properties from the provided arguments.
*
* @since 3.8.0
*
* @param WP_Block_Parser_Block $block Full or partial block.
* @param int $token_start Byte offset into document for start of parse token.
* @param int $token_length Byte length of entire parse token string.
* @param int $prev_offset Byte offset into document for after parse token ends.
* @param int $leading_html_start Byte offset into document where leading HTML before token starts.
*/
function __construct( $block, $token_start, $token_length, $prev_offset = null, $leading_html_start = null ) {
$this->block = $block;
$this->token_start = $token_start;
@@ -190,7 +221,7 @@ class WP_Block_Parser {
*
* @since 3.8.0
*
* @param string $document
* @param string $document Input document being parsed.
* @return WP_Block_Parser_Block[]
*/
function parse( $document ) {
@@ -201,7 +232,7 @@ class WP_Block_Parser {
$this->empty_attrs = json_decode( '{}', true );
do {
// twiddle our thumbs
// twiddle our thumbs.
} while ( $this->proceed() );
return $this->output;
@@ -226,12 +257,12 @@ class WP_Block_Parser {
list( $token_type, $block_name, $attrs, $start_offset, $token_length ) = $next_token;
$stack_depth = count( $this->stack );
// we may have some HTML soup before the next block
// we may have some HTML soup before the next block.
$leading_html_start = $start_offset > $this->offset ? $this->offset : null;
switch ( $token_type ) {
case 'no-more-tokens':
// if not in a block then flush output
// if not in a block then flush output.
if ( 0 === $stack_depth ) {
$this->add_freeform();
return false;
@@ -246,7 +277,7 @@ class WP_Block_Parser {
* - assume an implicit closer (easiest when not nesting)
*/
// for the easy case we'll assume an implicit closer
// for the easy case we'll assume an implicit closer.
if ( 1 === $stack_depth ) {
$this->add_block_from_stack();
return false;
@@ -281,7 +312,7 @@ class WP_Block_Parser {
return true;
}
// otherwise we found an inner block
// otherwise we found an inner block.
$this->add_inner_block(
new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ),
$start_offset,
@@ -291,7 +322,7 @@ class WP_Block_Parser {
return true;
case 'block-opener':
// track all newly-opened blocks on the stack
// track all newly-opened blocks on the stack.
array_push( $this->stack, new WP_Block_Parser_Frame(
new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ),
$start_offset,
@@ -318,7 +349,7 @@ class WP_Block_Parser {
return false;
}
// if we're not nesting then this is easy - close the block
// if we're not nesting then this is easy - close the block.
if ( 1 === $stack_depth ) {
$this->add_block_from_stack( $start_offset );
$this->offset = $start_offset + $token_length;
@@ -345,7 +376,7 @@ class WP_Block_Parser {
return true;
default:
// This is an error
// This is an error.
$this->add_freeform();
return false;
}
@@ -381,12 +412,12 @@ class WP_Block_Parser {
$this->offset
);
// if we get here we probably have catastrophic backtracking or out-of-memory in the PCRE
// if we get here we probably have catastrophic backtracking or out-of-memory in the PCRE.
if ( false === $has_match ) {
return array( 'no-more-tokens', null, null, null, null );
}
// we have no more tokens
// we have no more tokens.
if ( 0 === $has_match ) {
return array( 'no-more-tokens', null, null, null, null );
}
@@ -414,7 +445,7 @@ class WP_Block_Parser {
* This is an error
*/
if ( $is_closer && ( $is_void || $has_attrs ) ) {
// we can ignore them since they don't hurt anything
// we can ignore them since they don't hurt anything.
}
if ( $is_void ) {
@@ -434,8 +465,8 @@ class WP_Block_Parser {
* @internal
* @since 3.9.0
*
* @param string $innerHTML HTML content of block
* @return WP_Block_Parser_Block freeform block object
* @param string $innerHTML HTML content of block.
* @return WP_Block_Parser_Block freeform block object.
*/
function freeform( $innerHTML ) {
return new WP_Block_Parser_Block( null, $this->empty_attrs, array(), $innerHTML, array( $innerHTML ) );
@@ -443,11 +474,11 @@ class WP_Block_Parser {
/**
* Pushes a length of text from the input document
* to the output list as a freeform block
* to the output list as a freeform block.
*
* @internal
* @since 3.8.0
* @param null $length how many bytes of document text to output
* @param null $length how many bytes of document text to output.
*/
function add_freeform( $length = null ) {
$length = $length ? $length : strlen( $this->document ) - $this->offset;
@@ -461,14 +492,14 @@ class WP_Block_Parser {
/**
* Given a block structure from memory pushes
* a new block to the output list
* a new block to the output list.
*
* @internal
* @since 3.8.0
* @param WP_Block_Parser_Block $block the block to add to the output
* @param int $token_start byte offset into the document where the first token for the block starts
* @param int $token_length byte length of entire block from start of opening token to end of closing token
* @param int|null $last_offset last byte offset into document if continuing form earlier output
* @param WP_Block_Parser_Block $block The block to add to the output.
* @param int $token_start Byte offset into the document where the first token for the block starts.
* @param int $token_length Byte length of entire block from start of opening token to end of closing token.
* @param int|null $last_offset Last byte offset into document if continuing form earlier output.
*/
function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) {
$parent = $this->stack[ count( $this->stack ) - 1 ];
@@ -485,11 +516,11 @@ class WP_Block_Parser {
}
/**
* Pushes the top block from the parsing stack to the output list
* Pushes the top block from the parsing stack to the output list.
*
* @internal
* @since 3.8.0
* @param int|null $end_offset byte offset into document for where we should stop sending text output as HTML
* @param int|null $end_offset byte offset into document for where we should stop sending text output as HTML.
*/
function add_block_from_stack( $end_offset = null ) {
$stack_top = array_pop( $this->stack );