diff --git a/lib/compat/wordpress-6.0/theme-json-webfonts-handler.php b/lib/compat/wordpress-6.0/theme-json-webfonts-handler.php new file mode 100644 index 00000000000000..35c9896a037bb3 --- /dev/null +++ b/lib/compat/wordpress-6.0/theme-json-webfonts-handler.php @@ -0,0 +1,521 @@ +get_settings(); + + // If in the editor, add webfonts defined in variations. + if ( is_admin() || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ) { + $variations = WP_Theme_JSON_Resolver_6_0::get_style_variations(); + foreach ( $variations as $variation ) { + // Skip if fontFamilies are not defined in the variation. + if ( + empty( $variation['settings'] ) || + empty( $variation['settings']['typography'] ) || + empty( $variation['settings']['typography']['fontFamilies'] ) + ) { + continue; + } + + // Initialize the array structure. + if ( empty( $settings['typography'] ) ) { + $settings['typography'] = array(); + } + if ( empty( $settings['typography']['fontFamilies'] ) ) { + $settings['typography']['fontFamilies'] = array(); + } + if ( empty( $settings['typography']['fontFamilies']['theme'] ) ) { + $settings['typography']['fontFamilies']['theme'] = array(); + } + + // Combine variations with settings. Remove duplicates. + $settings['typography']['fontFamilies']['theme'] = array_merge( $settings['typography']['fontFamilies']['theme'], $variation['settings']['typography']['fontFamilies']['theme'] ); + $settings['typography']['fontFamilies'] = array_unique( $settings['typography']['fontFamilies'] ); + } + } + + // Bail out early if there are no settings for webfonts. + if ( empty( $settings['typography'] ) || empty( $settings['typography']['fontFamilies'] ) ) { + return array(); + } + + $webfonts = array(); + + // Look for fontFamilies. + foreach ( $settings['typography']['fontFamilies'] as $font_families ) { + foreach ( $font_families as $font_family ) { + + // Skip if fontFace is not defined. + if ( empty( $font_family['fontFace'] ) ) { + continue; + } + + // Skip if fontFace is not an array of webfonts. + if ( ! is_array( $font_family['fontFace'] ) ) { + continue; + } + + $webfonts = array_merge( $webfonts, $font_family['fontFace'] ); + } + } + + return $webfonts; + }; + + /** + * Transforms each 'src' into an URI by replacing 'file:./' + * placeholder from theme.json. + * + * The absolute path to the webfont file(s) cannot be defined in + * theme.json. `file:./` is the placeholder which is replaced by + * the theme's URL path to the theme's root. + * + * @since 6.0.0 + * + * @param array $src Webfont file(s) `src`. + * @return array Webfont's `src` in URI. + */ + $fn_transform_src_into_uri = static function( array $src ) { + foreach ( $src as $key => $url ) { + // Tweak the URL to be relative to the theme root. + if ( ! str_starts_with( $url, 'file:./' ) ) { + continue; + } + + $src[ $key ] = get_theme_file_uri( str_replace( 'file:./', '', $url ) ); + } + + return $src; + }; + + /** + * Converts the font-face properties (i.e. keys) into kebab-case. + * + * @since 6.0.0 + * + * @param array $font_face Font face to convert. + * @return array Font faces with each property in kebab-case format. + */ + $fn_convert_keys_to_kebab_case = static function( array $font_face ) { + foreach ( $font_face as $property => $value ) { + $kebab_case = _wp_to_kebab_case( $property ); + $font_face[ $kebab_case ] = $value; + if ( $kebab_case !== $property ) { + unset( $font_face[ $property ] ); + } + } + + return $font_face; + }; + + /** + * Validates a webfont. + * + * @since 6.0.0 + * + * @param array $webfont The webfont arguments. + * @return array|false The validated webfont arguments, or false if the webfont is invalid. + */ + $fn_validate_webfont = static function( $webfont ) { + $webfont = wp_parse_args( + $webfont, + array( + 'font-family' => '', + 'font-style' => 'normal', + 'font-weight' => '400', + 'font-display' => 'fallback', + 'src' => array(), + ) + ); + + // Check the font-family. + if ( empty( $webfont['font-family'] ) || ! is_string( $webfont['font-family'] ) ) { + trigger_error( __( 'Webfont font family must be a non-empty string.', 'gutenberg' ) ); + + return false; + } + + // Check that the `src` property is defined and a valid type. + if ( empty( $webfont['src'] ) || ( ! is_string( $webfont['src'] ) && ! is_array( $webfont['src'] ) ) ) { + trigger_error( __( 'Webfont src must be a non-empty string or an array of strings.', 'gutenberg' ) ); + + return false; + } + + // Validate the `src` property. + foreach ( (array) $webfont['src'] as $src ) { + if ( ! is_string( $src ) || '' === trim( $src ) ) { + trigger_error( __( 'Each webfont src must be a non-empty string.', 'gutenberg' ) ); + + return false; + } + } + + // Check the font-weight. + if ( ! is_string( $webfont['font-weight'] ) && ! is_int( $webfont['font-weight'] ) ) { + trigger_error( __( 'Webfont font weight must be a properly formatted string or integer.', 'gutenberg' ) ); + + return false; + } + + // Check the font-display. + if ( ! in_array( $webfont['font-display'], array( 'auto', 'block', 'fallback', 'swap' ), true ) ) { + $webfont['font-display'] = 'fallback'; + } + + $valid_props = array( + 'ascend-override', + 'descend-override', + 'font-display', + 'font-family', + 'font-stretch', + 'font-style', + 'font-weight', + 'font-variant', + 'font-feature-settings', + 'font-variation-settings', + 'line-gap-override', + 'size-adjust', + 'src', + 'unicode-range', + ); + + foreach ( $webfont as $prop => $value ) { + if ( ! in_array( $prop, $valid_props, true ) ) { + unset( $webfont[ $prop ] ); + } + } + + return $webfont; + }; + + /** + * Registers webfonts declared in theme.json. + * + * @since 6.0.0 + * + * @uses $registered_webfonts To access and update the registered webfonts registry (passed by reference). + * @uses $fn_get_webfonts_from_theme_json To run the function that gets the webfonts from theme.json. + * @uses $fn_convert_keys_to_kebab_case To run the function that converts keys into kebab-case. + * @uses $fn_validate_webfont To run the function that validates each font-face (webfont) from theme.json. + */ + $fn_register_webfonts = static function() use ( &$registered_webfonts, $fn_get_webfonts_from_theme_json, $fn_convert_keys_to_kebab_case, $fn_validate_webfont, $fn_transform_src_into_uri ) { + $registered_webfonts = array(); + + foreach ( $fn_get_webfonts_from_theme_json() as $webfont ) { + if ( ! is_array( $webfont ) ) { + continue; + } + + $webfont = $fn_convert_keys_to_kebab_case( $webfont ); + + $webfont = $fn_validate_webfont( $webfont ); + + $webfont['src'] = $fn_transform_src_into_uri( (array) $webfont['src'] ); + + // Skip if not valid. + if ( empty( $webfont ) ) { + continue; + } + + $registered_webfonts[] = $webfont; + } + }; + + /** + * Orders 'src' items to optimize for browser support. + * + * @since 6.0.0 + * + * @param array $webfont Webfont to process. + * @return array Ordered `src` items. + */ + $fn_order_src = static function( array $webfont ) { + $src = array(); + $src_ordered = array(); + + foreach ( $webfont['src'] as $url ) { + // Add data URIs first. + if ( str_starts_with( trim( $url ), 'data:' ) ) { + $src_ordered[] = array( + 'url' => $url, + 'format' => 'data', + ); + continue; + } + $format = pathinfo( $url, PATHINFO_EXTENSION ); + $src[ $format ] = $url; + } + + // Add woff2. + if ( ! empty( $src['woff2'] ) ) { + $src_ordered[] = array( + 'url' => sanitize_url( $src['woff2'] ), + 'format' => 'woff2', + ); + } + + // Add woff. + if ( ! empty( $src['woff'] ) ) { + $src_ordered[] = array( + 'url' => sanitize_url( $src['woff'] ), + 'format' => 'woff', + ); + } + + // Add ttf. + if ( ! empty( $src['ttf'] ) ) { + $src_ordered[] = array( + 'url' => sanitize_url( $src['ttf'] ), + 'format' => 'truetype', + ); + } + + // Add eot. + if ( ! empty( $src['eot'] ) ) { + $src_ordered[] = array( + 'url' => sanitize_url( $src['eot'] ), + 'format' => 'embedded-opentype', + ); + } + + // Add otf. + if ( ! empty( $src['otf'] ) ) { + $src_ordered[] = array( + 'url' => sanitize_url( $src['otf'] ), + 'format' => 'opentype', + ); + } + $webfont['src'] = $src_ordered; + + return $webfont; + }; + + /** + * Compiles the 'src' into valid CSS. + * + * @since 6.0.0 + * + * @param string $font_family Font family. + * @param array $value Value to process. + * @return string The CSS. + */ + $fn_compile_src = static function( $font_family, array $value ) { + $src = "local($font_family)"; + + foreach ( $value as $item ) { + + if ( + str_starts_with( $item['url'], site_url() ) || + str_starts_with( $item['url'], home_url() ) + ) { + $item['url'] = wp_make_link_relative( $item['url'] ); + } + + $src .= ( 'data' === $item['format'] ) + ? ", url({$item['url']})" + : ", url('{$item['url']}') format('{$item['format']}')"; + } + + return $src; + }; + + /** + * Compiles the font variation settings. + * + * @since 6.0.0 + * + * @param array $font_variation_settings Array of font variation settings. + * @return string The CSS. + */ + $fn_compile_variations = static function( array $font_variation_settings ) { + $variations = ''; + + foreach ( $font_variation_settings as $key => $value ) { + $variations .= "$key $value"; + } + + return $variations; + }; + + /** + * Builds the font-family's CSS. + * + * @since 6.0.0 + * + * @uses $fn_compile_src To run the function that compiles the src. + * @uses $fn_compile_variations To run the function that compiles the variations. + * + * @param array $webfont Webfont to process. + * @return string This font-family's CSS. + */ + $fn_build_font_face_css = static function( array $webfont ) use ( $fn_compile_src, $fn_compile_variations ) { + $css = ''; + + // Wrap font-family in quotes if it contains spaces. + if ( + str_contains( $webfont['font-family'], ' ' ) && + ! str_contains( $webfont['font-family'], '"' ) && + ! str_contains( $webfont['font-family'], "'" ) + ) { + $webfont['font-family'] = '"' . $webfont['font-family'] . '"'; + } + + foreach ( $webfont as $key => $value ) { + /* + * Skip "provider", since it's for internal API use, + * and not a valid CSS property. + */ + if ( 'provider' === $key ) { + continue; + } + + // Compile the "src" parameter. + if ( 'src' === $key ) { + $value = $fn_compile_src( $webfont['font-family'], $value ); + } + + // If font-variation-settings is an array, convert it to a string. + if ( 'font-variation-settings' === $key && is_array( $value ) ) { + $value = $fn_compile_variations( $value ); + } + + if ( ! empty( $value ) ) { + $css .= "$key:$value;"; + } + } + + return $css; + }; + + /** + * Gets the '@font-face' CSS styles for locally-hosted font files. + * + * @since 6.0.0 + * + * @uses $registered_webfonts To access and update the registered webfonts registry (passed by reference). + * @uses $fn_order_src To run the function that orders the src. + * @uses $fn_build_font_face_css To run the function that builds the font-face CSS. + * + * @return string The `@font-face` CSS. + */ + $fn_get_css = static function() use ( &$registered_webfonts, $fn_order_src, $fn_build_font_face_css ) { + $css = ''; + + foreach ( $registered_webfonts as $webfont ) { + // Order the webfont's `src` items to optimize for browser support. + $webfont = $fn_order_src( $webfont ); + + // Build the @font-face CSS for this webfont. + $css .= '@font-face{' . $fn_build_font_face_css( $webfont ) . '}'; + } + + return $css; + }; + + /** + * Generates and enqueues webfonts styles. + * + * @since 6.0.0 + * + * @uses $fn_get_css To run the function that gets the CSS. + */ + $fn_generate_and_enqueue_styles = static function() use ( $fn_get_css ) { + // Generate the styles. + $styles = $fn_get_css(); + + // Bail out if there are no styles to enqueue. + if ( '' === $styles ) { + return; + } + + // Enqueue the stylesheet. + wp_register_style( 'wp-webfonts', '' ); + wp_enqueue_style( 'wp-webfonts' ); + + // Add the styles to the stylesheet. + wp_add_inline_style( 'wp-webfonts', $styles ); + }; + + /** + * Generates and enqueues editor styles. + * + * @since 6.0.0 + * + * @uses $fn_get_css To run the function that gets the CSS. + */ + $fn_generate_and_enqueue_editor_styles = static function() use ( $fn_get_css ) { + // Generate the styles. + $styles = $fn_get_css(); + + // Bail out if there are no styles to enqueue. + if ( '' === $styles ) { + return; + } + + wp_add_inline_style( 'wp-block-library', $styles ); + }; + + /** + * Adds webfonts mime types. + * + * @since 6.0.0 + * + * @param array $mime_types Array of mime types. + * @return array Mime types with webfonts formats. + */ + $fn_add_mime_types = static function( $mime_types ) { + // Webfonts formats. + $mime_types['woff2'] = 'font/woff2'; + $mime_types['woff'] = 'font/woff'; + $mime_types['ttf'] = 'font/ttf'; + $mime_types['eot'] = 'application/vnd.ms-fontobject'; + $mime_types['otf'] = 'application/x-font-opentype'; + + return $mime_types; + }; + + add_action( 'wp_loaded', $fn_register_webfonts ); + add_action( 'wp_enqueue_scripts', $fn_generate_and_enqueue_styles ); + add_action( 'admin_init', $fn_generate_and_enqueue_editor_styles ); + add_filter( 'mime_types', $fn_add_mime_types ); + } +} diff --git a/lib/experimental/class-wp-theme-json-resolver-gutenberg.php b/lib/experimental/class-wp-theme-json-resolver-gutenberg.php index 960ea659e8d2ee..9c11d888d92a46 100644 --- a/lib/experimental/class-wp-theme-json-resolver-gutenberg.php +++ b/lib/experimental/class-wp-theme-json-resolver-gutenberg.php @@ -36,14 +36,26 @@ public static function get_theme_data( $deprecated = array(), $settings = array( if ( null === static::$theme ) { $theme_json_data = static::read_json_file( static::get_file_path_from_theme( 'theme.json' ) ); $theme_json_data = static::translate( $theme_json_data, wp_get_theme()->get( 'TextDomain' ) ); - $theme_json_data = gutenberg_add_registered_webfonts_to_theme_json( $theme_json_data ); + + /* + * DO NOT MERGE THIS CODE CHANGE. + * + * Commenting this out to avoid fatal error when testing the stopgap. + */ + // $theme_json_data = gutenberg_add_registered_webfonts_to_theme_json( $theme_json_data ); static::$theme = new WP_Theme_JSON_Gutenberg( $theme_json_data ); if ( wp_get_theme()->parent() ) { // Get parent theme.json. $parent_theme_json_data = static::read_json_file( static::get_file_path_from_theme( 'theme.json', true ) ); $parent_theme_json_data = static::translate( $parent_theme_json_data, wp_get_theme()->parent()->get( 'TextDomain' ) ); - $parent_theme_json_data = gutenberg_add_registered_webfonts_to_theme_json( $parent_theme_json_data ); + + /* + * DO NOT MERGE THIS CODE CHANGE. + * + * Commenting this out to avoid fatal error when testing the stopgap. + */ + // $parent_theme_json_data = gutenberg_add_registered_webfonts_to_theme_json( $parent_theme_json_data ); $parent_theme = new WP_Theme_JSON_Gutenberg( $parent_theme_json_data ); // Merge the child theme.json into the parent theme.json. diff --git a/lib/load.php b/lib/load.php index 5d9969c409ffa1..06f993c27300ab 100644 --- a/lib/load.php +++ b/lib/load.php @@ -114,12 +114,18 @@ function gutenberg_is_experiment_enabled( $name ) { require __DIR__ . '/compat/wordpress-6.0/block-patterns.php'; require __DIR__ . '/compat/wordpress-6.0/block-template.php'; require __DIR__ . '/compat/wordpress-6.0/edit-form-blocks.php'; -require __DIR__ . '/experimental/register-webfonts-from-theme-json.php'; +require __DIR__ . '/experimental/class-theme-json-webfonts-handler.php'; require __DIR__ . '/experimental/class-wp-theme-json-resolver-gutenberg.php'; + +/* + * DO NOT MERGE THIS CHANGE. + * Don't load the Webfonts API. +require __DIR__ . '/experimental/register-webfonts-from-theme-json.php'; require __DIR__ . '/experimental/class-wp-webfonts.php'; require __DIR__ . '/experimental/class-wp-webfonts-provider.php'; require __DIR__ . '/experimental/class-wp-webfonts-provider-local.php'; require __DIR__ . '/experimental/webfonts.php'; + */ require __DIR__ . '/experimental/blocks.php'; require __DIR__ . '/blocks.php'; diff --git a/phpunit/data/themedir1/webfonts-theme/style.css b/phpunit/data/themedir1/webfonts-theme/style.css new file mode 100644 index 00000000000000..bee25a0bfa18cb --- /dev/null +++ b/phpunit/data/themedir1/webfonts-theme/style.css @@ -0,0 +1,7 @@ +/* +Theme Name: Webfonts theme. +Theme URI: https://wordpress.org/ +Description: For testing purposes only. +Version: 1.0.0 +Text Domain: webfonts-theme +*/ diff --git a/phpunit/data/themedir1/webfonts-theme/theme.json b/phpunit/data/themedir1/webfonts-theme/theme.json new file mode 100644 index 00000000000000..39291efce4204b --- /dev/null +++ b/phpunit/data/themedir1/webfonts-theme/theme.json @@ -0,0 +1,373 @@ +{ + "version": 2, + "customTemplates": [ + { + "name": "blank", + "title": "Blank", + "postTypes": [ + "page", + "post" + ] + }, + { + "name": "page-large-header", + "title": "Page (Large Header)", + "postTypes": [ + "page" + ] + }, + { + "name": "single-no-separators", + "title": "Single Post (No Separators)", + "postTypes": [ + "post" + ] + }, + { + "name": "page-no-separators", + "title": "Page (No Separators)", + "postTypes": [ + "page" + ] + } + ], + "settings": { + "appearanceTools": true, + "color": { + "duotone": [ + { + "colors": [ "#000000", "#ffffff" ], + "slug": "foreground-and-background", + "name": "Foreground and background" + }, + { + "colors": [ "#000000", "#ffe2c7" ], + "slug": "foreground-and-secondary", + "name": "Foreground and secondary" + }, + { + "colors": [ "#000000", "#f6f6f6" ], + "slug": "foreground-and-tertiary", + "name": "Foreground and tertiary" + }, + { + "colors": [ "#1a4548", "#ffffff" ], + "slug": "primary-and-background", + "name": "Primary and background" + }, + { + "colors": [ "#1a4548", "#ffe2c7" ], + "slug": "primary-and-secondary", + "name": "Primary and secondary" + }, + { + "colors": [ "#1a4548", "#f6f6f6" ], + "slug": "primary-and-tertiary", + "name": "Primary and tertiary" + } + ], + "gradients": [ + { + "slug": "vertical-secondary-to-tertiary", + "gradient": "linear-gradient(to bottom,var(--wp--preset--color--secondary) 0%,var(--wp--preset--color--tertiary) 100%)", + "name": "Vertical secondary to tertiary" + }, + { + "slug": "vertical-secondary-to-background", + "gradient": "linear-gradient(to bottom,var(--wp--preset--color--secondary) 0%,var(--wp--preset--color--background) 100%)", + "name": "Vertical secondary to background" + }, + { + "slug": "vertical-tertiary-to-background", + "gradient": "linear-gradient(to bottom,var(--wp--preset--color--tertiary) 0%,var(--wp--preset--color--background) 100%)", + "name": "Vertical tertiary to background" + }, + { + "slug": "diagonal-primary-to-foreground", + "gradient": "linear-gradient(to bottom right,var(--wp--preset--color--primary) 0%,var(--wp--preset--color--foreground) 100%)", + "name": "Diagonal primary to foreground" + }, + { + "slug": "diagonal-secondary-to-background", + "gradient": "linear-gradient(to bottom right,var(--wp--preset--color--secondary) 50%,var(--wp--preset--color--background) 50%)", + "name": "Diagonal secondary to background" + }, + { + "slug": "diagonal-background-to-secondary", + "gradient": "linear-gradient(to bottom right,var(--wp--preset--color--background) 50%,var(--wp--preset--color--secondary) 50%)", + "name": "Diagonal background to secondary" + }, + { + "slug": "diagonal-tertiary-to-background", + "gradient": "linear-gradient(to bottom right,var(--wp--preset--color--tertiary) 50%,var(--wp--preset--color--background) 50%)", + "name": "Diagonal tertiary to background" + }, + { + "slug": "diagonal-background-to-tertiary", + "gradient": "linear-gradient(to bottom right,var(--wp--preset--color--background) 50%,var(--wp--preset--color--tertiary) 50%)", + "name": "Diagonal background to tertiary" + } + ], + "palette": [ + { + "slug": "foreground", + "color": "#000000", + "name": "Foreground" + }, + { + "slug": "background", + "color": "#ffffff", + "name": "Background" + }, + { + "slug": "primary", + "color": "#1a4548", + "name": "Primary" + }, + { + "slug": "secondary", + "color": "#ffe2c7", + "name": "Secondary" + }, + { + "slug": "tertiary", + "color": "#F6F6F6", + "name": "Tertiary" + } + ] + }, + "custom": { + "spacing": { + "small": "max(1.25rem, 5vw)", + "medium": "clamp(2rem, 8vw, calc(4 * var(--wp--style--block-gap)))", + "large": "clamp(4rem, 10vw, 8rem)", + "outer": "var(--wp--custom--spacing--small, 1.25rem)" + }, + "typography": { + "font-size": { + "huge": "clamp(2.25rem, 4vw, 2.75rem)", + "gigantic": "clamp(2.75rem, 6vw, 3.25rem)", + "colossal": "clamp(3.25rem, 8vw, 6.25rem)" + }, + "line-height": { + "tiny": 1.15, + "small": 1.2, + "medium": 1.4, + "normal": 1.6 + } + } + }, + "spacing": { + "units": [ + "%", + "px", + "em", + "rem", + "vh", + "vw" + ] + }, + "typography": { + "dropCap": false, + "fontFamilies": [ + { + "fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif", + "name": "System Font", + "slug": "system-font" + }, + { + "fontFamily": "\"Source Serif Pro\", serif", + "name": "Source Serif Pro", + "slug": "source-serif-pro", + "fontFace": [ + { + "fontFamily": "Source Serif Pro", + "fontWeight": "200 900", + "fontStyle": "normal", + "fontStretch": "normal", + "src": [ "file:./assets/fonts/SourceSerif4Variable-Roman.ttf.woff2" ] + }, + { + "fontFamily": "Source Serif Pro", + "fontWeight": "200 900", + "fontStyle": "italic", + "fontStretch": "normal", + "src": [ "file:./assets/fonts/SourceSerif4Variable-Italic.ttf.woff2" ] + } + ] + } + ], + "fontSizes": [ + { + "size": "1rem", + "slug": "small" + }, + { + "size": "1.125rem", + "slug": "medium" + }, + { + "size": "1.75rem", + "slug": "large" + }, + { + "size": "clamp(1.75rem, 3vw, 2.25rem)", + "slug": "x-large" + } + ] + }, + "layout": { + "contentSize": "650px", + "wideSize": "1000px" + } + }, + "styles": { + "blocks": { + "core/button": { + "border": { + "radius": "0" + }, + "color": { + "background": "var(--wp--preset--color--primary)", + "text": "var(--wp--preset--color--background)" + }, + "typography": { + "fontSize": "var(--wp--preset--font-size--medium)" + } + }, + "core/post-title": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--source-serif-pro)", + "fontWeight": "300", + "lineHeight": "var(--wp--custom--typography--line-height--tiny)", + "fontSize": "var(--wp--custom--typography--font-size--gigantic)" + } + }, + "core/post-comments": { + "spacing": { + "padding": { + "top": "var(--wp--custom--spacing--small)" + } + } + }, + "core/pullquote": { + "border": { + "width": "1px 0" + } + }, + "core/query-title": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--source-serif-pro)", + "fontWeight": "300", + "lineHeight": "var(--wp--custom--typography--line-height--small)", + "fontSize": "var(--wp--custom--typography--font-size--gigantic)" + } + }, + "core/quote": { + "border": { + "width": "1px" + } + }, + "core/site-title": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--system-font)", + "lineHeight": "var(--wp--custom--typography--line-height--normal)", + "fontSize": "var(--wp--preset--font-size--medium)", + "fontStyle": "italic", + "fontWeight": "normal" + } + } + }, + "color": { + "background": "var(--wp--preset--color--background)", + "text": "var(--wp--preset--color--foreground)" + }, + "elements": { + "h1": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--source-serif-pro)", + "fontWeight": "300", + "lineHeight": "var(--wp--custom--typography--line-height--tiny)", + "fontSize": "var(--wp--custom--typography--font-size--colossal)" + } + }, + "h2": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--source-serif-pro)", + "fontWeight": "300", + "lineHeight": "var(--wp--custom--typography--line-height--small)", + "fontSize": "var(--wp--custom--typography--font-size--gigantic)" + } + }, + "h3": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--source-serif-pro)", + "fontWeight": "300", + "lineHeight": "var(--wp--custom--typography--line-height--tiny)", + "fontSize": "var(--wp--custom--typography--font-size--huge)" + } + }, + "h4": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--source-serif-pro)", + "fontWeight": "300", + "lineHeight": "var(--wp--custom--typography--line-height--tiny)", + "fontSize": "var(--wp--preset--font-size--x-large)" + } + }, + "h5": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--system-font)", + "fontWeight": "700", + "textTransform": "uppercase", + "lineHeight": "var(--wp--custom--typography--line-height--normal)", + "fontSize": "var(--wp--preset--font-size--medium)" + } + }, + "h6": { + "typography": { + "fontFamily": "var(--wp--preset--font-family--system-font)", + "fontWeight": "400", + "textTransform": "uppercase", + "lineHeight": "var(--wp--custom--typography--line-height--normal)", + "fontSize": "var(--wp--preset--font-size--medium)" + } + }, + "link": { + "color": { + "text": "var(--wp--preset--color--foreground)" + } + } + }, + "spacing": { + "blockGap": "1.5rem" + }, + "typography": { + "fontFamily": "var(--wp--preset--font-family--system-font)", + "lineHeight": "var(--wp--custom--typography--line-height--normal)", + "fontSize": "var(--wp--preset--font-size--medium)" + } + }, + "templateParts": [ + { + "name": "header", + "title": "Header", + "area": "header" + }, + { + "name": "header-large-dark", + "title": "Header (Dark, large)", + "area": "header" + }, + { + "name": "header-small-dark", + "title": "Header (Dark, small)", + "area": "header" + }, + { + "name": "footer", + "title": "Footer", + "area": "footer" + } + ] +} diff --git a/phpunit/theme-json-webfonts-handler-test.php b/phpunit/theme-json-webfonts-handler-test.php new file mode 100644 index 00000000000000..1bfdb24861474f --- /dev/null +++ b/phpunit/theme-json-webfonts-handler-test.php @@ -0,0 +1,117 @@ +old_wp_styles = $wp_styles; + $wp_styles = null; + + global $wp_webfonts; + $this->old_wp_webfonts = $wp_webfonts; + $wp_webfonts = null; + + $this->theme_root = realpath( __DIR__ . '/data/themedir1' ); + $this->old_theme_dir = $GLOBALS['wp_theme_directories']; + + // /themes is necessary as theme.php functions assume /themes is the root if there is only one root. + $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root ); + + $theme_root_callback = function () { + return $this->theme_root; + }; + + add_filter( 'theme_root', $theme_root_callback ); + add_filter( 'stylesheet_root', $theme_root_callback ); + add_filter( 'template_root', $theme_root_callback ); + + // Clear caches. + wp_clean_themes_cache(); + unset( $GLOBALS['wp_themes'] ); + } + + public function tear_down() { + global $wp_webfonts; + global $wp_styles; + + $wp_webfonts = $this->old_wp_webfonts; + $wp_styles = $this->old_wp_styles; + + // Restore the original theme directory setup. + $GLOBALS['wp_theme_directories'] = $this->old_theme_dir; + wp_clean_themes_cache(); + unset( $GLOBALS['wp_themes'] ); + + parent::tear_down(); + } + + public function test_font_face_styles_are_generated() { + // Set up the theme. + switch_theme( 'webfonts-theme' ); + do_action( 'after_setup_theme' ); + WP_Theme_JSON_Resolver::clean_cached_data(); + do_action( 'wp_loaded' ); + do_action( 'wp_enqueue_scripts' ); + + $expected = << +@font-face{font-family:"Source Serif Pro";font-style:normal;font-weight:200 900;font-display:fallback;src:local("Source Serif Pro"), url('/wp-content/gutenberg/phpunit/data/themedir1/assets/fonts/SourceSerif4Variable-Roman.ttf.woff2') format('woff2');font-stretch:normal;}@font-face{font-family:"Source Serif Pro";font-style:italic;font-weight:200 900;font-display:fallback;src:local("Source Serif Pro"), url('/wp-content/gutenberg/phpunit/data/themedir1/assets/fonts/SourceSerif4Variable-Italic.ttf.woff2') format('woff2');font-stretch:normal;} + +EOF; + + $this->assertStringContainsString( + $expected, + get_echo( 'wp_print_styles' ) + ); + } + + public function test_mime_types_added() { + $actual = wp_get_mime_types(); + + $this->assertArrayHasKey( 'woff2', $actual, 'woff2 mime type is expected to be added' ); + $this->assertArrayHasKey( 'woff', $actual, 'woff mime type is expected to be added' ); + $this->assertArrayHasKey( 'ttf', $actual, 'ttf mime type is expected to be added' ); + $this->assertArrayHasKey( 'otf', $actual, 'otf mime type is expected to be added' ); + } +}