WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTML API: Add bookmark invalidation logic. 

While `WP_HTML_Tag_Processor` currently only supports changing a given tag's attributes, the plan is to provide methods to make broader changes (possibly through a subclass of `WP_HTML_Tag_Processor`). The API will have the potential of replacing a tag that a bookmark points to. To prepare, this changeset makes sure that all bookmarks affected by a HTML replacement are invalidated (i.e. released).

Changes:
* Extends the existing loop in `WP_HTML_Tag_Processor::apply_attributes_updates()` that adjusts bookmarks' start and end positions upon HTML changes to check if the entire bookmark is within a portion of the HTML that has been replaced.
* Adds `WP_HTML_Tag_Processor::has_bookmark() to check whether the given bookmark name exists.

References:
* [https://github.com/WordPress/gutenberg/pull/47559 Gutenberg PR 47559]
* [https://github.com/WordPress/gutenberg/releases/tag/v15.3.0 Released in Gutenberg 15.3.0]

Follow-up to [55203].

Props bernhard-reiter, dmsnell, zieladam.
Fixes #57788.
Built from https://develop.svn.wordpress.org/trunk@55555


git-svn-id: http://core.svn.wordpress.org/trunk@55067 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
hellofromTonya 2023-03-16 13:11:24 +00:00
parent bef2674152
commit 95f3aceea7
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
wp-includes/html-api/class-wp-html-tag-processor.php
View File

@ -1404,6 +1404,7 @@ class WP_HTML_Tag_Processor {
* Applies attribute updates to HTML document. * Applies attribute updates to HTML document.
* *
* @since 6.2.0 * @since 6.2.0
* @since 6.3.0 Invalidate any bookmarks whose targets are overwritten.
* *
* @return void * @return void
*/ */
@ -1434,7 +1435,7 @@ class WP_HTML_Tag_Processor {
* Adjust bookmark locations to account for how the text * Adjust bookmark locations to account for how the text
* replacements adjust offsets in the input document. * replacements adjust offsets in the input document.
*/ */
foreach ( $this->bookmarks as $bookmark ) { foreach ( $this->bookmarks as $bookmark_name => $bookmark ) {
/* /*
* Each lexical update which appears before the bookmark's endpoints * Each lexical update which appears before the bookmark's endpoints
* might shift the offsets for those endpoints. Loop through each change * might shift the offsets for those endpoints. Loop through each change
@ -1445,20 +1446,22 @@ class WP_HTML_Tag_Processor {
$tail_delta = 0; $tail_delta = 0;
foreach ( $this->lexical_updates as $diff ) { foreach ( $this->lexical_updates as $diff ) {
$update_head = $bookmark->start >= $diff->start; if ( $bookmark->start < $diff->start && $bookmark->end < $diff->start ) {
$update_tail = $bookmark->end >= $diff->start;
if ( ! $update_head && ! $update_tail ) {
break; break;
} }
if ( $bookmark->start >= $diff->start && $bookmark->end < $diff->end ) {
$this->release_bookmark( $bookmark_name );
continue 2;
}
$delta = strlen( $diff->text ) - ( $diff->end - $diff->start ); $delta = strlen( $diff->text ) - ( $diff->end - $diff->start );
if ( $update_head ) { if ( $bookmark->start >= $diff->start ) {
$head_delta += $delta; $head_delta += $delta;
} }
if ( $update_tail ) { if ( $bookmark->end >= $diff->end ) {
$tail_delta += $delta; $tail_delta += $delta;
} }
} }
@ -1470,6 +1473,18 @@ class WP_HTML_Tag_Processor {
$this->lexical_updates = array(); $this->lexical_updates = array();
} }
/**
* Checks whether a bookmark with the given name exists.
*
* @since 6.3.0
*
* @param string $bookmark_name Name to identify a bookmark that potentially exists.
* @return bool Whether that bookmark exists.
*/
public function has_bookmark( $bookmark_name ) {
return array_key_exists( $bookmark_name, $this->bookmarks );
}
/** /**
* Move the internal cursor in the Tag Processor to a given bookmark's location. * Move the internal cursor in the Tag Processor to a given bookmark's location.
* *

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.3-alpha-55554'; $wp_version = '6.3-alpha-55555';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.