The use of
The client-side block settings object passed as a second parameter includes two especially relevant properties:
+
- `edit`: The React component that gets used in the editor for our block.
- `save`: The function that returns the static HTML markup that gets saved to the Database.
diff --git a/docs/getting-started/fundamentals/static-dynamic-rendering.md b/docs/getting-started/fundamentals/static-dynamic-rendering.md
index 34d5432850c45e..214fb9da8b40fc 100644
--- a/docs/getting-started/fundamentals/static-dynamic-rendering.md
+++ b/docs/getting-started/fundamentals/static-dynamic-rendering.md
@@ -63,6 +63,7 @@ The markup stored for a block can be modified before it gets rendered on the fro
Some examples of core blocks with static rendering are:
+
- [`separator`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/separator) (see its [`save`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/separator/save.js) function)
- [`spacer`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/spacer) (see its [`save`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/spacer/save.js) function).
- [`button`](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/button) (see its [`save`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/button/save.js) function).
@@ -82,10 +83,12 @@ There are some common use cases for dynamic blocks:
### How to define dynamic rendering for a block
A block can define dynamic rendering in two main ways:
+
1. Via the `render_callback` argument that can be passed to the [`register_block_type()` function](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block/#registration-of-the-block-with-php-server-side).
-1. Via a separate PHP file (usually named `render.php`) which path can be defined at the [`render` property of the `block.json`](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-json/#files-for-the-blocks-behavior-output-or-style).
+2. Via a separate PHP file (usually named `render.php`) which path can be defined at the [`render` property of the `block.json`](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-json/#files-for-the-blocks-behavior-output-or-style).
Both of these ways to define the block's dynamic rendering receive the following data:
+
- `$attributes` - The array of attributes for this block.
- `$content` - Rendered block output (markup of the block as stored in the database).
- `$block` - The instance of the [WP_Block](https://developer.wordpress.org/reference/classes/wp_block/) class that represents the block being rendered ([metadata of the block](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/)).
@@ -95,7 +98,6 @@ Both of these ways to define the block's dynamic rendering receive the following
For example, the [`site-title`](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/site-title) core block with the following function registered as [`render_callback`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/site-title/index.php)...
-
```php
function render_block_core_site_title( $attributes ) {
$site_title = get_bloginfo( 'name' );
@@ -159,6 +161,7 @@ For dynamic blocks, the `save` callback function can return just `null`, which t
Blocks with dynamic rendering can also save an HTML representation of the block as a backup. If you provide a server-side rendering callback, the HTML representing the block in the database will be replaced with the output of your callback, but will be rendered if your block is deactivated (the plugin that registers the block is uninstalled) or your render callback is removed.
In some cases, the block saves an HTML representation of the block and uses a dynamic rendering to fine-tune this markup if some conditions are met. Some examples of core blocks using this approach are:
+
- The [`cover`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/cover) block saves a [full HTML representation of the block in the database](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/cover/save.js). This markup is processed via a [`render_callback`](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/cover/index.php#L74) when requested to do some PHP magic that dynamically [injects the featured image if the "use featured image" setting is enabled](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/cover/index.php#L16).
- The [`image`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/image) block also saves [its HTML representation in the database](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/image/save.js) and processes it via a [`render_callback`](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/image/index.php#L363) when requested to [add some attributes to the markup](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/image/index.php#L18) if some conditions are met.
diff --git a/docs/how-to-guides/block-tutorial/extending-the-query-loop-block.md b/docs/how-to-guides/block-tutorial/extending-the-query-loop-block.md
index 9be4f3a993d203..d3628d991f872f 100644
--- a/docs/how-to-guides/block-tutorial/extending-the-query-loop-block.md
+++ b/docs/how-to-guides/block-tutorial/extending-the-query-loop-block.md
@@ -208,13 +208,13 @@ export const withBookQueryControls = ( BlockEdit ) => ( props ) => {
// function to handle that.
return isMyBooksVariation( props ) ? (
<>
- supports generates a set of properties that need to be manually added to the wrapping element of the block so they're properly stored as part of the block data.
@@ -10,8 +10,8 @@ The use of supports generates a set of properties that need to be m
A block can have three sets of markup defined, each one of them with a specific target and purpose:
-- The one for the **Block Editor**, defined through a `edit` React component passed to [`registerBlockType`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/#registerblocktype) when registering the block in the client.
-- The one used to **save the block in the DB**, defined through a `save` function passed to `registerBlockType` when registering the block in the client.
+- The one for the **Block Editor**, defined through a `edit` React component passed to [`registerBlockType`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/#registerblocktype) when registering the block in the client.
+- The one used to **save the block in the DB**, defined through a `save` function passed to `registerBlockType` when registering the block in the client.
- This markup will be returned to the front end on request if no dynamic render has been defined for the block.
- The one used to **dynamically render the markup of the block** returned to the front end on request, defined through the `render_callback` on [`register_block_type`](https://developer.wordpress.org/reference/functions/register_block_type/) or the [`render`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#render) PHP file in `block.json`
- If defined, this server-side generated markup will be returned to the front end, ignoring the markup stored in DB.
@@ -21,13 +21,14 @@ For the [`edit` React component and the `save` function](https://developer.wordp
## The Edit component's markup
-The [`useBlockProps()`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor/#useblockprops) hook available on the [`@wordpress/block-editor`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor) allows passing the required attributes for the Block Editor to the `edit` block's outer wrapper.
+The [`useBlockProps()`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor/#useblockprops) hook available on the [`@wordpress/block-editor`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor) allows passing the required attributes for the Block Editor to the `edit` block's outer wrapper.
Among other things, the `useBlockProps()` hook takes care of including in this wrapper:
-- An `id` for the block's markup
-- Some accesibility and `data-` attributes
+
+- An `id` for the block's markup
+- Some accessibility and `data-` attributes
- Classes and inline styles reflecting custom settings, which include by default:
- - The `wp-block` class
+ - The `wp-block` class
- A class that contains the name of the block with its namespace
For example, for the following piece of code of a block's registration in the client...
@@ -43,18 +44,18 @@ _(see the [code above](https://github.com/WordPress/block-development-examples/b
...the markup of the block in the Block Editor could look like this:
```html
-Hello World - Block Editor
@@ -87,16 +88,16 @@ _(see the [code above](https://github.com/WordPress/block-development-examples/bHello World – Frontend
``` -Any additional classes and attributes for the `save` function of the block should be passed as an argument of `useBlockProps.save()` (see [example](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/stylesheets-79a4c3/src/save.js)). +Any additional classes and attributes for the `save` function of the block should be passed as an argument of `useBlockProps.save()` (see [example](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/stylesheets-79a4c3/src/save.js)). When you add `supports` for any feature, the proper classes get added to the object returned by the `useBlockProps.save()` hook. ```htmlHello World
``` @@ -105,10 +106,10 @@ _(check the [example](https://github.com/WordPress/block-development-examples/tr ## The server-side render markup -Any markup in the server-side render definition for the block can use the [`get_block_wrapper_attributes()`](https://developer.wordpress.org/reference/functions/get_block_wrapper_attributes/) function to generate the string of attributes required to reflect the block settings (see [example](https://github.com/WordPress/block-development-examples/blob/f68640f42d993f0866d1879f67c73910285ca114/plugins/block-dynamic-rendering-64756b/src/render.php#L11)). +Any markup in the server-side render definition for the block can use the [`get_block_wrapper_attributes()`](https://developer.wordpress.org/reference/functions/get_block_wrapper_attributes/) function to generate the string of attributes required to reflect the block settings (see [example](https://github.com/WordPress/block-development-examples/blob/f68640f42d993f0866d1879f67c73910285ca114/plugins/block-dynamic-rendering-64756b/src/render.php#L11)). ```php>
-``` \ No newline at end of file +``` diff --git a/docs/getting-started/fundamentals/file-structure-of-a-block.md b/docs/getting-started/fundamentals/file-structure-of-a-block.md index 72531ccfb2b272..b52f5c5efd0f76 100644 --- a/docs/getting-started/fundamentals/file-structure-of-a-block.md +++ b/docs/getting-started/fundamentals/file-structure-of-a-block.md @@ -30,7 +30,8 @@ This file contains the [metadata of the block](https://developer.wordpress.org/b Among other data it provides properties to define the paths of the files involved in the block's behaviour, output and style. If there's a build process involved, this `block.json` along with the generated files are placed into a destination folder (usually the `build` folder) so the paths provided target to the bundled versions of these files. -The most relevant properties that can be defined in a `block.json` to set the files involved in the block's behaviour, output or style are: +The most relevant properties that can be defined in a `block.json` to set the files involved in the block's behaviour, output, or style are: + - The [`editorScript`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#editor-script) property, usually set with the path of a bundled `index.js` file (output build from `src/index.js`). - The [`style`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#style) property, usually set with the path of a bundled `style-index.css` file (output build from `src/style.(css|scss|sass)`). - The [`editorStyle`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#editor-style) property, usually set with the path of a bundled `index.css` (output build from `src/editor.(css|scss|sass)`). diff --git a/docs/getting-started/fundamentals/markup-representation-block.md b/docs/getting-started/fundamentals/markup-representation-block.md index 506d0feb8d3d17..b048160907a259 100644 --- a/docs/getting-started/fundamentals/markup-representation-block.md +++ b/docs/getting-started/fundamentals/markup-representation-block.md @@ -1,8 +1,9 @@ # Markup representation of a block -When stored, in the database (DB) or in templates as HTML files, blocks are represented using a [specific HTML grammar](https://developer.wordpress.org/block-editor/explanations/architecture/key-concepts/#data-and-attributes), which is technically valid HTML based on HTML comments that act as explicit block delimiters +When stored in the database or in templates as HTML files, blocks are represented using a [specific HTML grammar](https://developer.wordpress.org/block-editor/explanations/architecture/key-concepts/#data-and-attributes), which is technically valid HTML based on HTML comments that act as explicit block delimiters These are some of the rules for the markup used to represent a block: + - All core block comments start with a prefix and the block name: `wp:blockname` - For custom blocks, `blockname` is `namespace/blockname` - The comment can be a single line, self-closing, or wrapper for HTML content. @@ -17,21 +18,22 @@ _Example: Markup representation of an `image` core block_ ``` The [markup representation of a block is parsed for the Block Editor](https://developer.wordpress.org/block-editor/explanations/architecture/data-flow/) and the block's output for the front end: + - In the editor, WordPress parses this block markup, captures its data and loads its `edit` version - In the front end, WordPress parses this block markup, captures its data and generates its final HTML markup Whenever a block is saved, the `save` function, defined when the [block is registered in the client](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block/#registration-of-the-block-with-javascript-client-side), is called to return the markup that will be saved into the database within the block delimiter's comment. If `save` is `null` (common case for blocks with dynamic rendering), only a single line block delimiter's comment is stored, along with any attributes The Post Editor checks that the markup created by the `save` function is identical to the block's markup saved to the database: + - If there are any differences, the Post Editor triggers a [block validation error](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#validation). - Block validation errors usually happen when a block’s `save` function is updated to change the markup produced by the block. - A block developer can mitigate these issues by adding a [**block deprecation**](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-deprecation/) to register the change in the block. -The markup of a **block with dynamic rendering** is expected to change so the markup of these blocks is not saved to the database. What is saved in the DB as representation of the block, for blocks with dynamic rendering, is a single line of HTML consisting on just the block delimiter's comment (including block attributes values). That HTML is not subject to the Post Editor’s validation. +The markup of a **block with dynamic rendering** is expected to change so the markup of these blocks is not saved to the database. What is saved in the database as representation of the block, for blocks with dynamic rendering, is a single line of HTML consisting on just the block delimiter's comment (including block attributes values). That HTML is not subject to the Post Editor’s validation. _Example: Markup representation of a block with dynamic rendering (`save` = `null`) and attributes_ - ```html ``` diff --git a/docs/getting-started/fundamentals/registration-of-a-block.md b/docs/getting-started/fundamentals/registration-of-a-block.md index 7d7b0e5ac31634..65cd85b0fa3e5b 100644 --- a/docs/getting-started/fundamentals/registration-of-a-block.md +++ b/docs/getting-started/fundamentals/registration-of-a-block.md @@ -69,6 +69,7 @@ The content ofblock.json (or any other .json file) ca
-
diff --git a/docs/reference-guides/filters/block-filters.md b/docs/reference-guides/filters/block-filters.md
index 7e164a10e6c93f..35a041052889c0 100644
--- a/docs/reference-guides/filters/block-filters.md
+++ b/docs/reference-guides/filters/block-filters.md
@@ -189,7 +189,7 @@ const withMyPluginControls = createHigherOrderComponent( ( BlockEdit ) => {
return ( props ) => {
return (
<>
-
- wrapper. - * - * @var array - */ - private static $needs_list_item_wrapper = array( - 'core/site-title', - 'core/site-logo', - ); - - /** - * Keeps track of all the navigation names that have been seen. - * - * @var array - */ - private static $seen_menu_names = array(); - - /** - * Returns whether or not this is responsive navigation. - * - * @param array $attributes The block attributes. - * @return bool Returns whether or not this is responsive navigation. - */ - private static function is_responsive( $attributes ) { - /** - * This is for backwards compatibility after the `isResponsive` attribute was been removed. - */ - - $has_old_responsive_attribute = ! empty( $attributes['isResponsive'] ) && $attributes['isResponsive']; - return isset( $attributes['overlayMenu'] ) && 'never' !== $attributes['overlayMenu'] || $has_old_responsive_attribute; - } - - /** - * Returns whether or not a navigation has a submenu. - * - * @param WP_Block_List $inner_blocks The list of inner blocks. - * @return bool Returns whether or not a navigation has a submenu. - */ - private static function has_submenus( $inner_blocks ) { - foreach ( $inner_blocks as $inner_block ) { - $inner_block_content = $inner_block->render(); - $p = new WP_HTML_Tag_Processor( $inner_block_content ); - if ( $p->next_tag( - array( - 'name' => 'LI', - 'class_name' => 'has-child', - ) - ) ) { - return true; - } - } - return false; - } - - /** - * Determine whether to load the view script. - * - * @param array $attributes The block attributes. - * @param WP_Block_List $inner_blocks The list of inner blocks. - * @return bool Returns whether or not to load the view script. - */ - private static function should_load_view_script( $attributes, $inner_blocks ) { - $has_submenus = static::has_submenus( $inner_blocks ); - $is_responsive_menu = static::is_responsive( $attributes ); - return ( $has_submenus && ( $attributes['openSubmenusOnClick'] || $attributes['showSubmenuIcon'] ) ) || $is_responsive_menu; - } - - /** - * Returns whether or not a block needs a list item wrapper. - * - * @param WP_Block $block The block. - * @return bool Returns whether or not a block needs a list item wrapper. - */ - private static function does_block_need_a_list_item_wrapper( $block ) { - return in_array( $block->name, static::$needs_list_item_wrapper, true ); - } - - /** - * Returns the markup for a single inner block. - * - * @param WP_Block $inner_block The inner block. - * @return string Returns the markup for a single inner block. - */ - private static function get_markup_for_inner_block( $inner_block ) { - $inner_block_content = $inner_block->render(); - if ( ! empty( $inner_block_content ) ) { - if ( static::does_block_need_a_list_item_wrapper( $inner_block ) ) { - return ' '; - } - - return $inner_block_content; - } - } - - /** - * Returns the html for the inner blocks of the navigation block. - * - * @param array $attributes The block attributes. - * @param WP_Block_List $inner_blocks The list of inner blocks. - * @return string Returns the html for the inner blocks of the navigation block. - */ - private static function get_inner_blocks_html( $attributes, $inner_blocks ) { - $has_submenus = static::has_submenus( $inner_blocks ); - $should_load_view_script = static::should_load_view_script( $attributes, $inner_blocks ); - - $style = static::get_styles( $attributes ); - $class = static::get_classes( $attributes ); - $container_attributes = get_block_wrapper_attributes( - array( - 'class' => 'wp-block-navigation__container ' . $class, - 'style' => $style, - ) - ); - - $inner_blocks_html = ''; - $is_list_open = false; - - foreach ( $inner_blocks as $inner_block ) { - $is_list_item = in_array( $inner_block->name, static::$nav_blocks_wrapped_in_list_item, true ); - - if ( $is_list_item && ! $is_list_open ) { - $is_list_open = true; - $inner_blocks_html .= sprintf( - '
- ',
- $container_attributes
- );
- }
-
- if ( ! $is_list_item && $is_list_open ) {
- $is_list_open = false;
- $inner_blocks_html .= '
-
-
',
- esc_attr( $modal_unique_id ),
- $inner_blocks_html,
- $toggle_aria_label_open,
- $toggle_aria_label_close,
- esc_attr( implode( ' ', $responsive_container_classes ) ),
- esc_attr( implode( ' ', $open_button_classes ) ),
- esc_attr( safecss_filter_attr( $colors['overlay_inline_styles'] ) ),
- $toggle_button_content,
- $toggle_close_button_content,
- $open_button_directives,
- $responsive_container_directives,
- $responsive_dialog_directives,
- $close_button_directives,
- $responsive_container_content_directives
- );
- }
-
- /**
- * Get the wrapper attributes
- *
- * @param array $attributes The block attributes.
- * @param WP_Block_List $inner_blocks A list of inner blocks.
- * @return string Returns the navigation block markup.
- */
- private static function get_nav_wrapper_attributes( $attributes, $inner_blocks ) {
- $nav_menu_name = static::get_unique_navigation_name( $attributes );
- $should_load_view_script = static::should_load_view_script( $attributes, $inner_blocks );
- $is_responsive_menu = static::is_responsive( $attributes );
- $style = static::get_styles( $attributes );
- $class = static::get_classes( $attributes );
- $wrapper_attributes = get_block_wrapper_attributes(
- array(
- 'class' => $class,
- 'style' => $style,
- 'aria-label' => $nav_menu_name,
- )
- );
-
- if ( $is_responsive_menu ) {
- $nav_element_directives = static::get_nav_element_directives( $should_load_view_script, $attributes );
- $wrapper_attributes .= ' ' . $nav_element_directives;
- }
-
- return $wrapper_attributes;
- }
-
- /**
- * Get the nav element directives
- *
- * @param bool $should_load_view_script Whether or not the view script should be loaded.
- * @return string the directives for the navigation element.
- */
- private static function get_nav_element_directives( $should_load_view_script, $attributes ) {
- if ( ! $should_load_view_script ) {
- return '';
- }
- // When adding to this array be mindful of security concerns.
- $nav_element_context = wp_json_encode(
- array(
- 'overlayOpenedBy' => array(),
- 'type' => 'overlay',
- 'roleAttribute' => '',
- 'ariaLabel' => __( 'Menu' ),
- ),
- JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP
- );
- $nav_element_directives = '
- data-wp-interactive=\'{"namespace":"core/navigation"}\'
- data-wp-context=\'' . $nav_element_context . '\'
- ';
-
- // When the navigation overlayMenu attribute is set to "always"
- // we don't need to use JavaScript to collapse the menu as we set the class manually.
- if ( ! static::is_always_overlay( $attributes ) ) {
- $nav_element_directives .= 'data-wp-init="callbacks.initNav"';
- $nav_element_directives .= ' '; // space separator
- $nav_element_directives .= 'data-wp-class--is-collapsed="context.isCollapsed"';
- }
-
- return $nav_element_directives;
- }
-
- /**
- * Handle view script loading.
- *
- * @param array $attributes The block attributes.
- * @param WP_Block $block The parsed block.
- * @param WP_Block_List $inner_blocks The list of inner blocks.
- */
- private static function handle_view_script_loading( $attributes, $block, $inner_blocks ) {
- $should_load_view_script = static::should_load_view_script( $attributes, $inner_blocks );
- $is_gutenberg_plugin = defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN;
- $view_js_file = 'wp-block-navigation-view';
- $script_handles = $block->block_type->view_script_handles;
-
- if ( $is_gutenberg_plugin ) {
- if ( $should_load_view_script ) {
- gutenberg_enqueue_module( '@wordpress/block-library/navigation-block' );
- }
- // Remove the view script because we are using the module.
- $block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
- } else {
- // If the script already exists, there is no point in removing it from viewScript.
- if ( ! wp_script_is( $view_js_file ) ) {
-
- // If the script is not needed, and it is still in the `view_script_handles`, remove it.
- if ( ! $should_load_view_script && in_array( $view_js_file, $script_handles, true ) ) {
- $block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
- }
- // If the script is needed, but it was previously removed, add it again.
- if ( $should_load_view_script && ! in_array( $view_js_file, $script_handles, true ) ) {
- $block->block_type->view_script_handles = array_merge( $script_handles, array( $view_js_file ) );
- }
- }
- }
- }
-
- /**
- * Returns the markup for the navigation block.
- *
- * @param array $attributes The block attributes.
- * @param WP_Block_List $inner_blocks The list of inner blocks.
- * @return string Returns the navigation wrapper markup.
- */
- private static function get_wrapper_markup( $attributes, $inner_blocks ) {
- $inner_blocks_html = static::get_inner_blocks_html( $attributes, $inner_blocks );
- if ( static::is_responsive( $attributes ) ) {
- return static::get_responsive_container_markup( $attributes, $inner_blocks, $inner_blocks_html );
- }
- return $inner_blocks_html;
- }
-
- /**
- * Returns a unique name for the navigation.
- *
- * @param array $attributes The block attributes.
- * @return string Returns a unique name for the navigation.
- */
- private static function get_unique_navigation_name( $attributes ) {
- $nav_menu_name = static::get_navigation_name( $attributes );
-
- // If the menu name has been used previously then append an ID
- // to the name to ensure uniqueness across a given post.
- if ( isset( static::$seen_menu_names[ $nav_menu_name ] ) && static::$seen_menu_names[ $nav_menu_name ] > 1 ) {
- $count = static::$seen_menu_names[ $nav_menu_name ];
- $nav_menu_name = $nav_menu_name . ' ' . ( $count );
- }
-
- return $nav_menu_name;
- }
-
- /**
- * Renders the navigation block.
- *
- * @param array $attributes The block attributes.
- * @param string $content The saved content.
- * @param WP_Block $block The parsed block.
- * @return string Returns the navigation block markup.
- */
- public static function render( $attributes, $content, $block ) {
- /**
- * Deprecated:
- * The rgbTextColor and rgbBackgroundColor attributes
- * have been deprecated in favor of
- * customTextColor and customBackgroundColor ones.
- * Move the values from old attrs to the new ones.
- */
- if ( isset( $attributes['rgbTextColor'] ) && empty( $attributes['textColor'] ) ) {
- $attributes['customTextColor'] = $attributes['rgbTextColor'];
- }
-
- if ( isset( $attributes['rgbBackgroundColor'] ) && empty( $attributes['backgroundColor'] ) ) {
- $attributes['customBackgroundColor'] = $attributes['rgbBackgroundColor'];
- }
-
- unset( $attributes['rgbTextColor'], $attributes['rgbBackgroundColor'] );
-
- $inner_blocks = static::get_inner_blocks( $attributes, $block );
- // Prevent navigation blocks referencing themselves from rendering.
- if ( gutenberg_block_core_navigation_block_contains_core_navigation( $inner_blocks ) ) {
- return '';
- }
-
- static::handle_view_script_loading( $attributes, $block, $inner_blocks );
-
- return sprintf(
- '',
- static::get_nav_wrapper_attributes( $attributes, $inner_blocks ),
- static::get_wrapper_markup( $attributes, $inner_blocks )
- );
- }
-}
diff --git a/lib/compat/wordpress-6.5/class-wp-script-modules.php b/lib/compat/wordpress-6.5/class-wp-script-modules.php
new file mode 100644
index 00000000000000..f6a2a348f92ef3
--- /dev/null
+++ b/lib/compat/wordpress-6.5/class-wp-script-modules.php
@@ -0,0 +1,323 @@
+
+ */
+ private $enqueued_before_registered = array();
+
+ /**
+ * Registers the script module if no script module with that script module
+ * identifier has already been registered.
+ *
+ * @since 6.5.0
+ *
+ * @param string $id The identifier of the script module. Should be unique. It will be used in the
+ * final import map.
+ * @param string $src Optional. Full URL of the script module, or path of the script module relative
+ * to the WordPress root directory. If it is provided and the script module has
+ * not been registered yet, it will be registered.
+ * @param array $deps {
+ * Optional. List of dependencies.
+ *
+ * @type string|array $0... {
+ * An array of script module identifiers of the dependencies of this script
+ * module. The dependencies can be strings or arrays. If they are arrays,
+ * they need an `id` key with the script module identifier, and can contain
+ * an `import` key with either `static` or `dynamic`. By default,
+ * dependencies that don't contain an `import` key are considered static.
+ *
+ * @type string $id The script module identifier.
+ * @type string $import Optional. Import type. May be either `static` or
+ * `dynamic`. Defaults to `static`.
+ * }
+ * }
+ * @param string|false|null $version Optional. String specifying the script module version number. Defaults to false.
+ * It is added to the URL as a query string for cache busting purposes. If $version
+ * is set to false, the version number is the currently installed WordPress version.
+ * If $version is set to null, no version is added.
+ */
+ public function register( string $id, string $src, array $deps = array(), $version = false ) {
+ if ( ! isset( $this->registered[ $id ] ) ) {
+ $dependencies = array();
+ foreach ( $deps as $dependency ) {
+ if ( is_array( $dependency ) ) {
+ if ( ! isset( $dependency['id'] ) ) {
+ _doing_it_wrong( __METHOD__, __( 'Missing required id key in entry among dependencies array.' ), '6.5.0' );
+ continue;
+ }
+ $dependencies[] = array(
+ 'id' => $dependency['id'],
+ 'import' => isset( $dependency['import'] ) && 'dynamic' === $dependency['import'] ? 'dynamic' : 'static',
+ );
+ } elseif ( is_string( $dependency ) ) {
+ $dependencies[] = array(
+ 'id' => $dependency,
+ 'import' => 'static',
+ );
+ } else {
+ _doing_it_wrong( __METHOD__, __( 'Entries in dependencies array must be either strings or arrays with an id key.' ), '6.5.0' );
+ }
+ }
+
+ $this->registered[ $id ] = array(
+ 'src' => $src,
+ 'version' => $version,
+ 'enqueue' => isset( $this->enqueued_before_registered[ $id ] ),
+ 'dependencies' => $dependencies,
+ );
+ }
+ }
+
+ /**
+ * Marks the script module to be enqueued in the page.
+ *
+ * If a src is provided and the script module has not been registered yet, it
+ * will be registered.
+ *
+ * @since 6.5.0
+ *
+ * @param string $id The identifier of the script module. Should be unique. It will be used in the
+ * final import map.
+ * @param string $src Optional. Full URL of the script module, or path of the script module relative
+ * to the WordPress root directory. If it is provided and the script module has
+ * not been registered yet, it will be registered.
+ * @param array $deps {
+ * Optional. List of dependencies.
+ *
+ * @type string|array $0... {
+ * An array of script module identifiers of the dependencies of this script
+ * module. The dependencies can be strings or arrays. If they are arrays,
+ * they need an `id` key with the script module identifier, and can contain
+ * an `import` key with either `static` or `dynamic`. By default,
+ * dependencies that don't contain an `import` key are considered static.
+ *
+ * @type string $id The script module identifier.
+ * @type string $import Optional. Import type. May be either `static` or
+ * `dynamic`. Defaults to `static`.
+ * }
+ * }
+ * @param string|false|null $version Optional. String specifying the script module version number. Defaults to false.
+ * It is added to the URL as a query string for cache busting purposes. If $version
+ * is set to false, the version number is the currently installed WordPress version.
+ * If $version is set to null, no version is added.
+ */
+ public function enqueue( string $id, string $src = '', array $deps = array(), $version = false ) {
+ if ( isset( $this->registered[ $id ] ) ) {
+ $this->registered[ $id ]['enqueue'] = true;
+ } elseif ( $src ) {
+ $this->register( $id, $src, $deps, $version );
+ $this->registered[ $id ]['enqueue'] = true;
+ } else {
+ $this->enqueued_before_registered[ $id ] = true;
+ }
+ }
+
+ /**
+ * Unmarks the script module so it will no longer be enqueued in the page.
+ *
+ * @since 6.5.0
+ *
+ * @param string $id The identifier of the script module.
+ */
+ public function dequeue( string $id ) {
+ if ( isset( $this->registered[ $id ] ) ) {
+ $this->registered[ $id ]['enqueue'] = false;
+ }
+ unset( $this->enqueued_before_registered[ $id ] );
+ }
+
+ /**
+ * Adds the hooks to print the import map, enqueued script modules and script
+ * module preloads.
+ *
+ * In classic themes, the script modules used by the blocks are not yet known
+ * when the `wp_head` actions is fired, so it needs to print everything in the
+ * footer.
+ *
+ * @since 6.5.0
+ */
+ public function add_hooks() {
+ $position = wp_is_block_theme() ? 'wp_head' : 'wp_footer';
+ add_action( $position, array( $this, 'print_import_map' ) );
+ add_action( $position, array( $this, 'print_enqueued_script_modules' ) );
+ add_action( $position, array( $this, 'print_script_module_preloads' ) );
+ }
+
+ /**
+ * Prints the enqueued script modules using script tags with type="module"
+ * attributes.
+ *
+ * @since 6.5.0
+ */
+ public function print_enqueued_script_modules() {
+ foreach ( $this->get_marked_for_enqueue() as $id => $script_module ) {
+ wp_print_script_tag(
+ array(
+ 'type' => 'module',
+ 'src' => $this->get_versioned_src( $script_module ),
+ 'id' => $id . '-js-module',
+ )
+ );
+ }
+ }
+
+ /**
+ * Prints the the static dependencies of the enqueued script modules using
+ * link tags with rel="modulepreload" attributes.
+ *
+ * If a script module is marked for enqueue, it will not be preloaded.
+ *
+ * @since 6.5.0
+ */
+ public function print_script_module_preloads() {
+ foreach ( $this->get_dependencies( array_keys( $this->get_marked_for_enqueue() ), array( 'static' ) ) as $id => $script_module ) {
+ // Don't preload if it's marked for enqueue.
+ if ( true !== $script_module['enqueue'] ) {
+ echo sprintf(
+ '',
+ esc_url( $this->get_versioned_src( $script_module ) ),
+ esc_attr( $id . '-js-modulepreload' )
+ );
+ }
+ }
+ }
+
+ /**
+ * Prints the import map using a script tag with a type="importmap" attribute.
+ *
+ * @since 6.5.0
+ */
+ public function print_import_map() {
+ $import_map = $this->get_import_map();
+ if ( ! empty( $import_map['imports'] ) ) {
+ wp_print_inline_script_tag(
+ wp_json_encode( $import_map, JSON_HEX_TAG | JSON_HEX_AMP ),
+ array(
+ 'type' => 'importmap',
+ 'id' => 'wp-importmap',
+ )
+ );
+ }
+ }
+
+ /**
+ * Returns the import map array.
+ *
+ * @since 6.5.0
+ *
+ * @return array Array with an `imports` key mapping to an array of script module identifiers and their respective
+ * URLs, including the version query.
+ */
+ private function get_import_map(): array {
+ $imports = array();
+ foreach ( $this->get_dependencies( array_keys( $this->get_marked_for_enqueue() ) ) as $id => $script_module ) {
+ $imports[ $id ] = $this->get_versioned_src( $script_module );
+ }
+ return array( 'imports' => $imports );
+ }
+
+ /**
+ * Retrieves the list of script modules marked for enqueue.
+ *
+ * @since 6.5.0
+ *
+ * @return array Script modules marked for enqueue, keyed by script module identifier.
+ */
+ private function get_marked_for_enqueue(): array {
+ $enqueued = array();
+ foreach ( $this->registered as $id => $script_module ) {
+ if ( true === $script_module['enqueue'] ) {
+ $enqueued[ $id ] = $script_module;
+ }
+ }
+ return $enqueued;
+ }
+
+ /**
+ * Retrieves all the dependencies for the given script module identifiers,
+ * filtered by import types.
+ *
+ * It will consolidate an array containing a set of unique dependencies based
+ * on the requested import types: 'static', 'dynamic', or both. This method is
+ * recursive and also retrieves dependencies of the dependencies.
+ *
+ * @since 6.5.0
+ *
+
+ * @param string[] $ids The identifiers of the script modules for which to gather dependencies.
+ * @param array $import_types Optional. Import types of dependencies to retrieve: 'static', 'dynamic', or both.
+ * Default is both.
+ * @return array List of dependencies, keyed by script module identifier.
+ */
+ private function get_dependencies( array $ids, array $import_types = array( 'static', 'dynamic' ) ) {
+ return array_reduce(
+ $ids,
+ function ( $dependency_script_modules, $id ) use ( $import_types ) {
+ $dependencies = array();
+ foreach ( $this->registered[ $id ]['dependencies'] as $dependency ) {
+ if (
+ in_array( $dependency['import'], $import_types, true ) &&
+ isset( $this->registered[ $dependency['id'] ] ) &&
+ ! isset( $dependency_script_modules[ $dependency['id'] ] )
+ ) {
+ $dependencies[ $dependency['id'] ] = $this->registered[ $dependency['id'] ];
+ }
+ }
+ return array_merge( $dependency_script_modules, $dependencies, $this->get_dependencies( array_keys( $dependencies ), $import_types ) );
+ },
+ array()
+ );
+ }
+
+ /**
+ * Gets the versioned URL for a script module src.
+ *
+ * If $version is set to false, the version number is the currently installed
+ * WordPress version. If $version is set to null, no version is added.
+ * Otherwise, the string passed in $version is used.
+ *
+ * @since 6.5.0
+ *
+ * @param array $script_module The script module.
+ * @return string The script module src with a version if relevant.
+ */
+ private function get_versioned_src( array $script_module ): string {
+ $args = array();
+ if ( false === $script_module['version'] ) {
+ $args['ver'] = get_bloginfo( 'version' );
+ } elseif ( null !== $script_module['version'] ) {
+ $args['ver'] = $script_module['version'];
+ }
+ if ( $args ) {
+ return add_query_arg( $args, $script_module['src'] );
+ }
+ return $script_module['src'];
+ }
+ }
+}
diff --git a/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api-directives-processor.php b/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api-directives-processor.php
new file mode 100644
index 00000000000000..b437bcefa67568
--- /dev/null
+++ b/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api-directives-processor.php
@@ -0,0 +1,143 @@
+get_balanced_tag_bookmarks();
+ if ( ! $bookmarks ) {
+ return null;
+ }
+ list( $start_name, $end_name ) = $bookmarks;
+
+ $start = $this->bookmarks[ $start_name ]->start + $this->bookmarks[ $start_name ]->length + 1;
+ $end = $this->bookmarks[ $end_name ]->start;
+
+ $this->seek( $start_name );
+ $this->release_bookmark( $start_name );
+ $this->release_bookmark( $end_name );
+
+ return substr( $this->html, $start, $end - $start );
+ }
+
+ /**
+ * Sets the content between two balanced tags.
+ *
+ * @access private
+ *
+ * @param string $new_content The string to replace the content between the matching tags.
+ * @return bool Whether the content was successfully replaced.
+ */
+ public function set_content_between_balanced_tags( string $new_content ): bool {
+ $this->get_updated_html();
+
+ $bookmarks = $this->get_balanced_tag_bookmarks();
+ if ( ! $bookmarks ) {
+ return false;
+ }
+ list( $start_name, $end_name ) = $bookmarks;
+
+ $start = $this->bookmarks[ $start_name ]->start + $this->bookmarks[ $start_name ]->length + 1;
+ $end = $this->bookmarks[ $end_name ]->start;
+
+ $this->seek( $start_name );
+ $this->release_bookmark( $start_name );
+ $this->release_bookmark( $end_name );
+
+ $this->lexical_updates[] = new Gutenberg_HTML_Text_Replacement_6_5( $start, $end - $start, esc_html( $new_content ) );
+ return true;
+ }
+
+ /**
+ * Returns a pair of bookmarks for the current opening tag and the matching
+ * closing tag.
+ *
+ * @return array|null A pair of bookmarks, or null if there's no matching closing tag.
+ */
+ private function get_balanced_tag_bookmarks() {
+ static $i = 0;
+ $start_name = 'start_of_balanced_tag_' . ++$i;
+
+ $this->set_bookmark( $start_name );
+ if ( ! $this->next_balanced_closer() ) {
+ $this->release_bookmark( $start_name );
+ return null;
+ }
+
+ $end_name = 'end_of_balanced_tag_' . ++$i;
+ $this->set_bookmark( $end_name );
+
+ return array( $start_name, $end_name );
+ }
+
+ /**
+ * Finds the matching closing tag for an opening tag.
+ *
+ * When called while the processor is on an open tag, it traverses the HTML
+ * until it finds the matching closing tag, respecting any in-between content,
+ * including nested tags of the same name. Returns false when called on a
+ * closing or void tag, or if no matching closing tag was found.
+ *
+ * @return bool Whether a matching closing tag was found.
+ */
+ private function next_balanced_closer(): bool {
+ $depth = 0;
+ $tag_name = $this->get_tag();
+
+ if ( $this->is_void() ) {
+ return false;
+ }
+
+ while ( $this->next_tag(
+ array(
+ 'tag_name' => $tag_name,
+ 'tag_closers' => 'visit',
+ )
+ ) ) {
+ if ( ! $this->is_tag_closer() ) {
+ ++$depth;
+ continue;
+ }
+
+ if ( 0 === $depth ) {
+ return true;
+ }
+
+ --$depth;
+ }
+
+ return false;
+ }
+
+ /**
+ * Checks whether the current tag is void.
+ *
+ * @access private
+ *
+ * @return bool Whether the current tag is void or not.
+ */
+ public function is_void(): bool {
+ $tag_name = $this->get_tag();
+ return Gutenberg_HTML_Processor_6_5::is_void( null !== $tag_name ? $tag_name : '' );
+ }
+ }
+}
diff --git a/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api.php b/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api.php
new file mode 100644
index 00000000000000..ad9e5d7c439533
--- /dev/null
+++ b/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api.php
@@ -0,0 +1,678 @@
+ 'data_wp_interactive_processor',
+ 'data-wp-context' => 'data_wp_context_processor',
+ 'data-wp-bind' => 'data_wp_bind_processor',
+ 'data-wp-class' => 'data_wp_class_processor',
+ 'data-wp-style' => 'data_wp_style_processor',
+ 'data-wp-text' => 'data_wp_text_processor',
+ );
+
+ /**
+ * Holds the initial state of the different Interactivity API stores.
+ *
+ * This state is used during the server directive processing. Then, it is
+ * serialized and sent to the client as part of the interactivity data to be
+ * recovered during the hydration of the client interactivity stores.
+ *
+ * @since 6.5.0
+ * @var array
+ */
+ private $state_data = array();
+
+ /**
+ * Holds the configuration required by the different Interactivity API stores.
+ *
+ * This configuration is serialized and sent to the client as part of the
+ * interactivity data and can be accessed by the client interactivity stores.
+ *
+ * @since 6.5.0
+ * @var array
+ */
+ private $config_data = array();
+
+ /**
+ * Gets and/or sets the initial state of an Interactivity API store for a
+ * given namespace.
+ *
+ * If state for that store namespace already exists, it merges the new
+ * provided state with the existing one.
+ *
+ * @since 6.5.0
+ *
+ * @param string $store_namespace The unique store namespace identifier.
+ * @param array $state Optional. The array that will be merged with the existing state for the specified
+ * store namespace.
+ * @return array The current state for the specified store namespace.
+ */
+ public function state( string $store_namespace, array $state = null ): array {
+ if ( ! isset( $this->state_data[ $store_namespace ] ) ) {
+ $this->state_data[ $store_namespace ] = array();
+ }
+ if ( is_array( $state ) ) {
+ $this->state_data[ $store_namespace ] = array_replace_recursive(
+ $this->state_data[ $store_namespace ],
+ $state
+ );
+ }
+ return $this->state_data[ $store_namespace ];
+ }
+
+ /**
+ * Gets and/or sets the configuration of the Interactivity API for a given
+ * store namespace.
+ *
+ * If configuration for that store namespace exists, it merges the new
+ * provided configuration with the existing one.
+ *
+ * @since 6.5.0
+ *
+ * @param string $store_namespace The unique store namespace identifier.
+ * @param array $config Optional. The array that will be merged with the existing configuration for the
+ * specified store namespace.
+ * @return array The current configuration for the specified store namespace.
+ */
+ public function config( string $store_namespace, array $config = null ): array {
+ if ( ! isset( $this->config_data[ $store_namespace ] ) ) {
+ $this->config_data[ $store_namespace ] = array();
+ }
+ if ( is_array( $config ) ) {
+ $this->config_data[ $store_namespace ] = array_replace_recursive(
+ $this->config_data[ $store_namespace ],
+ $config
+ );
+ }
+ return $this->config_data[ $store_namespace ];
+ }
+
+ /**
+ * Prints the serialized client-side interactivity data.
+ *
+ * Encodes the config and initial state into JSON and prints them inside a
+ * script tag of type "application/json". Once in the browser, the state will
+ * be parsed and used to hydrate the client-side interactivity stores and the
+ * configuration will be available using a `getConfig` utility.
+ *
+ * @since 6.5.0
+ */
+ public function print_client_interactivity_data() {
+ $store = array();
+ $has_state = ! empty( $this->state_data );
+ $has_config = ! empty( $this->config_data );
+
+ if ( $has_state || $has_config ) {
+ if ( $has_config ) {
+ $store['config'] = $this->config_data;
+ }
+ if ( $has_state ) {
+ $store['state'] = $this->state_data;
+ }
+ wp_print_inline_script_tag(
+ wp_json_encode(
+ $store,
+ JSON_HEX_TAG | JSON_HEX_AMP
+ ),
+ array(
+ 'type' => 'application/json',
+ 'id' => 'wp-interactivity-data',
+ )
+ );
+ }
+ }
+
+ /**
+ * Registers the `@wordpress/interactivity` script modules.
+ *
+ * @since 6.5.0
+ */
+ public function register_script_modules() {
+ wp_register_script_module(
+ '@wordpress/interactivity',
+ gutenberg_url( '/build/interactivity/index.min.js' ),
+ array(),
+ defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
+ );
+
+ wp_register_script_module(
+ '@wordpress/interactivity-router',
+ gutenberg_url( '/build/interactivity/router.min.js' ),
+ array( '@wordpress/interactivity' ),
+ defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
+ );
+ }
+
+ /**
+ * Adds the necessary hooks for the Interactivity API.
+ *
+ * @since 6.5.0
+ */
+ public function add_hooks() {
+ add_action( 'wp_footer', array( $this, 'print_client_interactivity_data' ) );
+ }
+
+ /**
+ * Processes the interactivity directives contained within the HTML content
+ * and updates the markup accordingly.
+ *
+ * @since 6.5.0
+ *
+ * @param string $html The HTML content to process.
+ * @return string The processed HTML content. It returns the original content when the HTML contains unbalanced tags.
+ */
+ public function process_directives( string $html ): string {
+ $p = new WP_Interactivity_API_Directives_Processor( $html );
+ $tag_stack = array();
+ $namespace_stack = array();
+ $context_stack = array();
+ $unbalanced = false;
+
+ $directive_processor_prefixes = array_keys( self::$directive_processors );
+ $directive_processor_prefixes_reversed = array_reverse( $directive_processor_prefixes );
+
+ while ( $p->next_tag( array( 'tag_closers' => 'visit' ) ) && false === $unbalanced ) {
+ $tag_name = $p->get_tag();
+
+ if ( $p->is_tag_closer() ) {
+ list( $opening_tag_name, $directives_prefixes ) = end( $tag_stack );
+
+ if ( 0 === count( $tag_stack ) || $opening_tag_name !== $tag_name ) {
+
+ /*
+ * If the tag stack is empty or the matching opening tag is not the
+ * same than the closing tag, it means the HTML is unbalanced and it
+ * stops processing it.
+ */
+ $unbalanced = true;
+ continue;
+ } else {
+
+ /*
+ * It removes the last tag from the stack.
+ */
+ array_pop( $tag_stack );
+
+ /*
+ * If the matching opening tag didn't have any directives, it can skip
+ * the processing.
+ */
+ if ( 0 === count( $directives_prefixes ) ) {
+ continue;
+ }
+ }
+ } else {
+ $directives_prefixes = array();
+
+ foreach ( $p->get_attribute_names_with_prefix( 'data-wp-' ) as $attribute_name ) {
+
+ /*
+ * Extracts the directive prefix to see if there is a server directive
+ * processor registered for that directive.
+ */
+ list( $directive_prefix ) = $this->extract_prefix_and_suffix( $attribute_name );
+ if ( array_key_exists( $directive_prefix, self::$directive_processors ) ) {
+ $directives_prefixes[] = $directive_prefix;
+ }
+ }
+
+ /*
+ * If this is not a void element, it adds it to the tag stack so it can
+ * process its closing tag and check for unbalanced tags.
+ */
+ if ( ! $p->is_void() ) {
+ $tag_stack[] = array( $tag_name, $directives_prefixes );
+ }
+ }
+
+ /*
+ * Sorts the attributes by the order of the `directives_processor` array
+ * and checks what directives are present in this element. The processing
+ * order is reversed for tag closers.
+ */
+ $directives_prefixes = array_intersect(
+ $p->is_tag_closer()
+ ? $directive_processor_prefixes_reversed
+ : $directive_processor_prefixes,
+ $directives_prefixes
+ );
+
+ // Executes the directive processors present in this element.
+ foreach ( $directives_prefixes as $directive_prefix ) {
+ $func = is_array( self::$directive_processors[ $directive_prefix ] )
+ ? self::$directive_processors[ $directive_prefix ]
+ : array( $this, self::$directive_processors[ $directive_prefix ] );
+ call_user_func_array(
+ $func,
+ array( $p, &$context_stack, &$namespace_stack )
+ );
+ }
+ }
+
+ /*
+ * It returns the original content if the HTML is unbalanced because
+ * unbalanced HTML is not safe to process. In that case, the Interactivity
+ * API runtime will update the HTML on the client side during the hydration.
+ */
+ return $unbalanced || 0 < count( $tag_stack ) ? $html : $p->get_updated_html();
+ }
+
+ /**
+ * Evaluates the reference path passed to a directive based on the current
+ * store namespace, state and context.
+ *
+ * @since 6.5.0
+ *
+ * @param string|true $directive_value The directive attribute value string or `true` when it's a boolean attribute.
+ * @param string $default_namespace The default namespace to use if none is explicitly defined in the directive
+ * value.
+ * @param array|false $context The current context for evaluating the directive or false if there is no
+ * context.
+ * @return mixed|null The result of the evaluation. Null if the reference path doesn't exist.
+ */
+ private function evaluate( $directive_value, string $default_namespace, $context = false ) {
+ list( $ns, $path ) = $this->extract_directive_value( $directive_value, $default_namespace );
+ if ( empty( $path ) ) {
+ return null;
+ }
+
+ $store = array(
+ 'state' => isset( $this->state_data[ $ns ] ) ? $this->state_data[ $ns ] : array(),
+ 'context' => isset( $context[ $ns ] ) ? $context[ $ns ] : array(),
+ );
+
+ // Checks if the reference path is preceded by a negator operator (!).
+ $should_negate_value = '!' === $path[0];
+ $path = $should_negate_value ? substr( $path, 1 ) : $path;
+
+ // Extracts the value from the store using the reference path.
+ $path_segments = explode( '.', $path );
+ $current = $store;
+ foreach ( $path_segments as $path_segment ) {
+ if ( isset( $current[ $path_segment ] ) ) {
+ $current = $current[ $path_segment ];
+ } else {
+ return null;
+ }
+ }
+
+ // Returns the opposite if it contains a negator operator (!).
+ return $should_negate_value ? ! $current : $current;
+ }
+
+ /**
+ * Extracts the directive attribute name to separate and return the directive
+ * prefix and an optional suffix.
+ *
+ * The suffix is the string after the first double hyphen and the prefix is
+ * everything that comes before the suffix.
+ *
+ * Example:
+ *
+ * extract_prefix_and_suffix( 'data-wp-interactive' ) => array( 'data-wp-interactive', null )
+ * extract_prefix_and_suffix( 'data-wp-bind--src' ) => array( 'data-wp-bind', 'src' )
+ * extract_prefix_and_suffix( 'data-wp-foo--and--bar' ) => array( 'data-wp-foo', 'and--bar' )
+ *
+ * @since 6.5.0
+ *
+ * @param string $directive_name The directive attribute name.
+ * @return array An array containing the directive prefix and optional suffix.
+ */
+ private function extract_prefix_and_suffix( string $directive_name ): array {
+ return explode( '--', $directive_name, 2 );
+ }
+
+ /**
+ * Parses and extracts the namespace and reference path from the given
+ * directive attribute value.
+ *
+ * If the value doesn't contain an explicit namespace, it returns the
+ * default one. If the value contains a JSON object instead of a reference
+ * path, the function tries to parse it and return the resulting array. If
+ * the value contains strings that reprenset booleans ("true" and "false"),
+ * numbers ("1" and "1.2") or "null", the function also transform them to
+ * regular booleans, numbers and `null`.
+ *
+ * Example:
+ *
+ * extract_directive_value( 'actions.foo', 'myPlugin' ) => array( 'myPlugin', 'actions.foo' )
+ * extract_directive_value( 'otherPlugin::actions.foo', 'myPlugin' ) => array( 'otherPlugin', 'actions.foo' )
+ * extract_directive_value( '{ "isOpen": false }', 'myPlugin' ) => array( 'myPlugin', array( 'isOpen' => false ) )
+ * extract_directive_value( 'otherPlugin::{ "isOpen": false }', 'myPlugin' ) => array( 'otherPlugin', array( 'isOpen' => false ) )
+ *
+ * @since 6.5.0
+ *
+ * @param string|true $directive_value The directive attribute value. It can be `true` when it's a boolean
+ * attribute.
+ * @param string|null $default_namespace Optional. The default namespace if none is explicitly defined.
+ * @return array An array containing the namespace in the first item and the JSON, the reference path, or null on the
+ * second item.
+ */
+ private function extract_directive_value( $directive_value, $default_namespace = null ): array {
+ if ( empty( $directive_value ) || is_bool( $directive_value ) ) {
+ return array( $default_namespace, null );
+ }
+
+ // Replaces the value and namespace if there is a namespace in the value.
+ if ( 1 === preg_match( '/^([\w\-_\/]+)::./', $directive_value ) ) {
+ list($default_namespace, $directive_value) = explode( '::', $directive_value, 2 );
+ }
+
+ /*
+ * Tries to decode the value as a JSON object. If it fails and the value
+ * isn't `null`, it returns the value as it is. Otherwise, it returns the
+ * decoded JSON or null for the string `null`.
+ */
+ $decoded_json = json_decode( $directive_value, true );
+ if ( null !== $decoded_json || 'null' === $directive_value ) {
+ $directive_value = $decoded_json;
+ }
+
+ return array( $default_namespace, $directive_value );
+ }
+
+
+ /**
+ * Processes the `data-wp-interactive` directive.
+ *
+ * It adds the default store namespace defined in the directive value to the
+ * stack so it's available for the nested interactivity elements.
+ *
+ * @since 6.5.0
+ *
+ * @param WP_Interactivity_API_Directives_Processor $p The directives processor instance.
+ * @param array $context_stack The reference to the context stack.
+ * @param array $namespace_stack The reference to the store namespace stack.
+ */
+ private function data_wp_interactive_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+ // In closing tags, it removes the last namespace from the stack.
+ if ( $p->is_tag_closer() ) {
+ return array_pop( $namespace_stack );
+ }
+
+ // Tries to decode the `data-wp-interactive` attribute value.
+ $attribute_value = $p->get_attribute( 'data-wp-interactive' );
+ $decoded_json = is_string( $attribute_value ) && ! empty( $attribute_value )
+ ? json_decode( $attribute_value, true )
+ : null;
+
+ /*
+ * Pushes the newly defined namespace or the current one if the
+ * `data-wp-interactive` definition was invalid or does not contain a
+ * namespace. It does so because the function pops out the current namespace
+ * from the stack whenever it finds a `data-wp-interactive`'s closing tag,
+ * independently of whether the previous `data-wp-interactive` definition
+ * contained a valid namespace.
+ */
+ $namespace_stack[] = isset( $decoded_json['namespace'] )
+ ? $decoded_json['namespace']
+ : end( $namespace_stack );
+ }
+
+ /**
+ * Processes the `data-wp-context` directive.
+ *
+ * It adds the context defined in the directive value to the stack so it's
+ * available for the nested interactivity elements.
+ *
+ * @since 6.5.0
+ *
+ * @param WP_Interactivity_API_Directives_Processor $p The directives processor instance.
+ * @param array $context_stack The reference to the context stack.
+ * @param array $namespace_stack The reference to the store namespace stack.
+ */
+ private function data_wp_context_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+ // In closing tags, it removes the last context from the stack.
+ if ( $p->is_tag_closer() ) {
+ return array_pop( $context_stack );
+ }
+
+ $attribute_value = $p->get_attribute( 'data-wp-context' );
+ $namespace_value = end( $namespace_stack );
+
+ // Separates the namespace from the context JSON object.
+ list( $namespace_value, $decoded_json ) = is_string( $attribute_value ) && ! empty( $attribute_value )
+ ? $this->extract_directive_value( $attribute_value, $namespace_value )
+ : array( $namespace_value, null );
+
+ /*
+ * If there is a namespace, it adds a new context to the stack merging the
+ * previous context with the new one.
+ */
+ if ( is_string( $namespace_value ) ) {
+ array_push(
+ $context_stack,
+ array_replace_recursive(
+ end( $context_stack ) !== false ? end( $context_stack ) : array(),
+ array( $namespace_value => is_array( $decoded_json ) ? $decoded_json : array() )
+ )
+ );
+ } else {
+ /*
+ * If there is no namespace, it pushes the current context to the stack.
+ * It needs to do so because the function pops out the current context
+ * from the stack whenever it finds a `data-wp-context`'s closing tag.
+ */
+ array_push( $context_stack, end( $context_stack ) );
+ }
+ }
+
+ /**
+ * Processes the `data-wp-bind` directive.
+ *
+ * It updates or removes the bound attributes based on the evaluation of its
+ * associated reference.
+ *
+ * @since 6.5.0
+ *
+ * @param WP_Interactivity_API_Directives_Processor $p The directives processor instance.
+ * @param array $context_stack The reference to the context stack.
+ * @param array $namespace_stack The reference to the store namespace stack.
+ */
+ private function data_wp_bind_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+ if ( ! $p->is_tag_closer() ) {
+ $all_bind_directives = $p->get_attribute_names_with_prefix( 'data-wp-bind--' );
+
+ foreach ( $all_bind_directives as $attribute_name ) {
+ list( , $bound_attribute ) = $this->extract_prefix_and_suffix( $attribute_name );
+ if ( empty( $bound_attribute ) ) {
+ return;
+ }
+
+ $attribute_value = $p->get_attribute( $attribute_name );
+ $result = $this->evaluate( $attribute_value, end( $namespace_stack ), end( $context_stack ) );
+
+ if ( null !== $result && ( false !== $result || '-' === $bound_attribute[4] ) ) {
+ /*
+ * If the result of the evaluation is a boolean and the attribute is
+ * `aria-` or `data-, convert it to a string "true" or "false". It
+ * follows the exact same logic as Preact because it needs to
+ * replicate what Preact will later do in the client:
+ * https://github.com/preactjs/preact/blob/ea49f7a0f9d1ff2c98c0bdd66aa0cbc583055246/src/diff/props.js#L131C24-L136
+ */
+ if ( is_bool( $result ) && '-' === $bound_attribute[4] ) {
+ $result = $result ? 'true' : 'false';
+ }
+ $p->set_attribute( $bound_attribute, $result );
+ } else {
+ $p->remove_attribute( $bound_attribute );
+ }
+ }
+ }
+ }
+
+
+ /**
+ * Processes the `data-wp-class` directive.
+ *
+ * It adds or removes CSS classes in the current HTML element based on the
+ * evaluation of its associated references.
+ *
+ * @since 6.5.0
+ *
+ * @param WP_Interactivity_API_Directives_Processor $p The directives processor instance.
+ * @param array $context_stack The reference to the context stack.
+ * @param array $namespace_stack The reference to the store namespace stack.
+ */
+ private function data_wp_class_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+ if ( ! $p->is_tag_closer() ) {
+ $all_class_directives = $p->get_attribute_names_with_prefix( 'data-wp-class--' );
+
+ foreach ( $all_class_directives as $attribute_name ) {
+ list( , $class_name ) = $this->extract_prefix_and_suffix( $attribute_name );
+ if ( empty( $class_name ) ) {
+ return;
+ }
+
+ $attribute_value = $p->get_attribute( $attribute_name );
+ $result = $this->evaluate( $attribute_value, end( $namespace_stack ), end( $context_stack ) );
+
+ if ( $result ) {
+ $p->add_class( $class_name );
+ } else {
+ $p->remove_class( $class_name );
+ }
+ }
+ }
+ }
+
+ /**
+ * Processes the `data-wp-style` directive.
+ *
+ * It updates the style attribute value of the current HTML element based on
+ * the evaluation of its associated references.
+ *
+ * @since 6.5.0
+ *
+ * @param WP_Interactivity_API_Directives_Processor $p The directives processor instance.
+ * @param array $context_stack The reference to the context stack.
+ * @param array $namespace_stack The reference to the store namespace stack.
+ */
+ private function data_wp_style_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+ if ( ! $p->is_tag_closer() ) {
+ $all_style_attributes = $p->get_attribute_names_with_prefix( 'data-wp-style--' );
+
+ foreach ( $all_style_attributes as $attribute_name ) {
+ list( , $style_property ) = $this->extract_prefix_and_suffix( $attribute_name );
+ if ( empty( $style_property ) ) {
+ continue;
+ }
+
+ $directive_attribute_value = $p->get_attribute( $attribute_name );
+ $style_property_value = $this->evaluate( $directive_attribute_value, end( $namespace_stack ), end( $context_stack ) );
+ $style_attribute_value = $p->get_attribute( 'style' );
+ $style_attribute_value = ( $style_attribute_value && ! is_bool( $style_attribute_value ) ) ? $style_attribute_value : '';
+
+ /*
+ * Checks first if the style property is not falsy and the style
+ * attribute value is not empty because if it is, it doesn't need to
+ * update the attribute value.
+ */
+ if ( $style_property_value || ( ! $style_property_value && $style_attribute_value ) ) {
+ $style_attribute_value = $this->set_style_property( $style_attribute_value, $style_property, $style_property_value );
+ /*
+ * If the style attribute value is not empty, it sets it. Otherwise,
+ * it removes it.
+ */
+ if ( ! empty( $style_attribute_value ) ) {
+ $p->set_attribute( 'style', $style_attribute_value );
+ } else {
+ $p->remove_attribute( 'style' );
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Sets an individual style property in the `style` attribute of an HTML
+ * element, updating or removing the property when necessary.
+ *
+ * If a property is modified, it is added at the end of the list to make sure
+ * that it overrides the previous ones.
+ *
+ * @since 6.5.0
+ *
+ * Example:
+ *
+ * set_style_property( 'color:green;', 'color', 'red' ) => 'color:red;'
+ * set_style_property( 'background:green;', 'color', 'red' ) => 'background:green;color:red;'
+ * set_style_property( 'color:green;', 'color', null ) => ''
+ *
+ * @param string $style_attribute_value The current style attribute value.
+ * @param string $style_property_name The style property name to set.
+ * @param string|false|null $style_property_value The value to set for the style property. With false, null or an
+ * empty string, it removes the style property.
+ * @return string The new style attribute value after the specified property has been added, updated or removed.
+ */
+ private function set_style_property( string $style_attribute_value, string $style_property_name, $style_property_value ): string {
+ $style_assignments = explode( ';', $style_attribute_value );
+ $result = array();
+ $style_property_value = ! empty( $style_property_value ) ? rtrim( trim( $style_property_value ), ';' ) : null;
+ $new_style_property = $style_property_value ? $style_property_name . ':' . $style_property_value . ';' : '';
+
+ // Generate an array with all the properties but the modified one.
+ foreach ( $style_assignments as $style_assignment ) {
+ if ( empty( trim( $style_assignment ) ) ) {
+ continue;
+ }
+ list( $name, $value ) = explode( ':', $style_assignment );
+ if ( trim( $name ) !== $style_property_name ) {
+ $result[] = trim( $name ) . ':' . trim( $value ) . ';';
+ }
+ }
+
+ // Add the new/modified property at the end of the list.
+ array_push( $result, $new_style_property );
+
+ return implode( '', $result );
+ }
+
+ /**
+ * Processes the `data-wp-text` directive.
+ *
+ * It updates the inner content of the current HTML element based on the
+ * evaluation of its associated reference.
+ *
+ * @since 6.5.0
+ *
+ * @param WP_Interactivity_API_Directives_Processor $p The directives processor instance.
+ * @param array $context_stack The reference to the context stack.
+ * @param array $namespace_stack The reference to the store namespace stack.
+ */
+ private function data_wp_text_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+ if ( ! $p->is_tag_closer() ) {
+ $attribute_value = $p->get_attribute( 'data-wp-text' );
+ $result = $this->evaluate( $attribute_value, end( $namespace_stack ), end( $context_stack ) );
+
+ /*
+ * Follows the same logic as Preact in the client and only changes the
+ * content if the value is a string or a number. Otherwise, it removes the
+ * content.
+ */
+ if ( is_string( $result ) || is_numeric( $result ) ) {
+ $p->set_content_between_balanced_tags( esc_html( $result ) );
+ } else {
+ $p->set_content_between_balanced_tags( '' );
+ }
+ }
+ }
+ }
+
+}
diff --git a/lib/compat/wordpress-6.5/interactivity-api/interactivity-api.php b/lib/compat/wordpress-6.5/interactivity-api/interactivity-api.php
new file mode 100644
index 00000000000000..cd7ca7fb902870
--- /dev/null
+++ b/lib/compat/wordpress-6.5/interactivity-api/interactivity-api.php
@@ -0,0 +1,144 @@
+get_registered( $block_name );
+
+ if ( isset( $block_name ) && isset( $block_type->supports['interactivity'] ) && $block_type->supports['interactivity'] ) {
+ // Annotates the root interactive block for processing.
+ $root_interactive_block = array( $block_name, md5( serialize( $parsed_block ) ) );
+
+ /*
+ * Adds a filter to process the root interactive block once it has
+ * finished rendering.
+ */
+ $process_interactive_blocks = static function ( $content, $parsed_block ) use ( &$root_interactive_block, &$process_interactive_blocks ) {
+ // Checks whether the current block is the root interactive block.
+ list($root_block_name, $root_block_md5) = $root_interactive_block;
+ if ( $root_block_name === $parsed_block['blockName'] && md5( serialize( $parsed_block ) ) === $root_block_md5 ) {
+ // The root interactive blocks has finished rendering, process it.
+ $content = wp_interactivity_process_directives( $content );
+ // Removes the filter and reset the root interactive block.
+ remove_filter( 'render_block', $process_interactive_blocks );
+ $root_interactive_block = null;
+ }
+ return $content;
+ };
+
+ /*
+ * Uses a priority of 20 to ensure that other filters can add additional
+ * directives before the processing starts.
+ */
+ add_filter( 'render_block', $process_interactive_blocks, 20, 2 );
+ }
+ }
+
+ return $parsed_block;
+ }
+ add_filter( 'render_block_data', 'wp_interactivity_process_directives_of_interactive_blocks', 10, 1 );
+}
+
+if ( ! function_exists( 'wp_interactivity' ) ) {
+ /**
+ * Retrieves the main WP_Interactivity_API instance.
+ *
+ * It provides access to the WP_Interactivity_API instance, creating one if it
+ * doesn't exist yet. It also registers the hooks and necessary script
+ * modules.
+ *
+ * @since 6.5.0
+ *
+ * @return WP_Interactivity_API The main WP_Interactivity_API instance.
+ */
+ function wp_interactivity() {
+ static $instance = null;
+ if ( is_null( $instance ) ) {
+ $instance = new WP_Interactivity_API();
+ $instance->add_hooks();
+ $instance->register_script_modules();
+ }
+ return $instance;
+ }
+}
+
+if ( ! function_exists( 'wp_interactivity_process_directives' ) ) {
+ /**
+ * Processes the interactivity directives contained within the HTML content
+ * and updates the markup accordingly.
+ *
+ * @since 6.5.0
+ *
+ * @param string $html The HTML content to process.
+ * @return string The processed HTML content. It returns the original content when the HTML contains unbalanced tags.
+ */
+ function wp_interactivity_process_directives( $html ) {
+ return wp_interactivity()->process_directives( $html );
+ }
+}
+
+if ( ! function_exists( 'wp_interactivity_state' ) ) {
+ /**
+ * Gets and/or sets the initial state of an Interactivity API store for a
+ * given namespace.
+ *
+ * If state for that store namespace already exists, it merges the new
+ * provided state with the existing one.
+ *
+ * @since 6.5.0
+ *
+ * @param string $store_namespace The unique store namespace identifier.
+ * @param array $state Optional. The array that will be merged with the existing state for the specified
+ * store namespace.
+ * @return array The current state for the specified store namespace.
+ */
+ function wp_interactivity_state( $store_namespace, $state = null ) {
+ return wp_interactivity()->state( $store_namespace, $state );
+ }
+}
+
+if ( ! function_exists( 'wp_interactivity_config' ) ) {
+ /**
+ * Gets and/or sets the configuration of the Interactivity API for a given
+ * store namespace.
+ *
+ * If configuration for that store namespace exists, it merges the new
+ * provided configuration with the existing one.
+ *
+ * @since 6.5.0
+ *
+ * @param string $store_namespace The unique store namespace identifier.
+ * @param array $config Optional. The array that will be merged with the existing configuration for the
+ * specified store namespace.
+ * @return array The current configuration for the specified store namespace.
+ */
+ function wp_interactivity_config( $store_namespace, $initial_state = null ) {
+ return wp_interactivity()->config( $store_namespace, $initial_state );
+ }
+}
diff --git a/lib/compat/wordpress-6.5/scripts-modules.php b/lib/compat/wordpress-6.5/scripts-modules.php
new file mode 100644
index 00000000000000..ba329b255b1965
--- /dev/null
+++ b/lib/compat/wordpress-6.5/scripts-modules.php
@@ -0,0 +1,119 @@
+add_hooks();
+ }
+ return $instance;
+ }
+}
+
+if ( ! function_exists( 'wp_register_script_module' ) ) {
+ /**
+ * Registers the script module if no script module with that script module
+ * identifier has already been registered.
+ *
+ * @since 6.5.0
+ *
+ * @param string $id The identifier of the script module. Should be unique. It will be used in the
+ * final import map.
+ * @param string $src Optional. Full URL of the script module, or path of the script module relative
+ * to the WordPress root directory. If it is provided and the script module has
+ * not been registered yet, it will be registered.
+ * @param array $deps {
+ * Optional. List of dependencies.
+ *
+ * @type string|array $0... {
+ * An array of script module identifiers of the dependencies of this script
+ * module. The dependencies can be strings or arrays. If they are arrays,
+ * they need an `id` key with the script module identifier, and can contain
+ * an `import` key with either `static` or `dynamic`. By default,
+ * dependencies that don't contain an `import` key are considered static.
+ *
+ * @type string $id The script module identifier.
+ * @type string $import Optional. Import type. May be either `static` or
+ * `dynamic`. Defaults to `static`.
+ * }
+ * }
+ * @param string|false|null $version Optional. String specifying the script module version number. Defaults to false.
+ * It is added to the URL as a query string for cache busting purposes. If $version
+ * is set to false, the version number is the currently installed WordPress version.
+ * If $version is set to null, no version is added.
+ */
+ function wp_register_script_module( string $id, string $src, array $deps = array(), $version = false ) {
+ wp_script_modules()->register( $id, $src, $deps, $version );
+ }
+}
+
+if ( ! function_exists( 'wp_enqueue_script_module' ) ) {
+ /**
+ * Marks the script module to be enqueued in the page.
+ *
+ * If a src is provided and the script module has not been registered yet, it
+ * will be registered.
+ *
+ * @since 6.5.0
+ *
+ * @param string $id The identifier of the script module. Should be unique. It will be used in the
+ * final import map.
+ * @param string $src Optional. Full URL of the script module, or path of the script module relative
+ * to the WordPress root directory. If it is provided and the script module has
+ * not been registered yet, it will be registered.
+ * @param array $deps {
+ * Optional. List of dependencies.
+ *
+ * @type string|array $0... {
+ * An array of script module identifiers of the dependencies of this script
+ * module. The dependencies can be strings or arrays. If they are arrays,
+ * they need an `id` key with the script module identifier, and can contain
+ * an `import` key with either `static` or `dynamic`. By default,
+ * dependencies that don't contain an `import` key are considered static.
+ *
+ * @type string $id The script module identifier.
+ * @type string $import Optional. Import type. May be either `static` or
+ * `dynamic`. Defaults to `static`.
+ * }
+ * }
+ * @param string|false|null $version Optional. String specifying the script module version number. Defaults to false.
+ * It is added to the URL as a query string for cache busting purposes. If $version
+ * is set to false, the version number is the currently installed WordPress version.
+ * If $version is set to null, no version is added.
+ */
+ function wp_enqueue_script_module( string $id, string $src = '', array $deps = array(), $version = false ) {
+ wp_script_modules()->enqueue( $id, $src, $deps, $version );
+ }
+}
+
+if ( ! function_exists( 'wp_dequeue_script_module' ) ) {
+ /**
+ * Unmarks the script module so it is no longer enqueued in the page.
+ *
+ * @since 6.5.0
+ *
+ * @param string $id The identifier of the script module.
+ */
+ function wp_dequeue_script_module( string $id ) {
+ wp_script_modules()->dequeue( $id );
+ }
+}
diff --git a/lib/experimental/block-bindings/block-bindings.php b/lib/experimental/block-bindings/block-bindings.php
deleted file mode 100644
index 83a1d6132f5f43..00000000000000
--- a/lib/experimental/block-bindings/block-bindings.php
+++ /dev/null
@@ -1,69 +0,0 @@
-register_source( $source_name, $label, $apply );
- }
-}
-
-/**
- * Retrieves the list of registered block sources.
- *
- * @return array The list of registered block sources.
- */
-if ( ! function_exists( 'wp_block_bindings_get_sources' ) ) {
- function wp_block_bindings_get_sources() {
- return wp_block_bindings()->get_sources();
- }
-}
-
-/**
- * Replaces the HTML content of a block based on the provided source value.
- *
- * @param string $block_content Block Content.
- * @param string $block_name The name of the block to process.
- * @param string $block_attr The attribute of the block we want to process.
- * @param string $source_value The value used to replace the HTML.
- * @return string The modified block content.
- */
-if ( ! function_exists( 'wp_block_bindings_replace_html' ) ) {
- function wp_block_bindings_replace_html( $block_content, $block_name, $block_attr, $source_value ) {
- return wp_block_bindings()->replace_html( $block_content, $block_name, $block_attr, $source_value );
- }
-}
diff --git a/lib/experimental/block-bindings/class-wp-block-bindings.php b/lib/experimental/block-bindings/class-wp-block-bindings.php
deleted file mode 100644
index 7eb443dd367a6f..00000000000000
--- a/lib/experimental/block-bindings/class-wp-block-bindings.php
+++ /dev/null
@@ -1,158 +0,0 @@
-sources[ $source_name ] = array(
- 'label' => $label,
- 'apply' => $apply,
- );
- }
-
- /**
- * Depending on the block attributes, replace the proper HTML based on the value returned by the source.
- *
- * @param string $block_content Block Content.
- * @param string $block_name The name of the block to process.
- * @param string $block_attr The attribute of the block we want to process.
- * @param string $source_value The value used to replace the HTML.
- */
- public function replace_html( $block_content, $block_name, $block_attr, $source_value ) {
- $block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
- if ( null === $block_type ) {
- return;
- }
-
- // Depending on the attribute source, the processing will be different.
- switch ( $block_type->attributes[ $block_attr ]['source'] ) {
- case 'html':
- case 'rich-text':
- $block_reader = new WP_HTML_Tag_Processor( $block_content );
-
- // TODO: Support for CSS selectors whenever they are ready in the HTML API.
- // In the meantime, support comma-separated selectors by exploding them into an array.
- $selectors = explode( ',', $block_type->attributes[ $block_attr ]['selector'] );
- // Add a bookmark to the first tag to be able to iterate over the selectors.
- $block_reader->next_tag();
- $block_reader->set_bookmark( 'iterate-selectors' );
-
- // TODO: This shouldn't be needed when the `set_inner_html` function is ready.
- // Store the parent tag and its attributes to be able to restore them later in the button.
- // The button block has a wrapper while the paragraph and heading blocks don't.
- if ( 'core/button' === $block_name ) {
- $button_wrapper = $block_reader->get_tag();
- $button_wrapper_attribute_names = $block_reader->get_attribute_names_with_prefix( '' );
- $button_wrapper_attrs = array();
- foreach ( $button_wrapper_attribute_names as $name ) {
- $button_wrapper_attrs[ $name ] = $block_reader->get_attribute( $name );
- }
- }
-
- foreach ( $selectors as $selector ) {
- // If the parent tag, or any of its children, matches the selector, replace the HTML.
- if ( strcasecmp( $block_reader->get_tag( $selector ), $selector ) === 0 || $block_reader->next_tag(
- array(
- 'tag_name' => $selector,
- )
- ) ) {
- $block_reader->release_bookmark( 'iterate-selectors' );
-
- // TODO: Use `set_inner_html` method whenever it's ready in the HTML API.
- // Until then, it is hardcoded for the paragraph, heading, and button blocks.
- // Store the tag and its attributes to be able to restore them later.
- $selector_attribute_names = $block_reader->get_attribute_names_with_prefix( '' );
- $selector_attrs = array();
- foreach ( $selector_attribute_names as $name ) {
- $selector_attrs[ $name ] = $block_reader->get_attribute( $name );
- }
- $selector_markup = "<$selector>" . esc_html( $source_value ) . "";
- $amended_content = new WP_HTML_Tag_Processor( $selector_markup );
- $amended_content->next_tag();
- foreach ( $selector_attrs as $attribute_key => $attribute_value ) {
- $amended_content->set_attribute( $attribute_key, $attribute_value );
- }
- if ( 'core/paragraph' === $block_name || 'core/heading' === $block_name ) {
- return $amended_content->get_updated_html();
- }
- if ( 'core/button' === $block_name ) {
- $button_markup = "<$button_wrapper>{$amended_content->get_updated_html()}";
- $amended_button = new WP_HTML_Tag_Processor( $button_markup );
- $amended_button->next_tag();
- foreach ( $button_wrapper_attrs as $attribute_key => $attribute_value ) {
- $amended_button->set_attribute( $attribute_key, $attribute_value );
- }
- return $amended_button->get_updated_html();
- }
- } else {
- $block_reader->seek( 'iterate-selectors' );
- }
- }
- $block_reader->release_bookmark( 'iterate-selectors' );
- return $block_content;
-
- case 'attribute':
- $amended_content = new WP_HTML_Tag_Processor( $block_content );
- if ( ! $amended_content->next_tag(
- array(
- // TODO: build the query from CSS selector.
- 'tag_name' => $block_type->attributes[ $block_attr ]['selector'],
- )
- ) ) {
- return $block_content;
- }
- $amended_content->set_attribute( $block_type->attributes[ $block_attr ]['attribute'], esc_attr( $source_value ) );
- return $amended_content->get_updated_html();
- break;
-
- default:
- return $block_content;
- break;
- }
- return;
- }
-
- /**
- * Retrieves the list of registered block sources.
- *
- * @return array The array of registered sources.
- */
- public function get_sources() {
- return $this->sources;
- }
-}
diff --git a/lib/experimental/block-bindings/index.php b/lib/experimental/block-bindings/index.php
deleted file mode 100644
index dc9a6c9b96957b..00000000000000
--- a/lib/experimental/block-bindings/index.php
+++ /dev/null
@@ -1,19 +0,0 @@
-attributes, array( 'metadata', 'id' ), false ) ) {
- return null;
- }
- $block_id = $block_instance->attributes['metadata']['id'];
- return _wp_array_get( $block_instance->context, array( 'pattern/overrides', $block_id, $attribute_name ), null );
- };
- wp_block_bindings_register_source(
- 'pattern_attributes',
- __( 'Pattern Attributes', 'gutenberg' ),
- $pattern_source_callback
- );
-}
diff --git a/lib/experimental/blocks.php b/lib/experimental/blocks.php
index 93b65f95fc61ae..fc67f2c9d43770 100644
--- a/lib/experimental/blocks.php
+++ b/lib/experimental/blocks.php
@@ -77,92 +77,3 @@ function wp_enqueue_block_view_script( $block_name, $args ) {
add_filter( 'render_block', $callback, 10, 2 );
}
}
-
-
-
-
-$gutenberg_experiments = get_option( 'gutenberg-experiments' );
-if ( $gutenberg_experiments && (
- array_key_exists( 'gutenberg-block-bindings', $gutenberg_experiments ) ||
- array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments )
-) ) {
-
- require_once __DIR__ . '/block-bindings/index.php';
-
- if ( ! function_exists( 'gutenberg_process_block_bindings' ) ) {
- /**
- * Process the block bindings attribute.
- *
- * @param string $block_content Block Content.
- * @param array $block Block attributes.
- * @param WP_Block $block_instance The block instance.
- */
- function gutenberg_process_block_bindings( $block_content, $block, $block_instance ) {
-
- // Allowed blocks that support block bindings.
- // TODO: Look for a mechanism to opt-in for this. Maybe adding a property to block attributes?
- $allowed_blocks = array(
- 'core/paragraph' => array( 'content' ),
- 'core/heading' => array( 'content' ),
- 'core/image' => array( 'url', 'title', 'alt' ),
- 'core/button' => array( 'url', 'text' ),
- );
-
- // If the block doesn't have the bindings property or isn't one of the allowed block types, return.
- if ( ! isset( $block['attrs']['metadata']['bindings'] ) || ! isset( $allowed_blocks[ $block_instance->name ] ) ) {
- return $block_content;
- }
-
- // Assuming the following format for the bindings property of the "metadata" attribute:
- //
- // "bindings": {
- // "title": {
- // "source": {
- // "name": "post_meta",
- // "attributes": { "value": "text_custom_field" }
- // }
- // },
- // "url": {
- // "source": {
- // "name": "post_meta",
- // "attributes": { "value": "text_custom_field" }
- // }
- // }
- // }
- //
-
- $block_bindings_sources = wp_block_bindings_get_sources();
- $modified_block_content = $block_content;
- foreach ( $block['attrs']['metadata']['bindings'] as $binding_attribute => $binding_source ) {
-
- // If the attribute is not in the list, process next attribute.
- if ( ! in_array( $binding_attribute, $allowed_blocks[ $block_instance->name ], true ) ) {
- continue;
- }
- // If no source is provided, or that source is not registered, process next attribute.
- if ( ! isset( $binding_source['source'] ) || ! isset( $binding_source['source']['name'] ) || ! isset( $block_bindings_sources[ $binding_source['source']['name'] ] ) ) {
- continue;
- }
-
- $source_callback = $block_bindings_sources[ $binding_source['source']['name'] ]['apply'];
- // Get the value based on the source.
- if ( ! isset( $binding_source['source']['attributes'] ) ) {
- $source_args = array();
- } else {
- $source_args = $binding_source['source']['attributes'];
- }
- $source_value = $source_callback( $source_args, $block_instance, $binding_attribute );
- // If the value is null, process next attribute.
- if ( is_null( $source_value ) ) {
- continue;
- }
-
- // Process the HTML based on the block and the attribute.
- $modified_block_content = wp_block_bindings_replace_html( $modified_block_content, $block_instance->name, $binding_attribute, $source_value );
- }
- return $modified_block_content;
- }
- }
-
- add_filter( 'render_block', 'gutenberg_process_block_bindings', 20, 3 );
-}
diff --git a/lib/experimental/editor-settings.php b/lib/experimental/editor-settings.php
index 729376cf030dd9..37774e07b27691 100644
--- a/lib/experimental/editor-settings.php
+++ b/lib/experimental/editor-settings.php
@@ -25,18 +25,9 @@ function gutenberg_enable_experiments() {
if ( $gutenberg_experiments && array_key_exists( 'gutenberg-group-grid-variation', $gutenberg_experiments ) ) {
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableGroupGridVariation = true', 'before' );
}
-
- if ( $gutenberg_experiments && array_key_exists( 'gutenberg-block-bindings', $gutenberg_experiments ) ) {
- wp_add_inline_script( 'wp-block-editor', 'window.__experimentalBlockBindings = true', 'before' );
- }
-
if ( gutenberg_is_experiment_enabled( 'gutenberg-no-tinymce' ) ) {
wp_add_inline_script( 'wp-block-library', 'window.__experimentalDisableTinymce = true', 'before' );
}
-
- if ( $gutenberg_experiments && array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments ) ) {
- wp_add_inline_script( 'wp-block-editor', 'window.__experimentalPatternPartialSyncing = true', 'before' );
- }
}
add_action( 'admin_init', 'gutenberg_enable_experiments' );
diff --git a/lib/experimental/fonts/font-library/class-wp-font-collection.php b/lib/experimental/fonts/font-library/class-wp-font-collection.php
index 6189da5fa984b1..1ff96b1343b453 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-collection.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-collection.php
@@ -21,41 +21,128 @@
class WP_Font_Collection {
/**
- * Font collection configuration.
+ * The unique slug for the font collection.
+ *
+ * @since 6.5.0
+ *
+ * @var string
+ */
+ private $slug;
+
+ /**
+ * The name of the font collection.
+ *
+ * @since 6.5.0
+ *
+ * @var string
+ */
+ private $name;
+
+ /**
+ * Description of the font collection.
+ *
+ * @since 6.5.0
+ *
+ * @var string
+ */
+ private $description;
+
+ /**
+ * Source of the font collection.
+ *
+ * @since 6.5.0
+ *
+ * @var string
+ */
+ private $src;
+
+ /**
+ * Array of font families in the collection.
*
* @since 6.5.0
*
* @var array
*/
- private $config;
+ private $font_families;
+
+ /**
+ * Categories associated with the font collection.
+ *
+ * @since 6.5.0
+ *
+ * @var array
+ */
+ private $categories;
+
/**
* WP_Font_Collection constructor.
*
* @since 6.5.0
*
- * @param array $config Font collection config options.
- * See {@see wp_register_font_collection()} for the supported fields.
- * @throws Exception If the required parameters are missing.
+ * @param array $config Font collection config options. {
+ * @type string $slug The font collection's unique slug.
+ * @type string $name The font collection's name.
+ * @type string $description The font collection's description.
+ * @type string $src The font collection's source.
+ * @type array $font_families An array of font families in the font collection.
+ * @type array $categories The font collection's categories.
+ * }
*/
public function __construct( $config ) {
- if ( empty( $config ) || ! is_array( $config ) ) {
- throw new Exception( 'Font Collection config options is required as a non-empty array.' );
- }
+ $this->is_config_valid( $config );
+
+ $this->slug = isset( $config['slug'] ) ? $config['slug'] : '';
+ $this->name = isset( $config['name'] ) ? $config['name'] : '';
+ $this->description = isset( $config['description'] ) ? $config['description'] : '';
+ $this->src = isset( $config['src'] ) ? $config['src'] : '';
+ $this->font_families = isset( $config['font_families'] ) ? $config['font_families'] : array();
+ $this->categories = isset( $config['categories'] ) ? $config['categories'] : array();
+ }
- if ( empty( $config['slug'] ) || ! is_string( $config['slug'] ) ) {
- throw new Exception( 'Font Collection config slug is required as a non-empty string.' );
+ /**
+ * Checks if the font collection config is valid.
+ *
+ * @since 6.5.0
+ *
+ * @param array $config Font collection config options. {
+ * @type string $slug The font collection's unique slug.
+ * @type string $name The font collection's name.
+ * @type string $description The font collection's description.
+ * @type string $src The font collection's source.
+ * @type array $font_families An array of font families in the font collection.
+ * @type array $categories The font collection's categories.
+ * }
+ * @return bool True if the font collection config is valid and false otherwise.
+ */
+ public static function is_config_valid( $config ) {
+ if ( empty( $config ) || ! is_array( $config ) ) {
+ _doing_it_wrong( __METHOD__, __( 'Font Collection config options are required as a non-empty array.', 'gutenberg' ), '6.5.0' );
+ return false;
}
- if ( empty( $config['name'] ) || ! is_string( $config['name'] ) ) {
- throw new Exception( 'Font Collection config name is required as a non-empty string.' );
+ $required_keys = array( 'slug', 'name' );
+ foreach ( $required_keys as $key ) {
+ if ( empty( $config[ $key ] ) ) {
+ _doing_it_wrong(
+ __METHOD__,
+ // translators: %s: Font collection config key.
+ sprintf( __( 'Font Collection config %s is required as a non-empty string.', 'gutenberg' ), $key ),
+ '6.5.0'
+ );
+ return false;
+ }
}
- if ( ( empty( $config['src'] ) || ! is_string( $config['src'] ) ) && ( empty( $config['data'] ) ) ) {
- throw new Exception( 'Font Collection config "src" option OR "data" option is required.' );
+ if (
+ ( empty( $config['src'] ) && empty( $config['font_families'] ) ) ||
+ ( ! empty( $config['src'] ) && ! empty( $config['font_families'] ) )
+ ) {
+ _doing_it_wrong( __METHOD__, __( 'Font Collection config "src" option OR "font_families" option are required.', 'gutenberg' ), '6.5.0' );
+ return false;
}
- $this->config = $config;
+ return true;
}
/**
@@ -73,56 +160,59 @@ public function __construct( $config ) {
*/
public function get_config() {
return array(
- 'slug' => $this->config['slug'],
- 'name' => $this->config['name'],
- 'description' => $this->config['description'] ?? '',
+ 'slug' => $this->slug,
+ 'name' => $this->name,
+ 'description' => $this->description,
);
}
/**
- * Gets the font collection config and data.
+ * Gets the font collection content.
*
- * This function returns an array containing the font collection's unique ID,
- * name, and its data as a PHP array.
+ * Load the font collection data from the src if it is not already loaded.
*
* @since 6.5.0
*
- * @return array {
- * An array of font collection config and data.
+ * @return array|WP_Error {
+ * An array of font collection contents.
*
- * @type string $slug The font collection's unique ID.
- * @type string $name The font collection's name.
- * @type string $description The font collection's description.
- * @type array $data The font collection's data as a PHP array.
+ * @type array $font_families The font collection's font families.
+ * @type string $categories The font collection's categories.
* }
+ *
+ * A WP_Error object if there was an error loading the font collection data.
*/
- public function get_config_and_data() {
- $config_and_data = $this->get_config();
- $config_and_data['data'] = $this->load_data();
- return $config_and_data;
+ public function get_content() {
+ // If the font families are not loaded, and the src is not empty, load the data from the src.
+ if ( empty( $this->font_families ) && ! empty( $this->src ) ) {
+ $data = $this->load_contents_from_src();
+ if ( is_wp_error( $data ) ) {
+ return $data;
+ }
+ }
+
+ return array(
+ 'font_families' => $this->font_families,
+ 'categories' => $this->categories,
+ );
}
/**
- * Loads the font collection data.
+ * Loads the font collection data from the src.
*
* @since 6.5.0
*
* @return array|WP_Error An array containing the list of font families in font-collection.json format on success,
* else an instance of WP_Error on failure.
*/
- public function load_data() {
-
- if ( ! empty( $this->config['data'] ) ) {
- return $this->config['data'];
- }
-
+ private function load_contents_from_src() {
// If the src is a URL, fetch the data from the URL.
- if ( str_contains( $this->config['src'], 'http' ) && str_contains( $this->config['src'], '://' ) ) {
- if ( ! wp_http_validate_url( $this->config['src'] ) ) {
+ if ( preg_match( '#^https?://#', $this->src ) ) {
+ if ( ! wp_http_validate_url( $this->src ) ) {
return new WP_Error( 'font_collection_read_error', __( 'Invalid URL for Font Collection data.', 'gutenberg' ) );
}
- $response = wp_remote_get( $this->config['src'] );
+ $response = wp_remote_get( $this->src );
if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
return new WP_Error( 'font_collection_read_error', __( 'Error fetching the Font Collection data from a URL.', 'gutenberg' ) );
}
@@ -133,15 +223,22 @@ public function load_data() {
}
// If the src is a file path, read the data from the file.
} else {
- if ( ! file_exists( $this->config['src'] ) ) {
+ if ( ! file_exists( $this->src ) ) {
return new WP_Error( 'font_collection_read_error', __( 'Font Collection data JSON file does not exist.', 'gutenberg' ) );
}
- $data = wp_json_file_decode( $this->config['src'], array( 'associative' => true ) );
+ $data = wp_json_file_decode( $this->src, array( 'associative' => true ) );
if ( empty( $data ) ) {
return new WP_Error( 'font_collection_read_error', __( 'Error reading the Font Collection data JSON file contents.', 'gutenberg' ) );
}
}
+ if ( empty( $data['font_families'] ) ) {
+ return new WP_Error( 'font_collection_contents_error', __( 'Font Collection data JSON file does not contain font families.', 'gutenberg' ) );
+ }
+
+ $this->font_families = $data['font_families'];
+ $this->categories = $data['categories'] ?? array();
+
return $data;
}
}
diff --git a/lib/experimental/fonts/font-library/class-wp-font-family-utils.php b/lib/experimental/fonts/font-library/class-wp-font-family-utils.php
index 35e6856e50aad8..b291a8f1ee348d 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-family-utils.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-family-utils.php
@@ -91,7 +91,7 @@ public static function format_font_family( $font_family ) {
function ( $family ) {
$trimmed = trim( $family );
if ( ! empty( $trimmed ) && strpos( $trimmed, ' ' ) !== false && strpos( $trimmed, "'" ) === false && strpos( $trimmed, '"' ) === false ) {
- return "'" . $trimmed . "'";
+ return '"' . $trimmed . '"';
}
return $trimmed;
},
@@ -107,4 +107,84 @@ function ( $family ) {
return $font_family;
}
+
+ /**
+ * Generates a slug from font face properties, e.g. `open sans;normal;400;100%;U+0-10FFFF`
+ *
+ * Used for comparison with other font faces in the same family, to prevent duplicates
+ * that would both match according the CSS font matching spec. Uses only simple case-insensitive
+ * matching for fontFamily and unicodeRange, so does not handle overlapping font-family lists or
+ * unicode ranges.
+ *
+ * @since 6.5.0
+ *
+ * @link https://drafts.csswg.org/css-fonts/#font-style-matching
+ *
+ * @param array $settings {
+ * Font face settings.
+ *
+ * @type string $fontFamily Font family name.
+ * @type string $fontStyle Optional font style, defaults to 'normal'.
+ * @type string $fontWeight Optional font weight, defaults to 400.
+ * @type string $fontStretch Optional font stretch, defaults to '100%'.
+ * @type string $unicodeRange Optional unicode range, defaults to 'U+0-10FFFF'.
+ * }
+ * @return string Font face slug.
+ */
+ public static function get_font_face_slug( $settings ) {
+ $settings = wp_parse_args(
+ $settings,
+ array(
+ 'fontFamily' => '',
+ 'fontStyle' => 'normal',
+ 'fontWeight' => '400',
+ 'fontStretch' => '100%',
+ 'unicodeRange' => 'U+0-10FFFF',
+ )
+ );
+
+ // Convert all values to lowercase for comparison.
+ // Font family names may use multibyte characters.
+ $font_family = mb_strtolower( $settings['fontFamily'] );
+ $font_style = strtolower( $settings['fontStyle'] );
+ $font_weight = strtolower( $settings['fontWeight'] );
+ $font_stretch = strtolower( $settings['fontStretch'] );
+ $unicode_range = strtoupper( $settings['unicodeRange'] );
+
+ // Convert weight keywords to numeric strings.
+ $font_weight = str_replace( 'normal', '400', $font_weight );
+ $font_weight = str_replace( 'bold', '700', $font_weight );
+
+ // Convert stretch keywords to numeric strings.
+ $font_stretch_map = array(
+ 'ultra-condensed' => '50%',
+ 'extra-condensed' => '62.5%',
+ 'condensed' => '75%',
+ 'semi-condensed' => '87.5%',
+ 'normal' => '100%',
+ 'semi-expanded' => '112.5%',
+ 'expanded' => '125%',
+ 'extra-expanded' => '150%',
+ 'ultra-expanded' => '200%',
+ );
+ $font_stretch = str_replace( array_keys( $font_stretch_map ), array_values( $font_stretch_map ), $font_stretch );
+
+ $slug_elements = array( $font_family, $font_style, $font_weight, $font_stretch, $unicode_range );
+
+ $slug_elements = array_map(
+ function ( $elem ) {
+ // Remove quotes to normalize font-family names, and ';' to use as a separator.
+ $elem = trim( str_replace( array( '"', "'", ';' ), '', $elem ) );
+
+ // Normalize comma separated lists by removing whitespace in between items,
+ // but keep whitespace within items (e.g. "Open Sans" and "OpenSans" are different fonts).
+ // CSS spec for whitespace includes: U+000A LINE FEED, U+0009 CHARACTER TABULATION, or U+0020 SPACE,
+ // which by default are all matched by \s in PHP.
+ return preg_replace( '/,\s+/', ',', $elem );
+ },
+ $slug_elements
+ );
+
+ return join( ';', $slug_elements );
+ }
}
diff --git a/lib/experimental/fonts/font-library/class-wp-font-family.php b/lib/experimental/fonts/font-library/class-wp-font-family.php
deleted file mode 100644
index f64aebc0c8efa7..00000000000000
--- a/lib/experimental/fonts/font-library/class-wp-font-family.php
+++ /dev/null
@@ -1,621 +0,0 @@
-data = $font_data;
- }
-
- /**
- * Gets the font family data.
- *
- * @since 6.5.0
- *
- * @return array An array in fontFamily theme.json format.
- */
- public function get_data() {
- return $this->data;
- }
-
- /**
- * Gets the font family data.
- *
- * @since 6.5.0
- *
- * @return string fontFamily in theme.json format as stringified JSON.
- */
- public function get_data_as_json() {
- return wp_json_encode( $this->get_data() );
- }
-
- /**
- * Checks whether the font family has font faces defined.
- *
- * @since 6.5.0
- *
- * @return bool True if the font family has font faces defined, false otherwise.
- */
- public function has_font_faces() {
- return ! empty( $this->data['fontFace'] ) && is_array( $this->data['fontFace'] );
- }
-
- /**
- * Removes font family assets.
- *
- * @since 6.5.0
- *
- * @return bool True if assets were removed, false otherwise.
- */
- private function remove_font_family_assets() {
- if ( $this->has_font_faces() ) {
- foreach ( $this->data['fontFace'] as $font_face ) {
- $were_assets_removed = $this->delete_font_face_assets( $font_face );
- if ( false === $were_assets_removed ) {
- return false;
- }
- }
- }
- return true;
- }
-
- /**
- * Removes a font family from the database and deletes its assets.
- *
- * @since 6.5.0
- *
- * @return bool|WP_Error True if the font family was uninstalled, WP_Error otherwise.
- */
- public function uninstall() {
- $post = $this->get_data_from_post();
- if ( null === $post ) {
- return new WP_Error(
- 'font_family_not_found',
- __( 'The font family could not be found.', 'gutenberg' )
- );
- }
-
- if (
- ! $this->remove_font_family_assets() ||
- ! wp_delete_post( $post->ID, true )
- ) {
- return new WP_Error(
- 'font_family_not_deleted',
- __( 'The font family could not be deleted.', 'gutenberg' )
- );
- }
-
- return true;
- }
-
- /**
- * Deletes a specified font asset file from the fonts directory.
- *
- * @since 6.5.0
- *
- * @param string $src The path of the font asset file to delete.
- * @return bool Whether the file was deleted.
- */
- private static function delete_asset( $src ) {
- $filename = basename( $src );
- $file_path = path_join( wp_get_font_dir()['path'], $filename );
-
- wp_delete_file( $file_path );
-
- return ! file_exists( $file_path );
- }
-
- /**
- * Deletes all font face asset files associated with a given font face.
- *
- * @since 6.5.0
- *
- * @param array $font_face The font face array containing the 'src' attribute
- * with the file path(s) to be deleted.
- * @return bool True if delete was successful, otherwise false.
- */
- private static function delete_font_face_assets( $font_face ) {
- $sources = (array) $font_face['src'];
- foreach ( $sources as $src ) {
- $was_asset_removed = self::delete_asset( $src );
- if ( ! $was_asset_removed ) {
- // Bail if any of the assets could not be removed.
- return false;
- }
- }
- return true;
- }
-
- /**
- * Gets the overrides for the 'wp_handle_upload' function.
- *
- * @since 6.5.0
- *
- * @param string $filename The filename to be used for the uploaded file.
- * @return array The overrides for the 'wp_handle_upload' function.
- */
- private function get_upload_overrides( $filename ) {
- return array(
- // Arbitrary string to avoid the is_uploaded_file() check applied
- // when using 'wp_handle_upload'.
- 'action' => 'wp_handle_font_upload',
- // Not testing a form submission.
- 'test_form' => false,
- // Seems mime type for files that are not images cannot be tested.
- // See wp_check_filetype_and_ext().
- 'test_type' => true,
- 'mimes' => WP_Font_Library::get_expected_font_mime_types_per_php_version(),
- 'unique_filename_callback' => static function () use ( $filename ) {
- // Keep the original filename.
- return $filename;
- },
- );
- }
-
- /**
- * Downloads a font asset from a specified source URL and saves it to
- * the font directory.
- *
- * @since 6.5.0
- *
- * @param string $url The source URL of the font asset to be downloaded.
- * @param string $filename The filename to save the downloaded font asset as.
- * @return string|bool The relative path to the downloaded font asset.
- * False if the download failed.
- */
- private function download_asset( $url, $filename ) {
- // Include file with download_url() if function doesn't exist.
- if ( ! function_exists( 'download_url' ) ) {
- require_once ABSPATH . 'wp-admin/includes/file.php';
- }
-
- // Downloads the font asset or returns false.
- $temp_file = download_url( $url );
- if ( is_wp_error( $temp_file ) ) {
- return false;
- }
-
- $overrides = $this->get_upload_overrides( $filename );
-
- $file = array(
- 'tmp_name' => $temp_file,
- 'name' => $filename,
- );
-
- $handled_file = wp_handle_upload( $file, $overrides );
-
- // Cleans the temp file.
- @unlink( $temp_file );
-
- if ( ! isset( $handled_file['url'] ) ) {
- return false;
- }
-
- // Returns the relative path to the downloaded font asset to be used as
- // font face src.
- return $handled_file['url'];
- }
-
- /**
- * Moves an uploaded font face asset from temp folder to the fonts directory.
- *
- * This is used when uploading local fonts.
- *
- * @since 6.5.0
- *
- * @param array $font_face Font face to download.
- * @param array $file Uploaded file.
- * @return array New font face with all assets downloaded and referenced in
- * the font face definition.
- */
- private function move_font_face_asset( $font_face, $file ) {
- $new_font_face = $font_face;
- $filename = WP_Font_Family_Utils::get_filename_from_font_face(
- $this->data['slug'],
- $font_face,
- $file['name']
- );
-
- // Remove the uploaded font asset reference from the font face definition
- // because it is no longer needed.
- unset( $new_font_face['uploadedFile'] );
-
- // Move the uploaded font asset from the temp folder to the fonts directory.
- if ( ! function_exists( 'wp_handle_upload' ) ) {
- require_once ABSPATH . 'wp-admin/includes/file.php';
- }
-
- $overrides = $this->get_upload_overrides( $filename );
-
- $handled_file = wp_handle_upload( $file, $overrides );
-
- if ( isset( $handled_file['url'] ) ) {
- // If the file was successfully moved, update the font face definition
- // to reference the new file location.
- $new_font_face['src'] = $handled_file['url'];
- }
-
- return $new_font_face;
- }
-
- /**
- * Sanitizes the font family data using WP_Theme_JSON.
- *
- * @since 6.5.0
- *
- * @return array A sanitized font family definition.
- */
- private function sanitize() {
- // Creates the structure of theme.json array with the new fonts.
- $fonts_json = array(
- 'version' => '2',
- 'settings' => array(
- 'typography' => array(
- 'fontFamilies' => array(
- 'custom' => array(
- $this->data,
- ),
- ),
- ),
- ),
- );
-
- // Creates a new WP_Theme_JSON object with the new fonts to
- // leverage sanitization and validation.
- $fonts_json = WP_Theme_JSON_Gutenberg::remove_insecure_properties( $fonts_json );
- $theme_json = new WP_Theme_JSON_Gutenberg( $fonts_json );
- $theme_data = $theme_json->get_data();
- $sanitized_font = ! empty( $theme_data['settings']['typography']['fontFamilies'] )
- ? $theme_data['settings']['typography']['fontFamilies'][0]
- : array();
-
- $sanitized_font['slug'] = _wp_to_kebab_case( $sanitized_font['slug'] );
- $sanitized_font['fontFamily'] = WP_Font_Family_Utils::format_font_family( $sanitized_font['fontFamily'] );
- $this->data = $sanitized_font;
- return $this->data;
- }
-
- /**
- * Downloads font face assets.
- *
- * Downloads the font face asset(s) associated with a font face. It works with
- * both single source URLs and arrays of multiple source URLs.
- *
- * @since 6.5.0
- *
- * @param array $font_face The font face array containing the 'src' attribute
- * with the source URL(s) of the assets.
- * @return array The modified font face array with the new source URL(s) to
- * the downloaded assets.
- */
- private function download_font_face_assets( $font_face ) {
- $new_font_face = $font_face;
- $sources = (array) $font_face['downloadFromUrl'];
- $new_font_face['src'] = array();
- $index = 0;
-
- foreach ( $sources as $src ) {
- $suffix = $index++ > 0 ? $index : '';
- $filename = WP_Font_Family_Utils::get_filename_from_font_face(
- $this->data['slug'],
- $font_face,
- $src,
- $suffix
- );
- $new_src = $this->download_asset( $src, $filename );
- if ( $new_src ) {
- $new_font_face['src'][] = $new_src;
- }
- }
-
- if ( count( $new_font_face['src'] ) === 1 ) {
- $new_font_face['src'] = $new_font_face['src'][0];
- }
-
- // Remove the download url reference from the font face definition
- // because it is no longer needed.
- unset( $new_font_face['downloadFromUrl'] );
-
- return $new_font_face;
- }
-
-
- /**
- * Downloads font face assets if the font family is a Google font,
- * or moves them if it is a local font.
- *
- * @since 6.5.0
- *
- * @param array $files An array of files to be installed.
- * @return bool True if the font faces were downloaded or moved successfully, false otherwise.
- */
- private function download_or_move_font_faces( $files ) {
- if ( ! $this->has_font_faces() ) {
- return true;
- }
-
- $new_font_faces = array();
- foreach ( $this->data['fontFace'] as $font_face ) {
- // If the fonts are not meant to be downloaded or uploaded
- // (for example to install fonts that use a remote url).
- $new_font_face = $font_face;
-
- $font_face_is_repeated = false;
-
- // If the font face has the same fontStyle and fontWeight as an existing, continue.
- foreach ( $new_font_faces as $font_to_compare ) {
- if ( $new_font_face['fontStyle'] === $font_to_compare['fontStyle'] &&
- $new_font_face['fontWeight'] === $font_to_compare['fontWeight'] ) {
- $font_face_is_repeated = true;
- }
- }
-
- if ( $font_face_is_repeated ) {
- continue;
- }
-
- // If the font face requires the use of the filesystem, create the fonts dir if it doesn't exist.
- if ( ! empty( $font_face['downloadFromUrl'] ) && ! empty( $font_face['uploadedFile'] ) ) {
- wp_mkdir_p( wp_get_font_dir()['path'] );
- }
-
- // If installing google fonts, download the font face assets.
- if ( ! empty( $font_face['downloadFromUrl'] ) ) {
- $new_font_face = $this->download_font_face_assets( $new_font_face );
- }
-
- // If installing local fonts, move the font face assets from
- // the temp folder to the wp fonts directory.
- if ( ! empty( $font_face['uploadedFile'] ) && ! empty( $files ) ) {
- $new_font_face = $this->move_font_face_asset(
- $new_font_face,
- $files[ $new_font_face['uploadedFile'] ]
- );
- }
-
- /*
- * If the font face assets were successfully downloaded, add the font face
- * to the new font. Font faces with failed downloads are not added to the
- * new font.
- */
- if ( ! empty( $new_font_face['src'] ) ) {
- $new_font_faces[] = $new_font_face;
- }
- }
-
- if ( ! empty( $new_font_faces ) ) {
- $this->data['fontFace'] = $new_font_faces;
- return true;
- }
-
- return false;
- }
-
- /**
- * Gets the post for a font family.
- *
- * @since 6.5.0
- *
- * @return WP_Post|null The post for this font family object or
- * null if the post does not exist.
- */
- public function get_font_post() {
- $args = array(
- 'post_type' => 'wp_font_family',
- 'post_name' => $this->data['slug'],
- 'name' => $this->data['slug'],
- 'posts_per_page' => 1,
- );
-
- $posts_query = new WP_Query( $args );
-
- if ( $posts_query->have_posts() ) {
- return $posts_query->posts[0];
- }
-
- return null;
- }
-
- /**
- * Gets the data for this object from the database and
- * sets it to the data property.
- *
- * @since 6.5.0
- *
- * @return WP_Post|null The post for this font family object or
- * null if the post does not exist.
- */
- private function get_data_from_post() {
- $post = $this->get_font_post();
- if ( $post ) {
- $this->data = json_decode( $post->post_content, true );
- return $post;
- }
-
- return null;
- }
-
- /**
- * Creates a post for a font family.
- *
- * @since 6.5.0
- *
- * @return int|WP_Error Post ID if the post was created, WP_Error otherwise.
- */
- private function create_font_post() {
- $post = array(
- 'post_title' => $this->data['name'],
- 'post_name' => $this->data['slug'],
- 'post_type' => 'wp_font_family',
- 'post_content' => $this->get_data_as_json(),
- 'post_status' => 'publish',
- );
-
- $post_id = wp_insert_post( $post );
- if ( 0 === $post_id || is_wp_error( $post_id ) ) {
- return new WP_Error(
- 'font_post_creation_failed',
- __( 'Font post creation failed', 'gutenberg' )
- );
- }
-
- return $post_id;
- }
-
- /**
- * Gets the font faces that are in both the existing and incoming font families.
- *
- * @since 6.5.0
- *
- * @param array $existing The existing font faces.
- * @param array $incoming The incoming font faces.
- * @return array The font faces that are in both the existing and incoming font families.
- */
- private function get_intersecting_font_faces( $existing, $incoming ) {
- $intersecting = array();
- foreach ( $existing as $existing_face ) {
- foreach ( $incoming as $incoming_face ) {
- if ( $incoming_face['fontStyle'] === $existing_face['fontStyle'] &&
- $incoming_face['fontWeight'] === $existing_face['fontWeight'] &&
- $incoming_face['src'] !== $existing_face['src'] ) {
- $intersecting[] = $existing_face;
- }
- }
- }
- return $intersecting;
- }
-
- /**
- * Updates a post for a font family.
- *
- * @since 6.5.0
- *
- * @param WP_Post $post The post to update.
- * @return int|WP_Error Post ID if the update was successful, WP_Error otherwise.
- */
- private function update_font_post( $post ) {
- $post_font_data = json_decode( $post->post_content, true );
- $new_data = WP_Font_Family_Utils::merge_fonts_data( $post_font_data, $this->data );
- if ( isset( $post_font_data['fontFace'] ) && ! empty( $post_font_data['fontFace'] ) ) {
- $intersecting = $this->get_intersecting_font_faces( $post_font_data['fontFace'], $new_data['fontFace'] );
- }
-
- if ( isset( $intersecting ) && ! empty( $intersecting ) ) {
- $serialized_font_faces = array_map( 'serialize', $new_data['fontFace'] );
- $serialized_intersecting = array_map( 'serialize', $intersecting );
-
- $diff = array_diff( $serialized_font_faces, $serialized_intersecting );
-
- $new_data['fontFace'] = array_values( array_map( 'unserialize', $diff ) );
-
- foreach ( $intersecting as $intersect ) {
- $this->delete_font_face_assets( $intersect );
- }
- }
- $this->data = $new_data;
-
- $post = array(
- 'ID' => $post->ID,
- 'post_content' => $this->get_data_as_json(),
- );
-
- $post_id = wp_update_post( $post );
-
- if ( 0 === $post_id || is_wp_error( $post_id ) ) {
- return new WP_Error(
- 'font_post_update_failed',
- __( 'Font post update failed', 'gutenberg' )
- );
- }
-
- return $post_id;
- }
-
- /**
- * Creates a post for a font in the Font Library if it doesn't exist,
- * or updates it if it does.
- *
- * @since 6.5.0
- *
- * @return int|WP_Error Post id if the post was created or updated successfully,
- * WP_Error otherwise.
- */
- private function create_or_update_font_post() {
- $this->sanitize();
-
- $post = $this->get_font_post();
- if ( $post ) {
- return $this->update_font_post( $post );
- }
-
- return $this->create_font_post();
- }
-
- /**
- * Installs the font family into the library.
- *
- * @since 6.5.0
- *
- * @param array $files Optional. An array of files to be installed. Default null.
- * @return array|WP_Error An array of font family data on success, WP_Error otherwise.
- */
- public function install( $files = null ) {
- add_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
- add_filter( 'upload_dir', 'wp_get_font_dir' );
- $were_assets_written = $this->download_or_move_font_faces( $files );
- remove_filter( 'upload_dir', 'wp_get_font_dir' );
- remove_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
-
- if ( ! $were_assets_written ) {
- return new WP_Error(
- 'font_face_download_failed',
- __( 'The font face assets could not be written.', 'gutenberg' )
- );
- }
-
- $post_id = $this->create_or_update_font_post();
-
- if ( is_wp_error( $post_id ) ) {
- return $post_id;
- }
-
- return $this->get_data();
- }
-}
diff --git a/lib/experimental/fonts/font-library/class-wp-font-library.php b/lib/experimental/fonts/font-library/class-wp-font-library.php
index fd36f6ba073c4f..51a84b957ea117 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-library.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-library.php
@@ -62,11 +62,17 @@ public static function get_expected_font_mime_types_per_php_version( $php_versio
* @return WP_Font_Collection|WP_Error A font collection is it was registered successfully and a WP_Error otherwise.
*/
public static function register_font_collection( $config ) {
+ if ( ! WP_Font_Collection::is_config_valid( $config ) ) {
+ $error_message = __( 'Font collection config is invalid.', 'gutenberg' );
+ return new WP_Error( 'font_collection_registration_error', $error_message );
+ }
+
$new_collection = new WP_Font_Collection( $config );
- if ( self::is_collection_registered( $config['slug'] ) ) {
+
+ if ( self::is_collection_registered( $new_collection->get_config()['slug'] ) ) {
$error_message = sprintf(
/* translators: %s: Font collection slug. */
- __( 'Font collection with slug: "%s" is already registered.', 'default' ),
+ __( 'Font collection with slug: "%s" is already registered.', 'gutenberg' ),
$config['slug']
);
_doing_it_wrong(
@@ -76,7 +82,7 @@ public static function register_font_collection( $config ) {
);
return new WP_Error( 'font_collection_registration_error', $error_message );
}
- self::$collections[ $config['slug'] ] = $new_collection;
+ self::$collections[ $new_collection->get_config()['slug'] ] = $new_collection;
return $new_collection;
}
diff --git a/lib/experimental/fonts/font-library/class-wp-rest-autosave-font-families-controller.php b/lib/experimental/fonts/font-library/class-wp-rest-autosave-font-families-controller.php
deleted file mode 100644
index 0e31bd4004b40f..00000000000000
--- a/lib/experimental/fonts/font-library/class-wp-rest-autosave-font-families-controller.php
+++ /dev/null
@@ -1,25 +0,0 @@
- WP_REST_Server::READABLE,
- 'callback' => array( $this, 'get_font_collections' ),
- 'permission_callback' => array( $this, 'update_font_library_permissions_check' ),
+ 'callback' => array( $this, 'get_items' ),
+ 'permission_callback' => array( $this, 'get_items_permissions_check' ),
),
)
);
@@ -54,13 +54,29 @@ public function register_routes() {
array(
array(
'methods' => WP_REST_Server::READABLE,
- 'callback' => array( $this, 'get_font_collection' ),
- 'permission_callback' => array( $this, 'update_font_library_permissions_check' ),
+ 'callback' => array( $this, 'get_item' ),
+ 'permission_callback' => array( $this, 'get_items_permissions_check' ),
),
)
);
}
+ /**
+ * Gets the font collections available.
+ *
+ * @since 6.5.0
+ *
+ * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+ */
+ public function get_items( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+ $collections = array();
+ foreach ( WP_Font_Library::get_font_collections() as $collection ) {
+ $collections[] = $collection->get_config();
+ }
+
+ return rest_ensure_response( $collections, 200 );
+ }
+
/**
* Gets a font collection.
*
@@ -69,54 +85,42 @@ public function register_routes() {
* @param WP_REST_Request $request Full details about the request.
* @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
*/
- public function get_font_collection( $request ) {
+ public function get_item( $request ) {
$slug = $request->get_param( 'slug' );
$collection = WP_Font_Library::get_font_collection( $slug );
+
// If the collection doesn't exist returns a 404.
if ( is_wp_error( $collection ) ) {
$collection->add_data( array( 'status' => 404 ) );
return $collection;
}
- $config_and_data = $collection->get_config_and_data();
- $collection_data = $config_and_data['data'];
- // If there was an error getting the collection data, return the error.
- if ( is_wp_error( $collection_data ) ) {
- $collection_data->add_data( array( 'status' => 500 ) );
- return $collection_data;
- }
-
- return new WP_REST_Response( $config_and_data );
- }
+ $config = $collection->get_config();
+ $contents = $collection->get_content();
- /**
- * Gets the font collections available.
- *
- * @since 6.5.0
- *
- * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
- */
- public function get_font_collections() {
- $collections = array();
- foreach ( WP_Font_Library::get_font_collections() as $collection ) {
- $collections[] = $collection->get_config_and_data();
+ // If there was an error getting the collection data, return the error.
+ if ( is_wp_error( $contents ) ) {
+ $contents->add_data( array( 'status' => 500 ) );
+ return $contents;
}
- return new WP_REST_Response( $collections, 200 );
+ $collection_data = array_merge( $config, $contents );
+ return rest_ensure_response( $collection_data );
}
/**
- * Checks whether the user has permissions to update the Font Library.
+ * Checks whether the user has permissions to use the Fonts Collections.
*
* @since 6.5.0
*
* @return true|WP_Error True if the request has write access for the item, WP_Error object otherwise.
*/
- public function update_font_library_permissions_check() {
+ public function get_items_permissions_check( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+
if ( ! current_user_can( 'edit_theme_options' ) ) {
return new WP_Error(
- 'rest_cannot_update_font_library',
- __( 'Sorry, you are not allowed to update the Font Library on this site.', 'gutenberg' ),
+ 'rest_cannot_read',
+ __( 'Sorry, you are not allowed to use the Font Library on this site.', 'gutenberg' ),
array(
'status' => rest_authorization_required_code(),
)
diff --git a/lib/experimental/fonts/font-library/class-wp-rest-font-faces-controller.php b/lib/experimental/fonts/font-library/class-wp-rest-font-faces-controller.php
new file mode 100644
index 00000000000000..fac32362325f49
--- /dev/null
+++ b/lib/experimental/fonts/font-library/class-wp-rest-font-faces-controller.php
@@ -0,0 +1,836 @@
+namespace,
+ '/' . $this->rest_base,
+ array(
+ 'args' => array(
+ 'font_family_id' => array(
+ 'description' => __( 'The ID for the parent font family of the font face.', 'gutenberg' ),
+ 'type' => 'integer',
+ 'required' => true,
+ ),
+ ),
+ array(
+ 'methods' => WP_REST_Server::READABLE,
+ 'callback' => array( $this, 'get_items' ),
+ 'permission_callback' => array( $this, 'get_items_permissions_check' ),
+ 'args' => $this->get_collection_params(),
+ ),
+ array(
+ 'methods' => WP_REST_Server::CREATABLE,
+ 'callback' => array( $this, 'create_item' ),
+ 'permission_callback' => array( $this, 'create_item_permissions_check' ),
+ 'args' => $this->get_create_params(),
+ ),
+ 'schema' => array( $this, 'get_public_item_schema' ),
+ )
+ );
+
+ register_rest_route(
+ $this->namespace,
+ '/' . $this->rest_base . '/(?P
- *
- *
- *
- *
- */
-class WP_Directive_Context {
- /**
- * The stack used to store contexts internally.
- *
- * @var array An array of contexts.
- */
- protected $stack = array( array() );
-
- /**
- * Constructor.
- *
- * Accepts a context as an argument to initialize this with.
- *
- * @param array $context A context.
- */
- public function __construct( $context = array() ) {
- $this->set_context( $context );
- }
-
- /**
- * Return the current context.
- *
- * @return array The current context.
- */
- public function get_context() {
- return end( $this->stack );
- }
-
- /**
- * Set the current context.
- *
- * @param array $context The context to be set.
- *
- * @return void
- */
- public function set_context( $context ) {
- array_push(
- $this->stack,
- array_replace_recursive( $this->get_context(), $context )
- );
- }
-
- /**
- * Reset the context to its previous state.
- *
- * @return void
- */
- public function rewind_context() {
- array_pop( $this->stack );
- }
-}
diff --git a/lib/experimental/interactivity-api/class-wp-directive-processor.php b/lib/experimental/interactivity-api/class-wp-directive-processor.php
deleted file mode 100644
index 723b36026ce2af..00000000000000
--- a/lib/experimental/interactivity-api/class-wp-directive-processor.php
+++ /dev/null
@@ -1,283 +0,0 @@
-get_tag();
-
- if ( self::is_html_void_element( $tag_name ) ) {
- return false;
- }
-
- while ( $this->next_tag(
- array(
- 'tag_name' => $tag_name,
- 'tag_closers' => 'visit',
- )
- ) ) {
- if ( ! $this->is_tag_closer() ) {
- ++$depth;
- continue;
- }
-
- if ( 0 === $depth ) {
- return true;
- }
-
- --$depth;
- }
-
- return false;
- }
-
- /**
- * Returns the content between two balanced tags.
- *
- * When called on an opening tag, return the HTML content found between that
- * opening tag and its matching closing tag.
- *
- * @return string The content between the current opening and its matching
- * closing tag.
- */
- public function get_inner_html() {
- $bookmarks = $this->get_balanced_tag_bookmarks();
- if ( ! $bookmarks ) {
- return false;
- }
- list( $start_name, $end_name ) = $bookmarks;
-
- $start = $this->bookmarks[ $start_name ]->start + $this->bookmarks[ $start_name ]->length + 1;
- $end = $this->bookmarks[ $end_name ]->start;
-
- $this->seek( $start_name ); // Return to original position.
- $this->release_bookmark( $start_name );
- $this->release_bookmark( $end_name );
-
- return substr( $this->html, $start, $end - $start );
- }
-
- /**
- * Sets the content between two balanced tags.
- *
- * When called on an opening tag, set the HTML content found between that
- * opening tag and its matching closing tag.
- *
- * @param string $new_html The string to replace the content between the
- * matching tags with.
- * @return bool Whether the content was successfully replaced.
- */
- public function set_inner_html( $new_html ) {
- $this->get_updated_html(); // Apply potential previous updates.
-
- $bookmarks = $this->get_balanced_tag_bookmarks();
- if ( ! $bookmarks ) {
- return false;
- }
- list( $start_name, $end_name ) = $bookmarks;
-
- $start = $this->bookmarks[ $start_name ]->start + $this->bookmarks[ $start_name ]->length + 1;
- $end = $this->bookmarks[ $end_name ]->start;
-
- $this->seek( $start_name ); // Return to original position.
- $this->release_bookmark( $start_name );
- $this->release_bookmark( $end_name );
-
- $this->lexical_updates[] = new Gutenberg_HTML_Text_Replacement_6_5( $start, $end - $start, $new_html );
- return true;
- }
-
- /**
- * Returns a pair of bookmarks for the current opening tag and the matching
- * closing tag.
- *
- * @return array|false A pair of bookmarks, or false if there's no matching
- * closing tag.
- */
- public function get_balanced_tag_bookmarks() {
- $i = 0;
- while ( array_key_exists( 'start' . $i, $this->bookmarks ) ) {
- ++$i;
- }
- $start_name = 'start' . $i;
-
- $this->set_bookmark( $start_name );
- if ( ! $this->next_balanced_closer() ) {
- $this->release_bookmark( $start_name );
- return false;
- }
-
- $i = 0;
- while ( array_key_exists( 'end' . $i, $this->bookmarks ) ) {
- ++$i;
- }
- $end_name = 'end' . $i;
- $this->set_bookmark( $end_name );
-
- return array( $start_name, $end_name );
- }
-
- /**
- * Checks whether a given HTML element is void (e.g. ). - * - * @see https://html.spec.whatwg.org/#elements-2 - * - * @param string $tag_name The element in question. - * @return bool True if the element is void. - */ - public static function is_html_void_element( $tag_name ) { - switch ( $tag_name ) { - case 'AREA': - case 'BASE': - case 'BR': - case 'COL': - case 'EMBED': - case 'HR': - case 'IMG': - case 'INPUT': - case 'LINK': - case 'META': - case 'SOURCE': - case 'TRACK': - case 'WBR': - return true; - - default: - return false; - } - } - - /** - * Extracts and return the directive type and the the part after the double - * hyphen from an attribute name (if present), in an array format. - * - * Examples: - * - * 'wp-island' => array( 'wp-island', null ) - * 'wp-bind--src' => array( 'wp-bind', 'src' ) - * 'wp-thing--and--thang' => array( 'wp-thing', 'and--thang' ) - * - * @param string $name The attribute name. - * @return array The resulting array. - */ - public static function parse_attribute_name( $name ) { - return explode( '--', $name, 2 ); - } - - /** - * Parse and extract the namespace and path from the given value. - * - * If the value contains a JSON instead of a path, the function parses it - * and returns the resulting array. - * - * @param string $value Passed value. - * @param string $ns Namespace fallback. - * @return array The resulting array - */ - public static function parse_attribute_value( $value, $ns = null ) { - $matches = array(); - $has_ns = preg_match( '/^([\w\-_\/]+)::(.+)$/', $value, $matches ); - - /* - * Overwrite both `$ns` and `$value` variables if `$value` explicitly - * contains a namespace. - */ - if ( $has_ns ) { - list( , $ns, $value ) = $matches; - } - - /* - * Try to decode `$value` as a JSON object. If it works, `$value` is - * replaced with the resulting array. The original string is preserved - * otherwise. - * - * Note that `json_decode` returns `null` both for an invalid JSON or - * the `'null'` string (a valid JSON). In the latter case, `$value` is - * replaced with `null`. - */ - $data = json_decode( $value, true ); - if ( null !== $data || 'null' === trim( $value ) ) { - $value = $data; - } - - return array( $ns, $value ); - } -} diff --git a/lib/experimental/interactivity-api/class-wp-interactivity-initial-state.php b/lib/experimental/interactivity-api/class-wp-interactivity-initial-state.php deleted file mode 100644 index 15e57edfa4a6a2..00000000000000 --- a/lib/experimental/interactivity-api/class-wp-interactivity-initial-state.php +++ /dev/null @@ -1,82 +0,0 @@ -%s', - wp_json_encode( self::$initial_state, JSON_HEX_TAG | JSON_HEX_AMP ) - ); - } -} diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php deleted file mode 100644 index 5a97166d6d22bf..00000000000000 --- a/lib/experimental/interactivity-api/directive-processing.php +++ /dev/null @@ -1,214 +0,0 @@ -get_registered( $parsed_block['blockName'] ); - $is_interactive = isset( $block_type->supports['interactivity'] ) && $block_type->supports['interactivity']; - if ( $is_interactive ) { - WP_Directive_Processor::mark_interactive_root_block( $parsed_block ); - } - } - - return $parsed_block; -} -add_filter( 'render_block_data', 'gutenberg_interactivity_mark_root_interactive_blocks', 10, 1 ); - -/** - * Processes the directives in the root blocks. - * - * @param string $block_content The block content. - * @param array $block The full block. - * - * @return string Filtered block content. - */ -function gutenberg_process_directives_in_root_blocks( $block_content, $block ) { - if ( WP_Directive_Processor::is_marked_as_interactive_root_block( $block ) ) { - WP_Directive_Processor::unmark_interactive_root_block(); - $context = new WP_Directive_Context(); - $namespace_stack = array(); - return gutenberg_process_interactive_html( $block_content, $context, $namespace_stack ); - } - - return $block_content; -} -add_filter( 'render_block', 'gutenberg_process_directives_in_root_blocks', 10, 2 ); - -/** - * Processes interactive HTML by applying directives to the HTML tags. - * - * It uses the WP_Directive_Processor class to parse the HTML and apply the - * directives. If a tag contains a 'WP-INNER-BLOCKS' string and there are inner - * blocks to process, the function processes these inner blocks and replaces the - * 'WP-INNER-BLOCKS' tag in the HTML with those blocks. - * - * @param string $html The HTML to process. - * @param mixed $context The context to use when processing. - * @param array $inner_blocks The inner blocks to process. - * @param array $namespace_stack Stack of namespackes passed by reference. - * - * @return string The processed HTML. - */ -function gutenberg_process_interactive_html( $html, $context, &$namespace_stack = array() ) { - static $directives = array( - 'data-wp-interactive' => 'gutenberg_interactivity_process_wp_interactive', - 'data-wp-context' => 'gutenberg_interactivity_process_wp_context', - 'data-wp-bind' => 'gutenberg_interactivity_process_wp_bind', - 'data-wp-class' => 'gutenberg_interactivity_process_wp_class', - 'data-wp-style' => 'gutenberg_interactivity_process_wp_style', - 'data-wp-text' => 'gutenberg_interactivity_process_wp_text', - ); - - $tags = new WP_Directive_Processor( $html ); - $prefix = 'data-wp-'; - $tag_stack = array(); - while ( $tags->next_tag( array( 'tag_closers' => 'visit' ) ) ) { - $tag_name = $tags->get_tag(); - - if ( $tags->is_tag_closer() ) { - if ( 0 === count( $tag_stack ) ) { - continue; - } - list( $latest_opening_tag_name, $attributes ) = end( $tag_stack ); - if ( $latest_opening_tag_name === $tag_name ) { - array_pop( $tag_stack ); - // If the matching opening tag didn't have any directives, we move on. - if ( 0 === count( $attributes ) ) { - continue; - } - } - } else { - $attributes = array(); - foreach ( $tags->get_attribute_names_with_prefix( $prefix ) as $name ) { - /* - * Removes the part after the double hyphen before looking for - * the directive processor inside `$directives`, e.g., "wp-bind" - * from "wp-bind--src" and "wp-context" from "wp-context" etc... - */ - list( $type ) = $tags::parse_attribute_name( $name ); - if ( array_key_exists( $type, $directives ) ) { - $attributes[] = $type; - } - } - - /* - * If this is an open tag, and if it either has directives, or if - * we're inside a tag that does, take note of this tag and its - * directives so we can call its directive processor once we - * encounter the matching closing tag. - */ - if ( - ! $tags::is_html_void_element( $tag_name ) && - ( 0 !== count( $attributes ) || 0 !== count( $tag_stack ) ) - ) { - $tag_stack[] = array( $tag_name, $attributes ); - } - } - - // Extract all directive names. They'll be used later on. - $directive_names = array_keys( $directives ); - $directive_names_rev = array_reverse( $directive_names ); - - /* - * Sort attributes by the order they appear in the `$directives` - * argument, considering it as the priority order in which - * directives should be processed. Note that the order is reversed - * for tag closers. - */ - $sorted_attrs = array_intersect( - $tags->is_tag_closer() - ? $directive_names_rev - : $directive_names, - $attributes - ); - - foreach ( $sorted_attrs as $attribute ) { - call_user_func_array( - $directives[ $attribute ], - array( - $tags, - $context, - end( $namespace_stack ), - &$namespace_stack, - ) - ); - } - } - - return $tags->get_updated_html(); -} - -/** - * Resolves the passed reference from the store and the context under the given - * namespace. - * - * A reference could be either a single path or a namespace followed by a path, - * separated by two colons, i.e, `namespace::path.to.prop`. If the reference - * contains a namespace, that namespace overrides the one passed as argument. - * - * @param string $reference Reference value. - * @param string $ns Inherited namespace. - * @param array $context Context data. - * @return mixed Resolved value. - */ -function gutenberg_interactivity_evaluate_reference( $reference, $ns, array $context = array() ) { - // Extract the namespace from the reference (if present). - list( $ns, $path ) = WP_Directive_Processor::parse_attribute_value( $reference, $ns ); - - $store = array( - 'state' => WP_Interactivity_Initial_State::get_state( $ns ), - 'context' => $context[ $ns ] ?? array(), - ); - - /* - * Checks first if the directive path is preceded by a negator operator (!), - * indicating that the value obtained from the Interactivity Store (or the - * passed context) using the subsequent path should be negated. - */ - $should_negate_value = '!' === $path[0]; - $path = $should_negate_value ? substr( $path, 1 ) : $path; - $path_segments = explode( '.', $path ); - $current = $store; - foreach ( $path_segments as $p ) { - if ( isset( $current[ $p ] ) ) { - $current = $current[ $p ]; - } else { - return null; - } - } - - /* - * Checks if $current is an anonymous function or an arrow function, and if - * so, call it passing the store. Other types of callables are ignored on - * purpose, as arbitrary strings or arrays could be wrongly evaluated as - * "callables". - * - * E.g., "file" is an string and a "callable" (the "file" function exists). - */ - if ( $current instanceof Closure ) { - /* - * TODO: Figure out a way to implement derived state without having to - * pass the store as argument: - * - * $current = call_user_func( $current ); - */ - } - - // Returns the opposite if it has a negator operator (!). - return $should_negate_value ? ! $current : $current; -} diff --git a/lib/experimental/interactivity-api/directives/wp-bind.php b/lib/experimental/interactivity-api/directives/wp-bind.php deleted file mode 100644 index 57d2e5deb23ab4..00000000000000 --- a/lib/experimental/interactivity-api/directives/wp-bind.php +++ /dev/null @@ -1,33 +0,0 @@ -is_tag_closer() ) { - return; - } - - $prefixed_attributes = $tags->get_attribute_names_with_prefix( 'data-wp-bind--' ); - - foreach ( $prefixed_attributes as $attr ) { - list( , $bound_attr ) = WP_Directive_Processor::parse_attribute_name( $attr ); - if ( empty( $bound_attr ) ) { - continue; - } - - $reference = $tags->get_attribute( $attr ); - $value = gutenberg_interactivity_evaluate_reference( $reference, $ns, $context->get_context() ); - $tags->set_attribute( $bound_attr, $value ); - } -} diff --git a/lib/experimental/interactivity-api/directives/wp-class.php b/lib/experimental/interactivity-api/directives/wp-class.php deleted file mode 100644 index ef91835be86fc1..00000000000000 --- a/lib/experimental/interactivity-api/directives/wp-class.php +++ /dev/null @@ -1,37 +0,0 @@ -is_tag_closer() ) { - return; - } - - $prefixed_attributes = $tags->get_attribute_names_with_prefix( 'data-wp-class--' ); - - foreach ( $prefixed_attributes as $attr ) { - list( , $class_name ) = WP_Directive_Processor::parse_attribute_name( $attr ); - if ( empty( $class_name ) ) { - continue; - } - - $reference = $tags->get_attribute( $attr ); - $add_class = gutenberg_interactivity_evaluate_reference( $reference, $ns, $context->get_context() ); - if ( $add_class ) { - $tags->add_class( $class_name ); - } else { - $tags->remove_class( $class_name ); - } - } -} diff --git a/lib/experimental/interactivity-api/directives/wp-context.php b/lib/experimental/interactivity-api/directives/wp-context.php deleted file mode 100644 index b41b47c86c78c3..00000000000000 --- a/lib/experimental/interactivity-api/directives/wp-context.php +++ /dev/null @@ -1,30 +0,0 @@ -is_tag_closer() ) { - $context->rewind_context(); - return; - } - - $attr_value = $tags->get_attribute( 'data-wp-context' ); - - //Separate namespace and value from the context directive attribute. - list( $ns, $data ) = is_string( $attr_value ) && ! empty( $attr_value ) - ? WP_Directive_Processor::parse_attribute_value( $attr_value, $ns ) - : array( $ns, null ); - - // Add parsed data to the context under the corresponding namespace. - $context->set_context( array( $ns => is_array( $data ) ? $data : array() ) ); -} diff --git a/lib/experimental/interactivity-api/directives/wp-interactive.php b/lib/experimental/interactivity-api/directives/wp-interactive.php deleted file mode 100644 index 9f3471a8b4e6a9..00000000000000 --- a/lib/experimental/interactivity-api/directives/wp-interactive.php +++ /dev/null @@ -1,44 +0,0 @@ -is_tag_closer() ) { - array_pop( $ns_stack ); - return; - } - - /* - * Decode the data-wp-interactive attribute. In the case it is not a valid - * JSON string, NULL is stored in `$island_data`. - */ - $island = $tags->get_attribute( 'data-wp-interactive' ); - $island_data = is_string( $island ) && ! empty( $island ) - ? json_decode( $island, true ) - : null; - - /* - * Push the newly defined namespace, or the current one if the island - * definition was invalid or does not contain a namespace. - * - * This is done because the function pops out the current namespace from the - * stack whenever it finds an island's closing tag, independently of whether - * the island definition was correct or it contained a valid namespace. - */ - $ns_stack[] = isset( $island_data ) && $island_data['namespace'] - ? $island_data['namespace'] - : $ns; -} diff --git a/lib/experimental/interactivity-api/directives/wp-style.php b/lib/experimental/interactivity-api/directives/wp-style.php deleted file mode 100644 index 16432e57282606..00000000000000 --- a/lib/experimental/interactivity-api/directives/wp-style.php +++ /dev/null @@ -1,73 +0,0 @@ -is_tag_closer() ) { - return; - } - - $prefixed_attributes = $tags->get_attribute_names_with_prefix( 'data-wp-style--' ); - - foreach ( $prefixed_attributes as $attr ) { - list( , $style_name ) = WP_Directive_Processor::parse_attribute_name( $attr ); - if ( empty( $style_name ) ) { - continue; - } - - $reference = $tags->get_attribute( $attr ); - $style_value = gutenberg_interactivity_evaluate_reference( $reference, $ns, $context->get_context() ); - if ( $style_value ) { - $style_attr = $tags->get_attribute( 'style' ) ?? ''; - $style_attr = gutenberg_interactivity_set_style( $style_attr, $style_name, $style_value ); - $tags->set_attribute( 'style', $style_attr ); - } else { - // TODO: Do we want to unset styles if they're null? - } - } -} - -/** - * Set style. - * - * @param string $style Existing style to amend. - * @param string $name Style property name. - * @param string $value Style property value. - * @return string Amended styles. - */ -function gutenberg_interactivity_set_style( $style, $name, $value ) { - $style_assignments = explode( ';', $style ); - $modified = false; - foreach ( $style_assignments as $style_assignment ) { - list( $style_name ) = explode( ':', $style_assignment ); - if ( trim( $style_name ) === $name ) { - // TODO: Retain surrounding whitespace from $style_value, if any. - $style_assignment = $style_name . ': ' . $value; - $modified = true; - break; - } - } - - if ( ! $modified ) { - $new_style_assignment = $name . ': ' . $value; - // If the last element is empty or whitespace-only, we insert - // the new "key: value" pair before it. - if ( empty( trim( end( $style_assignments ) ) ) ) { - array_splice( $style_assignments, - 1, 0, $new_style_assignment ); - } else { - array_push( $style_assignments, $new_style_assignment ); - } - } - return implode( ';', $style_assignments ); -} diff --git a/lib/experimental/interactivity-api/directives/wp-text.php b/lib/experimental/interactivity-api/directives/wp-text.php deleted file mode 100644 index c4c5bb27a31e10..00000000000000 --- a/lib/experimental/interactivity-api/directives/wp-text.php +++ /dev/null @@ -1,28 +0,0 @@ -is_tag_closer() ) { - return; - } - - $value = $tags->get_attribute( 'data-wp-text' ); - if ( null === $value ) { - return; - } - - $text = gutenberg_interactivity_evaluate_reference( $value, $ns, $context->get_context() ); - $tags->set_inner_html( esc_html( $text ) ); -} diff --git a/lib/experimental/interactivity-api/initial-state.php b/lib/experimental/interactivity-api/initial-state.php deleted file mode 100644 index a38d0da631f3c4..00000000000000 --- a/lib/experimental/interactivity-api/initial-state.php +++ /dev/null @@ -1,29 +0,0 @@ - $dependency['id'], - 'type' => isset( $dependency['type'] ) && 'dynamic' === $dependency['type'] ? 'dynamic' : 'static', - ); - } elseif ( is_string( $dependency ) ) { - $deps[] = array( - 'id' => $dependency, - 'type' => 'static', - ); - } - } - - self::$registered[ $module_identifier ] = array( - 'src' => $src, - 'version' => $version, - 'enqueued' => in_array( $module_identifier, self::$enqueued_modules_before_register, true ), - 'dependencies' => $deps, - ); - } - } - - /** - * Marks the module to be enqueued in the page. - * - * @param string $module_identifier The identifier of the module. - */ - public static function enqueue( $module_identifier ) { - if ( isset( self::$registered[ $module_identifier ] ) ) { - self::$registered[ $module_identifier ]['enqueued'] = true; - } elseif ( ! in_array( $module_identifier, self::$enqueued_modules_before_register, true ) ) { - self::$enqueued_modules_before_register[] = $module_identifier; - } - } - - /** - * Unmarks the module so it is no longer enqueued in the page. - * - * @param string $module_identifier The identifier of the module. - */ - public static function dequeue( $module_identifier ) { - if ( isset( self::$registered[ $module_identifier ] ) ) { - self::$registered[ $module_identifier ]['enqueued'] = false; - } - $key = array_search( $module_identifier, self::$enqueued_modules_before_register, true ); - if ( false !== $key ) { - array_splice( self::$enqueued_modules_before_register, $key, 1 ); - } - } - - /** - * Returns the import map array. - * - * @return array Array with an 'imports' key mapping to an array of module identifiers and their respective source URLs, including the version query. - */ - public static function get_import_map() { - $imports = array(); - foreach ( self::get_dependencies( array_keys( self::get_enqueued() ) ) as $module_identifier => $module ) { - $imports[ $module_identifier ] = $module['src'] . self::get_version_query_string( $module['version'] ); - } - return array( 'imports' => $imports ); - } - - /** - * Prints the import map using a script tag with an type="importmap" attribute. - */ - public static function print_import_map() { - $import_map = self::get_import_map(); - if ( ! empty( $import_map['imports'] ) ) { - echo ''; - } - } - - /** - * Prints all the enqueued modules using ' - ); - } - - /** - * Gets the version of a module. - * - * If SCRIPT_DEBUG is true, the version is the current timestamp. If $version - * is set to false, the version number is the currently installed WordPress - * version. If $version is set to null, no version is added. - * - * @param array $version The version of the module. - * @return string A string presenting the version. - */ - private static function get_version_query_string( $version ) { - if ( defined( 'SCRIPT_DEBUG ' ) && SCRIPT_DEBUG ) { - return '?ver=' . time(); - } elseif ( false === $version ) { - return '?ver=' . get_bloginfo( 'version' ); - } elseif ( null !== $version ) { - return '?ver=' . $version; - } - return ''; - } - - /** - * Retrieves an array of enqueued modules. - * - * @return array Array of modules keyed by module identifier. - */ - private static function get_enqueued() { - $enqueued = array(); - foreach ( self::$registered as $module_identifier => $module ) { - if ( true === $module['enqueued'] ) { - $enqueued[ $module_identifier ] = $module; - } - } - return $enqueued; - } - - /** - * Retrieves all the dependencies for given modules depending on type. - * - * This method is recursive to also retrieve dependencies of the dependencies. - * It will consolidate an array containing unique dependencies based on the - * requested types ('static' or 'dynamic'). - * - * @param array $module_identifiers The identifiers of the modules for which to gather dependencies. - * @param array $types Optional. Types of dependencies to retrieve: 'static', 'dynamic', or both. Default is both. - * @return array Array of modules keyed by module identifier. - */ - private static function get_dependencies( $module_identifiers, $types = array( 'static', 'dynamic' ) ) { - return array_reduce( - $module_identifiers, - function ( $dependency_modules, $module_identifier ) use ( $types ) { - $dependencies = array(); - foreach ( self::$registered[ $module_identifier ]['dependencies'] as $dependency ) { - if ( - in_array( $dependency['type'], $types, true ) && - isset( self::$registered[ $dependency['id'] ] ) && - ! isset( $dependency_modules[ $dependency['id'] ] ) - ) { - $dependencies[ $dependency['id'] ] = self::$registered[ $dependency['id'] ]; - } - } - return array_merge( $dependency_modules, $dependencies, self::get_dependencies( array_keys( $dependencies ), $types ) ); - }, - array() - ); - } -} - -/** - * Registers the module if no module with that module identifier has already - * been registered. - * - * @param string $module_identifier The identifier of the module. Should be unique. It will be used in the final import map. - * @param string $src Full URL of the module, or path of the script relative to the WordPress root directory. - * @param array $dependencies Optional. An array of module identifiers of the dependencies of this module. The dependencies can be strings or arrays. If they are arrays, they need an `id` key with the module identifier, and can contain a `type` key with either `static` or `dynamic`. By default, dependencies that don't contain a type are considered static. - * @param string|false|null $version Optional. String specifying module version number. Defaults to false. It is added to the URL as a query string for cache busting purposes. If SCRIPT_DEBUG is true, the version is the current timestamp. If $version is set to false, the version number is the currently installed WordPress version. If $version is set to null, no version is added. - */ -function gutenberg_register_module( $module_identifier, $src, $dependencies = array(), $version = false ) { - Gutenberg_Modules::register( $module_identifier, $src, $dependencies, $version ); -} - -/** - * Marks the module to be enqueued in the page. - * - * @param string $module_identifier The identifier of the module. - */ -function gutenberg_enqueue_module( $module_identifier ) { - Gutenberg_Modules::enqueue( $module_identifier ); -} - -/** - * Unmarks the module so it is not longer enqueued in the page. - * - * @param string $module_identifier The identifier of the module. - */ -function gutenberg_dequeue_module( $module_identifier ) { - Gutenberg_Modules::dequeue( $module_identifier ); -} - -$modules_position = wp_is_block_theme() ? 'wp_head' : 'wp_footer'; -// Prints the import map in the head tag in block themes. Otherwise in the footer. -add_action( $modules_position, array( 'Gutenberg_Modules', 'print_import_map' ) ); - -// Prints the enqueued modules in the head tag in block themes. Otherwise in the footer. -add_action( $modules_position, array( 'Gutenberg_Modules', 'print_enqueued_modules' ) ); - -// Prints the preloaded modules in the head tag in block themes. Otherwise in the footer. -add_action( $modules_position, array( 'Gutenberg_Modules', 'print_module_preloads' ) ); - -// Prints the script that loads the import map polyfill in the footer. -add_action( 'wp_head', array( 'Gutenberg_Modules', 'print_import_map_polyfill' ), 11 ); - -/** - * Add module fields from block metadata to WP_Block_Type settings. - * - * This filter allows us to register modules from block metadata and attach additional fields to - * WP_Block_Type instances. - * - * @param array $settings Array of determined settings for registering a block type. - * @param array $metadata Metadata provided for registering a block type. - */ -function gutenberg_filter_block_type_metadata_settings_register_modules( $settings, $metadata = null ) { - $module_fields = array( - 'viewModule' => 'view_module_ids', - ); - foreach ( $module_fields as $metadata_field_name => $settings_field_name ) { - if ( ! empty( $settings[ $metadata_field_name ] ) ) { - $metadata[ $metadata_field_name ] = $settings[ $metadata_field_name ]; - } - if ( ! empty( $metadata[ $metadata_field_name ] ) ) { - $modules = $metadata[ $metadata_field_name ]; - $processed_modules = array(); - if ( is_array( $modules ) ) { - for ( $index = 0; $index < count( $modules ); $index++ ) { - $processed_modules[] = gutenberg_register_block_module_id( - $metadata, - $metadata_field_name, - $index - ); - } - } else { - $processed_modules[] = gutenberg_register_block_module_id( - $metadata, - $metadata_field_name - ); - } - $settings[ $settings_field_name ] = $processed_modules; - } - } - - return $settings; -} - -add_filter( 'block_type_metadata_settings', 'gutenberg_filter_block_type_metadata_settings_register_modules', 10, 2 ); - -/** - * Enqueue modules associated with the block. - * - * @param string $block_content The block content. - * @param array $block The full block, including name and attributes. - * @param WP_Block $instance The block instance. - */ -function gutenberg_filter_render_block_enqueue_view_modules( $block_content, $parsed_block, $block_instance ) { - $block_type = $block_instance->block_type; - - if ( ! empty( $block_type->view_module_ids ) ) { - foreach ( $block_type->view_module_ids as $module_id ) { - gutenberg_enqueue_module( $module_id ); - } - } - - return $block_content; -} - -add_filter( 'render_block', 'gutenberg_filter_render_block_enqueue_view_modules', 10, 3 ); - -/** - * Finds a module ID for the selected block metadata field. It detects - * when a path to file was provided and finds a corresponding asset file - * with details necessary to register the module under an automatically - * generated module ID. - * - * This is analogous to the `register_block_script_handle` in WordPress Core. - * - * @param array $metadata Block metadata. - * @param string $field_name Field name to pick from metadata. - * @param int $index Optional. Index of the script to register when multiple items passed. - * Default 0. - * @return string Module ID. - */ -function gutenberg_register_block_module_id( $metadata, $field_name, $index = 0 ) { - if ( empty( $metadata[ $field_name ] ) ) { - return false; - } - - $module_id = $metadata[ $field_name ]; - if ( is_array( $module_id ) ) { - if ( empty( $module_id[ $index ] ) ) { - return false; - } - $module_id = $module_id[ $index ]; - } - - $module_path = remove_block_asset_path_prefix( $module_id ); - if ( $module_id === $module_path ) { - return $module_id; - } - - $path = dirname( $metadata['file'] ); - $module_asset_raw_path = $path . '/' . substr_replace( $module_path, '.asset.php', - strlen( '.js' ) ); - $module_id = gutenberg_generate_block_asset_module_id( $metadata['name'], $field_name, $index ); - $module_asset_path = wp_normalize_path( realpath( $module_asset_raw_path ) ); - - if ( empty( $module_asset_path ) ) { - _doing_it_wrong( - __FUNCTION__, - sprintf( - // This string is from WordPress Core. See `register_block_script_handle`. - // Translators: This is a translation from WordPress Core (default). No need to translate. - __( 'The asset file (%1$s) for the "%2$s" defined in "%3$s" block definition is missing.', 'default' ), - $module_asset_raw_path, - $field_name, - $metadata['name'] - ), - '6.5.0' - ); - return false; - } - - $module_path_norm = wp_normalize_path( realpath( $path . '/' . $module_path ) ); - $module_uri = get_block_asset_url( $module_path_norm ); - $module_asset = require $module_asset_path; - $module_dependencies = isset( $module_asset['dependencies'] ) ? $module_asset['dependencies'] : array(); - - gutenberg_register_module( - $module_id, - $module_uri, - $module_dependencies, - isset( $module_asset['version'] ) ? $module_asset['version'] : false - ); - - return $module_id; -} - -/** - * Generates the module ID for an asset based on the name of the block - * and the field name provided. - * - * This is analogous to the `generate_block_asset_handle` in WordPress Core. - * - * @param string $block_name Name of the block. - * @param string $field_name Name of the metadata field. - * @param int $index Optional. Index of the asset when multiple items passed. - * Default 0. - * @return string Generated module ID for the block's field. - */ -function gutenberg_generate_block_asset_module_id( $block_name, $field_name, $index = 0 ) { - if ( str_starts_with( $block_name, 'core/' ) ) { - $asset_handle = str_replace( 'core/', 'wp-block-', $block_name ); - if ( str_starts_with( $field_name, 'editor' ) ) { - $asset_handle .= '-editor'; - } - if ( str_starts_with( $field_name, 'view' ) ) { - $asset_handle .= '-view'; - } - if ( $index > 0 ) { - $asset_handle .= '-' . ( $index + 1 ); - } - return $asset_handle; - } - - $field_mappings = array( - 'viewModule' => 'view-module', - ); - $asset_handle = str_replace( '/', '-', $block_name ) . - '-' . $field_mappings[ $field_name ]; - if ( $index > 0 ) { - $asset_handle .= '-' . ( $index + 1 ); - } - return $asset_handle; -} - -function gutenberg_register_view_module_ids_rest_field() { - register_rest_field( - 'block-type', - 'view_module_ids', - array( - 'get_callback' => function ( $item ) { - $block_type = WP_Block_Type_Registry::get_instance()->get_registered( $item['name'] ); - if ( isset( $block_type->view_module_ids ) ) { - return $block_type->view_module_ids; - } - return array(); - }, - ) - ); -} - -add_action( 'rest_api_init', 'gutenberg_register_view_module_ids_rest_field' ); diff --git a/lib/experimental/script-modules.php b/lib/experimental/script-modules.php new file mode 100644 index 00000000000000..1f481a8098b20c --- /dev/null +++ b/lib/experimental/script-modules.php @@ -0,0 +1,234 @@ + 'view_module_ids', + ); + foreach ( $module_fields as $metadata_field_name => $settings_field_name ) { + if ( ! empty( $settings[ $metadata_field_name ] ) ) { + $metadata[ $metadata_field_name ] = $settings[ $metadata_field_name ]; + } + if ( ! empty( $metadata[ $metadata_field_name ] ) ) { + $modules = $metadata[ $metadata_field_name ]; + $processed_modules = array(); + if ( is_array( $modules ) ) { + for ( $index = 0; $index < count( $modules ); $index++ ) { + $processed_modules[] = gutenberg_register_block_module_id( + $metadata, + $metadata_field_name, + $index + ); + } + } else { + $processed_modules[] = gutenberg_register_block_module_id( + $metadata, + $metadata_field_name + ); + } + $settings[ $settings_field_name ] = $processed_modules; + } + } + + return $settings; +} + +add_filter( 'block_type_metadata_settings', 'gutenberg_filter_block_type_metadata_settings_register_modules', 10, 2 ); + +/** + * Enqueue modules associated with the block. + * + * @param string $block_content The block content. + * @param array $parsed_block The full block, including name and attributes. + * @param WP_Block $block_instance The block instance. + */ +function gutenberg_filter_render_block_enqueue_view_modules( $block_content, $parsed_block, $block_instance ) { + $block_type = $block_instance->block_type; + + if ( ! empty( $block_type->view_module_ids ) ) { + foreach ( $block_type->view_module_ids as $module_id ) { + wp_enqueue_script_module( $module_id ); + } + } + + return $block_content; +} + +add_filter( 'render_block', 'gutenberg_filter_render_block_enqueue_view_modules', 10, 3 ); + +/** + * Finds a module ID for the selected block metadata field. It detects + * when a path to file was provided and finds a corresponding asset file + * with details necessary to register the module under an automatically + * generated module ID. + * + * This is analogous to the `register_block_script_handle` in WordPress Core. + * + * @param array $metadata Block metadata. + * @param string $field_name Field name to pick from metadata. + * @param int $index Optional. Index of the script to register when multiple items passed. + * Default 0. + * @return string Module ID. + */ +function gutenberg_register_block_module_id( $metadata, $field_name, $index = 0 ) { + if ( empty( $metadata[ $field_name ] ) ) { + return false; + } + + $module_id = $metadata[ $field_name ]; + if ( is_array( $module_id ) ) { + if ( empty( $module_id[ $index ] ) ) { + return false; + } + $module_id = $module_id[ $index ]; + } + + $module_path = remove_block_asset_path_prefix( $module_id ); + if ( $module_id === $module_path ) { + return $module_id; + } + + $path = dirname( $metadata['file'] ); + $module_asset_raw_path = $path . '/' . substr_replace( $module_path, '.asset.php', - strlen( '.js' ) ); + $module_id = gutenberg_generate_block_asset_module_id( $metadata['name'], $field_name, $index ); + $module_asset_path = wp_normalize_path( realpath( $module_asset_raw_path ) ); + + if ( empty( $module_asset_path ) ) { + _doing_it_wrong( + __FUNCTION__, + sprintf( + // This string is from WordPress Core. See `register_block_script_handle`. + // Translators: This is a translation from WordPress Core (default). No need to translate. + __( 'The asset file (%1$s) for the "%2$s" defined in "%3$s" block definition is missing.', 'default' ), + $module_asset_raw_path, + $field_name, + $metadata['name'] + ), + '6.5.0' + ); + return false; + } + + $module_path_norm = wp_normalize_path( realpath( $path . '/' . $module_path ) ); + $module_uri = get_block_asset_url( $module_path_norm ); + $module_asset = require $module_asset_path; + $module_dependencies = isset( $module_asset['dependencies'] ) ? $module_asset['dependencies'] : array(); + + wp_register_script_module( + $module_id, + $module_uri, + $module_dependencies, + isset( $module_asset['version'] ) ? $module_asset['version'] : false + ); + + return $module_id; +} + +/** + * Generates the module ID for an asset based on the name of the block + * and the field name provided. + * + * This is analogous to the `generate_block_asset_handle` in WordPress Core. + * + * @param string $block_name Name of the block. + * @param string $field_name Name of the metadata field. + * @param int $index Optional. Index of the asset when multiple items passed. + * Default 0. + * @return string Generated module ID for the block's field. + */ +function gutenberg_generate_block_asset_module_id( $block_name, $field_name, $index = 0 ) { + if ( str_starts_with( $block_name, 'core/' ) ) { + $asset_handle = str_replace( 'core/', 'wp-block-', $block_name ); + if ( str_starts_with( $field_name, 'editor' ) ) { + $asset_handle .= '-editor'; + } + if ( str_starts_with( $field_name, 'view' ) ) { + $asset_handle .= '-view'; + } + if ( $index > 0 ) { + $asset_handle .= '-' . ( $index + 1 ); + } + return $asset_handle; + } + + $field_mappings = array( + 'viewModule' => 'view-module', + ); + $asset_handle = str_replace( '/', '-', $block_name ) . + '-' . $field_mappings[ $field_name ]; + if ( $index > 0 ) { + $asset_handle .= '-' . ( $index + 1 ); + } + return $asset_handle; +} + +/** + * Registers a REST field for block types to provide view module IDs. + * + * Adds the `view_module_ids` field to block type objects in the REST API, which + * lists the script module IDs for any script modules associated with the + * block's viewModule(s) key. + * + * @since 6.5.0 + */ +function gutenberg_register_view_module_ids_rest_field() { + register_rest_field( + 'block-type', + 'view_module_ids', + array( + 'get_callback' => function ( $item ) { + $block_type = WP_Block_Type_Registry::get_instance()->get_registered( $item['name'] ); + if ( isset( $block_type->view_module_ids ) ) { + return $block_type->view_module_ids; + } + return array(); + }, + ) + ); +} + +add_action( 'rest_api_init', 'gutenberg_register_view_module_ids_rest_field' ); + +/** + * Registers the module if no module with that module identifier has already + * been registered. + * + * @param string $module_identifier The identifier of the module. Should be unique. It will be used in the final import map. + * @param string $src Full URL of the module, or path of the script relative to the WordPress root directory. + * @param array $dependencies Optional. An array of module identifiers of the dependencies of this module. The dependencies can be strings or arrays. If they are arrays, they need an `id` key with the module identifier, and can contain an `import` key with either `static` or `dynamic`. By default, dependencies that don't contain an import are considered static. + * @param string|false|null $version Optional. String specifying module version number. Defaults to false. It is added to the URL as a query string for cache busting purposes. If $version is set to false, the version number is the currently installed WordPress version. If $version is set to null, no version is added. + * @deprecated 17.6.0 gutenberg_register_module is deprecated. Please use wp_register_script_module instead. + */ +function gutenberg_register_module( $module_identifier, $src = '', $dependencies = array(), $version = false ) { + _deprecated_function( __FUNCTION__, 'Gutenberg 17.6.0', 'wp_register_script_module' ); + wp_script_modules()->register( $module_identifier, $src, $dependencies, $version ); +} + +/** + * Marks the module to be enqueued in the page. + * + * @param string $module_identifier The identifier of the module. + * @deprecated 17.6.0 gutenberg_enqueue_module is deprecated. Please use wp_enqueue_script_module instead. + */ +function gutenberg_enqueue_module( $module_identifier ) { + _deprecated_function( __FUNCTION__, 'Gutenberg 17.6.0', 'wp_enqueue_script_module' ); + wp_script_modules()->enqueue( $module_identifier ); +} + +/** + * Unmarks the module so it is not longer enqueued in the page. + * + * @param string $module_identifier The identifier of the module. + * @deprecated 17.6.0 gutenberg_dequeue_module is deprecated. Please use wp_dequeue_script_module instead. + */ +function gutenberg_dequeue_module( $module_identifier ) { + _deprecated_function( __FUNCTION__, 'Gutenberg 17.6.0', 'wp_dequeue_script_module' ); + wp_script_modules()->dequeue( $module_identifier ); +} diff --git a/lib/experiments-page.php b/lib/experiments-page.php index 8af1eb82c6bed0..bccbed2195958b 100644 --- a/lib/experiments-page.php +++ b/lib/experiments-page.php @@ -126,30 +126,6 @@ function gutenberg_initialize_experiments_settings() { ) ); - add_settings_field( - 'gutenberg-custom-fields', - __( 'Block Bindings & Custom Fields', 'gutenberg' ), - 'gutenberg_display_experiment_field', - 'gutenberg-experiments', - 'gutenberg_experiments_section', - array( - 'label' => __( 'Test connecting block attributes to different sources like custom fields', 'gutenberg' ), - 'id' => 'gutenberg-block-bindings', - ) - ); - - add_settings_field( - 'gutenberg-pattern-partial-syncing', - __( 'Pattern overrides', 'gutenberg' ), - 'gutenberg_display_experiment_field', - 'gutenberg-experiments', - 'gutenberg_experiments_section', - array( - 'label' => __( 'Test overrides in synced patterns', 'gutenberg' ), - 'id' => 'gutenberg-pattern-partial-syncing', - ) - ); - register_setting( 'gutenberg-experiments', 'gutenberg-experiments' diff --git a/lib/load.php b/lib/load.php index 37e4d61c36832e..4b2b4d5d8b0db8 100644 --- a/lib/load.php +++ b/lib/load.php @@ -106,8 +106,17 @@ function gutenberg_is_experiment_enabled( $name ) { // WordPress 6.5 compat. require __DIR__ . '/compat/wordpress-6.5/blocks.php'; require __DIR__ . '/compat/wordpress-6.5/block-patterns.php'; -require __DIR__ . '/compat/wordpress-6.5/class-wp-navigation-block-renderer.php'; require __DIR__ . '/compat/wordpress-6.5/kses.php'; +require __DIR__ . '/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api.php'; +require __DIR__ . '/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api-directives-processor.php'; +require __DIR__ . '/compat/wordpress-6.5/interactivity-api/interactivity-api.php'; +require __DIR__ . '/compat/wordpress-6.5/class-wp-script-modules.php'; +require __DIR__ . '/compat/wordpress-6.5/scripts-modules.php'; +require __DIR__ . '/compat/wordpress-6.5/block-bindings/class-wp-block-bindings.php'; +require __DIR__ . '/compat/wordpress-6.5/block-bindings/block-bindings.php'; +require __DIR__ . '/compat/wordpress-6.5/block-bindings/sources/post-meta.php'; +require __DIR__ . '/compat/wordpress-6.5/block-bindings/sources/pattern.php'; + // Experimental features. require __DIR__ . '/experimental/block-editor-settings-mobile.php'; @@ -116,26 +125,12 @@ function gutenberg_is_experiment_enabled( $name ) { require __DIR__ . '/experimental/kses.php'; require __DIR__ . '/experimental/l10n.php'; require __DIR__ . '/experimental/synchronization.php'; +require __DIR__ . '/experimental/script-modules.php'; if ( gutenberg_is_experiment_enabled( 'gutenberg-no-tinymce' ) ) { require __DIR__ . '/experimental/disable-tinymce.php'; } -require __DIR__ . '/experimental/interactivity-api/class-wp-interactivity-initial-state.php'; -require __DIR__ . '/experimental/interactivity-api/initial-state.php'; -require __DIR__ . '/experimental/interactivity-api/modules.php'; -require __DIR__ . '/experimental/interactivity-api/class-wp-directive-processor.php'; -require __DIR__ . '/experimental/interactivity-api/class-wp-directive-context.php'; -require __DIR__ . '/experimental/interactivity-api/directive-processing.php'; -require __DIR__ . '/experimental/interactivity-api/directives/wp-bind.php'; -require __DIR__ . '/experimental/interactivity-api/directives/wp-context.php'; -require __DIR__ . '/experimental/interactivity-api/directives/wp-class.php'; -require __DIR__ . '/experimental/interactivity-api/directives/wp-style.php'; -require __DIR__ . '/experimental/interactivity-api/directives/wp-text.php'; -require __DIR__ . '/experimental/interactivity-api/directives/wp-interactive.php'; - -require __DIR__ . '/experimental/modules/class-gutenberg-modules.php'; - // Fonts API / Font Face. remove_action( 'plugins_loaded', '_wp_theme_json_webfonts_handler' ); // Turns off WordPress 6.0's stopgap handler. @@ -143,10 +138,9 @@ function gutenberg_is_experiment_enabled( $name ) { require __DIR__ . '/experimental/fonts/font-library/class-wp-font-collection.php'; require __DIR__ . '/experimental/fonts/font-library/class-wp-font-library.php'; require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family-utils.php'; -require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family.php'; require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-families-controller.php'; +require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-faces-controller.php'; require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php'; -require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-autosave-font-families-controller.php'; require __DIR__ . '/experimental/fonts/font-library/font-library.php'; // Load the Font Face and Font Face Resolver, if not already loaded by WordPress Core. @@ -213,7 +207,6 @@ function gutenberg_is_experiment_enabled( $name ) { require __DIR__ . '/block-supports/duotone.php'; require __DIR__ . '/block-supports/shadow.php'; require __DIR__ . '/block-supports/background.php'; -require __DIR__ . '/block-supports/pattern.php'; // Data views. require_once __DIR__ . '/experimental/data-views.php'; diff --git a/package-lock.json b/package-lock.json index 2a2fc30b96099b..c6669febe69f8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "gutenberg", - "version": "17.5.1", + "version": "17.6.0-rc.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "gutenberg", - "version": "17.5.1", + "version": "17.6.0-rc.1", "hasInstallScript": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -165,14 +165,14 @@ "babel-plugin-react-native-platform-specific-extensions": "1.1.1", "babel-plugin-transform-remove-console": "6.9.4", "benchmark": "2.1.4", - "browserslist": "4.21.10", - "caniuse-lite": "1.0.30001538", + "browserslist": "4.22.2", + "caniuse-lite": "1.0.30001579", "chalk": "4.1.1", "change-case": "4.1.2", "commander": "9.2.0", "concurrently": "3.5.0", "copy-webpack-plugin": "10.2.0", - "core-js-builder": "3.31.0", + "core-js-builder": "3.35.1", "cross-env": "3.2.4", "css-loader": "6.2.0", "cssnano": "6.0.1", @@ -17939,6 +17939,10 @@ "resolved": "packages/interactivity", "link": true }, + "node_modules/@wordpress/interactivity-router": { + "resolved": "packages/interactivity-router", + "link": true + }, "node_modules/@wordpress/interface": { "resolved": "packages/interface", "link": true @@ -19623,28 +19627,22 @@ "dev": true }, "node_modules/assert": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", - "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz", + "integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==", "dev": true, "dependencies": { - "object-assign": "^4.1.1", - "util": "0.10.3" + "object.assign": "^4.1.4", + "util": "^0.10.4" } }, - "node_modules/assert/node_modules/inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==", - "dev": true - }, "node_modules/assert/node_modules/util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==", + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", + "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", "dev": true, "dependencies": { - "inherits": "2.0.1" + "inherits": "2.0.3" } }, "node_modules/assign-symbols": { @@ -19686,10 +19684,16 @@ "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==" }, "node_modules/async-each": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz", + "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==", "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], "optional": true }, "node_modules/async-limiter": { @@ -20801,20 +20805,23 @@ } }, "node_modules/browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", + "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==", "dev": true, "dependencies": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", + "bn.js": "^5.2.1", + "browserify-rsa": "^4.1.0", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", + "elliptic": "^6.5.4", "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "parse-asn1": "^5.1.6", + "readable-stream": "^3.6.2", + "safe-buffer": "^5.2.1" + }, + "engines": { + "node": ">= 4" } }, "node_modules/browserify-sign/node_modules/inherits": { @@ -20867,9 +20874,9 @@ } }, "node_modules/browserslist": { - "version": "4.21.10", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", - "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", + "version": "4.22.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz", + "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==", "funding": [ { "type": "opencollective", @@ -20885,10 +20892,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001517", - "electron-to-chromium": "^1.4.477", - "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.11" + "caniuse-lite": "^1.0.30001565", + "electron-to-chromium": "^1.4.601", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -21350,9 +21357,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001538", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz", - "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==", + "version": "1.0.30001579", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001579.tgz", + "integrity": "sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==", "funding": [ { "type": "opencollective", @@ -23114,9 +23121,9 @@ } }, "node_modules/core-js": { - "version": "3.31.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz", - "integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ==", + "version": "3.35.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.35.1.tgz", + "integrity": "sha512-IgdsbxNyMskrTFxa9lWHyMwAJU5gXOPP+1yO+K59d50VLVAIDAbs7gIv705KzALModfK3ZrSZTPNpC0PQgIZuw==", "hasInstallScript": true, "funding": { "type": "opencollective", @@ -23124,15 +23131,15 @@ } }, "node_modules/core-js-builder": { - "version": "3.31.0", - "resolved": "https://registry.npmjs.org/core-js-builder/-/core-js-builder-3.31.0.tgz", - "integrity": "sha512-qx8vgRM3U4+IjlMqNQl7Vj53ectTm1FpzJ+nJSQuT865StCXvusxCO+HuASWIKlkoc+96AfnFa2MEdqvGep9nA==", + "version": "3.35.1", + "resolved": "https://registry.npmjs.org/core-js-builder/-/core-js-builder-3.35.1.tgz", + "integrity": "sha512-CfIvg+khWyS7ElbRXhuQH9QVUQxRDFl8AUwP08BxubJmYtRZuqwjwvc/DVnwRXQ6sqg8ghfNRgnUDWzwNhU/Rw==", "dev": true, "dependencies": { - "core-js": "3.31.0", - "core-js-compat": "3.31.0", + "core-js": "3.35.1", + "core-js-compat": "3.35.1", "mkdirp": ">=0.5.5 <1", - "webpack": ">=4.46.0 <5" + "webpack": ">=4.47.0 <5" }, "engines": { "node": ">=8.9.0" @@ -23327,9 +23334,9 @@ } }, "node_modules/core-js-builder/node_modules/webpack": { - "version": "4.46.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", - "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", + "version": "4.47.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz", + "integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==", "dev": true, "dependencies": { "@webassemblyjs/ast": "1.9.0", @@ -23386,11 +23393,11 @@ } }, "node_modules/core-js-compat": { - "version": "3.31.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz", - "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==", + "version": "3.35.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.1.tgz", + "integrity": "sha512-sftHa5qUJY3rs9Zht1WEnmkvXputCyDBczPnr7QDgL8n3qrF3CMXY4VPSYtOLLiOUJcah2WNXREd48iOl6mQIw==", "dependencies": { - "browserslist": "^4.21.5" + "browserslist": "^4.22.2" }, "funding": { "type": "opencollective", @@ -23983,9 +23990,9 @@ } }, "node_modules/cyclist": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", - "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.2.tgz", + "integrity": "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==", "dev": true }, "node_modules/damerau-levenshtein": { @@ -24891,9 +24898,9 @@ } }, "node_modules/des.js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", - "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz", + "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==", "dev": true, "dependencies": { "inherits": "^2.0.1", @@ -25559,9 +25566,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.525", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.525.tgz", - "integrity": "sha512-GIZ620hDK4YmIqAWkscG4W6RwY6gOx1y5J6f4JUQwctiJrqH2oxZYU4mXHi35oV32tr630UcepBzSBGJ/WYcZA==" + "version": "1.4.643", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.643.tgz", + "integrity": "sha512-QHscvvS7gt155PtoRC0dR2ilhL8E9LHhfTQEq1uD5AL0524rBLAwpAREFH06f87/e45B9XkR6Ki5dbhbCsVEIg==" }, "node_modules/elegant-spinner": { "version": "1.0.1", @@ -27691,9 +27698,10 @@ "dev": true }, "node_modules/figgy-pudding": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", - "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", + "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==", + "deprecated": "This module is no longer supported.", "dev": true }, "node_modules/figures": { @@ -28116,13 +28124,13 @@ } }, "node_modules/flush-write-stream": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz", - "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", + "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", "dev": true, "dependencies": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.4" + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" } }, "node_modules/fn.name": { @@ -39413,9 +39421,9 @@ "dev": true }, "node_modules/nan": { - "version": "2.14.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", - "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", + "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==", "dev": true, "optional": true }, @@ -39736,9 +39744,9 @@ "dev": true }, "node_modules/node-releases": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==" + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==" }, "node_modules/node-stream-zip": { "version": "1.15.0", @@ -42114,12 +42122,12 @@ "dev": true }, "node_modules/parallel-transform": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", - "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz", + "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", "dev": true, "dependencies": { - "cyclist": "~0.2.2", + "cyclist": "^1.0.1", "inherits": "^2.0.3", "readable-stream": "^2.1.5" } @@ -48096,9 +48104,9 @@ } }, "node_modules/source-list-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", - "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", + "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==", "dev": true }, "node_modules/source-map": { @@ -48527,9 +48535,9 @@ } }, "node_modules/stream-each": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz", - "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", + "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", "dev": true, "dependencies": { "end-of-stream": "^1.1.0", @@ -50950,9 +50958,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", - "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "funding": [ { "type": "opencollective", @@ -53772,7 +53780,7 @@ }, "packages/a11y": { "name": "@wordpress/a11y", - "version": "3.49.0", + "version": "3.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -53785,7 +53793,7 @@ }, "packages/annotations": { "name": "@wordpress/annotations", - "version": "2.49.0", + "version": "2.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -53813,7 +53821,7 @@ }, "packages/api-fetch": { "name": "@wordpress/api-fetch", - "version": "6.46.0", + "version": "6.47.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -53826,7 +53834,7 @@ }, "packages/autop": { "name": "@wordpress/autop", - "version": "3.49.0", + "version": "3.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" @@ -53837,7 +53845,7 @@ }, "packages/babel-plugin-import-jsx-pragma": { "name": "@wordpress/babel-plugin-import-jsx-pragma", - "version": "4.32.0", + "version": "4.33.0", "dev": true, "license": "GPL-2.0-or-later", "engines": { @@ -53849,7 +53857,7 @@ }, "packages/babel-plugin-makepot": { "name": "@wordpress/babel-plugin-makepot", - "version": "5.33.0", + "version": "5.34.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -53866,7 +53874,7 @@ }, "packages/babel-preset-default": { "name": "@wordpress/babel-preset-default", - "version": "7.33.0", + "version": "7.34.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -53889,13 +53897,13 @@ }, "packages/base-styles": { "name": "@wordpress/base-styles", - "version": "4.40.0", + "version": "4.41.0", "dev": true, "license": "GPL-2.0-or-later" }, "packages/blob": { "name": "@wordpress/blob", - "version": "3.49.0", + "version": "3.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" @@ -53906,7 +53914,7 @@ }, "packages/block-directory": { "name": "@wordpress/block-directory", - "version": "4.26.0", + "version": "4.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -53941,7 +53949,7 @@ }, "packages/block-editor": { "name": "@wordpress/block-editor", - "version": "12.17.0", + "version": "12.18.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54038,7 +54046,7 @@ }, "packages/block-library": { "name": "@wordpress/block-library", - "version": "8.26.0", + "version": "8.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54062,6 +54070,7 @@ "@wordpress/i18n": "file:../i18n", "@wordpress/icons": "file:../icons", "@wordpress/interactivity": "file:../interactivity", + "@wordpress/interactivity-router": "file:../interactivity-router", "@wordpress/keycodes": "file:../keycodes", "@wordpress/notices": "file:../notices", "@wordpress/patterns": "file:../patterns", @@ -54101,7 +54110,7 @@ }, "packages/block-serialization-default-parser": { "name": "@wordpress/block-serialization-default-parser", - "version": "4.49.0", + "version": "4.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" @@ -54112,7 +54121,7 @@ }, "packages/block-serialization-spec-parser": { "name": "@wordpress/block-serialization-spec-parser", - "version": "4.49.0", + "version": "4.50.0", "license": "GPL-2.0-or-later", "dependencies": { "pegjs": "^0.10.0", @@ -54124,7 +54133,7 @@ }, "packages/blocks": { "name": "@wordpress/blocks", - "version": "12.26.0", + "version": "12.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54178,7 +54187,7 @@ }, "packages/browserslist-config": { "name": "@wordpress/browserslist-config", - "version": "5.32.0", + "version": "5.33.0", "dev": true, "license": "GPL-2.0-or-later", "engines": { @@ -54187,7 +54196,7 @@ }, "packages/commands": { "name": "@wordpress/commands", - "version": "0.20.0", + "version": "0.21.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54212,7 +54221,7 @@ }, "packages/components": { "name": "@wordpress/components", - "version": "25.15.0", + "version": "25.16.0", "license": "GPL-2.0-or-later", "dependencies": { "@ariakit/react": "^0.3.12", @@ -54317,7 +54326,7 @@ }, "packages/compose": { "name": "@wordpress/compose", - "version": "6.26.0", + "version": "6.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54353,7 +54362,7 @@ }, "packages/core-commands": { "name": "@wordpress/core-commands", - "version": "0.18.0", + "version": "0.19.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54378,7 +54387,7 @@ }, "packages/core-data": { "name": "@wordpress/core-data", - "version": "6.26.0", + "version": "6.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54422,7 +54431,7 @@ }, "packages/create-block": { "name": "@wordpress/create-block", - "version": "4.33.0", + "version": "4.34.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -54450,13 +54459,13 @@ }, "packages/create-block-tutorial-template": { "name": "@wordpress/create-block-tutorial-template", - "version": "3.3.0", + "version": "3.4.0", "dev": true, "license": "GPL-2.0-or-later" }, "packages/customize-widgets": { "name": "@wordpress/customize-widgets", - "version": "4.26.0", + "version": "4.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54493,7 +54502,7 @@ }, "packages/data": { "name": "@wordpress/data", - "version": "9.19.0", + "version": "9.20.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54521,7 +54530,7 @@ }, "packages/data-controls": { "name": "@wordpress/data-controls", - "version": "3.18.0", + "version": "3.19.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54538,7 +54547,7 @@ }, "packages/dataviews": { "name": "@wordpress/dataviews", - "version": "0.3.0", + "version": "0.4.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54563,7 +54572,7 @@ }, "packages/date": { "name": "@wordpress/date", - "version": "4.49.0", + "version": "4.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54577,7 +54586,7 @@ }, "packages/dependency-extraction-webpack-plugin": { "name": "@wordpress/dependency-extraction-webpack-plugin", - "version": "5.0.0", + "version": "5.1.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -54592,7 +54601,7 @@ }, "packages/deprecated": { "name": "@wordpress/deprecated", - "version": "3.49.0", + "version": "3.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54604,7 +54613,7 @@ }, "packages/docgen": { "name": "@wordpress/docgen", - "version": "1.58.0", + "version": "1.59.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -54622,7 +54631,7 @@ }, "packages/dom": { "name": "@wordpress/dom", - "version": "3.49.0", + "version": "3.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54634,7 +54643,7 @@ }, "packages/dom-ready": { "name": "@wordpress/dom-ready", - "version": "3.49.0", + "version": "3.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" @@ -54645,7 +54654,7 @@ }, "packages/e2e-test-utils": { "name": "@wordpress/e2e-test-utils", - "version": "10.20.0", + "version": "10.21.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -54667,7 +54676,7 @@ }, "packages/e2e-test-utils-playwright": { "name": "@wordpress/e2e-test-utils-playwright", - "version": "0.17.0", + "version": "0.18.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -54690,12 +54699,13 @@ }, "packages/e2e-tests": { "name": "@wordpress/e2e-tests", - "version": "7.20.0", + "version": "7.21.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { "@wordpress/e2e-test-utils": "file:../e2e-test-utils", "@wordpress/interactivity": "file:../interactivity", + "@wordpress/interactivity-router": "file:../interactivity-router", "@wordpress/jest-console": "file:../jest-console", "@wordpress/jest-puppeteer-axe": "file:../jest-puppeteer-axe", "@wordpress/scripts": "file:../scripts", @@ -54728,7 +54738,7 @@ }, "packages/edit-post": { "name": "@wordpress/edit-post", - "version": "7.26.0", + "version": "7.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54776,7 +54786,7 @@ }, "packages/edit-site": { "name": "@wordpress/edit-site", - "version": "5.26.0", + "version": "5.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54841,7 +54851,7 @@ }, "packages/edit-widgets": { "name": "@wordpress/edit-widgets", - "version": "5.26.0", + "version": "5.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54884,7 +54894,7 @@ }, "packages/editor": { "name": "@wordpress/editor", - "version": "13.26.0", + "version": "13.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54935,7 +54945,7 @@ }, "packages/element": { "name": "@wordpress/element", - "version": "5.26.0", + "version": "5.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -54953,7 +54963,7 @@ }, "packages/env": { "name": "@wordpress/env", - "version": "9.1.0", + "version": "9.2.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -55087,7 +55097,7 @@ }, "packages/escape-html": { "name": "@wordpress/escape-html", - "version": "2.49.0", + "version": "2.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" @@ -55098,7 +55108,7 @@ }, "packages/eslint-plugin": { "name": "@wordpress/eslint-plugin", - "version": "17.6.0", + "version": "17.7.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -55141,7 +55151,7 @@ }, "packages/format-library": { "name": "@wordpress/format-library", - "version": "4.26.0", + "version": "4.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55168,7 +55178,7 @@ }, "packages/hooks": { "name": "@wordpress/hooks", - "version": "3.49.0", + "version": "3.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" @@ -55179,7 +55189,7 @@ }, "packages/html-entities": { "name": "@wordpress/html-entities", - "version": "3.49.0", + "version": "3.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" @@ -55190,7 +55200,7 @@ }, "packages/i18n": { "name": "@wordpress/i18n", - "version": "4.49.0", + "version": "4.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55209,7 +55219,7 @@ }, "packages/icons": { "name": "@wordpress/icons", - "version": "9.40.0", + "version": "9.41.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55222,7 +55232,7 @@ }, "packages/interactivity": { "name": "@wordpress/interactivity", - "version": "3.2.0", + "version": "4.0.0", "license": "GPL-2.0-or-later", "dependencies": { "@preact/signals": "^1.2.2", @@ -55233,6 +55243,17 @@ "node": ">=12" } }, + "packages/interactivity-router": { + "name": "@wordpress/interactivity-router", + "version": "1.0.0", + "license": "GPL-2.0-or-later", + "dependencies": { + "@wordpress/interactivity": "file:../interactivity" + }, + "engines": { + "node": ">=12" + } + }, "packages/interactivity/node_modules/@preact/signals": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/@preact/signals/-/signals-1.2.2.tgz", @@ -55284,7 +55305,7 @@ }, "packages/interface": { "name": "@wordpress/interface", - "version": "5.26.0", + "version": "5.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55312,7 +55333,7 @@ }, "packages/is-shallow-equal": { "name": "@wordpress/is-shallow-equal", - "version": "4.49.0", + "version": "4.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" @@ -55323,7 +55344,7 @@ }, "packages/jest-console": { "name": "@wordpress/jest-console", - "version": "7.20.0", + "version": "7.21.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -55339,7 +55360,7 @@ }, "packages/jest-preset-default": { "name": "@wordpress/jest-preset-default", - "version": "11.20.0", + "version": "11.21.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -55356,7 +55377,7 @@ }, "packages/jest-puppeteer-axe": { "name": "@wordpress/jest-puppeteer-axe", - "version": "6.20.0", + "version": "6.21.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -55378,7 +55399,7 @@ }, "packages/keyboard-shortcuts": { "name": "@wordpress/keyboard-shortcuts", - "version": "4.26.0", + "version": "4.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55396,7 +55417,7 @@ }, "packages/keycodes": { "name": "@wordpress/keycodes", - "version": "3.49.0", + "version": "3.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55408,7 +55429,7 @@ }, "packages/lazy-import": { "name": "@wordpress/lazy-import", - "version": "1.36.0", + "version": "1.37.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -55422,7 +55443,7 @@ }, "packages/list-reusable-blocks": { "name": "@wordpress/list-reusable-blocks", - "version": "4.26.0", + "version": "4.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55444,7 +55465,7 @@ }, "packages/media-utils": { "name": "@wordpress/media-utils", - "version": "4.40.0", + "version": "4.41.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55459,7 +55480,7 @@ }, "packages/notices": { "name": "@wordpress/notices", - "version": "4.17.0", + "version": "4.18.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55475,7 +55496,7 @@ }, "packages/npm-package-json-lint-config": { "name": "@wordpress/npm-package-json-lint-config", - "version": "4.34.0", + "version": "4.35.0", "dev": true, "license": "GPL-2.0-or-later", "engines": { @@ -55487,7 +55508,7 @@ }, "packages/nux": { "name": "@wordpress/nux", - "version": "8.11.0", + "version": "8.12.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55510,7 +55531,7 @@ }, "packages/patterns": { "name": "@wordpress/patterns", - "version": "1.10.0", + "version": "1.11.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55540,7 +55561,7 @@ }, "packages/plugins": { "name": "@wordpress/plugins", - "version": "6.17.0", + "version": "6.18.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55562,7 +55583,7 @@ }, "packages/postcss-plugins-preset": { "name": "@wordpress/postcss-plugins-preset", - "version": "4.33.0", + "version": "4.34.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -55578,7 +55599,7 @@ }, "packages/postcss-themes": { "name": "@wordpress/postcss-themes", - "version": "5.32.0", + "version": "5.33.0", "dev": true, "license": "GPL-2.0-or-later", "engines": { @@ -55590,7 +55611,7 @@ }, "packages/preferences": { "name": "@wordpress/preferences", - "version": "3.26.0", + "version": "3.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55615,7 +55636,7 @@ }, "packages/preferences-persistence": { "name": "@wordpress/preferences-persistence", - "version": "1.41.0", + "version": "1.42.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55627,7 +55648,7 @@ }, "packages/prettier-config": { "name": "@wordpress/prettier-config", - "version": "3.6.0", + "version": "3.7.0", "dev": true, "license": "GPL-2.0-or-later", "engines": { @@ -55639,7 +55660,7 @@ }, "packages/primitives": { "name": "@wordpress/primitives", - "version": "3.47.0", + "version": "3.48.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55652,7 +55673,7 @@ }, "packages/priority-queue": { "name": "@wordpress/priority-queue", - "version": "2.49.0", + "version": "2.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55664,7 +55685,7 @@ }, "packages/private-apis": { "name": "@wordpress/private-apis", - "version": "0.31.0", + "version": "0.32.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" @@ -55675,7 +55696,7 @@ }, "packages/project-management-automation": { "name": "@wordpress/project-management-automation", - "version": "1.48.0", + "version": "1.49.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -55688,7 +55709,7 @@ }, "packages/react-i18n": { "name": "@wordpress/react-i18n", - "version": "3.47.0", + "version": "3.48.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55702,7 +55723,7 @@ }, "packages/react-native-aztec": { "name": "@wordpress/react-native-aztec", - "version": "1.111.0", + "version": "1.111.1", "license": "GPL-2.0-or-later", "dependencies": { "@wordpress/element": "file:../element", @@ -55715,7 +55736,7 @@ }, "packages/react-native-bridge": { "name": "@wordpress/react-native-bridge", - "version": "1.111.0", + "version": "1.111.1", "license": "GPL-2.0-or-later", "dependencies": { "@wordpress/react-native-aztec": "file:../react-native-aztec" @@ -55726,7 +55747,7 @@ }, "packages/react-native-editor": { "name": "@wordpress/react-native-editor", - "version": "1.111.0", + "version": "1.111.1", "hasInstallScript": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -55836,7 +55857,7 @@ }, "packages/readable-js-assets-webpack-plugin": { "name": "@wordpress/readable-js-assets-webpack-plugin", - "version": "2.32.0", + "version": "2.33.0", "dev": true, "license": "GPL-2.0-or-later", "engines": { @@ -55848,7 +55869,7 @@ }, "packages/redux-routine": { "name": "@wordpress/redux-routine", - "version": "4.49.0", + "version": "4.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55892,7 +55913,7 @@ }, "packages/reusable-blocks": { "name": "@wordpress/reusable-blocks", - "version": "4.26.0", + "version": "4.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55918,7 +55939,7 @@ }, "packages/rich-text": { "name": "@wordpress/rich-text", - "version": "6.26.0", + "version": "6.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55942,7 +55963,7 @@ }, "packages/router": { "name": "@wordpress/router", - "version": "0.18.0", + "version": "0.19.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -55960,7 +55981,7 @@ }, "packages/scripts": { "name": "@wordpress/scripts", - "version": "27.0.0", + "version": "27.1.0", "dev": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -56182,7 +56203,7 @@ }, "packages/server-side-render": { "name": "@wordpress/server-side-render", - "version": "4.26.0", + "version": "4.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -56207,7 +56228,7 @@ }, "packages/shortcode": { "name": "@wordpress/shortcode", - "version": "3.49.0", + "version": "3.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -56219,7 +56240,7 @@ }, "packages/style-engine": { "name": "@wordpress/style-engine", - "version": "1.32.0", + "version": "1.33.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -56231,7 +56252,7 @@ }, "packages/stylelint-config": { "name": "@wordpress/stylelint-config", - "version": "21.32.0", + "version": "21.33.0", "dev": true, "license": "MIT", "dependencies": { @@ -56247,7 +56268,7 @@ }, "packages/sync": { "name": "@wordpress/sync", - "version": "0.11.0", + "version": "0.12.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -56267,7 +56288,7 @@ }, "packages/token-list": { "name": "@wordpress/token-list", - "version": "2.49.0", + "version": "2.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" @@ -56278,7 +56299,7 @@ }, "packages/undo-manager": { "name": "@wordpress/undo-manager", - "version": "0.9.0", + "version": "0.10.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -56290,7 +56311,7 @@ }, "packages/url": { "name": "@wordpress/url", - "version": "3.50.0", + "version": "3.51.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -56302,7 +56323,7 @@ }, "packages/viewport": { "name": "@wordpress/viewport", - "version": "5.26.0", + "version": "5.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -56319,7 +56340,7 @@ }, "packages/warning": { "name": "@wordpress/warning", - "version": "2.49.0", + "version": "2.50.0", "license": "GPL-2.0-or-later", "engines": { "node": ">=12" @@ -56327,7 +56348,7 @@ }, "packages/widgets": { "name": "@wordpress/widgets", - "version": "3.26.0", + "version": "3.27.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0", @@ -56351,7 +56372,7 @@ }, "packages/wordcount": { "name": "@wordpress/wordcount", - "version": "3.49.0", + "version": "3.50.0", "license": "GPL-2.0-or-later", "dependencies": { "@babel/runtime": "^7.16.0" @@ -69263,6 +69284,7 @@ "@wordpress/i18n": "file:../i18n", "@wordpress/icons": "file:../icons", "@wordpress/interactivity": "file:../interactivity", + "@wordpress/interactivity-router": "file:../interactivity-router", "@wordpress/keycodes": "file:../keycodes", "@wordpress/notices": "file:../notices", "@wordpress/patterns": "file:../patterns", @@ -69707,6 +69729,7 @@ "requires": { "@wordpress/e2e-test-utils": "file:../e2e-test-utils", "@wordpress/interactivity": "file:../interactivity", + "@wordpress/interactivity-router": "file:../interactivity-router", "@wordpress/jest-console": "file:../jest-console", "@wordpress/jest-puppeteer-axe": "file:../jest-puppeteer-axe", "@wordpress/scripts": "file:../scripts", @@ -70120,6 +70143,12 @@ } } }, + "@wordpress/interactivity-router": { + "version": "file:packages/interactivity-router", + "requires": { + "@wordpress/interactivity": "file:../interactivity" + } + }, "@wordpress/interface": { "version": "file:packages/interface", "requires": { @@ -71933,28 +71962,22 @@ } }, "assert": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", - "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz", + "integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==", "dev": true, "requires": { - "object-assign": "^4.1.1", - "util": "0.10.3" + "object.assign": "^4.1.4", + "util": "^0.10.4" }, "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==", - "dev": true - }, "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==", + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", + "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", "dev": true, "requires": { - "inherits": "2.0.1" + "inherits": "2.0.3" } } } @@ -71989,9 +72012,9 @@ "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==" }, "async-each": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz", + "integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==", "dev": true, "optional": true }, @@ -72876,20 +72899,20 @@ } }, "browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", + "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==", "dev": true, "requires": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", + "bn.js": "^5.2.1", + "browserify-rsa": "^4.1.0", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", + "elliptic": "^6.5.4", "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "parse-asn1": "^5.1.6", + "readable-stream": "^3.6.2", + "safe-buffer": "^5.2.1" }, "dependencies": { "inherits": { @@ -72927,14 +72950,14 @@ } }, "browserslist": { - "version": "4.21.10", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", - "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", + "version": "4.22.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz", + "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==", "requires": { - "caniuse-lite": "^1.0.30001517", - "electron-to-chromium": "^1.4.477", - "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.11" + "caniuse-lite": "^1.0.30001565", + "electron-to-chromium": "^1.4.601", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.0.13" } }, "bser": { @@ -73290,9 +73313,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001538", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz", - "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==" + "version": "1.0.30001579", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001579.tgz", + "integrity": "sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==" }, "capital-case": { "version": "1.0.4", @@ -74672,20 +74695,20 @@ } }, "core-js": { - "version": "3.31.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz", - "integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ==" + "version": "3.35.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.35.1.tgz", + "integrity": "sha512-IgdsbxNyMskrTFxa9lWHyMwAJU5gXOPP+1yO+K59d50VLVAIDAbs7gIv705KzALModfK3ZrSZTPNpC0PQgIZuw==" }, "core-js-builder": { - "version": "3.31.0", - "resolved": "https://registry.npmjs.org/core-js-builder/-/core-js-builder-3.31.0.tgz", - "integrity": "sha512-qx8vgRM3U4+IjlMqNQl7Vj53ectTm1FpzJ+nJSQuT865StCXvusxCO+HuASWIKlkoc+96AfnFa2MEdqvGep9nA==", + "version": "3.35.1", + "resolved": "https://registry.npmjs.org/core-js-builder/-/core-js-builder-3.35.1.tgz", + "integrity": "sha512-CfIvg+khWyS7ElbRXhuQH9QVUQxRDFl8AUwP08BxubJmYtRZuqwjwvc/DVnwRXQ6sqg8ghfNRgnUDWzwNhU/Rw==", "dev": true, "requires": { - "core-js": "3.31.0", - "core-js-compat": "3.31.0", + "core-js": "3.35.1", + "core-js-compat": "3.35.1", "mkdirp": ">=0.5.5 <1", - "webpack": ">=4.46.0 <5" + "webpack": ">=4.47.0 <5" }, "dependencies": { "ajv": { @@ -74837,9 +74860,9 @@ } }, "webpack": { - "version": "4.46.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", - "integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==", + "version": "4.47.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz", + "integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==", "dev": true, "requires": { "@webassemblyjs/ast": "1.9.0", @@ -74880,11 +74903,11 @@ } }, "core-js-compat": { - "version": "3.31.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz", - "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==", + "version": "3.35.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.1.tgz", + "integrity": "sha512-sftHa5qUJY3rs9Zht1WEnmkvXputCyDBczPnr7QDgL8n3qrF3CMXY4VPSYtOLLiOUJcah2WNXREd48iOl6mQIw==", "requires": { - "browserslist": "^4.21.5" + "browserslist": "^4.22.2" } }, "core-js-pure": { @@ -75341,9 +75364,9 @@ } }, "cyclist": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", - "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.2.tgz", + "integrity": "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==", "dev": true }, "damerau-levenshtein": { @@ -76002,9 +76025,9 @@ "dev": true }, "des.js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", - "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz", + "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==", "dev": true, "requires": { "inherits": "^2.0.1", @@ -76515,9 +76538,9 @@ } }, "electron-to-chromium": { - "version": "1.4.525", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.525.tgz", - "integrity": "sha512-GIZ620hDK4YmIqAWkscG4W6RwY6gOx1y5J6f4JUQwctiJrqH2oxZYU4mXHi35oV32tr630UcepBzSBGJ/WYcZA==" + "version": "1.4.643", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.643.tgz", + "integrity": "sha512-QHscvvS7gt155PtoRC0dR2ilhL8E9LHhfTQEq1uD5AL0524rBLAwpAREFH06f87/e45B9XkR6Ki5dbhbCsVEIg==" }, "elegant-spinner": { "version": "1.0.1", @@ -78157,9 +78180,9 @@ "dev": true }, "figgy-pudding": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", - "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", + "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==", "dev": true }, "figures": { @@ -78496,13 +78519,13 @@ "integrity": "sha512-2hJ5ACYeJCzNtiVULov6pljKOLygy0zddoqSI1fFetM+XRPpRshFdGEijtqlamA1XwyZ+7rhryI6FQFzvtLWUQ==" }, "flush-write-stream": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz", - "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", + "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", "dev": true, "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.4" + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" } }, "fn.name": { @@ -87175,9 +87198,9 @@ "dev": true }, "nan": { - "version": "2.14.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", - "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", + "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==", "dev": true, "optional": true }, @@ -87424,9 +87447,9 @@ "dev": true }, "node-releases": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==" + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==" }, "node-stream-zip": { "version": "1.15.0", @@ -89220,12 +89243,12 @@ "dev": true }, "parallel-transform": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", - "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz", + "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", "dev": true, "requires": { - "cyclist": "~0.2.2", + "cyclist": "^1.0.1", "inherits": "^2.0.3", "readable-stream": "^2.1.5" } @@ -93765,9 +93788,9 @@ } }, "source-list-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", - "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", + "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==", "dev": true }, "source-map": { @@ -94105,9 +94128,9 @@ } }, "stream-each": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz", - "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", + "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", "dev": true, "requires": { "end-of-stream": "^1.1.0", @@ -95969,9 +95992,9 @@ "optional": true }, "update-browserslist-db": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", - "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "requires": { "escalade": "^3.1.1", "picocolors": "^1.0.0" diff --git a/package.json b/package.json index 035c8d69cc56f0..e47b3580c2a41e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gutenberg", - "version": "17.5.1", + "version": "17.6.0-rc.1", "private": true, "description": "A new WordPress editor experience.", "author": "The WordPress Contributors", @@ -177,14 +177,14 @@ "babel-plugin-react-native-platform-specific-extensions": "1.1.1", "babel-plugin-transform-remove-console": "6.9.4", "benchmark": "2.1.4", - "browserslist": "4.21.10", - "caniuse-lite": "1.0.30001538", + "browserslist": "4.22.2", + "caniuse-lite": "1.0.30001579", "chalk": "4.1.1", "change-case": "4.1.2", "commander": "9.2.0", "concurrently": "3.5.0", "copy-webpack-plugin": "10.2.0", - "core-js-builder": "3.31.0", + "core-js-builder": "3.35.1", "cross-env": "3.2.4", "css-loader": "6.2.0", "cssnano": "6.0.1", diff --git a/packages/a11y/CHANGELOG.md b/packages/a11y/CHANGELOG.md index 7c5c9d79784102..e302cf7514cbf5 100644 --- a/packages/a11y/CHANGELOG.md +++ b/packages/a11y/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## 3.50.0 (2024-01-24) + ## 3.49.0 (2024-01-10) ## 3.48.0 (2023-12-13) diff --git a/packages/a11y/package.json b/packages/a11y/package.json index c2d1b666339bf6..bfdee27579a985 100644 --- a/packages/a11y/package.json +++ b/packages/a11y/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/a11y", - "version": "3.49.0", + "version": "3.50.0", "description": "Accessibility (a11y) utilities for WordPress.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/annotations/CHANGELOG.md b/packages/annotations/CHANGELOG.md index 42c37836527973..df543928a05efb 100644 --- a/packages/annotations/CHANGELOG.md +++ b/packages/annotations/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## 2.50.0 (2024-01-24) + ## 2.49.0 (2024-01-10) ## 2.48.0 (2023-12-13) diff --git a/packages/annotations/package.json b/packages/annotations/package.json index 007b02ad29a71d..ebe468f068da7f 100644 --- a/packages/annotations/package.json +++ b/packages/annotations/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/annotations", - "version": "2.49.0", + "version": "2.50.0", "description": "Annotate content in the Gutenberg editor.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/api-fetch/CHANGELOG.md b/packages/api-fetch/CHANGELOG.md index 67df4dad50c64c..5284234afd2289 100644 --- a/packages/api-fetch/CHANGELOG.md +++ b/packages/api-fetch/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## 6.47.0 (2024-01-24) + ## 6.46.0 (2024-01-10) ## 6.45.0 (2023-12-13) diff --git a/packages/api-fetch/package.json b/packages/api-fetch/package.json index 02d0474156bfc1..a7ad0ad752d061 100644 --- a/packages/api-fetch/package.json +++ b/packages/api-fetch/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/api-fetch", - "version": "6.46.0", + "version": "6.47.0", "description": "Utility to make WordPress REST API requests.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/autop/CHANGELOG.md b/packages/autop/CHANGELOG.md index 4e4c9a91bc781d..969a52ded8a7fa 100644 --- a/packages/autop/CHANGELOG.md +++ b/packages/autop/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## 3.50.0 (2024-01-24) + ## 3.49.0 (2024-01-10) ## 3.48.0 (2023-12-13) diff --git a/packages/autop/package.json b/packages/autop/package.json index e335e4ac7349b5..09fac4ca6c6609 100644 --- a/packages/autop/package.json +++ b/packages/autop/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/autop", - "version": "3.49.0", + "version": "3.50.0", "description": "WordPress's automatic paragraph functions `autop` and `removep`.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md b/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md index 19269095d73d70..8ee06832be474c 100644 --- a/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md +++ b/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## 4.33.0 (2024-01-24) + ## 4.32.0 (2024-01-10) ## 4.31.0 (2023-12-13) diff --git a/packages/babel-plugin-import-jsx-pragma/package.json b/packages/babel-plugin-import-jsx-pragma/package.json index 3af7e30b2e2340..c0ccae09f1811a 100644 --- a/packages/babel-plugin-import-jsx-pragma/package.json +++ b/packages/babel-plugin-import-jsx-pragma/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/babel-plugin-import-jsx-pragma", - "version": "4.32.0", + "version": "4.33.0", "description": "Babel transform plugin for automatically injecting an import to be used as the pragma for the React JSX Transform plugin.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/babel-plugin-makepot/CHANGELOG.md b/packages/babel-plugin-makepot/CHANGELOG.md index fd1a0546da3ad0..ef5ce07c677b59 100644 --- a/packages/babel-plugin-makepot/CHANGELOG.md +++ b/packages/babel-plugin-makepot/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## 5.34.0 (2024-01-24) + ## 5.33.0 (2024-01-10) ## 5.32.0 (2023-12-13) diff --git a/packages/babel-plugin-makepot/package.json b/packages/babel-plugin-makepot/package.json index 6163ad1df3ff1b..3994df49b320a0 100644 --- a/packages/babel-plugin-makepot/package.json +++ b/packages/babel-plugin-makepot/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/babel-plugin-makepot", - "version": "5.33.0", + "version": "5.34.0", "description": "WordPress Babel internationalization (i18n) plugin.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/babel-preset-default/CHANGELOG.md b/packages/babel-preset-default/CHANGELOG.md index 4149381dce16f8..2ebbc9e4efc24d 100644 --- a/packages/babel-preset-default/CHANGELOG.md +++ b/packages/babel-preset-default/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## 7.34.0 (2024-01-24) + ## 7.33.0 (2024-01-10) ## 7.32.0 (2023-12-13) diff --git a/packages/babel-preset-default/bin/index.js b/packages/babel-preset-default/bin/index.js index a2d86233565138..54c35564d43d74 100755 --- a/packages/babel-preset-default/bin/index.js +++ b/packages/babel-preset-default/bin/index.js @@ -8,17 +8,13 @@ const { minify } = require( 'uglify-js' ); const { writeFile } = require( 'fs' ).promises; builder( { - modules: [ 'es', 'web' ], + modules: [ 'es.', 'web.' ], exclude: [ - // core-js is extremely conservative in which polyfills to include. - // Since we don't care about the tiny browser implementation bugs behind its decision - // to polyfill these features, we forcefully prevent them from being included. - // @see https://github.com/WordPress/gutenberg/pull/31279 - 'es.promise', // This is an IE-only feature which we don't use, and don't want to polyfill. // @see https://github.com/WordPress/gutenberg/pull/49234 'web.immediate', ], + summary: { console: { size: true, modules: true } }, targets: require( '@wordpress/browserslist-config' ), filename: './build/polyfill.js', } ) diff --git a/packages/babel-preset-default/package.json b/packages/babel-preset-default/package.json index 66e63b24ff51eb..6110031337c893 100644 --- a/packages/babel-preset-default/package.json +++ b/packages/babel-preset-default/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/babel-preset-default", - "version": "7.33.0", + "version": "7.34.0", "description": "Default Babel preset for WordPress development.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/base-styles/CHANGELOG.md b/packages/base-styles/CHANGELOG.md index a399317b2aef0d..614d83a498a33f 100644 --- a/packages/base-styles/CHANGELOG.md +++ b/packages/base-styles/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## 4.41.0 (2024-01-24) + ## 4.40.0 (2024-01-10) ## 4.39.0 (2023-12-13) diff --git a/packages/base-styles/package.json b/packages/base-styles/package.json index 64d3835a00aca3..f9fe0dbd9230bc 100644 --- a/packages/base-styles/package.json +++ b/packages/base-styles/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/base-styles", - "version": "4.40.0", + "version": "4.41.0", "description": "Base SCSS utilities and variables for WordPress.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/blob/CHANGELOG.md b/packages/blob/CHANGELOG.md index b2a501021c5aaa..87e1956b5a5569 100644 --- a/packages/blob/CHANGELOG.md +++ b/packages/blob/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## 3.50.0 (2024-01-24) + ## 3.49.0 (2024-01-10) ## 3.48.0 (2023-12-13) diff --git a/packages/blob/package.json b/packages/blob/package.json index 53071228e0af1e..aaabbefa579785 100644 --- a/packages/blob/package.json +++ b/packages/blob/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/blob", - "version": "3.49.0", + "version": "3.50.0", "description": "Blob utilities for WordPress.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/block-directory/CHANGELOG.md b/packages/block-directory/CHANGELOG.md index 608fc4c4f005cf..25162b8b692bf6 100644 --- a/packages/block-directory/CHANGELOG.md +++ b/packages/block-directory/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## 4.27.0 (2024-01-24) + ## 4.26.0 (2024-01-10) ## 4.25.0 (2023-12-13) diff --git a/packages/block-directory/package.json b/packages/block-directory/package.json index 466d1fd783e952..c47c5ef91389b5 100644 --- a/packages/block-directory/package.json +++ b/packages/block-directory/package.json @@ -1,6 +1,6 @@ { "name": "@wordpress/block-directory", - "version": "4.26.0", + "version": "4.27.0", "description": "Extend editor with block directory features to search, download and install blocks.", "author": "The WordPress Contributors", "license": "GPL-2.0-or-later", diff --git a/packages/block-directory/src/components/downloadable-blocks-panel/index.js b/packages/block-directory/src/components/downloadable-blocks-panel/index.js index 46866003128513..4ceee3ddcb16e6 100644 --- a/packages/block-directory/src/components/downloadable-blocks-panel/index.js +++ b/packages/block-directory/src/components/downloadable-blocks-panel/index.js @@ -3,9 +3,8 @@ */ import { __ } from '@wordpress/i18n'; import { Spinner } from '@wordpress/components'; -import { compose } from '@wordpress/compose'; import { store as coreStore } from '@wordpress/core-data'; -import { withSelect } from '@wordpress/data'; +import { useSelect } from '@wordpress/data'; import { getBlockType } from '@wordpress/blocks'; /** @@ -18,16 +17,71 @@ import { store as blockDirectoryStore } from '../../store'; const EMPTY_ARRAY = []; -function DownloadableBlocksPanel( { - downloadableItems, +const useDownloadableBlocks = ( filterValue ) => + useSelect( + ( select ) => { + const { + getDownloadableBlocks, + isRequestingDownloadableBlocks, + getInstalledBlockTypes, + } = select( blockDirectoryStore ); + + const hasPermission = select( coreStore ).canUser( + 'read', + 'block-directory/search' + ); + + let downloadableBlocks = EMPTY_ARRAY; + if ( hasPermission ) { + downloadableBlocks = getDownloadableBlocks( filterValue ); + + // Filter out blocks that are already installed. + const installedBlockTypes = getInstalledBlockTypes(); + const installableBlocks = downloadableBlocks.filter( + ( { name } ) => { + // Check if the block has just been installed, in which case it + // should still show in the list to avoid suddenly disappearing. + // `installedBlockTypes` only returns blocks stored in state + // immediately after installation, not all installed blocks. + const isJustInstalled = installedBlockTypes.some( + ( blockType ) => blockType.name === name + ); + const isPreviouslyInstalled = getBlockType( name ); + return isJustInstalled || ! isPreviouslyInstalled; + } + ); + + // Keep identity of the `downloadableBlocks` array if nothing was filtered out + if ( installableBlocks.length !== downloadableBlocks.length ) { + downloadableBlocks = installableBlocks; + } + + // Return identical empty array when there are no blocks + if ( downloadableBlocks.length === 0 ) { + downloadableBlocks = EMPTY_ARRAY; + } + } + + return { + hasPermission, + downloadableBlocks, + isLoading: isRequestingDownloadableBlocks( filterValue ), + }; + }, + [ filterValue ] + ); + +export default function DownloadableBlocksPanel( { onSelect, onHover, hasLocalBlocks, - hasPermission, - isLoading, isTyping, + filterValue, } ) { - if ( typeof hasPermission === 'undefined' || isLoading || isTyping ) { + const { hasPermission, downloadableBlocks, isLoading } = + useDownloadableBlocks( filterValue ); + + if ( hasPermission === undefined || isLoading || isTyping ) { return ( <> { hasPermission && ! hasLocalBlocks && ( @@ -55,71 +109,20 @@ function DownloadableBlocksPanel( { return null; } - return !! downloadableItems.length ? ( + if ( downloadableBlocks.length === 0 ) { + return hasLocalBlocks ? null :
{ _n( - 'Post or page content will not be displayed if you delete this block.', - 'Post or page content will not be displayed if you delete these blocks.', + 'Deleting this block will stop your post or page content from displaying on this template. It is not recommended.', + 'Deleting these blocks will stop your post or page content from displaying on this template. It is not recommended.', blockNamesForPrompt.length ) }
diff --git a/packages/block-editor/src/components/block-tools/insertion-point.js b/packages/block-editor/src/components/block-tools/insertion-point.js index 1caec5f3aee8e0..19ad39caca336a 100644 --- a/packages/block-editor/src/components/block-tools/insertion-point.js +++ b/packages/block-editor/src/components/block-tools/insertion-point.js @@ -24,6 +24,8 @@ export const InsertionPointOpenRef = createContext(); function InbetweenInsertionPointPopover( { __unstablePopoverSlot, __unstableContentRef, + operation = 'insert', + nearestSide = 'right', } ) { const { selectBlock, hideInsertionPoint } = useDispatch( blockEditorStore ); const openRef = useContext( InsertionPointOpenRef ); @@ -138,9 +140,14 @@ function InbetweenInsertionPointPopover( { return null; } + const orientationClassname = + orientation === 'horizontal' || operation === 'group' + ? 'is-horizontal' + : 'is-vertical'; + const className = classnames( 'block-editor-block-list__insertion-point', - 'is-' + orientation + orientationClassname ); return ( @@ -149,6 +156,8 @@ function InbetweenInsertionPointPopover( { nextClientId={ nextClientId } __unstablePopoverSlot={ __unstablePopoverSlot } __unstableContentRef={ __unstableContentRef } + operation={ operation } + nearestSide={ nearestSide } >
{ ! isEmptyURL ? (
<>
-
+
- { displayTitle }
+
+ { displayTitle }
+
-
{ value?.url && displayTitle !== displayURL && (
- { displayURL }
+
+ { displayURL }
+
) }
@@ -119,7 +130,7 @@ export default function LinkPreview( {
label={ __( 'Edit' ) }
className="block-editor-link-control__search-item-action"
onClick={ onEditClick }
- iconSize={ 24 }
+ size="compact"
/>
{ hasUnlinkControl && (
) }
+
-
- { !! (
- ( hasRichData &&
- ( richData?.image || richData?.description ) ) ||
- isFetching
- ) && (
-
- { ( richData?.image || isFetching ) && (
-
- ) }
-
{ additionalControls && additionalControls() }
);
diff --git a/packages/block-editor/src/components/link-control/style.scss b/packages/block-editor/src/components/link-control/style.scss
index 1a053eabf265ce..7b6470df435437 100644
--- a/packages/block-editor/src/components/link-control/style.scss
+++ b/packages/block-editor/src/components/link-control/style.scss
@@ -1,5 +1,4 @@
$block-editor-link-control-number-of-actions: 1;
-$preview-image-height: 140px;
@keyframes loadingpulse {
0% {
@@ -180,6 +179,7 @@ $preview-image-height: 140px;
flex-direction: row;
align-items: flex-start;
margin-right: $grid-unit-10;
+ gap: $grid-unit-10;
// Force text to wrap to improve UX when encountering long lines
// of text, particular those with no spaces.
@@ -188,6 +188,9 @@ $preview-image-height: 140px;
overflow-wrap: break-word;
.block-editor-link-control__search-item-info {
+ color: $gray-700;
+ line-height: 1.1;
+ font-size: $helptext-font-size;
word-break: break-all;
}
}
@@ -206,17 +209,29 @@ $preview-image-height: 140px;
word-break: break-all;
}
+ .block-editor-link-control__search-item-details {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ gap: $grid-unit-05;
+ }
+
+ .block-editor-link-control__search-item-header .block-editor-link-control__search-item-icon {
+ background-color: $gray-100;
+ width: $grid-unit-40;
+ height: $grid-unit-40;
+ border-radius: $radius-block-ui;
+ }
+
.block-editor-link-control__search-item-icon {
position: relative;
- margin-right: $grid-unit-10;
- max-height: 24px;
flex-shrink: 0;
- width: 24px;
display: flex;
justify-content: center;
+ align-items: center;
img {
- width: 16px; // favicons often have a source of 32px
+ width: $grid-unit-20; // favicons often have a source of 32px
}
}
@@ -227,10 +242,13 @@ $preview-image-height: 140px;
}
.block-editor-link-control__search-item-title {
- display: block;
- font-weight: 500;
- position: relative;
- line-height: $grid-unit-30;
+ border-radius: $radius-block-ui;
+ line-height: 1.1;
+
+ &:focus-visible {
+ @include block-toolbar-button-style__focus();
+ text-decoration: none;
+ }
mark {
font-weight: 600;
@@ -246,58 +264,6 @@ $preview-image-height: 140px;
display: none; // specifically requested to be removed visually as well.
}
}
-
- .block-editor-link-control__search-item-description {
- padding-top: 12px;
- margin: 0;
-
- &.is-placeholder {
- margin-top: 12px;
- padding-top: 0;
- height: 28px;
- display: flex;
- flex-direction: column;
- justify-content: space-around;
-
- &::before,
- &::after {
- display: block;
- content: "";
- height: 0.7em;
- width: 100%;
- background-color: $gray-100;
- border-radius: 3px;
- }
- }
-
- .components-text {
- font-size: 0.9em;
- }
- }
-
- .block-editor-link-control__search-item-image {
- display: flex;
- width: 100%;
- background-color: $gray-100;
- justify-content: center;
- height: $preview-image-height; // limit height
- max-height: $preview-image-height; // limit height
- overflow: hidden;
- border-radius: 2px;
- margin-top: 12px;
-
- &.is-placeholder {
- background-color: $gray-100;
- border-radius: 3px;
- }
-
- img {
- display: block; // remove unwanted space below image
- width: 100%;
- height: 100%;
- object-fit: contain;
- }
- }
}
.block-editor-link-control__search-item-top {
@@ -307,24 +273,7 @@ $preview-image-height: 140px;
align-items: center;
}
-.block-editor-link-control__search-item-bottom {
- transition: opacity 1.5s;
- width: 100%;
-}
-
.block-editor-link-control__search-item.is-fetching {
- .block-editor-link-control__search-item-description {
- &::before,
- &::after {
- animation: loadingpulse 1s linear infinite;
- animation-delay: 0.5s; // avoid animating for fast network responses
- }
- }
-
- .block-editor-link-control__search-item-image {
- animation: loadingpulse 1s linear infinite;
- animation-delay: 0.5s; // avoid animating for fast network responses
- }
.block-editor-link-control__search-item-icon {
svg,
diff --git a/packages/block-editor/src/components/link-control/test/index.js b/packages/block-editor/src/components/link-control/test/index.js
index 32db57a55d76ed..054f7a3ea87468 100644
--- a/packages/block-editor/src/components/link-control/test/index.js
+++ b/packages/block-editor/src/components/link-control/test/index.js
@@ -2244,7 +2244,8 @@ describe( 'Rich link previews', () => {
const titlePreview = screen.getByText( selectedLink.title );
- expect( titlePreview ).toHaveClass(
+ // eslint-disable-next-line testing-library/no-node-access
+ expect( titlePreview.parentElement ).toHaveClass(
'block-editor-link-control__search-item-title'
);
} );
diff --git a/packages/block-editor/src/components/list-view/block.js b/packages/block-editor/src/components/list-view/block.js
index aab9d444a5948f..6dedabb48f8b85 100644
--- a/packages/block-editor/src/components/list-view/block.js
+++ b/packages/block-editor/src/components/list-view/block.js
@@ -187,7 +187,7 @@ function ListViewBlock( {
selectBlock( undefined, focusClientId, null, null );
}
- focusListItem( focusClientId, treeGridElementRef );
+ focusListItem( focusClientId, treeGridElementRef?.current );
},
[ selectBlock, treeGridElementRef ]
);
diff --git a/packages/block-editor/src/components/list-view/index.js b/packages/block-editor/src/components/list-view/index.js
index 5270a7af3a2962..895571755e4fa0 100644
--- a/packages/block-editor/src/components/list-view/index.js
+++ b/packages/block-editor/src/components/list-view/index.js
@@ -42,6 +42,7 @@ import useListViewExpandSelectedItem from './use-list-view-expand-selected-item'
import { store as blockEditorStore } from '../../store';
import { BlockSettingsDropdown } from '../block-settings-menu/block-settings-dropdown';
import { focusListItem } from './utils';
+import useClipboardHandler from './use-clipboard-handler';
const expanded = ( state, action ) => {
if ( Array.isArray( action.clientIds ) ) {
@@ -137,14 +138,6 @@ function ListViewComponent(
const [ expandedState, setExpandedState ] = useReducer( expanded, {} );
- const { ref: dropZoneRef, target: blockDropTarget } = useListViewDropZone( {
- dropZoneElement,
- expandedState,
- setExpandedState,
- } );
- const elementRef = useRef();
- const treeGridRef = useMergeRefs( [ elementRef, dropZoneRef, ref ] );
-
const [ insertedBlock, setInsertedBlock ] = useState( null );
const { setSelectedTreeId } = useListViewExpandSelectedItem( {
@@ -166,11 +159,31 @@ function ListViewComponent(
},
[ setSelectedTreeId, updateBlockSelection, onSelect, getBlock ]
);
+
+ const { ref: dropZoneRef, target: blockDropTarget } = useListViewDropZone( {
+ dropZoneElement,
+ expandedState,
+ setExpandedState,
+ } );
+ const elementRef = useRef();
+
+ // Allow handling of copy, cut, and paste events.
+ const clipBoardRef = useClipboardHandler( {
+ selectBlock: selectEditorBlock,
+ } );
+
+ const treeGridRef = useMergeRefs( [
+ clipBoardRef,
+ elementRef,
+ dropZoneRef,
+ ref,
+ ] );
+
useEffect( () => {
// If a blocks are already selected when the list view is initially
// mounted, shift focus to the first selected block.
if ( selectedClientIds?.length ) {
- focusListItem( selectedClientIds[ 0 ], elementRef );
+ focusListItem( selectedClientIds[ 0 ], elementRef?.current );
}
// Disable reason: Only focus on the selected item when the list view is mounted.
// eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/packages/block-editor/src/components/list-view/use-clipboard-handler.js b/packages/block-editor/src/components/list-view/use-clipboard-handler.js
new file mode 100644
index 00000000000000..cd25c71e9bf7c4
--- /dev/null
+++ b/packages/block-editor/src/components/list-view/use-clipboard-handler.js
@@ -0,0 +1,199 @@
+/**
+ * WordPress dependencies
+ */
+import { useDispatch, useSelect } from '@wordpress/data';
+import { useRefEffect } from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../store';
+import { useNotifyCopy } from '../../utils/use-notify-copy';
+import { focusListItem } from './utils';
+import { getPasteBlocks, setClipboardBlocks } from '../writing-flow/utils';
+
+// This hook borrows from useClipboardHandler in ../writing-flow/use-clipboard-handler.js
+// and adds behaviour for the list view, while skipping partial selection.
+export default function useClipboardHandler( { selectBlock } ) {
+ const {
+ getBlockOrder,
+ getBlockRootClientId,
+ getBlocksByClientId,
+ getPreviousBlockClientId,
+ getSelectedBlockClientIds,
+ getSettings,
+ canInsertBlockType,
+ canRemoveBlocks,
+ } = useSelect( blockEditorStore );
+ const { flashBlock, removeBlocks, replaceBlocks, insertBlocks } =
+ useDispatch( blockEditorStore );
+ const notifyCopy = useNotifyCopy();
+
+ return useRefEffect( ( node ) => {
+ function updateFocusAndSelection( focusClientId, shouldSelectBlock ) {
+ if ( shouldSelectBlock ) {
+ selectBlock( undefined, focusClientId, null, null );
+ }
+
+ focusListItem( focusClientId, node );
+ }
+
+ // Determine which blocks to update:
+ // If the current (focused) block is part of the block selection, use the whole selection.
+ // If the focused block is not part of the block selection, only update the focused block.
+ function getBlocksToUpdate( clientId ) {
+ const selectedBlockClientIds = getSelectedBlockClientIds();
+ const isUpdatingSelectedBlocks =
+ selectedBlockClientIds.includes( clientId );
+ const firstBlockClientId = isUpdatingSelectedBlocks
+ ? selectedBlockClientIds[ 0 ]
+ : clientId;
+ const firstBlockRootClientId =
+ getBlockRootClientId( firstBlockClientId );
+
+ const blocksToUpdate = isUpdatingSelectedBlocks
+ ? selectedBlockClientIds
+ : [ clientId ];
+
+ return {
+ blocksToUpdate,
+ firstBlockClientId,
+ firstBlockRootClientId,
+ originallySelectedBlockClientIds: selectedBlockClientIds,
+ };
+ }
+
+ function handler( event ) {
+ if ( event.defaultPrevented ) {
+ // This was possibly already handled in rich-text/use-paste-handler.js.
+ return;
+ }
+
+ // Only handle events that occur within the list view.
+ if ( ! node.contains( event.target.ownerDocument.activeElement ) ) {
+ return;
+ }
+
+ // Retrieve the block clientId associated with the focused list view row.
+ // This enables applying copy / cut / paste behavior to the focused block,
+ // rather than just the blocks that are currently selected.
+ const listViewRow =
+ event.target.ownerDocument.activeElement?.closest(
+ '[role=row]'
+ );
+ const clientId = listViewRow?.dataset?.block;
+ if ( ! clientId ) {
+ return;
+ }
+
+ const {
+ blocksToUpdate: selectedBlockClientIds,
+ firstBlockClientId,
+ firstBlockRootClientId,
+ originallySelectedBlockClientIds,
+ } = getBlocksToUpdate( clientId );
+
+ if ( selectedBlockClientIds.length === 0 ) {
+ return;
+ }
+
+ event.preventDefault();
+
+ if ( event.type === 'copy' || event.type === 'cut' ) {
+ if ( selectedBlockClientIds.length === 1 ) {
+ flashBlock( selectedBlockClientIds[ 0 ] );
+ }
+
+ notifyCopy( event.type, selectedBlockClientIds );
+ const blocks = getBlocksByClientId( selectedBlockClientIds );
+ setClipboardBlocks( event, blocks );
+ }
+
+ if ( event.type === 'cut' ) {
+ // Don't update the selection if the blocks cannot be deleted.
+ if (
+ ! canRemoveBlocks(
+ selectedBlockClientIds,
+ firstBlockRootClientId
+ )
+ ) {
+ return;
+ }
+
+ let blockToFocus =
+ getPreviousBlockClientId( firstBlockClientId ) ??
+ // If the previous block is not found (when the first block is deleted),
+ // fallback to focus the parent block.
+ firstBlockRootClientId;
+
+ // Remove blocks, but don't update selection, and it will be handled below.
+ removeBlocks( selectedBlockClientIds, false );
+
+ // Update the selection if the original selection has been removed.
+ const shouldUpdateSelection =
+ originallySelectedBlockClientIds.length > 0 &&
+ getSelectedBlockClientIds().length === 0;
+
+ // If there's no previous block nor parent block, focus the first block.
+ if ( ! blockToFocus ) {
+ blockToFocus = getBlockOrder()[ 0 ];
+ }
+
+ updateFocusAndSelection( blockToFocus, shouldUpdateSelection );
+ } else if ( event.type === 'paste' ) {
+ const {
+ __experimentalCanUserUseUnfilteredHTML:
+ canUserUseUnfilteredHTML,
+ } = getSettings();
+ const blocks = getPasteBlocks(
+ event,
+ canUserUseUnfilteredHTML
+ );
+
+ if ( selectedBlockClientIds.length === 1 ) {
+ const [ selectedBlockClientId ] = selectedBlockClientIds;
+
+ // If a single block is focused, and the blocks to be posted can
+ // be inserted within the block, then append the pasted blocks
+ // within the focused block. For example, if you have copied a paragraph
+ // block and paste it within a single Group block, this will append
+ // the paragraph block within the Group block.
+ if (
+ blocks.every( ( block ) =>
+ canInsertBlockType(
+ block.name,
+ selectedBlockClientId
+ )
+ )
+ ) {
+ insertBlocks(
+ blocks,
+ undefined,
+ selectedBlockClientId
+ );
+ updateFocusAndSelection( blocks[ 0 ]?.clientId, false );
+ return;
+ }
+ }
+
+ replaceBlocks(
+ selectedBlockClientIds,
+ blocks,
+ blocks.length - 1,
+ -1
+ );
+ updateFocusAndSelection( blocks[ 0 ]?.clientId, false );
+ }
+ }
+
+ node.ownerDocument.addEventListener( 'copy', handler );
+ node.ownerDocument.addEventListener( 'cut', handler );
+ node.ownerDocument.addEventListener( 'paste', handler );
+
+ return () => {
+ node.ownerDocument.removeEventListener( 'copy', handler );
+ node.ownerDocument.removeEventListener( 'cut', handler );
+ node.ownerDocument.removeEventListener( 'paste', handler );
+ };
+ }, [] );
+}
diff --git a/packages/block-editor/src/components/list-view/utils.js b/packages/block-editor/src/components/list-view/utils.js
index ed7a321dea0c86..c91376b0472116 100644
--- a/packages/block-editor/src/components/list-view/utils.js
+++ b/packages/block-editor/src/components/list-view/utils.js
@@ -63,12 +63,12 @@ export function getCommonDepthClientIds(
*
* @typedef {import('@wordpress/element').RefObject} RefObject
*
- * @param {string} focusClientId The client ID of the block to focus.
- * @param {RefObject
- { richData?.image && (
- 
- ) }
-
- ) }
-
- { ( richData?.description || isFetching ) && (
-
- { richData?.description && (
-
- { richData.description }
-
- ) }
-
- ) }
- /g, '\n' ); - - const plainText = stripHTML( html ).trim(); - - // Merge any consecutive line breaks - return plainText.replace( /\n\n+/g, '\n\n' ); -} diff --git a/packages/block-editor/src/components/writing-flow/utils.js b/packages/block-editor/src/components/writing-flow/utils.js new file mode 100644 index 00000000000000..ef1827077ccbf1 --- /dev/null +++ b/packages/block-editor/src/components/writing-flow/utils.js @@ -0,0 +1,103 @@ +/** + * WordPress dependencies + */ +import { __unstableStripHTML as stripHTML } from '@wordpress/dom'; +import { + serialize, + createBlock, + pasteHandler, + findTransform, + getBlockTransforms, +} from '@wordpress/blocks'; + +/** + * Internal dependencies + */ +import { getPasteEventData } from '../../utils/pasting'; + +/** + * Sets the clipboard data for the provided blocks, with both HTML and plain + * text representations. + * + * @param {ClipboardEvent} event Clipboard event. + * @param {WPBlock[]} blocks Blocks to set as clipboard data. + */ +export function setClipboardBlocks( event, blocks ) { + let _blocks = blocks; + const wrapperBlockName = event.clipboardData.getData( + '__unstableWrapperBlockName' + ); + + if ( wrapperBlockName ) { + _blocks = createBlock( + wrapperBlockName, + JSON.parse( + event.clipboardData.getData( + '__unstableWrapperBlockAttributes' + ) + ), + _blocks + ); + } + + const serialized = serialize( _blocks ); + + event.clipboardData.setData( 'text/plain', toPlainText( serialized ) ); + event.clipboardData.setData( 'text/html', serialized ); +} + +/** + * Returns the blocks to be pasted from the clipboard event. + * + * @param {ClipboardEvent} event The clipboard event. + * @param {boolean} canUserUseUnfilteredHTML Whether the user can or can't post unfiltered HTML. + * @return {Array|string} A list of blocks or a string, depending on `handlerMode`. + */ +export function getPasteBlocks( event, canUserUseUnfilteredHTML ) { + const { plainText, html, files } = getPasteEventData( event ); + let blocks = []; + + if ( files.length ) { + const fromTransforms = getBlockTransforms( 'from' ); + blocks = files + .reduce( ( accumulator, file ) => { + const transformation = findTransform( + fromTransforms, + ( transform ) => + transform.type === 'files' && + transform.isMatch( [ file ] ) + ); + if ( transformation ) { + accumulator.push( transformation.transform( [ file ] ) ); + } + return accumulator; + }, [] ) + .flat(); + } else { + blocks = pasteHandler( { + HTML: html, + plainText, + mode: 'BLOCKS', + canUserUseUnfilteredHTML, + } ); + } + + return blocks; +} + +/** + * Given a string of HTML representing serialized blocks, returns the plain + * text extracted after stripping the HTML of any tags and fixing line breaks. + * + * @param {string} html Serialized blocks. + * @return {string} The plain-text content with any html removed. + */ +function toPlainText( html ) { + // Manually handle BR tags as line breaks prior to `stripHTML` call + html = html.replace( /
/g, '\n' ); + + const plainText = stripHTML( html ).trim(); + + // Merge any consecutive line breaks + return plainText.replace( /\n\n+/g, '\n\n' ); +} diff --git a/packages/block-editor/src/hooks/block-hooks.js b/packages/block-editor/src/hooks/block-hooks.js index f9d7026e48545f..1e0b8e894d2067 100644 --- a/packages/block-editor/src/hooks/block-hooks.js +++ b/packages/block-editor/src/hooks/block-hooks.js @@ -55,8 +55,7 @@ function BlockHooksControlPure( { name, clientId } ) { const _hookedBlockClientIds = hookedBlocksForCurrentBlock.reduce( ( clientIds, block ) => { // If the block doesn't exist anywhere in the block tree, - // we know that we have to display the toggle for it, and set - // it to disabled. + // we know that we have to set the toggle to disabled. if ( getGlobalBlockCount( block.name ) === 0 ) { return clientIds; } @@ -96,13 +95,8 @@ function BlockHooksControlPure( { name, clientId } ) { } // If no hooked block was found in any of its designated locations, - // but it exists elsewhere in the block tree, we consider it manually inserted. - // In this case, we take note and will remove the corresponding toggle from the - // block inspector panel. - return { - ...clientIds, - [ block.name ]: false, - }; + // we set the toggle to disabled. + return clientIds; }, {} ); @@ -118,13 +112,7 @@ function BlockHooksControlPure( { name, clientId } ) { const { insertBlock, removeBlock } = useDispatch( blockEditorStore ); - // Remove toggle if block isn't present in the designated location but elsewhere in the block tree. - const hookedBlocksForCurrentBlockIfNotPresentElsewhere = - hookedBlocksForCurrentBlock?.filter( - ( block ) => hookedBlockClientIds?.[ block.name ] !== false - ); - - if ( ! hookedBlocksForCurrentBlockIfNotPresentElsewhere.length ) { + if ( ! hookedBlocksForCurrentBlock.length ) { return null; } diff --git a/packages/block-editor/src/hooks/dimensions.js b/packages/block-editor/src/hooks/dimensions.js index bbf5b12ca27cf8..6f03ddac2c6504 100644 --- a/packages/block-editor/src/hooks/dimensions.js +++ b/packages/block-editor/src/hooks/dimensions.js @@ -1,7 +1,12 @@ +/** + * External dependencies + */ +import classnames from 'classnames'; + /** * WordPress dependencies */ -import { useState, useEffect, useCallback } from '@wordpress/element'; +import { Platform, useState, useEffect, useCallback } from '@wordpress/element'; import { useDispatch, useSelect } from '@wordpress/data'; import { getBlockSupport } from '@wordpress/blocks'; import deprecated from '@wordpress/deprecated'; @@ -18,8 +23,7 @@ import { MarginVisualizer } from './margin'; import { PaddingVisualizer } from './padding'; import { store as blockEditorStore } from '../store'; import { unlock } from '../lock-unlock'; - -import { cleanEmptyObject } from './utils'; +import { cleanEmptyObject, shouldSkipSerialization } from './utils'; export const DIMENSIONS_SUPPORT_KEY = 'dimensions'; export const SPACING_SUPPORT_KEY = 'spacing'; @@ -125,6 +129,73 @@ export function DimensionsPanel( { clientId, name, setAttributes, settings } ) { ); } +/** + * Determine whether there is block support for dimensions. + * + * @param {string} blockName Block name. + * @param {string} feature Background image feature to check for. + * + * @return {boolean} Whether there is support. + */ +export function hasDimensionsSupport( blockName, feature = 'any' ) { + if ( Platform.OS !== 'web' ) { + return false; + } + + const support = getBlockSupport( blockName, DIMENSIONS_SUPPORT_KEY ); + + if ( support === true ) { + return true; + } + + if ( feature === 'any' ) { + return !! ( support?.aspectRatio || !! support?.minHeight ); + } + + return !! support?.[ feature ]; +} + +export default { + useBlockProps, + attributeKeys: [ 'minHeight', 'style' ], + hasSupport( name ) { + return hasDimensionsSupport( name, 'aspectRatio' ); + }, +}; + +function useBlockProps( { name, minHeight, style } ) { + if ( + ! hasDimensionsSupport( name, 'aspectRatio' ) || + shouldSkipSerialization( name, DIMENSIONS_SUPPORT_KEY, 'aspectRatio' ) + ) { + return {}; + } + + const className = classnames( { + 'has-aspect-ratio': !! style?.dimensions?.aspectRatio, + } ); + + // Allow dimensions-based inline style overrides to override any global styles rules that + // might be set for the block, and therefore affect the display of the aspect ratio. + const inlineStyleOverrides = {}; + + // Apply rules to unset incompatible styles. + // Note that a set `aspectRatio` will win out if both an aspect ratio and a minHeight are set. + // This is because the aspect ratio is a newer block support, so (in theory) any aspect ratio + // that is set should be intentional and should override any existing minHeight. The Cover block + // and dimensions controls have logic that will manually clear the aspect ratio if a minHeight + // is set. + if ( style?.dimensions?.aspectRatio ) { + // To ensure the aspect ratio does not get overridden by `minHeight` unset any existing rule. + inlineStyleOverrides.minHeight = 'unset'; + } else if ( minHeight || style?.dimensions?.minHeight ) { + // To ensure the minHeight does not get overridden by `aspectRatio` unset any existing rule. + inlineStyleOverrides.aspectRatio = 'unset'; + } + + return { className, style: inlineStyleOverrides }; +} + /** * @deprecated */ diff --git a/packages/block-editor/src/hooks/effects.js b/packages/block-editor/src/hooks/effects.js new file mode 100644 index 00000000000000..74d2aa46019d7b --- /dev/null +++ b/packages/block-editor/src/hooks/effects.js @@ -0,0 +1,57 @@ +/** + * WordPress dependencies + */ +import { hasBlockSupport } from '@wordpress/blocks'; +import { useSelect } from '@wordpress/data'; +/** + * Internal dependencies + */ +import StylesEffectsPanel, { + useHasEffectsPanel, +} from '../components/global-styles/effects-panel'; +import { InspectorControls } from '../components'; +import { store as blockEditorStore } from '../store'; +import { cleanEmptyObject } from './utils'; + +export const SHADOW_SUPPORT_KEY = 'shadow'; +export const EFFECTS_SUPPORT_KEYS = [ SHADOW_SUPPORT_KEY ]; + +export function hasEffectsSupport( blockName ) { + return EFFECTS_SUPPORT_KEYS.some( ( key ) => + hasBlockSupport( blockName, key ) + ); +} + +function EffectsInspectorControl( { children, resetAllFilter } ) { + return ( +
- { attributes.isLink ? (
- event.preventDefault() }
- >
- {
isSelected={ isSelected }
setAttributes={ setAttributes }
/>
- ) }
-
+ 
',
- $tags->get_updated_html()
- );
- $this->assertSame( './wordpress.png', $tags->get_attribute( 'src' ) );
- $this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-bind directive changed context' );
- }
-
- public function test_directive_ignores_empty_bound_attribute() {
- $markup = '