diff --git a/lib/block-templates.php b/lib/block-templates.php new file mode 100644 index 00000000000000..04f53e5aa5e736 --- /dev/null +++ b/lib/block-templates.php @@ -0,0 +1,14 @@ +register( $template_name, 'wp_template', $args ); +} + +function gutenberg_register_block_template_part( $template_name, $args = array() ) { + return WP_Block_Templates_Registry::get_instance()->register( $template_name, 'wp_template_part', $args ); +} diff --git a/lib/class-wp-block-templates-registry.php b/lib/class-wp-block-templates-registry.php new file mode 100644 index 00000000000000..a96d1b3b390e8e --- /dev/null +++ b/lib/class-wp-block-templates-registry.php @@ -0,0 +1,249 @@ + array(), + 'wp_template_part' => array(), + ); + private static $instance = null; + + public function register( $template_name, $template_type, $args = array() ) { + + $template = null; + if ( $template_name instanceof WP_Block_Template ) { + $template = $template_name; + $template_name = $template->name; + } + + if ( ! is_string( $template_name ) ) { + _doing_it_wrong( + __METHOD__, + __( 'Block template names must be strings.', 'gutenberg' ), + '6.6.0' + ); + return false; + } + + if ( 'wp_template' !== $template_type && 'wp_template_part' !== $template_type ) { + _doing_it_wrong( + __METHOD__, + __( 'Block templates need to be of `wp_template` or `wp_template_part` type.', 'gutenberg' ), + '6.6.0' + ); + return false; + } + + if ( preg_match( '/[A-Z]+/', $template_name ) ) { + _doing_it_wrong( + __METHOD__, + __( 'Block template names must not contain uppercase characters.', 'gutenberg' ), + '6.6.0' + ); + return false; + } + + $name_matcher = '/^[a-z0-9-]+\/\/[a-z0-9-]+$/'; + if ( ! preg_match( $name_matcher, $template_name ) ) { + _doing_it_wrong( + __METHOD__, + __( 'Block template names must contain a namespace prefix. Example: my-plugin/my-custom-template', 'gutenberg' ), + '6.6.0' + ); + return false; + } + + if ( $this->is_registered( $template_type, $template_name ) ) { + _doing_it_wrong( + __METHOD__, + /* translators: %s: Template name. */ + sprintf( __( 'Template "%s" is already registered.', 'gutenberg' ), $template_name ), + '6.6.0' + ); + return false; + } + + if ( ! $template ) { + $theme_name = get_stylesheet(); + $template = new WP_Block_Template(); + $template->id = $theme_name . '//' . $args['slug']; + $template->theme = $theme_name; // @todo If not attached to the theme, this should be the plugin URI. + $template->plugin = array_key_exists( 'plugin', $args ) ? $args['plugin'] : ''; + $template->author = null; + $template->content = array_key_exists( 'path', $args ) ? file_get_contents( $args['path'] ) : ''; + $template->source = 'plugin'; + $template->slug = array_key_exists( 'slug', $args ) ? $args['slug'] : ''; + $template->type = $template_type; + $template->title = array_key_exists( 'title', $args ) ? $args['title'] : ''; + $template->description = array_key_exists( 'description', $args ) ? $args['description'] : ''; + $template->status = 'publish'; + $template->has_theme_file = true; + $template->origin = 'plugin'; + $template->is_custom = false; + $template->post_types = array_key_exists( 'post_types', $args ) ? $args['post_types'] : ''; + $template->area = 'wp_template_part' === $template_type && array_key_exists( 'area', $args ) ? $args['area'] : ''; + } + + $this->registered_block_templates[ $template_type ][ $template_name ] = $template; + + return $template; + } + + public function get_by_slug( $template_type, $template_slug ) { + $all_templates = $this->get_all_registered( $template_type ); + + if ( ! $all_templates ) { + return null; + } + + foreach ( $all_templates as $template ) { + if ( $template->slug === $template_slug ) { + return $template; + } + } + + return null; + } + + /** + * Retrieves a registered template. + * + * @since 6.6.0 + * + * @param string $template_type Template type, either `wp_template` or `wp_template_part`. + * @param string $template_name Block type name including namespace. + * @return WP_Block_Type|null The registered block type, or null if it is not registered. + */ + public function get_registered( $template_type, $template_name ) { + if ( 'wp_template' !== $template_type && 'wp_template_part' !== $template_type ) { + _doing_it_wrong( + __METHOD__, + __( 'Only valid block template types are `wp_template` and `wp_template_part`.', 'gutenberg' ), + '6.6.0' + ); + return false; + } + + if ( ! $this->is_registered( $template_type, $template_name ) ) { + return null; + } + + return $this->registered_block_templates[ $template_type ][ $template_name ]; + } + + /** + * Retrieves all registered block templates by type. + * + * @since 6.6.0 + * + * @param string $template_type Template type, either `wp_template` or `wp_template_part`. + * @return WP_Block_Template[] Associative array of `$block_type_name => $block_type` pairs. + */ + public function get_all_registered( $template_type ) { + if ( 'wp_template' !== $template_type && 'wp_template_part' !== $template_type ) { + _doing_it_wrong( + __METHOD__, + __( 'Only valid block template types are `wp_template` and `wp_template_part`.', 'gutenberg' ), + '6.6.0' + ); + return false; + } + + return $this->registered_block_templates[ $template_type ]; + } + + /** + * Retrieves all registered block templates by type. + * + * @since 6.6.0 + * + * @param string $template_type Template type. Either 'wp_template' or 'wp_template_part'. + * @param array $query { + * Arguments to retrieve templates. Optional, empty by default. + * + * @type string[] $slug__in List of slugs to include. + * @type string[] $slug__not_in List of slugs to skip. + * @type string $area A 'wp_template_part_area' taxonomy value to filter by (for 'wp_template_part' template type only). + * @type string $post_type Post type to get the templates for. + * } + */ + public function get_by_query( $template_type, $query = array() ) { + $all_templates = $this->get_all_registered( $template_type ); + + if ( ! $all_templates ) { + return array(); + } + + $slugs_to_include = isset( $query['slug__in'] ) ? $query['slug__in'] : array(); + $slugs_to_skip = isset( $query['slug__not_in'] ) ? $query['slug__not_in'] : array(); + $area = isset( $query['area'] ) ? $query['area'] : null; + $post_type = isset( $query['post_type'] ) ? $query['post_type'] : ''; + + foreach ( $all_templates as $template_name => $template ) { + if ( ! empty( $slugs_to_include ) && ! in_array( $template->slug, $slugs_to_include, true ) ) { + unset( $all_templates[ $template_name ] ); + } + + if ( ! empty( $slugs_to_skip ) && in_array( $template->slug, $slugs_to_skip, true ) ) { + unset( $all_templates[ $template_name ] ); + } + + if ( 'wp_template_part' === $template_type && $template->area !== $area ) { + unset( $all_templates[ $template_name ] ); + } + + if ( ! empty( $post_type ) && ! in_array( $post_type, $template->post_types, true ) ) { + unset( $all_templates[ $template_name ] ); + } + } + + return $all_templates; + } + + /** + * Checks if a block template is registered. + * + * @since 6.6.0 + * + * @param string $template_type Template type, either `wp_template` or `wp_template_part`. + * @param string $template_name Block type name including namespace. + * @return bool True if the template is registered, false otherwise. + */ + public function is_registered( $template_type, $template_name ) { + if ( 'wp_template' !== $template_type && 'wp_template_part' !== $template_type ) { + _doing_it_wrong( + __METHOD__, + __( 'Only valid block template types are `wp_template` and `wp_template_part`.', 'gutenberg' ), + '6.6.0' + ); + return false; + } + + return isset( $this->registered_block_templates[ $template_type ][ $template_name ] ); + } + + public function unregister( $template_name ) { + // @todo + } + + /** + * Utility method to retrieve the main instance of the class. + * + * The instance will be created if it does not exist yet. + * + * @since 6.6.0 + * + * @return WP_Block_Templates_Registry The main instance. + */ + public static function get_instance() { + if ( null === self::$instance ) { + self::$instance = new self(); + } + + return self::$instance; + } +} diff --git a/lib/compat/wordpress-6.6/block-template-utils.php b/lib/compat/wordpress-6.6/block-template-utils.php index 953f6bf20c077e..c6430f0cee2f7c 100644 --- a/lib/compat/wordpress-6.6/block-template-utils.php +++ b/lib/compat/wordpress-6.6/block-template-utils.php @@ -340,6 +340,23 @@ function gutenberg_get_block_templates( $query = array(), $template_type = 'wp_t foreach ( $template_files as $template_file ) { $query_result[] = _build_block_template_result_from_file( $template_file, $template_type ); } + + /* + * Add templates registered in the template registry. Filtering out the ones which have a theme file. + */ + $registered_templates = WP_Block_Templates_Registry::get_instance()->get_by_query( $template_type, $query ); + $matching_registered_templates = array_filter( + $registered_templates, + function( $registered_template ) use ( $template_files ) { + foreach ( $template_files as $template_file ) { + if ( $template_file['slug'] === $registered_template->slug ) { + return false; + } + } + return true; + } + ); + $query_result = array_merge( $query_result, $matching_registered_templates ); } /** diff --git a/lib/compat/wordpress-6.6/class-gutenberg-rest-templates-controller-6-6.php b/lib/compat/wordpress-6.6/class-gutenberg-rest-templates-controller-6-6.php index 656e38ffe933fa..104b1e1a83f9bd 100644 --- a/lib/compat/wordpress-6.6/class-gutenberg-rest-templates-controller-6-6.php +++ b/lib/compat/wordpress-6.6/class-gutenberg-rest-templates-controller-6-6.php @@ -117,4 +117,151 @@ public function get_template_fallback( $request ) { return rest_ensure_response( $response ); } + + /** + * Returns the given template + * + * @param WP_REST_Request $request The request instance. + * @return WP_REST_Response|WP_Error + */ + public function get_item( $request ) { + if ( isset( $request['source'] ) && 'theme' === $request['source'] ) { + $template = get_block_file_template( $request['id'], $this->post_type ); + } elseif ( isset( $request['source'] ) && 'plugin' === $request['source'] ) { + list( $namespace, $slug ) = explode( '//', $request['id'] ); + $template = WP_Block_Templates_Registry::get_instance()->get_by_slug( $this->post_type, $slug ); + } else { + $template = get_block_template( $request['id'], $this->post_type ); + } + + if ( ! $template ) { + return new WP_Error( 'rest_template_not_found', __( 'No templates exist with that id.' ), array( 'status' => 404 ) ); + } + + return $this->prepare_item_for_response( $template, $request ); + } + + /** + * Fix wrong author in plugin templates. + * + * @param WP_Block_Template $item Template instance. + * @param WP_REST_Request $request Request object. + * @return WP_REST_Response Response object. + */ + public function prepare_item_for_response( $item, $request ) { + $template = $item; + + $fields = $this->get_fields_for_response( $request ); + + if ( 'plugin' !== $item->origin ) { + return parent::prepare_item_for_response( $item, $request ); + } + $cloned_item = clone $item; + // Set the origin as theme when calling the previous `prepare_item_for_response()` to prevent warnings when generating the author text. + $cloned_item->origin = 'theme'; + $response = parent::prepare_item_for_response( $cloned_item, $request ); + $data = $response->data; + + if ( rest_is_field_included( 'origin', $fields ) ) { + $data['origin'] = 'plugin'; + } + + if ( rest_is_field_included( 'author_text', $fields ) ) { + $data['author_text'] = $this->get_wp_templates_author_text_field( $template ); + } + + if ( rest_is_field_included( 'original_source', $fields ) ) { + $data['original_source'] = $this->get_wp_templates_original_source_field( $template ); + } + + $response = rest_ensure_response( $data ); + + if ( rest_is_field_included( '_links', $fields ) || rest_is_field_included( '_embedded', $fields ) ) { + $links = $this->prepare_links( $template->id ); + $response->add_links( $links ); + if ( ! empty( $links['self']['href'] ) ) { + $actions = $this->get_available_actions(); + $self = $links['self']['href']; + foreach ( $actions as $rel ) { + $response->add_link( $rel, $self ); + } + } + } + + return $response; + } + + /** + * Allow plugin authors where `has_theme_file` is false. + * + * @param WP_Block_Template $template_object Template instance. + * @return string Original source of the template one of theme, plugin, site, or user. + */ + private static function get_wp_templates_original_source_field( $template_object ) { + if ( 'wp_template' === $template_object->type || 'wp_template_part' === $template_object->type ) { + // Added by theme. + // Template originally provided by a theme, but customized by a user. + // Templates originally didn't have the 'origin' field so identify + // older customized templates by checking for no origin and a 'theme' + // or 'custom' source. + if ( $template_object->has_theme_file && + ( 'theme' === $template_object->origin || ( + empty( $template_object->origin ) && in_array( + $template_object->source, + array( + 'theme', + 'custom', + ), + true + ) ) + ) + ) { + return 'theme'; + } + + // Added by plugin. + if ( 'plugin' === $template_object->origin ) { + return 'plugin'; + } + + // Added by site. + // Template was created from scratch, but has no author. Author support + // was only added to templates in WordPress 5.9. Fallback to showing the + // site logo and title. + if ( empty( $template_object->has_theme_file ) && 'custom' === $template_object->source && empty( $template_object->author ) ) { + return 'site'; + } + } + + // Added by user. + return 'user'; + } + + /** + * Prioritize plugin name instead of theme name for plugin-registered templates. + * + * @param WP_Block_Template $template_object Template instance. + * @return string Human readable text for the author. + */ + private static function get_wp_templates_author_text_field( $template_object ) { + $original_source = self::get_wp_templates_original_source_field( $template_object ); + switch ( $original_source ) { + case 'theme': + $theme_name = wp_get_theme( $template_object->theme )->get( 'Name' ); + return empty( $theme_name ) ? $template_object->theme : $theme_name; + case 'plugin': + $plugins = get_plugins(); + $plugin_name = isset( $template_object->plugin ) ? $template_object->plugin . '/' . $template_object->plugin : $template_object->theme; + $plugin = $plugins[ plugin_basename( sanitize_text_field( $plugin_name . '.php' ) ) ]; + return empty( $plugin['Name'] ) ? $template_object->theme : $plugin['Name']; + case 'site': + return get_bloginfo( 'name' ); + case 'user': + $author = get_user_by( 'id', $template_object->author ); + if ( ! $author ) { + return __( 'Unknown author' ); + } + return $author->get( 'display_name' ); + } + } } diff --git a/lib/load.php b/lib/load.php index d556dd7f21b435..e75c3ab6b4da0d 100644 --- a/lib/load.php +++ b/lib/load.php @@ -195,7 +195,9 @@ function gutenberg_is_experiment_enabled( $name ) { require __DIR__ . '/class-wp-theme-json-resolver-gutenberg.php'; require __DIR__ . '/class-wp-theme-json-schema-gutenberg.php'; require __DIR__ . '/class-wp-duotone-gutenberg.php'; +require __DIR__ . '/class-wp-block-templates-registry.php'; require __DIR__ . '/blocks.php'; +require __DIR__ . '/block-templates.php'; require __DIR__ . '/block-editor-settings.php'; require __DIR__ . '/client-assets.php'; require __DIR__ . '/demo.php'; diff --git a/packages/edit-site/src/utils/is-template-removable.js b/packages/edit-site/src/utils/is-template-removable.js index 9cb1de23daab75..b9d0db25be0611 100644 --- a/packages/edit-site/src/utils/is-template-removable.js +++ b/packages/edit-site/src/utils/is-template-removable.js @@ -7,7 +7,7 @@ import { TEMPLATE_ORIGINS } from './constants'; * Check if a template is removable. * * @param {Object} template The template entity to check. - * @return {boolean} Whether the template is revertable. + * @return {boolean} Whether the template is removable. */ export default function isTemplateRemovable( template ) { if ( ! template ) { @@ -15,6 +15,8 @@ export default function isTemplateRemovable( template ) { } return ( - template.source === TEMPLATE_ORIGINS.custom && ! template.has_theme_file + template.source === TEMPLATE_ORIGINS.custom && + template.origin !== 'plugin' && // @todo check `is_removable` value here. + ! template.has_theme_file ); } diff --git a/packages/edit-site/src/utils/is-template-revertable.js b/packages/edit-site/src/utils/is-template-revertable.js index a6274d07ebebb6..e9b65df0580c41 100644 --- a/packages/edit-site/src/utils/is-template-revertable.js +++ b/packages/edit-site/src/utils/is-template-revertable.js @@ -15,7 +15,8 @@ export default function isTemplateRevertable( template ) { } /* eslint-disable camelcase */ return ( - template?.source === TEMPLATE_ORIGINS.custom && template?.has_theme_file + template?.source === TEMPLATE_ORIGINS.custom && + ( template?.origin === 'plugin' || template?.has_theme_file ) ); /* eslint-enable camelcase */ } diff --git a/packages/editor/src/store/private-actions.js b/packages/editor/src/store/private-actions.js index c3fca0798e8b70..ffe05cce1a99d0 100644 --- a/packages/editor/src/store/private-actions.js +++ b/packages/editor/src/store/private-actions.js @@ -269,7 +269,7 @@ export const revertTemplate = const fileTemplatePath = addQueryArgs( `${ templateEntityConfig.baseURL }/${ template.id }`, - { context: 'edit', source: 'theme' } + { context: 'edit', source: template.origin } ); const fileTemplate = await apiFetch( { path: fileTemplatePath } ); diff --git a/packages/editor/src/store/utils/is-template-revertable.js b/packages/editor/src/store/utils/is-template-revertable.js index efe4647f212801..f366f5c4d7a440 100644 --- a/packages/editor/src/store/utils/is-template-revertable.js +++ b/packages/editor/src/store/utils/is-template-revertable.js @@ -17,7 +17,8 @@ export default function isTemplateRevertable( template ) { } /* eslint-disable camelcase */ return ( - template?.source === TEMPLATE_ORIGINS.custom && template?.has_theme_file + template?.source === TEMPLATE_ORIGINS.custom && + ( template?.origin === 'plugin' || template?.has_theme_file ) ); /* eslint-enable camelcase */ }