wp-now. This is a lightweight tool powered by WordPress Playground that streamlines setting up a simple local WordPress environment. While still experimental, this tool is great for quickly testing WordPress releases, plugins, and themes.
http://localhost:8888. Log into the WordPress dashboard using username `admin` and password `password`. The plugin will already be installed and activated. Open the Editor or Site Editor, and insert the Copyright Date Block as you would any other block.
Visit the [Getting started](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-wp-env/) guide to learn more about `wp-env`.
diff --git a/docs/reference-guides/data/data-core-block-editor.md b/docs/reference-guides/data/data-core-block-editor.md
index 38a93552bcbef2..7b0bd386daaf48 100644
--- a/docs/reference-guides/data/data-core-block-editor.md
+++ b/docs/reference-guides/data/data-core-block-editor.md
@@ -588,18 +588,6 @@ _Properties_
- _isDisabled_ `boolean`: Whether or not the user should be prevented from inserting this item.
- _frecency_ `number`: Heuristic that combines frequency and recency.
-### getLastFocus
-
-Returns the element of the last element that had focus when focus left the editor canvas.
-
-_Parameters_
-
-- _state_ `Object`: Block editor state.
-
-_Returns_
-
-- `Object`: Element.
-
### getLastMultiSelectedBlockClientId
Returns the client ID of the last block in the multi-selection set, or null if there is no multi-selection.
@@ -1663,18 +1651,6 @@ _Parameters_
- _clientId_ `string`: The block's clientId.
- _hasControlledInnerBlocks_ `boolean`: True if the block's inner blocks are controlled.
-### setLastFocus
-
-Action that sets the element that had focus when focus leaves the editor canvas.
-
-_Parameters_
-
-- _lastFocus_ `Object`: The last focused element.
-
-_Returns_
-
-- `Object`: Action object.
-
### setNavigationMode
Action that enables or disables the navigation mode.
diff --git a/docs/reference-guides/theme-json-reference/theme-json-living.md b/docs/reference-guides/theme-json-reference/theme-json-living.md
index 4baa5a6009ded6..ee88f779ace1ce 100644
--- a/docs/reference-guides/theme-json-reference/theme-json-living.md
+++ b/docs/reference-guides/theme-json-reference/theme-json-living.md
@@ -176,6 +176,7 @@ Settings related to typography.
| Property | Type | Default | Props |
| --- | --- | --- |--- |
+| defaultFontSizes | boolean | true | |
| customFontSize | boolean | true | |
| fontStyle | boolean | true | |
| fontWeight | boolean | true | |
diff --git a/gutenberg.php b/gutenberg.php
index 35e416006bea50..9559f838608da9 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -5,7 +5,7 @@
* Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
* Requires at least: 6.3
* Requires PHP: 7.0
- * Version: 17.4.1
+ * Version: 17.5.0-rc.1
* Author: Gutenberg Team
* Text Domain: gutenberg
*
diff --git a/lib/block-supports/pattern.php b/lib/block-supports/pattern.php
index a783135c793e3f..2f7717091ff506 100644
--- a/lib/block-supports/pattern.php
+++ b/lib/block-supports/pattern.php
@@ -13,7 +13,7 @@
* @param WP_Block_Type $block_type Block Type.
*/
function gutenberg_register_pattern_support( $block_type ) {
- $pattern_support = property_exists( $block_type, 'supports' ) ? _wp_array_get( $block_type->supports, array( '__experimentalConnections' ), false ) : false;
+ $pattern_support = 'core/paragraph' === $block_type->name ? true : false;
if ( $pattern_support ) {
if ( ! $block_type->uses_context ) {
diff --git a/lib/class-wp-theme-json-gutenberg.php b/lib/class-wp-theme-json-gutenberg.php
index af750fa0599795..a063ab34d9069c 100644
--- a/lib/class-wp-theme-json-gutenberg.php
+++ b/lib/class-wp-theme-json-gutenberg.php
@@ -155,7 +155,7 @@ class WP_Theme_JSON_Gutenberg {
),
array(
'path' => array( 'typography', 'fontSizes' ),
- 'prevent_override' => false,
+ 'prevent_override' => array( 'typography', 'defaultFontSizes' ),
'use_default_names' => true,
'value_func' => 'gutenberg_get_typography_font_size_value',
'css_vars' => '--wp--preset--font-size--$slug',
@@ -411,19 +411,20 @@ class WP_Theme_JSON_Gutenberg {
'defaultPresets' => null,
),
'typography' => array(
- 'fluid' => null,
- 'customFontSize' => null,
- 'dropCap' => null,
- 'fontFamilies' => null,
- 'fontSizes' => null,
- 'fontStyle' => null,
- 'fontWeight' => null,
- 'letterSpacing' => null,
- 'lineHeight' => null,
- 'textColumns' => null,
- 'textDecoration' => null,
- 'textTransform' => null,
- 'writingMode' => null,
+ 'fluid' => null,
+ 'customFontSize' => null,
+ 'defaultFontSizes' => null,
+ 'dropCap' => null,
+ 'fontFamilies' => null,
+ 'fontSizes' => null,
+ 'fontStyle' => null,
+ 'fontWeight' => null,
+ 'letterSpacing' => null,
+ 'lineHeight' => null,
+ 'textColumns' => null,
+ 'textDecoration' => null,
+ 'textTransform' => null,
+ 'writingMode' => null,
),
);
@@ -1021,8 +1022,7 @@ protected static function get_blocks_metadata() {
if ( ! empty( $block_type->styles ) ) {
$style_selectors = array();
foreach ( $block_type->styles as $style ) {
- // The style variation classname is duplicated in the selector to ensure that it overrides core block styles.
- $style_selectors[ $style['name'] ] = static::append_to_selector( '.is-style-' . $style['name'] . '.is-style-' . $style['name'], static::$blocks_metadata[ $block_name ]['selector'] );
+ $style_selectors[ $style['name'] ] = static::append_to_selector( '.is-style-' . $style['name'], static::$blocks_metadata[ $block_name ]['selector'] );
}
static::$blocks_metadata[ $block_name ]['styleVariations'] = $style_selectors;
}
diff --git a/lib/experimental/block-bindings/html-processing.php b/lib/experimental/block-bindings/html-processing.php
new file mode 100644
index 00000000000000..515749d0a8e753
--- /dev/null
+++ b/lib/experimental/block-bindings/html-processing.php
@@ -0,0 +1,110 @@
+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;
+ }
+}
diff --git a/lib/experimental/block-bindings/index.php b/lib/experimental/block-bindings/index.php
new file mode 100644
index 00000000000000..cca857e93702f3
--- /dev/null
+++ b/lib/experimental/block-bindings/index.php
@@ -0,0 +1,20 @@
+ $label,
+ 'apply' => $apply,
+ );
+ }
+}
diff --git a/lib/experimental/block-bindings/sources/pattern.php b/lib/experimental/block-bindings/sources/pattern.php
new file mode 100644
index 00000000000000..e3456aa468d3eb
--- /dev/null
+++ b/lib/experimental/block-bindings/sources/pattern.php
@@ -0,0 +1,21 @@
+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 );
+ };
+ register_block_bindings_source(
+ 'pattern_attributes',
+ __( 'Pattern Attributes', 'gutenberg' ),
+ $pattern_source_callback
+ );
+}
diff --git a/lib/experimental/block-bindings/sources/post-meta.php b/lib/experimental/block-bindings/sources/post-meta.php
new file mode 100644
index 00000000000000..99b6afc03c0d42
--- /dev/null
+++ b/lib/experimental/block-bindings/sources/post-meta.php
@@ -0,0 +1,25 @@
+context['postId'] but it wasn't available in the image block.
+ $post_id = get_the_ID();
+ }
+
+ return get_post_meta( $post_id, $source_attrs['value'], true );
+ };
+ register_block_bindings_source(
+ 'post_meta',
+ __( 'Post Meta', 'gutenberg' ),
+ $post_meta_source_callback
+ );
+}
diff --git a/lib/experimental/blocks.php b/lib/experimental/blocks.php
index 88e46b478389d2..42663e127870c9 100644
--- a/lib/experimental/blocks.php
+++ b/lib/experimental/blocks.php
@@ -83,118 +83,90 @@ function wp_enqueue_block_view_script( $block_name, $args ) {
$gutenberg_experiments = get_option( 'gutenberg-experiments' );
if ( $gutenberg_experiments && (
- array_key_exists( 'gutenberg-connections', $gutenberg_experiments ) ||
+ array_key_exists( 'gutenberg-block-bindings', $gutenberg_experiments ) ||
array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments )
) ) {
- /**
- * Renders the block meta attributes.
- *
- * @param string $block_content Block Content.
- * @param array $block Block attributes.
- * @param WP_Block $block_instance The block instance.
- */
- function gutenberg_render_block_connections( $block_content, $block, $block_instance ) {
- $connection_sources = require __DIR__ . '/connection-sources/index.php';
- $block_type = $block_instance->block_type;
-
- // Allowlist of blocks that support block connections.
- // Currently, we only allow the following blocks and attributes:
- // - Paragraph: content.
- // - Image: url.
- $blocks_attributes_allowlist = array(
- 'core/paragraph' => array( 'content' ),
- 'core/image' => array( 'url' ),
- );
-
- // Whitelist of the block types that support block connections.
- // Currently, we only allow the Paragraph and Image blocks to use block connections.
- if ( ! in_array( $block['blockName'], array_keys( $blocks_attributes_allowlist ), true ) ) {
- return $block_content;
- }
-
- // If for some reason, the block type is not found, skip it.
- if ( null === $block_type ) {
- return $block_content;
- }
-
- // If the block does not have support for block connections, skip it.
- if ( ! block_has_support( $block_type, array( '__experimentalConnections' ), false ) ) {
- return $block_content;
- }
-
- // Get all the attributes that have a connection.
- $connected_attributes = $block['attrs']['connections']['attributes'] ?? false;
- if ( ! $connected_attributes ) {
- return $block_content;
- }
-
- foreach ( $connected_attributes as $attribute_name => $attribute_value ) {
-
- // If the attribute is not in the allowlist, skip it.
- if ( ! in_array( $attribute_name, $blocks_attributes_allowlist[ $block['blockName'] ], true ) ) {
- continue;
- }
-
- // Skip if the source value is not "meta_fields" or "pattern_attributes".
- if ( 'meta_fields' !== $attribute_value['source'] && 'pattern_attributes' !== $attribute_value['source'] ) {
- continue;
- }
- // If the attribute does not have a source, skip it.
- if ( ! isset( $block_type->attributes[ $attribute_name ]['source'] ) ) {
- continue;
+ require_once __DIR__ . '/block-bindings/index.php';
+ // Allowed blocks that support block bindings.
+ // TODO: Look for a mechanism to opt-in for this. Maybe adding a property to block attributes?
+ global $block_bindings_allowed_blocks;
+ $block_bindings_allowed_blocks = array(
+ 'core/paragraph' => array( 'content' ),
+ 'core/heading' => array( 'content' ),
+ 'core/image' => array( 'url', 'title', 'alt' ),
+ 'core/button' => array( 'url', 'text' ),
+ );
+ if ( ! function_exists( '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 process_block_bindings( $block_content, $block, $block_instance ) {
+ // If the block doesn't have the bindings property, return.
+ if ( ! isset( $block['attrs']['metadata']['bindings'] ) ) {
+ return $block_content;
}
- if ( 'pattern_attributes' === $attribute_value['source'] ) {
- if ( ! _wp_array_get( $block_instance->attributes, array( 'metadata', 'id' ), false ) ) {
+ // 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" }
+ // }
+ // }
+ // }
+ //
+ global $block_bindings_allowed_blocks;
+ global $block_bindings_sources;
+ $modified_block_content = $block_content;
+ foreach ( $block['attrs']['metadata']['bindings'] as $binding_attribute => $binding_source ) {
+ // If the block is not in the list, stop processing.
+ if ( ! isset( $block_bindings_allowed_blocks[ $block['blockName'] ] ) ) {
+ return $block_content;
+ }
+ // If the attribute is not in the list, process next attribute.
+ if ( ! in_array( $binding_attribute, $block_bindings_allowed_blocks[ $block['blockName'] ], true ) ) {
continue;
}
-
- $custom_value = $connection_sources[ $attribute_value['source'] ]( $block_instance );
- } else {
- // If the attribute does not specify the name of the custom field, skip it.
- if ( ! isset( $attribute_value['value'] ) ) {
+ // 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;
}
- // Get the content from the connection source.
- $custom_value = $connection_sources[ $attribute_value['source'] ](
- $block_instance,
- $attribute_value['value']
- );
- }
-
- if ( false === $custom_value ) {
- 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;
+ }
- $tags = new WP_HTML_Tag_Processor( $block_content );
- $found = $tags->next_tag(
- array(
- // TODO: In the future, when blocks other than Paragraph and Image are
- // supported, we should build the full query from CSS selector.
- 'tag_name' => $block_type->attributes[ $attribute_name ]['selector'],
- )
- );
- if ( ! $found ) {
- return $block_content;
+ // Process the HTML based on the block and the attribute.
+ $modified_block_content = block_bindings_replace_html( $modified_block_content, $block['blockName'], $binding_attribute, $source_value );
}
- $tag_name = $tags->get_tag();
- $markup = "<$tag_name>$custom_value";
- $updated_tags = new WP_HTML_Tag_Processor( $markup );
- $updated_tags->next_tag();
-
- // Get all the attributes from the original block and add them to the new markup.
- $names = $tags->get_attribute_names_with_prefix( '' );
- foreach ( $names as $name ) {
- $updated_tags->set_attribute( $name, $tags->get_attribute( $name ) );
- }
-
- return $updated_tags->get_updated_html();
+ return $modified_block_content;
}
- return $block_content;
+ // Add filter only to the blocks in the list.
+ foreach ( $block_bindings_allowed_blocks as $block_name => $attributes ) {
+ add_filter( 'render_block_' . $block_name, 'process_block_bindings', 20, 3 );
+ }
}
-
- add_filter( 'render_block', 'gutenberg_render_block_connections', 10, 3 );
}
diff --git a/lib/experimental/connection-sources/index.php b/lib/experimental/connection-sources/index.php
deleted file mode 100644
index bf89ba177b6e94..00000000000000
--- a/lib/experimental/connection-sources/index.php
+++ /dev/null
@@ -1,19 +0,0 @@
- 'meta',
- 'meta_fields' => function ( $block_instance, $meta_field ) {
- // We should probably also check if the meta field exists but for now it's okay because
- // if it doesn't, `get_post_meta()` will just return an empty string.
- return get_post_meta( $block_instance->context['postId'], $meta_field, true );
- },
- 'pattern_attributes' => function ( $block_instance ) {
- $block_id = $block_instance->attributes['metadata']['id'];
- return _wp_array_get( $block_instance->context, array( 'pattern/overrides', $block_id ), false );
- },
-);
diff --git a/lib/experimental/editor-settings.php b/lib/experimental/editor-settings.php
index 5f61684e8b1342..729376cf030dd9 100644
--- a/lib/experimental/editor-settings.php
+++ b/lib/experimental/editor-settings.php
@@ -26,8 +26,8 @@ function gutenberg_enable_experiments() {
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableGroupGridVariation = true', 'before' );
}
- if ( $gutenberg_experiments && array_key_exists( 'gutenberg-connections', $gutenberg_experiments ) ) {
- wp_add_inline_script( 'wp-block-editor', 'window.__experimentalConnections = 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' ) ) {
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 e8cc7c98fe730f..6189da5fa984b1 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-collection.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-collection.php
@@ -35,7 +35,7 @@ class WP_Font_Collection {
* @since 6.5.0
*
* @param array $config Font collection config options.
- * See {@see wp_register_font_collection()} for the supported fields.
+ * See {@see wp_register_font_collection()} for the supported fields.
* @throws Exception If the required parameters are missing.
*/
public function __construct( $config ) {
@@ -43,16 +43,16 @@ public function __construct( $config ) {
throw new Exception( 'Font Collection config options is required as a non-empty array.' );
}
- if ( empty( $config['id'] ) || ! is_string( $config['id'] ) ) {
- throw new Exception( 'Font Collection config ID is required as a non-empty string.' );
+ if ( empty( $config['slug'] ) || ! is_string( $config['slug'] ) ) {
+ throw new Exception( 'Font Collection config slug is required as a non-empty string.' );
}
if ( empty( $config['name'] ) || ! is_string( $config['name'] ) ) {
throw new Exception( 'Font Collection config name is required as a non-empty string.' );
}
- if ( empty( $config['src'] ) || ! is_string( $config['src'] ) ) {
- throw new Exception( 'Font Collection config "src" option is required as a non-empty string.' );
+ if ( ( empty( $config['src'] ) || ! is_string( $config['src'] ) ) && ( empty( $config['data'] ) ) ) {
+ throw new Exception( 'Font Collection config "src" option OR "data" option is required.' );
}
$this->config = $config;
@@ -63,21 +63,59 @@ public function __construct( $config ) {
*
* @since 6.5.0
*
- * @return array An array containing the font collection config.
+ * @return array {
+ * An array of font collection config.
+ *
+ * @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.
+ * }
*/
public function get_config() {
- return $this->config;
+ return array(
+ 'slug' => $this->config['slug'],
+ 'name' => $this->config['name'],
+ 'description' => $this->config['description'] ?? '',
+ );
}
/**
- * Gets the font collection data.
+ * Gets the font collection config and data.
+ *
+ * This function returns an array containing the font collection's unique ID,
+ * name, and its data as a PHP array.
*
* @since 6.5.0
*
- * @return array|WP_Error An array containing the list of font families in theme.json format on success,
+ * @return array {
+ * An array of font collection config and data.
+ *
+ * @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.
+ * }
+ */
+ public function get_config_and_data() {
+ $config_and_data = $this->get_config();
+ $config_and_data['data'] = $this->load_data();
+ return $config_and_data;
+ }
+
+ /**
+ * Loads the font collection data.
+ *
+ * @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 get_data() {
+ public function load_data() {
+
+ if ( ! empty( $this->config['data'] ) ) {
+ return $this->config['data'];
+ }
+
// 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'] ) ) {
@@ -104,9 +142,6 @@ public function get_data() {
}
}
- $collection_data = $this->get_config();
- $collection_data['data'] = $data;
- unset( $collection_data['src'] );
- return $collection_data;
+ return $data;
}
}
diff --git a/lib/experimental/fonts/font-library/class-wp-font-family.php b/lib/experimental/fonts/font-library/class-wp-font-family.php
index a4204dfe1fa2c7..f64aebc0c8efa7 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-family.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-family.php
@@ -135,7 +135,7 @@ public function uninstall() {
*/
private static function delete_asset( $src ) {
$filename = basename( $src );
- $file_path = path_join( WP_Font_Library::get_fonts_dir(), $filename );
+ $file_path = path_join( wp_get_font_dir()['path'], $filename );
wp_delete_file( $file_path );
@@ -163,7 +163,6 @@ private static function delete_font_face_assets( $font_face ) {
return true;
}
-
/**
* Gets the overrides for the 'wp_handle_upload' function.
*
@@ -394,7 +393,7 @@ private function download_or_move_font_faces( $files ) {
// 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_Font_Library::get_fonts_dir() );
+ wp_mkdir_p( wp_get_font_dir()['path'] );
}
// If installing google fonts, download the font face assets.
@@ -599,9 +598,9 @@ private function create_or_update_font_post() {
*/
public function install( $files = null ) {
add_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
- add_filter( 'upload_dir', array( 'WP_Font_Library', 'set_upload_dir' ) );
+ add_filter( 'upload_dir', 'wp_get_font_dir' );
$were_assets_written = $this->download_or_move_font_faces( $files );
- remove_filter( 'upload_dir', array( 'WP_Font_Library', 'set_upload_dir' ) );
+ remove_filter( 'upload_dir', 'wp_get_font_dir' );
remove_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
if ( ! $were_assets_written ) {
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 59ec5e93fa787e..fd36f6ba073c4f 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-library.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-library.php
@@ -63,11 +63,11 @@ public static function get_expected_font_mime_types_per_php_version( $php_versio
*/
public static function register_font_collection( $config ) {
$new_collection = new WP_Font_Collection( $config );
- if ( self::is_collection_registered( $config['id'] ) ) {
+ if ( self::is_collection_registered( $config['slug'] ) ) {
$error_message = sprintf(
- /* translators: %s: Font collection id. */
- __( 'Font collection with id: "%s" is already registered.', 'default' ),
- $config['id']
+ /* translators: %s: Font collection slug. */
+ __( 'Font collection with slug: "%s" is already registered.', 'default' ),
+ $config['slug']
);
_doing_it_wrong(
__METHOD__,
@@ -76,7 +76,7 @@ public static function register_font_collection( $config ) {
);
return new WP_Error( 'font_collection_registration_error', $error_message );
}
- self::$collections[ $config['id'] ] = $new_collection;
+ self::$collections[ $config['slug'] ] = $new_collection;
return $new_collection;
}
@@ -85,20 +85,20 @@ public static function register_font_collection( $config ) {
*
* @since 6.5.0
*
- * @param string $collection_id Font collection ID.
+ * @param string $collection_slug Font collection slug.
* @return bool True if the font collection was unregistered successfully and false otherwise.
*/
- public static function unregister_font_collection( $collection_id ) {
- if ( ! self::is_collection_registered( $collection_id ) ) {
+ public static function unregister_font_collection( $slug ) {
+ if ( ! self::is_collection_registered( $slug ) ) {
_doing_it_wrong(
__METHOD__,
- /* translators: %s: Font collection id. */
- sprintf( __( 'Font collection "%s" not found.', 'default' ), $collection_id ),
+ /* translators: %s: Font collection slug. */
+ sprintf( __( 'Font collection "%s" not found.', 'default' ), $slug ),
'6.5.0'
);
return false;
}
- unset( self::$collections[ $collection_id ] );
+ unset( self::$collections[ $slug ] );
return true;
}
@@ -107,11 +107,11 @@ public static function unregister_font_collection( $collection_id ) {
*
* @since 6.5.0
*
- * @param string $collection_id Font collection ID.
+ * @param string $slug Font collection slug.
* @return bool True if the font collection is registered and false otherwise.
*/
- private static function is_collection_registered( $collection_id ) {
- return array_key_exists( $collection_id, self::$collections );
+ private static function is_collection_registered( $slug ) {
+ return array_key_exists( $slug, self::$collections );
}
/**
@@ -130,52 +130,17 @@ public static function get_font_collections() {
*
* @since 6.5.0
*
- * @param string $id Font collection id.
+ * @param string $slug Font collection slug.
* @return array List of font collections.
*/
- public static function get_font_collection( $id ) {
- if ( array_key_exists( $id, self::$collections ) ) {
- return self::$collections[ $id ];
+ public static function get_font_collection( $slug ) {
+ if ( array_key_exists( $slug, self::$collections ) ) {
+ return self::$collections[ $slug ];
}
return new WP_Error( 'font_collection_not_found', 'Font collection not found.' );
}
- /**
- * Gets the upload directory for fonts.
- *
- * @since 6.5.0
- *
- * @return string Path of the upload directory for fonts.
- */
- public static function get_fonts_dir() {
- return path_join( WP_CONTENT_DIR, 'fonts' );
- }
- /**
- * Sets the upload directory for fonts.
- *
- * @since 6.5.0
- *
- * @param array $defaults {
- * Default upload directory.
- *
- * @type string $path Path to the directory.
- * @type string $url URL for the directory.
- * @type string $subdir Sub-directory of the directory.
- * @type string $basedir Base directory.
- * @type string $baseurl Base URL.
- * }
- * @return array Modified upload directory.
- */
- public static function set_upload_dir( $defaults ) {
- $defaults['basedir'] = WP_CONTENT_DIR;
- $defaults['baseurl'] = content_url();
- $defaults['subdir'] = '/fonts';
- $defaults['path'] = self::get_fonts_dir();
- $defaults['url'] = $defaults['baseurl'] . '/fonts';
-
- return $defaults;
- }
/**
* Sets the allowed mime types for fonts.
diff --git a/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php b/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php
index 2367cba0b870a7..c7595a56413b9b 100644
--- a/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php
+++ b/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php
@@ -50,7 +50,7 @@ public function register_routes() {
register_rest_route(
$this->namespace,
- '/' . $this->rest_base . '/(?PLorem ipsum dolor sit amet, consectetur adipiscing elit. Sed imperdiet ut nibh vitae ornare. Sed auctor nec augue at blandit.
" `; -exports[`{ isLoading ? __( 'Loading…' ) : __( 'No results' ) }
+ ) } +