2021-05-24 10:37:55 +02:00
< ? php
/**
2021-05-24 15:25:56 +02:00
* WP_Theme_JSON class
2021-05-24 10:37:55 +02:00
*
* @ package WordPress
2021-05-24 15:25:56 +02:00
* @ subpackage Theme
* @ since 5.8 . 0
2021-05-24 10:37:55 +02:00
*/
/**
2021-05-24 15:25:56 +02:00
* Class that encapsulates the processing of structures that adhere to the theme . json spec .
2021-05-24 10:37:55 +02:00
*
2021-11-08 20:19:58 +01:00
* This class is for internal core usage and is not supposed to be used by extenders ( plugins and / or themes ) .
* This is a low - level API that may need to do breaking changes . Please ,
* use get_global_settings , get_global_styles , and get_global_stylesheet instead .
*
2021-05-24 10:37:55 +02:00
* @ access private
*/
Code Modernization: Add `AllowDynamicProperties` attribute to all (parent) classes.
Dynamic (non-explicitly declared) properties are deprecated as of PHP 8.2 and are expected to become a fatal error in PHP 9.0.
There are a number of ways to mitigate this:
* If it is an accidental typo for a declared property: fix the typo.
* For known properties: declare them on the class.
* For unknown properties: add the magic `__get()`, `__set()`, et al. methods to the class or let the class extend `stdClass` which has highly optimized versions of these magic methods built in.
* For unknown ''use'' of dynamic properties, the `#[AllowDynamicProperties]` attribute can be added to the class. The attribute will automatically be inherited by child classes.
Trac ticket #56034 is open to investigate and handle the third and fourth type of situations, however it has become clear this will need more time and will not be ready in time for WP 6.1.
To reduce “noise” in the meantime, both in the error logs of WP users moving onto PHP 8.2, in the test run logs of WP itself, in test runs of plugins and themes, as well as to prevent duplicate tickets from being opened for the same issue, this commit adds the `#[AllowDynamicProperties]` attribute to all “parent” classes in WP.
The logic used for this commit is as follows:
* If a class already has the attribute: no action needed.
* If a class does not `extend`: add the attribute.
* If a class does `extend`:
- If it extends `stdClass`: no action needed (as `stdClass` supports dynamic properties).
- If it extends a PHP native class: add the attribute.
- If it extends a class from one of WP's external dependencies: add the attribute.
* In all other cases: no action — the attribute should not be needed as child classes inherit from the parent.
Whether or not a class contains magic methods has not been taken into account, as a review of the currently existing magic methods has shown that those are generally not sturdy enough and often even set dynamic properties (which they should not). See the [https://www.youtube.com/watch?v=vDZWepDQQVE live stream from August 16, 2022] for more details.
This commit only affects classes in the `src` directory of WordPress core.
* Tests should not get this attribute, but should be fixed to not use dynamic properties instead. Patches for this are already being committed under ticket #56033.
* While a number bundled themes (2014, 2019, 2020, 2021) contain classes, they are not a part of this commit and may be updated separately.
Reference: [https://wiki.php.net/rfc/deprecate_dynamic_properties PHP RFC: Deprecate dynamic properties].
Follow-up to [53922].
Props jrf, hellofromTonya, markjaquith, peterwilsoncc, costdev, knutsp, aristath.
See #56513, #56034.
Built from https://develop.svn.wordpress.org/trunk@54133
git-svn-id: http://core.svn.wordpress.org/trunk@53692 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-12 17:47:14 +02:00
#[AllowDynamicProperties]
2021-05-24 10:37:55 +02:00
class WP_Theme_JSON {
/**
* Container of data in theme . json format .
*
2021-05-24 15:25:56 +02:00
* @ since 5.8 . 0
2021-05-24 10:37:55 +02:00
* @ var array
*/
2022-02-17 10:04:05 +01:00
protected $theme_json = null ;
2021-05-24 10:37:55 +02:00
/**
2021-05-24 19:39:57 +02:00
* Holds block metadata extracted from block . json
* to be shared among all instances so we don ' t
* process it twice .
2021-05-24 10:37:55 +02:00
*
2021-05-24 15:25:56 +02:00
* @ since 5.8 . 0
2022-10-04 17:50:12 +02:00
* @ since 6.1 . 0 Initialize as an empty array .
2021-05-24 10:37:55 +02:00
* @ var array
*/
2022-10-04 17:50:12 +02:00
protected static $blocks_metadata = array ();
2021-05-24 10:37:55 +02:00
2021-05-24 19:39:57 +02:00
/**
* The CSS selector for the top - level styles .
*
* @ since 5.8 . 0
* @ var string
*/
const ROOT_BLOCK_SELECTOR = 'body' ;
2021-06-15 13:25:08 +02:00
/**
* The sources of data this object can represent .
*
* @ since 5.8 . 0
Editor: Add missing `blocks` origin to `theme.json`.
This changeset updates the blocks origin name from core to blocks and adds it to the list of valid origins for `theme.json`.
(See the original fix in [https://github.com//pull/3319 Gutenberg's PR 44363]).
Why?
- This new origin was missing from the list.
- The `core` name is not reflective of what it does, as this data origin is related to block styles, whether they come with WordPress or third-party blocks.
- The existing filter for this piece of data is called `theme_json_blocks`, to reflect it filters "block" data.
- Though `core` origin was used in the past for `default`, this commit reverts it. Why? It was confusing. The goal is to use names that communicate what part of the pipeline are processing (`default > blocks > theme > custom`).
How?
- Renames the string, from `core` to `blocks`.
- Adds `blocks` to the list of valid origins.
- Verifies that the `$theme_json->get_stylesheet()` call uses the proper `$origins` at all times.
Follow-up to [54162], [54251].
Props oandregal, czapla, jorgefilipecosta, scruffian, bernhard-reiter hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54408
git-svn-id: http://core.svn.wordpress.org/trunk@53967 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-10-07 11:40:13 +02:00
* @ since 6.1 . 0 Added 'blocks' .
2021-07-01 23:02:57 +02:00
* @ var string []
2021-06-15 13:25:08 +02:00
*/
2021-06-15 10:52:30 +02:00
const VALID_ORIGINS = array (
2021-11-23 06:40:38 +01:00
'default' ,
Editor: Add missing `blocks` origin to `theme.json`.
This changeset updates the blocks origin name from core to blocks and adds it to the list of valid origins for `theme.json`.
(See the original fix in [https://github.com//pull/3319 Gutenberg's PR 44363]).
Why?
- This new origin was missing from the list.
- The `core` name is not reflective of what it does, as this data origin is related to block styles, whether they come with WordPress or third-party blocks.
- The existing filter for this piece of data is called `theme_json_blocks`, to reflect it filters "block" data.
- Though `core` origin was used in the past for `default`, this commit reverts it. Why? It was confusing. The goal is to use names that communicate what part of the pipeline are processing (`default > blocks > theme > custom`).
How?
- Renames the string, from `core` to `blocks`.
- Adds `blocks` to the list of valid origins.
- Verifies that the `$theme_json->get_stylesheet()` call uses the proper `$origins` at all times.
Follow-up to [54162], [54251].
Props oandregal, czapla, jorgefilipecosta, scruffian, bernhard-reiter hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54408
git-svn-id: http://core.svn.wordpress.org/trunk@53967 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-10-07 11:40:13 +02:00
'blocks' ,
2021-06-15 10:52:30 +02:00
'theme' ,
2021-11-30 01:24:27 +01:00
'custom' ,
2021-06-15 10:52:30 +02:00
);
2021-05-24 19:39:57 +02:00
/**
* Presets are a set of values that serve
* to bootstrap some styles : colors , font sizes , etc .
*
* They are a unkeyed array of values such as :
*
Docs: Update code examples formatting in `WP_HTML_Tag_Processor` documentation.
Per the [https://developer.wordpress.org/coding-standards/inline-documentation-standards/php/#description documentation standards], code samples should be created by indenting every line of the code by 4 spaces, with a blank line before and after. This matches the format used by the rest of core.
Follow-up to [55203], [55304], [55718], [55724].
Props juanmaguitar, coffee2code, azaozz, costdev, dmsnell, johnbillion, SergeyBiryukov.
Fixes #58028.
Built from https://develop.svn.wordpress.org/trunk@55727
git-svn-id: http://core.svn.wordpress.org/trunk@55239 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-05-08 19:32:24 +02:00
* array (
* array (
* 'slug' => 'unique-name-within-the-set' ,
* 'name' => 'Name for the UI' ,
* < value_key > => 'value'
* ),
* )
2021-05-24 19:39:57 +02:00
*
* This contains the necessary metadata to process them :
*
2022-04-11 12:38:00 +02:00
* - path => Where to find the preset within the settings section .
* - prevent_override => Disables override of default presets by theme presets .
* The relationship between whether to override the defaults
* and whether the defaults are enabled is inverse :
2023-06-20 06:59:18 +02:00
* - If defaults are enabled => theme presets should not be overridden
* - If defaults are disabled => theme presets should be overridden
2022-04-11 12:38:00 +02:00
* For example , a theme sets defaultPalette to false ,
* making the default palette hidden from the user .
* In that case , we want all the theme presets to be present ,
* so they should override the defaults by setting this false .
2021-12-21 07:02:06 +01:00
* - use_default_names => whether to use the default names
2022-04-11 12:38:00 +02:00
* - value_key => the key that represents the value
* - value_func => optionally , instead of value_key , a function to generate
* the value that takes a preset as an argument
* ( either value_key or value_func should be present )
* - css_vars => template string to use in generating the CSS Custom Property .
* Example output : " --wp--preset--duotone--blue: <value> " will generate as many CSS Custom Properties as presets defined
* substituting the $slug for the slug ' s value for each preset value .
* - classes => array containing a structure with the classes to
* generate for the presets , where for each array item
* the key is the class name and the value the property name .
* The " $slug " substring will be replaced by the slug of each preset .
* For example :
* 'classes' => array (
* '.has-$slug-color' => 'color' ,
* '.has-$slug-background-color' => 'background-color' ,
* '.has-$slug-border-color' => 'border-color' ,
* )
* - properties => array of CSS properties to be used by kses to
* validate the content of each preset
* by means of the remove_insecure_properties method .
2021-05-24 19:39:57 +02:00
*
* @ since 5.8 . 0
2021-12-21 11:20:04 +01:00
* @ since 5.9 . 0 Added the `color.duotone` and `typography.fontFamilies` presets ,
* `use_default_names` preset key , and simplified the metadata structure .
2022-04-11 12:38:00 +02:00
* @ since 6.0 . 0 Replaced `override` with `prevent_override` and updated the
2022-11-17 17:58:20 +01:00
* `prevent_override` value for `color.duotone` to use `color.defaultDuotone` .
2023-02-01 19:07:12 +01:00
* @ since 6.2 . 0 Added 'shadow' presets .
2023-06-29 08:21:28 +02:00
* @ since 6.3 . 0 Replaced value_func for duotone with `null` . Custom properties are handled by class - wp - duotone . php .
2021-05-24 19:39:57 +02:00
* @ var array
*/
const PRESETS_METADATA = array (
array (
2021-12-21 07:02:06 +01:00
'path' => array ( 'color' , 'palette' ),
2022-04-11 12:38:00 +02:00
'prevent_override' => array ( 'color' , 'defaultPalette' ),
2021-12-21 07:02:06 +01:00
'use_default_names' => false ,
'value_key' => 'color' ,
'css_vars' => '--wp--preset--color--$slug' ,
'classes' => array (
2021-11-08 20:19:58 +01:00
'.has-$slug-color' => 'color' ,
'.has-$slug-background-color' => 'background-color' ,
'.has-$slug-border-color' => 'border-color' ,
2021-05-24 19:39:57 +02:00
),
2021-12-21 07:02:06 +01:00
'properties' => array ( 'color' , 'background-color' , 'border-color' ),
2021-05-24 19:39:57 +02:00
),
array (
2021-12-21 07:02:06 +01:00
'path' => array ( 'color' , 'gradients' ),
2022-04-11 12:38:00 +02:00
'prevent_override' => array ( 'color' , 'defaultGradients' ),
2021-12-21 07:02:06 +01:00
'use_default_names' => false ,
'value_key' => 'gradient' ,
'css_vars' => '--wp--preset--gradient--$slug' ,
'classes' => array ( '.has-$slug-gradient-background' => 'background' ),
'properties' => array ( 'background' ),
2021-05-24 19:39:57 +02:00
),
array (
2021-12-21 07:02:06 +01:00
'path' => array ( 'color' , 'duotone' ),
2022-04-11 12:38:00 +02:00
'prevent_override' => array ( 'color' , 'defaultDuotone' ),
2021-12-21 07:02:06 +01:00
'use_default_names' => false ,
2023-06-29 08:21:28 +02:00
'value_func' => null , // CSS Custom Properties for duotone are handled by block supports in class-wp-duotone.php.
'css_vars' => null ,
2021-12-21 07:02:06 +01:00
'classes' => array (),
'properties' => array ( 'filter' ),
2021-11-08 20:19:58 +01:00
),
array (
2021-12-21 07:02:06 +01:00
'path' => array ( 'typography' , 'fontSizes' ),
2022-04-11 12:38:00 +02:00
'prevent_override' => false ,
2021-12-21 07:02:06 +01:00
'use_default_names' => true ,
Editor: Introduces fluid typography and uses Style Engine.
This commit introduces fluid typography block supports and switches to use the Style Engine for typography and colors.
The motivation for fluid typography block supports:
>"Fluid typography" describes how a site's font sizes adapt to every change in screen size, for example, growing larger as the viewport width increases, or smaller as it decreases.
>
>Font sizes can smoothly scale between minimum and maximum viewport widths.
Typography changes introduced from Gutenberg:
* Uses the Style Engine to generate the CSS and classnames in `wp_apply_typography_support()`.
* Introduces `wp_typography_get_preset_inline_style_value()` for backwards-compatibility.
* Introduces a private internal function called `wp_get_typography_value_and_unit()`, for checking and getting typography unit and value.
* Introduces a private internal function called `wp_get_computed_fluid_typography_value()`, for an internal implementation of CSS `clamp()`.
* Deprecates `wp_typography_get_css_variable_inline_style()`.
References:
* [https://github.com/WordPress/gutenberg/pull/40332 WordPress/gutenberg PR 40332] Style Engine: add typography and color to backend
* [https://github.com/WordPress/gutenberg/pull/39529 WordPress/gutenberg PR 39529] Block supports: add fluid typography
Follow-up to [53076], [52302], [52069], [51089], [50761], [49226].
Props ramonopoly, youknowriad, aristath, oandregal, aaronrobertshaw, cbirdsong, jorgefilipecosta, ironprogrammer, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54260
git-svn-id: http://core.svn.wordpress.org/trunk@53819 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-20 17:47:09 +02:00
'value_func' => 'wp_get_typography_font_size_value' ,
2021-12-21 07:02:06 +01:00
'css_vars' => '--wp--preset--font-size--$slug' ,
'classes' => array ( '.has-$slug-font-size' => 'font-size' ),
'properties' => array ( 'font-size' ),
2021-11-08 20:19:58 +01:00
),
array (
2021-12-21 07:02:06 +01:00
'path' => array ( 'typography' , 'fontFamilies' ),
2022-04-11 12:38:00 +02:00
'prevent_override' => false ,
2021-12-21 07:02:06 +01:00
'use_default_names' => false ,
'value_key' => 'fontFamily' ,
'css_vars' => '--wp--preset--font-family--$slug' ,
'classes' => array ( '.has-$slug-font-family' => 'font-family' ),
'properties' => array ( 'font-family' ),
2021-05-24 19:39:57 +02:00
),
2022-09-21 13:43:13 +02:00
array (
'path' => array ( 'spacing' , 'spacingSizes' ),
'prevent_override' => false ,
'use_default_names' => true ,
'value_key' => 'size' ,
'css_vars' => '--wp--preset--spacing--$slug' ,
'classes' => array (),
'properties' => array ( 'padding' , 'margin' ),
),
2023-02-01 19:07:12 +01:00
array (
'path' => array ( 'shadow' , 'presets' ),
'prevent_override' => array ( 'shadow' , 'defaultPresets' ),
'use_default_names' => false ,
'value_key' => 'shadow' ,
'css_vars' => '--wp--preset--shadow--$slug' ,
'classes' => array (),
'properties' => array ( 'box-shadow' ),
),
2021-05-24 19:39:57 +02:00
);
/**
* Metadata for style properties .
*
2021-11-08 20:19:58 +01:00
* Each element is a direct mapping from the CSS property name to the
* path to the value in theme . json & block attributes .
2021-05-24 19:39:57 +02:00
*
* @ since 5.8 . 0
2021-12-04 13:58:01 +01:00
* @ since 5.9 . 0 Added the `border-*` , `font-family` , `font-style` , `font-weight` ,
* `letter-spacing` , `margin-*` , `padding-*` , `--wp--style--block-gap` ,
* `text-decoration` , `text-transform` , and `filter` properties ,
* simplified the metadata structure .
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
* @ since 6.1 . 0 Added the `border-*-color` , `border-*-width` , `border-*-style` ,
* `--wp--style--root--padding-*` , and `box-shadow` properties ,
* removed the `--wp--style--block-gap` property .
Editor: Introduce minimum height dimensions block support.
This changeset adds the new dimension feature's PHP code for supporting minimum height in the block editor inspector and in global styles. Minimum height is quite useful for defining the minimum vertical dimensions of a block, while allowing it to expand beyond that size.
In this changeset:
* Adds support in `theme.json`.
* Adds support in the style engine.
* Adds support in `wp_apply_dimensions_support()`.
* Renames the setting from `'__experimentalDimensions'` to `dimensions` in `wp_register_dimensions_support()`.
* Adds PHPUnit tests.
Is renaming `'__experimentalDimensions'` a backwards-compatibility (BC) break?
Though the setting has been in the code since 5.9.0, it was never wired to anything, ie it did not expose any controls or styles. Notice in `wp_register_dimensions_support()` and `wp_apply_dimensions_support()` prior to this changeset, there are inline comments as placeholders for height and width support, but no code.
If a developer opted in to use it, it had no effect.
A search in wp.org's plugin and themes repo showed no instances of this experimental setting.
Given there was no functionality attached to it (until this changeset), no change in behavior or effect from removing it, and no usage found in the plugins and themes repository, it does appear to be a BC break.
References:
* [https://github.com/WordPress/gutenberg/pull/45300 Gutenberg PR 45300]
* [https://github.com/WordPress/gutenberg/pull/45334 Gutenberg PR 45334]
Follow-up to [53076], [52069].
Props andrewserong, aaronrobertshaw , costdev, hellofromTonya, isabel_brison, joen, paaljoachim, mukesh27, ntsekouras, oandregal, ramonopoly.
Fixes #57582.
Built from https://develop.svn.wordpress.org/trunk@55175
git-svn-id: http://core.svn.wordpress.org/trunk@54708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-01 17:15:15 +01:00
* @ since 6.2 . 0 Added `outline-*` , and `min-height` properties .
2023-06-22 10:18:19 +02:00
* @ since 6.3 . 0 Added `column-count` property .
2023-09-18 08:49:20 +02:00
* @ since 6.4 . 0 Added `writing-mode` property .
2024-01-31 03:54:17 +01:00
* @ since 6.5 . 0 Added `aspect-ratio` property .
2022-12-19 21:55:13 +01:00
*
2021-05-24 19:39:57 +02:00
* @ var array
*/
const PROPERTIES_METADATA = array (
2024-01-31 03:54:17 +01:00
'aspect-ratio' => array ( 'dimensions' , 'aspectRatio' ),
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
'background' => array ( 'color' , 'gradient' ),
'background-color' => array ( 'color' , 'background' ),
'border-radius' => array ( 'border' , 'radius' ),
'border-top-left-radius' => array ( 'border' , 'radius' , 'topLeft' ),
'border-top-right-radius' => array ( 'border' , 'radius' , 'topRight' ),
'border-bottom-left-radius' => array ( 'border' , 'radius' , 'bottomLeft' ),
'border-bottom-right-radius' => array ( 'border' , 'radius' , 'bottomRight' ),
'border-color' => array ( 'border' , 'color' ),
'border-width' => array ( 'border' , 'width' ),
'border-style' => array ( 'border' , 'style' ),
'border-top-color' => array ( 'border' , 'top' , 'color' ),
'border-top-width' => array ( 'border' , 'top' , 'width' ),
'border-top-style' => array ( 'border' , 'top' , 'style' ),
'border-right-color' => array ( 'border' , 'right' , 'color' ),
'border-right-width' => array ( 'border' , 'right' , 'width' ),
'border-right-style' => array ( 'border' , 'right' , 'style' ),
'border-bottom-color' => array ( 'border' , 'bottom' , 'color' ),
'border-bottom-width' => array ( 'border' , 'bottom' , 'width' ),
'border-bottom-style' => array ( 'border' , 'bottom' , 'style' ),
'border-left-color' => array ( 'border' , 'left' , 'color' ),
'border-left-width' => array ( 'border' , 'left' , 'width' ),
'border-left-style' => array ( 'border' , 'left' , 'style' ),
'color' => array ( 'color' , 'text' ),
2023-06-22 10:18:19 +02:00
'column-count' => array ( 'typography' , 'textColumns' ),
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
'font-family' => array ( 'typography' , 'fontFamily' ),
'font-size' => array ( 'typography' , 'fontSize' ),
'font-style' => array ( 'typography' , 'fontStyle' ),
'font-weight' => array ( 'typography' , 'fontWeight' ),
'letter-spacing' => array ( 'typography' , 'letterSpacing' ),
'line-height' => array ( 'typography' , 'lineHeight' ),
'margin' => array ( 'spacing' , 'margin' ),
'margin-top' => array ( 'spacing' , 'margin' , 'top' ),
'margin-right' => array ( 'spacing' , 'margin' , 'right' ),
'margin-bottom' => array ( 'spacing' , 'margin' , 'bottom' ),
'margin-left' => array ( 'spacing' , 'margin' , 'left' ),
Editor: Introduce minimum height dimensions block support.
This changeset adds the new dimension feature's PHP code for supporting minimum height in the block editor inspector and in global styles. Minimum height is quite useful for defining the minimum vertical dimensions of a block, while allowing it to expand beyond that size.
In this changeset:
* Adds support in `theme.json`.
* Adds support in the style engine.
* Adds support in `wp_apply_dimensions_support()`.
* Renames the setting from `'__experimentalDimensions'` to `dimensions` in `wp_register_dimensions_support()`.
* Adds PHPUnit tests.
Is renaming `'__experimentalDimensions'` a backwards-compatibility (BC) break?
Though the setting has been in the code since 5.9.0, it was never wired to anything, ie it did not expose any controls or styles. Notice in `wp_register_dimensions_support()` and `wp_apply_dimensions_support()` prior to this changeset, there are inline comments as placeholders for height and width support, but no code.
If a developer opted in to use it, it had no effect.
A search in wp.org's plugin and themes repo showed no instances of this experimental setting.
Given there was no functionality attached to it (until this changeset), no change in behavior or effect from removing it, and no usage found in the plugins and themes repository, it does appear to be a BC break.
References:
* [https://github.com/WordPress/gutenberg/pull/45300 Gutenberg PR 45300]
* [https://github.com/WordPress/gutenberg/pull/45334 Gutenberg PR 45334]
Follow-up to [53076], [52069].
Props andrewserong, aaronrobertshaw , costdev, hellofromTonya, isabel_brison, joen, paaljoachim, mukesh27, ntsekouras, oandregal, ramonopoly.
Fixes #57582.
Built from https://develop.svn.wordpress.org/trunk@55175
git-svn-id: http://core.svn.wordpress.org/trunk@54708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-01 17:15:15 +01:00
'min-height' => array ( 'dimensions' , 'minHeight' ),
2022-12-19 21:55:13 +01:00
'outline-color' => array ( 'outline' , 'color' ),
'outline-offset' => array ( 'outline' , 'offset' ),
'outline-style' => array ( 'outline' , 'style' ),
'outline-width' => array ( 'outline' , 'width' ),
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
'padding' => array ( 'spacing' , 'padding' ),
'padding-top' => array ( 'spacing' , 'padding' , 'top' ),
'padding-right' => array ( 'spacing' , 'padding' , 'right' ),
'padding-bottom' => array ( 'spacing' , 'padding' , 'bottom' ),
'padding-left' => array ( 'spacing' , 'padding' , 'left' ),
'--wp--style--root--padding' => array ( 'spacing' , 'padding' ),
'--wp--style--root--padding-top' => array ( 'spacing' , 'padding' , 'top' ),
'--wp--style--root--padding-right' => array ( 'spacing' , 'padding' , 'right' ),
'--wp--style--root--padding-bottom' => array ( 'spacing' , 'padding' , 'bottom' ),
'--wp--style--root--padding-left' => array ( 'spacing' , 'padding' , 'left' ),
'text-decoration' => array ( 'typography' , 'textDecoration' ),
'text-transform' => array ( 'typography' , 'textTransform' ),
'filter' => array ( 'filter' , 'duotone' ),
'box-shadow' => array ( 'shadow' ),
2023-09-18 08:49:20 +02:00
'writing-mode' => array ( 'typography' , 'writingMode' ),
2021-05-24 19:39:57 +02:00
);
2023-02-15 04:57:17 +01:00
/**
* Indirect metadata for style properties that are not directly output .
*
* Each element maps from a CSS property name to an array of
* paths to the value in theme . json & block attributes .
*
* Indirect properties are not output directly by `compute_style_properties` ,
* but are used elsewhere in the processing of global styles . The indirect
* property is used to validate whether or not a style value is allowed .
*
2023-02-15 23:56:20 +01:00
* @ since 6.2 . 0
*
2023-02-15 04:57:17 +01:00
* @ var array
*/
const INDIRECT_PROPERTIES_METADATA = array (
'gap' => array (
array ( 'spacing' , 'blockGap' ),
),
'column-gap' => array (
array ( 'spacing' , 'blockGap' , 'left' ),
),
'row-gap' => array (
array ( 'spacing' , 'blockGap' , 'top' ),
),
'max-width' => array (
array ( 'layout' , 'contentSize' ),
array ( 'layout' , 'wideSize' ),
),
);
2021-05-24 19:39:57 +02:00
/**
2021-11-08 20:19:58 +01:00
* Protected style properties .
*
* These style properties are only rendered if a setting enables it
* via a value other than `null` .
*
* Each element maps the style property to the corresponding theme . json
* setting key .
*
* @ since 5.9 . 0
*/
const PROTECTED_PROPERTIES = array (
'spacing.blockGap' => array ( 'spacing' , 'blockGap' ),
);
/**
* The top - level keys a theme . json can have .
*
2021-12-04 16:57:01 +01:00
* @ since 5.8 . 0 As `ALLOWED_TOP_LEVEL_KEYS` .
* @ since 5.9 . 0 Renamed from `ALLOWED_TOP_LEVEL_KEYS` to `VALID_TOP_LEVEL_KEYS` ,
2021-12-04 13:58:01 +01:00
* added the `customTemplates` and `templateParts` values .
2023-06-26 20:15:22 +02:00
* @ since 6.3 . 0 Added the `description` value .
2021-07-01 23:02:57 +02:00
* @ var string []
2021-05-24 19:39:57 +02:00
*/
2021-11-08 20:19:58 +01:00
const VALID_TOP_LEVEL_KEYS = array (
'customTemplates' ,
2023-06-26 20:15:22 +02:00
'description' ,
2022-04-11 12:38:00 +02:00
'patterns' ,
2021-05-24 10:37:55 +02:00
'settings' ,
2021-05-24 19:39:57 +02:00
'styles' ,
2021-11-08 20:19:58 +01:00
'templateParts' ,
2022-04-11 12:38:00 +02:00
'title' ,
2022-12-20 14:57:15 +01:00
'version' ,
2021-05-24 10:37:55 +02:00
);
2021-05-24 19:39:57 +02:00
/**
2021-11-08 20:19:58 +01:00
* The valid properties under the settings key .
*
2021-12-04 16:57:01 +01:00
* @ since 5.8 . 0 As `ALLOWED_SETTINGS` .
* @ since 5.9 . 0 Renamed from `ALLOWED_SETTINGS` to `VALID_SETTINGS` ,
* added new properties for `border` , `color` , `spacing` ,
* and `typography` , and renamed others according to the new schema .
2022-04-11 12:38:00 +02:00
* @ since 6.0 . 0 Added `color.defaultDuotone` .
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
* @ since 6.1 . 0 Added `layout.definitions` and `useRootPaddingAwareAlignments` .
2023-02-07 19:01:20 +01:00
* @ since 6.2 . 0 Added `dimensions.minHeight` , 'shadow.presets' , 'shadow.defaultPresets' ,
* `position.fixed` and `position.sticky` .
2023-06-27 09:25:22 +02:00
* @ since 6.3 . 0 Added support for `typography.textColumns` , removed `layout.definitions` .
2023-09-19 03:29:23 +02:00
* @ since 6.4 . 0 Added support for `layout.allowEditing` , `background.backgroundImage` ,
2023-09-21 08:35:20 +02:00
* `typography.writingMode` , `lightbox.enabled` and `lightbox.allowEditing` .
2024-01-31 03:54:17 +01:00
* @ since 6.5 . 0 Added support for `layout.allowCustomContentAndWideSize` ,
* `background.backgroundSize` and `dimensions.aspectRatio` .
2021-05-24 19:39:57 +02:00
* @ var array
*/
2021-11-08 20:19:58 +01:00
const VALID_SETTINGS = array (
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
'appearanceTools' => null ,
'useRootPaddingAwareAlignments' => null ,
2023-09-19 03:29:23 +02:00
'background' => array (
'backgroundImage' => null ,
2024-01-09 07:12:18 +01:00
'backgroundSize' => null ,
2023-09-19 03:29:23 +02:00
),
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
'border' => array (
2021-11-08 20:19:58 +01:00
'color' => null ,
'radius' => null ,
'style' => null ,
'width' => null ,
2021-08-03 20:14:58 +02:00
),
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
'color' => array (
2021-11-23 06:40:38 +01:00
'background' => null ,
'custom' => null ,
'customDuotone' => null ,
'customGradient' => null ,
2022-04-11 12:38:00 +02:00
'defaultDuotone' => null ,
2021-11-23 06:40:38 +01:00
'defaultGradients' => null ,
'defaultPalette' => null ,
'duotone' => null ,
'gradients' => null ,
'link' => null ,
2023-06-26 03:15:21 +02:00
'heading' => null ,
'button' => null ,
'caption' => null ,
2021-11-23 06:40:38 +01:00
'palette' => null ,
'text' => null ,
2021-05-24 10:37:55 +02:00
),
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
'custom' => null ,
Editor: Introduce minimum height dimensions block support.
This changeset adds the new dimension feature's PHP code for supporting minimum height in the block editor inspector and in global styles. Minimum height is quite useful for defining the minimum vertical dimensions of a block, while allowing it to expand beyond that size.
In this changeset:
* Adds support in `theme.json`.
* Adds support in the style engine.
* Adds support in `wp_apply_dimensions_support()`.
* Renames the setting from `'__experimentalDimensions'` to `dimensions` in `wp_register_dimensions_support()`.
* Adds PHPUnit tests.
Is renaming `'__experimentalDimensions'` a backwards-compatibility (BC) break?
Though the setting has been in the code since 5.9.0, it was never wired to anything, ie it did not expose any controls or styles. Notice in `wp_register_dimensions_support()` and `wp_apply_dimensions_support()` prior to this changeset, there are inline comments as placeholders for height and width support, but no code.
If a developer opted in to use it, it had no effect.
A search in wp.org's plugin and themes repo showed no instances of this experimental setting.
Given there was no functionality attached to it (until this changeset), no change in behavior or effect from removing it, and no usage found in the plugins and themes repository, it does appear to be a BC break.
References:
* [https://github.com/WordPress/gutenberg/pull/45300 Gutenberg PR 45300]
* [https://github.com/WordPress/gutenberg/pull/45334 Gutenberg PR 45334]
Follow-up to [53076], [52069].
Props andrewserong, aaronrobertshaw , costdev, hellofromTonya, isabel_brison, joen, paaljoachim, mukesh27, ntsekouras, oandregal, ramonopoly.
Fixes #57582.
Built from https://develop.svn.wordpress.org/trunk@55175
git-svn-id: http://core.svn.wordpress.org/trunk@54708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-01 17:15:15 +01:00
'dimensions' => array (
2024-01-31 03:54:17 +01:00
'aspectRatio' => null ,
'minHeight' => null ,
Editor: Introduce minimum height dimensions block support.
This changeset adds the new dimension feature's PHP code for supporting minimum height in the block editor inspector and in global styles. Minimum height is quite useful for defining the minimum vertical dimensions of a block, while allowing it to expand beyond that size.
In this changeset:
* Adds support in `theme.json`.
* Adds support in the style engine.
* Adds support in `wp_apply_dimensions_support()`.
* Renames the setting from `'__experimentalDimensions'` to `dimensions` in `wp_register_dimensions_support()`.
* Adds PHPUnit tests.
Is renaming `'__experimentalDimensions'` a backwards-compatibility (BC) break?
Though the setting has been in the code since 5.9.0, it was never wired to anything, ie it did not expose any controls or styles. Notice in `wp_register_dimensions_support()` and `wp_apply_dimensions_support()` prior to this changeset, there are inline comments as placeholders for height and width support, but no code.
If a developer opted in to use it, it had no effect.
A search in wp.org's plugin and themes repo showed no instances of this experimental setting.
Given there was no functionality attached to it (until this changeset), no change in behavior or effect from removing it, and no usage found in the plugins and themes repository, it does appear to be a BC break.
References:
* [https://github.com/WordPress/gutenberg/pull/45300 Gutenberg PR 45300]
* [https://github.com/WordPress/gutenberg/pull/45334 Gutenberg PR 45334]
Follow-up to [53076], [52069].
Props andrewserong, aaronrobertshaw , costdev, hellofromTonya, isabel_brison, joen, paaljoachim, mukesh27, ntsekouras, oandregal, ramonopoly.
Fixes #57582.
Built from https://develop.svn.wordpress.org/trunk@55175
git-svn-id: http://core.svn.wordpress.org/trunk@54708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-01 17:15:15 +01:00
),
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
'layout' => array (
2024-01-08 07:23:14 +01:00
'contentSize' => null ,
'wideSize' => null ,
'allowEditing' => null ,
'allowCustomContentAndWideSize' => null ,
2021-07-13 18:41:28 +02:00
),
2023-09-21 08:35:20 +02:00
'lightbox' => array (
'enabled' => null ,
'allowEditing' => null ,
),
2023-02-07 19:01:20 +01:00
'position' => array (
'fixed' => null ,
'sticky' => null ,
),
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
'spacing' => array (
2022-09-21 13:43:13 +02:00
'customSpacingSize' => null ,
'spacingSizes' => null ,
'spacingScale' => null ,
'blockGap' => null ,
'margin' => null ,
'padding' => null ,
'units' => null ,
2021-05-24 10:37:55 +02:00
),
2023-02-01 19:07:12 +01:00
'shadow' => array (
'presets' => null ,
'defaultPresets' => null ,
),
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
'typography' => array (
2022-09-29 21:45:09 +02:00
'fluid' => null ,
2021-11-08 20:19:58 +01:00
'customFontSize' => null ,
'dropCap' => null ,
'fontFamilies' => null ,
'fontSizes' => null ,
'fontStyle' => null ,
'fontWeight' => null ,
'letterSpacing' => null ,
'lineHeight' => null ,
2023-06-22 10:18:19 +02:00
'textColumns' => null ,
2021-11-08 20:19:58 +01:00
'textDecoration' => null ,
'textTransform' => null ,
2023-09-18 08:49:20 +02:00
'writingMode' => null ,
2021-05-24 10:37:55 +02:00
),
);
2024-01-31 11:55:10 +01:00
/*
* The valid properties for fontFamilies under settings key .
*
* @ since 6.5 . 0
*
* @ var array
*/
const FONT_FAMILY_SCHEMA = array (
array (
'fontFamily' => null ,
'name' => null ,
'slug' => null ,
'fontFace' => array (
array (
'ascentOverride' => null ,
'descentOverride' => null ,
'fontDisplay' => null ,
'fontFamily' => null ,
'fontFeatureSettings' => null ,
'fontStyle' => null ,
'fontStretch' => null ,
'fontVariationSettings' => null ,
'fontWeight' => null ,
'lineGapOverride' => null ,
'sizeAdjust' => null ,
'src' => null ,
'unicodeRange' => null ,
),
),
),
);
2021-05-24 19:39:57 +02:00
/**
2021-11-08 20:19:58 +01:00
* The valid properties under the styles key .
*
2021-12-04 16:57:01 +01:00
* @ since 5.8 . 0 As `ALLOWED_STYLES` .
* @ since 5.9 . 0 Renamed from `ALLOWED_STYLES` to `VALID_STYLES` ,
* added new properties for `border` , `filter` , `spacing` ,
* and `typography` .
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
* @ since 6.1 . 0 Added new side properties for `border` ,
2022-09-20 15:50:09 +02:00
* added new property `shadow` ,
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
* updated `blockGap` to be allowed at any level .
Editor: Introduce minimum height dimensions block support.
This changeset adds the new dimension feature's PHP code for supporting minimum height in the block editor inspector and in global styles. Minimum height is quite useful for defining the minimum vertical dimensions of a block, while allowing it to expand beyond that size.
In this changeset:
* Adds support in `theme.json`.
* Adds support in the style engine.
* Adds support in `wp_apply_dimensions_support()`.
* Renames the setting from `'__experimentalDimensions'` to `dimensions` in `wp_register_dimensions_support()`.
* Adds PHPUnit tests.
Is renaming `'__experimentalDimensions'` a backwards-compatibility (BC) break?
Though the setting has been in the code since 5.9.0, it was never wired to anything, ie it did not expose any controls or styles. Notice in `wp_register_dimensions_support()` and `wp_apply_dimensions_support()` prior to this changeset, there are inline comments as placeholders for height and width support, but no code.
If a developer opted in to use it, it had no effect.
A search in wp.org's plugin and themes repo showed no instances of this experimental setting.
Given there was no functionality attached to it (until this changeset), no change in behavior or effect from removing it, and no usage found in the plugins and themes repository, it does appear to be a BC break.
References:
* [https://github.com/WordPress/gutenberg/pull/45300 Gutenberg PR 45300]
* [https://github.com/WordPress/gutenberg/pull/45334 Gutenberg PR 45334]
Follow-up to [53076], [52069].
Props andrewserong, aaronrobertshaw , costdev, hellofromTonya, isabel_brison, joen, paaljoachim, mukesh27, ntsekouras, oandregal, ramonopoly.
Fixes #57582.
Built from https://develop.svn.wordpress.org/trunk@55175
git-svn-id: http://core.svn.wordpress.org/trunk@54708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-01 17:15:15 +01:00
* @ since 6.2 . 0 Added `outline` , and `minHeight` properties .
2023-06-22 10:18:19 +02:00
* @ since 6.3 . 0 Added support for `typography.textColumns` .
2024-01-31 03:54:17 +01:00
* @ since 6.5 . 0 Added support for `dimensions.aspectRatio` .
2022-12-19 21:55:13 +01:00
*
2021-05-24 19:39:57 +02:00
* @ var array
*/
2021-11-08 20:19:58 +01:00
const VALID_STYLES = array (
2021-08-03 20:14:58 +02:00
'border' => array (
2021-11-08 20:19:58 +01:00
'color' => null ,
2021-08-03 20:14:58 +02:00
'radius' => null ,
2021-11-08 20:19:58 +01:00
'style' => null ,
'width' => null ,
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
'top' => null ,
'right' => null ,
'bottom' => null ,
'left' => null ,
2021-08-03 20:14:58 +02:00
),
2021-05-24 19:39:57 +02:00
'color' => array (
'background' => null ,
'gradient' => null ,
'text' => null ,
),
Editor: Introduce minimum height dimensions block support.
This changeset adds the new dimension feature's PHP code for supporting minimum height in the block editor inspector and in global styles. Minimum height is quite useful for defining the minimum vertical dimensions of a block, while allowing it to expand beyond that size.
In this changeset:
* Adds support in `theme.json`.
* Adds support in the style engine.
* Adds support in `wp_apply_dimensions_support()`.
* Renames the setting from `'__experimentalDimensions'` to `dimensions` in `wp_register_dimensions_support()`.
* Adds PHPUnit tests.
Is renaming `'__experimentalDimensions'` a backwards-compatibility (BC) break?
Though the setting has been in the code since 5.9.0, it was never wired to anything, ie it did not expose any controls or styles. Notice in `wp_register_dimensions_support()` and `wp_apply_dimensions_support()` prior to this changeset, there are inline comments as placeholders for height and width support, but no code.
If a developer opted in to use it, it had no effect.
A search in wp.org's plugin and themes repo showed no instances of this experimental setting.
Given there was no functionality attached to it (until this changeset), no change in behavior or effect from removing it, and no usage found in the plugins and themes repository, it does appear to be a BC break.
References:
* [https://github.com/WordPress/gutenberg/pull/45300 Gutenberg PR 45300]
* [https://github.com/WordPress/gutenberg/pull/45334 Gutenberg PR 45334]
Follow-up to [53076], [52069].
Props andrewserong, aaronrobertshaw , costdev, hellofromTonya, isabel_brison, joen, paaljoachim, mukesh27, ntsekouras, oandregal, ramonopoly.
Fixes #57582.
Built from https://develop.svn.wordpress.org/trunk@55175
git-svn-id: http://core.svn.wordpress.org/trunk@54708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-01 17:15:15 +01:00
'dimensions' => array (
2024-01-31 03:54:17 +01:00
'aspectRatio' => null ,
'minHeight' => null ,
Editor: Introduce minimum height dimensions block support.
This changeset adds the new dimension feature's PHP code for supporting minimum height in the block editor inspector and in global styles. Minimum height is quite useful for defining the minimum vertical dimensions of a block, while allowing it to expand beyond that size.
In this changeset:
* Adds support in `theme.json`.
* Adds support in the style engine.
* Adds support in `wp_apply_dimensions_support()`.
* Renames the setting from `'__experimentalDimensions'` to `dimensions` in `wp_register_dimensions_support()`.
* Adds PHPUnit tests.
Is renaming `'__experimentalDimensions'` a backwards-compatibility (BC) break?
Though the setting has been in the code since 5.9.0, it was never wired to anything, ie it did not expose any controls or styles. Notice in `wp_register_dimensions_support()` and `wp_apply_dimensions_support()` prior to this changeset, there are inline comments as placeholders for height and width support, but no code.
If a developer opted in to use it, it had no effect.
A search in wp.org's plugin and themes repo showed no instances of this experimental setting.
Given there was no functionality attached to it (until this changeset), no change in behavior or effect from removing it, and no usage found in the plugins and themes repository, it does appear to be a BC break.
References:
* [https://github.com/WordPress/gutenberg/pull/45300 Gutenberg PR 45300]
* [https://github.com/WordPress/gutenberg/pull/45334 Gutenberg PR 45334]
Follow-up to [53076], [52069].
Props andrewserong, aaronrobertshaw , costdev, hellofromTonya, isabel_brison, joen, paaljoachim, mukesh27, ntsekouras, oandregal, ramonopoly.
Fixes #57582.
Built from https://develop.svn.wordpress.org/trunk@55175
git-svn-id: http://core.svn.wordpress.org/trunk@54708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-01 17:15:15 +01:00
),
2021-11-08 20:19:58 +01:00
'filter' => array (
'duotone' => null ,
),
2022-12-19 21:55:13 +01:00
'outline' => array (
'color' => null ,
'offset' => null ,
'style' => null ,
'width' => null ,
),
2022-12-20 14:57:15 +01:00
'shadow' => null ,
2021-05-24 19:39:57 +02:00
'spacing' => array (
2021-11-08 20:19:58 +01:00
'margin' => null ,
'padding' => null ,
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
'blockGap' => null ,
2021-05-24 19:39:57 +02:00
),
'typography' => array (
2021-11-08 20:19:58 +01:00
'fontFamily' => null ,
'fontSize' => null ,
'fontStyle' => null ,
'fontWeight' => null ,
'letterSpacing' => null ,
'lineHeight' => null ,
2023-06-22 10:18:19 +02:00
'textColumns' => null ,
2021-11-08 20:19:58 +01:00
'textDecoration' => null ,
'textTransform' => null ,
2023-09-18 08:49:20 +02:00
'writingMode' => null ,
2021-05-24 19:39:57 +02:00
),
Editor: Add support for custom CSS in global styles.
This changeset introduces functions `wp_get_global_styles_custom_css()` and `wp_enqueue_global_styles_custom_css()`, which allow accessing and enqueuing custom CSS added via global styles.
Custom CSS via global styles is handled separately from custom CSS via the Customizer. If a site uses both features, the custom CSS from both sources will be loaded. The global styles custom CSS is then loaded after the Customizer custom CSS, so if there are any conflicts between the rules, the global styles take precedence.
Similarly to e.g. [55185], the result is cached in a non-persistent cache, except when `WP_DEBUG` is on to avoid interrupting the theme developer's workflow.
Props glendaviesnz, oandregal, ntsekouras, mamaduka, davidbaumwald, hellofromtonya, flixos90.
Fixes #57536.
Built from https://develop.svn.wordpress.org/trunk@55192
git-svn-id: http://core.svn.wordpress.org/trunk@54725 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-02 19:52:17 +01:00
'css' => null ,
2021-05-24 19:39:57 +02:00
);
2022-09-10 14:38:12 +02:00
/**
* Defines which pseudo selectors are enabled for which elements .
*
2023-01-24 09:11:15 +01:00
* The order of the selectors should be : link , any - link , visited , hover , focus , active .
* This is to ensure the user action ( hover , focus and active ) styles have a higher
* specificity than the visited styles , which in turn have a higher specificity than
* the unvisited styles .
Themes: Re-order valid link pseudo classes.
Re-order the link pseudo classes to follow the long term LoVe (F)HA rule when set via `theme.json`.
In order that the CSS cascade behaves in a predictable manner, it's recommended that the selectors follow the order `:visited`, `:focus`/`:hover`, `:active`. As order affects the specificity, this ensures the interaction states override the visited states. CSS specificity is really quite beautiful, although complex.
Props mikachan, sabernhardt, davidbaumwald, mukesh27, Mamaduka, desrosj.
Fixes #56928.
Built from https://develop.svn.wordpress.org/trunk@54774
git-svn-id: http://core.svn.wordpress.org/trunk@54326 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-11-09 05:08:16 +01:00
*
* See https :// core . trac . wordpress . org / ticket / 56928.
2022-09-10 14:38:12 +02:00
* Note : this will affect both top - level and block - level elements .
*
* @ since 6.1 . 0
2023-01-24 09:11:15 +01:00
* @ since 6.2 . 0 Added support for ':link' and ':any-link' .
2022-09-10 14:38:12 +02:00
*/
const VALID_ELEMENT_PSEUDO_SELECTORS = array (
2023-01-24 09:11:15 +01:00
'link' => array ( ':link' , ':any-link' , ':visited' , ':hover' , ':focus' , ':active' ),
'button' => array ( ':link' , ':any-link' , ':visited' , ':hover' , ':focus' , ':active' ),
2022-09-10 14:38:12 +02:00
);
2021-05-24 19:39:57 +02:00
/**
2021-11-30 01:24:27 +01:00
* The valid elements that can be found under styles .
*
2021-05-24 19:39:57 +02:00
* @ since 5.8 . 0
2022-11-17 17:58:20 +01:00
* @ since 6.1 . 0 Added `heading` , `button` , and `caption` elements .
2021-07-01 23:02:57 +02:00
* @ var string []
2021-05-24 19:39:57 +02:00
*/
const ELEMENTS = array (
2022-09-10 14:38:12 +02:00
'link' => 'a:where(:not(.wp-element-button))' , // The `where` is needed to lower the specificity.
Global Styles: Add support for `heading`, `button`, and `caption` elements.
This enables themes to:
* Set style rules for all heading elements together rather than having to do it individually.
* Style captions in `theme.json` by adding this into your `theme.json` file:
{{{
{
"styles": {
"elements": {
"caption": {
"color": {
"background": "red",
"text": "yellow"
}
}
}
}
}
}}}
This commit backports the original PRs from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/41981 #41981: Global Styles: Add support for heading elements]
* [https://github.com/WordPress/gutenberg/pull/41140 #41140: Global Styles: Add support for caption elements]
Follow-up to [50973].
Props cbravobernal, scruffian, madhudollu, mikachan, zieladam, bph, poena, andraganescu, ndiego, bgardner.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54105
git-svn-id: http://core.svn.wordpress.org/trunk@53664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-08 18:44:11 +02:00
'heading' => 'h1, h2, h3, h4, h5, h6' ,
'h1' => 'h1' ,
'h2' => 'h2' ,
'h3' => 'h3' ,
'h4' => 'h4' ,
'h5' => 'h5' ,
'h6' => 'h6' ,
// We have the .wp-block-button__link class so that this will target older buttons that have been serialized.
'button' => '.wp-element-button, .wp-block-button__link' ,
// The block classes are necessary to target older content that won't use the new class names.
'caption' => '.wp-element-caption, .wp-block-audio figcaption, .wp-block-embed figcaption, .wp-block-gallery figcaption, .wp-block-image figcaption, .wp-block-table figcaption, .wp-block-video figcaption' ,
2022-10-07 11:46:13 +02:00
'cite' => 'cite' ,
2021-05-24 19:39:57 +02:00
);
2022-09-10 14:38:12 +02:00
const __EXPERIMENTAL_ELEMENT_CLASS_NAMES = array (
'button' => 'wp-element-button' ,
'caption' => 'wp-element-caption' ,
);
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
/**
* List of block support features that can have their related styles
* generated under their own feature level selector rather than the block ' s .
*
* @ since 6.1 . 0
* @ var string []
*/
const BLOCK_SUPPORT_FEATURE_LEVEL_SELECTORS = array (
'__experimentalBorder' => 'border' ,
'color' => 'color' ,
'spacing' => 'spacing' ,
'typography' => 'typography' ,
);
2024-01-31 11:55:10 +01:00
/**
* Return the input schema at the root and per origin .
*
* @ since 6.5 . 0
*
* @ param array $schema The base schema .
* @ return array The schema at the root and per origin .
*
* Example :
* schema_in_root_and_per_origin (
* array (
* 'fontFamily' => null ,
* 'slug' => null ,
* )
* )
*
* Returns :
* array (
* 'fontFamily' => null ,
* 'slug' => null ,
* 'default' => array (
* 'fontFamily' => null ,
* 'slug' => null ,
* ),
* 'blocks' => array (
* 'fontFamily' => null ,
* 'slug' => null ,
* ),
* 'theme' => array (
* 'fontFamily' => null ,
* 'slug' => null ,
* ),
* 'custom' => array (
* 'fontFamily' => null ,
* 'slug' => null ,
* ),
* )
*/
protected static function schema_in_root_and_per_origin ( $schema ) {
$schema_in_root_and_per_origin = $schema ;
foreach ( static :: VALID_ORIGINS as $origin ) {
$schema_in_root_and_per_origin [ $origin ] = $schema ;
}
return $schema_in_root_and_per_origin ;
}
2022-09-10 14:38:12 +02:00
/**
* Returns a class name by an element name .
*
* @ since 6.1 . 0
*
* @ param string $element The name of the element .
* @ return string The name of the class .
*/
public static function get_element_class_name ( $element ) {
$class_name = '' ;
2023-08-01 22:31:25 +02:00
if ( isset ( static :: __EXPERIMENTAL_ELEMENT_CLASS_NAMES [ $element ] ) ) {
2022-09-10 14:38:12 +02:00
$class_name = static :: __EXPERIMENTAL_ELEMENT_CLASS_NAMES [ $element ];
}
return $class_name ;
}
2022-04-11 12:38:00 +02:00
/**
* Options that settings . appearanceTools enables .
*
* @ since 6.0 . 0
2023-02-07 19:01:20 +01:00
* @ since 6.2 . 0 Added `dimensions.minHeight` and `position.sticky` .
2023-09-19 03:29:23 +02:00
* @ since 6.4 . 0 Added `background.backgroundImage` .
2024-01-31 03:54:17 +01:00
* @ since 6.5 . 0 Added `background.backgroundSize` and `dimensions.aspectRatio` .
2022-04-11 12:38:00 +02:00
* @ var array
*/
const APPEARANCE_TOOLS_OPT_INS = array (
2023-09-19 03:29:23 +02:00
array ( 'background' , 'backgroundImage' ),
2024-01-09 07:12:18 +01:00
array ( 'background' , 'backgroundSize' ),
2022-04-11 12:38:00 +02:00
array ( 'border' , 'color' ),
array ( 'border' , 'radius' ),
array ( 'border' , 'style' ),
array ( 'border' , 'width' ),
array ( 'color' , 'link' ),
2023-06-26 03:15:21 +02:00
array ( 'color' , 'heading' ),
array ( 'color' , 'button' ),
array ( 'color' , 'caption' ),
2024-01-31 03:54:17 +01:00
array ( 'dimensions' , 'aspectRatio' ),
Editor: Introduce minimum height dimensions block support.
This changeset adds the new dimension feature's PHP code for supporting minimum height in the block editor inspector and in global styles. Minimum height is quite useful for defining the minimum vertical dimensions of a block, while allowing it to expand beyond that size.
In this changeset:
* Adds support in `theme.json`.
* Adds support in the style engine.
* Adds support in `wp_apply_dimensions_support()`.
* Renames the setting from `'__experimentalDimensions'` to `dimensions` in `wp_register_dimensions_support()`.
* Adds PHPUnit tests.
Is renaming `'__experimentalDimensions'` a backwards-compatibility (BC) break?
Though the setting has been in the code since 5.9.0, it was never wired to anything, ie it did not expose any controls or styles. Notice in `wp_register_dimensions_support()` and `wp_apply_dimensions_support()` prior to this changeset, there are inline comments as placeholders for height and width support, but no code.
If a developer opted in to use it, it had no effect.
A search in wp.org's plugin and themes repo showed no instances of this experimental setting.
Given there was no functionality attached to it (until this changeset), no change in behavior or effect from removing it, and no usage found in the plugins and themes repository, it does appear to be a BC break.
References:
* [https://github.com/WordPress/gutenberg/pull/45300 Gutenberg PR 45300]
* [https://github.com/WordPress/gutenberg/pull/45334 Gutenberg PR 45334]
Follow-up to [53076], [52069].
Props andrewserong, aaronrobertshaw , costdev, hellofromTonya, isabel_brison, joen, paaljoachim, mukesh27, ntsekouras, oandregal, ramonopoly.
Fixes #57582.
Built from https://develop.svn.wordpress.org/trunk@55175
git-svn-id: http://core.svn.wordpress.org/trunk@54708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-01 17:15:15 +01:00
array ( 'dimensions' , 'minHeight' ),
2023-02-07 19:01:20 +01:00
array ( 'position' , 'sticky' ),
2022-04-11 12:38:00 +02:00
array ( 'spacing' , 'blockGap' ),
array ( 'spacing' , 'margin' ),
array ( 'spacing' , 'padding' ),
array ( 'typography' , 'lineHeight' ),
);
2021-05-24 19:39:57 +02:00
/**
2021-11-08 20:19:58 +01:00
* The latest version of the schema in use .
*
2021-05-24 19:39:57 +02:00
* @ since 5.8 . 0
2021-12-04 13:58:01 +01:00
* @ since 5.9 . 0 Changed value from 1 to 2.
2021-05-24 19:39:57 +02:00
* @ var int
*/
2021-11-08 20:19:58 +01:00
const LATEST_SCHEMA = 2 ;
2021-05-24 10:37:55 +02:00
/**
* Constructor .
*
2021-05-24 15:25:56 +02:00
* @ since 5.8 . 0
*
2021-12-06 23:42:00 +01:00
* @ param array $theme_json A structure that follows the theme . json schema .
* @ param string $origin Optional . What source of data this object represents .
* One of 'default' , 'theme' , or 'custom' . Default 'theme' .
2021-05-24 10:37:55 +02:00
*/
2021-06-15 10:52:30 +02:00
public function __construct ( $theme_json = array (), $origin = 'theme' ) {
2022-02-17 10:04:05 +01:00
if ( ! in_array ( $origin , static :: VALID_ORIGINS , true ) ) {
2021-06-15 10:52:30 +02:00
$origin = 'theme' ;
}
2021-11-08 20:19:58 +01:00
$this -> theme_json = WP_Theme_JSON_Schema :: migrate ( $theme_json );
2022-02-17 10:04:05 +01:00
$valid_block_names = array_keys ( static :: get_blocks_metadata () );
$valid_element_names = array_keys ( static :: ELEMENTS );
2023-06-14 09:42:19 +02:00
$valid_variations = array ();
foreach ( self :: get_blocks_metadata () as $block_name => $block_meta ) {
if ( ! isset ( $block_meta [ 'styleVariations' ] ) ) {
continue ;
}
$valid_variations [ $block_name ] = array_keys ( $block_meta [ 'styleVariations' ] );
}
$theme_json = static :: sanitize ( $this -> theme_json , $valid_block_names , $valid_element_names , $valid_variations );
$this -> theme_json = static :: maybe_opt_in_into_settings ( $theme_json );
2021-06-15 10:52:30 +02:00
// Internally, presets are keyed by origin.
2022-02-17 10:04:05 +01:00
$nodes = static :: get_setting_nodes ( $this -> theme_json );
2021-06-15 10:52:30 +02:00
foreach ( $nodes as $node ) {
2022-02-17 10:04:05 +01:00
foreach ( static :: PRESETS_METADATA as $preset_metadata ) {
2022-11-11 02:50:11 +01:00
$path = $node [ 'path' ];
foreach ( $preset_metadata [ 'path' ] as $subpath ) {
$path [] = $subpath ;
}
2021-06-15 10:52:30 +02:00
$preset = _wp_array_get ( $this -> theme_json , $path , null );
if ( null !== $preset ) {
2021-11-30 01:24:27 +01:00
// If the preset is not already keyed by origin.
if ( isset ( $preset [ 0 ] ) || empty ( $preset ) ) {
2021-11-23 06:40:38 +01:00
_wp_array_set ( $this -> theme_json , $path , array ( $origin => $preset ) );
}
2021-06-15 10:52:30 +02:00
}
}
}
2021-05-24 10:37:55 +02:00
}
2021-11-30 01:24:27 +01:00
/**
* Enables some opt - in settings if theme declared support .
*
* @ since 5.9 . 0
*
* @ param array $theme_json A theme . json structure to modify .
* @ return array The modified theme . json structure .
*/
2022-02-17 10:04:05 +01:00
protected static function maybe_opt_in_into_settings ( $theme_json ) {
2021-11-30 01:24:27 +01:00
$new_theme_json = $theme_json ;
2021-12-14 02:57:26 +01:00
if (
isset ( $new_theme_json [ 'settings' ][ 'appearanceTools' ] ) &&
true === $new_theme_json [ 'settings' ][ 'appearanceTools' ]
) {
2022-02-17 10:04:05 +01:00
static :: do_opt_in_into_settings ( $new_theme_json [ 'settings' ] );
2021-11-30 01:24:27 +01:00
}
if ( isset ( $new_theme_json [ 'settings' ][ 'blocks' ] ) && is_array ( $new_theme_json [ 'settings' ][ 'blocks' ] ) ) {
foreach ( $new_theme_json [ 'settings' ][ 'blocks' ] as & $block ) {
2021-12-14 02:57:26 +01:00
if ( isset ( $block [ 'appearanceTools' ] ) && ( true === $block [ 'appearanceTools' ] ) ) {
2022-02-17 10:04:05 +01:00
static :: do_opt_in_into_settings ( $block );
2021-11-30 01:24:27 +01:00
}
}
}
return $new_theme_json ;
}
/**
* Enables some settings .
*
* @ since 5.9 . 0
*
* @ param array $context The context to which the settings belong .
*/
2022-02-17 10:04:05 +01:00
protected static function do_opt_in_into_settings ( & $context ) {
2022-04-11 12:38:00 +02:00
foreach ( static :: APPEARANCE_TOOLS_OPT_INS as $path ) {
2023-07-09 23:40:23 +02:00
/*
* Use " unset prop " as a marker instead of " null " because
* " null " can be a valid value for some props ( e . g . blockGap ) .
*/
2021-12-14 02:57:26 +01:00
if ( 'unset prop' === _wp_array_get ( $context , $path , 'unset prop' ) ) {
2021-11-30 01:24:27 +01:00
_wp_array_set ( $context , $path , true );
}
}
unset ( $context [ 'appearanceTools' ] );
}
2021-05-24 10:37:55 +02:00
/**
* Sanitizes the input according to the schemas .
*
2021-05-24 15:25:56 +02:00
* @ since 5.8 . 0
2021-12-04 13:58:01 +01:00
* @ since 5.9 . 0 Added the `$valid_block_names` and `$valid_element_name` parameters .
2023-06-14 12:46:19 +02:00
* @ since 6.3 . 0 Added the `$valid_variations` parameter .
2021-05-24 10:37:55 +02:00
*
2021-12-04 13:58:01 +01:00
* @ param array $input Structure to sanitize .
* @ param array $valid_block_names List of valid block names .
2021-11-08 20:19:58 +01:00
* @ param array $valid_element_names List of valid element names .
2023-06-14 12:46:19 +02:00
* @ param array $valid_variations List of valid variations per block .
2021-05-24 10:37:55 +02:00
* @ return array The sanitized output .
*/
2023-06-14 09:42:19 +02:00
protected static function sanitize ( $input , $valid_block_names , $valid_element_names , $valid_variations ) {
2022-09-10 14:38:12 +02:00
2021-05-24 10:37:55 +02:00
$output = array ();
if ( ! is_array ( $input ) ) {
return $output ;
}
2022-09-10 14:38:12 +02:00
// Preserve only the top most level keys.
2022-02-17 10:04:05 +01:00
$output = array_intersect_key ( $input , array_flip ( static :: VALID_TOP_LEVEL_KEYS ) );
2021-05-24 10:37:55 +02:00
2022-09-10 14:38:12 +02:00
/*
* Remove any rules that are annotated as " top " in VALID_STYLES constant .
* Some styles are only meant to be available at the top - level ( e . g .: blockGap ),
* hence , the schema for blocks & elements should not have them .
*/
2022-02-17 10:04:05 +01:00
$styles_non_top_level = static :: VALID_STYLES ;
2022-01-04 06:39:28 +01:00
foreach ( array_keys ( $styles_non_top_level ) as $section ) {
2022-11-11 02:50:11 +01:00
// array_key_exists() needs to be used instead of isset() because the value can be null.
2022-09-20 15:50:09 +02:00
if ( array_key_exists ( $section , $styles_non_top_level ) && is_array ( $styles_non_top_level [ $section ] ) ) {
foreach ( array_keys ( $styles_non_top_level [ $section ] ) as $prop ) {
if ( 'top' === $styles_non_top_level [ $section ][ $prop ] ) {
unset ( $styles_non_top_level [ $section ][ $prop ] );
}
2022-01-04 06:39:28 +01:00
}
}
}
2021-11-08 20:19:58 +01:00
// Build the schema based on valid block & element names.
2021-05-24 10:37:55 +02:00
$schema = array ();
2021-05-24 19:39:57 +02:00
$schema_styles_elements = array ();
2022-09-10 14:38:12 +02:00
/*
* Set allowed element pseudo selectors based on per element allow list .
* Target data structure in schema :
* e . g .
* - top level elements : `$schema['styles']['elements']['link'][':hover']` .
* - block level elements : `$schema['styles']['blocks']['core/button']['elements']['link'][':hover']` .
*/
2021-11-08 20:19:58 +01:00
foreach ( $valid_element_names as $element ) {
2022-01-04 06:39:28 +01:00
$schema_styles_elements [ $element ] = $styles_non_top_level ;
2022-09-10 14:38:12 +02:00
2023-08-01 22:31:25 +02:00
if ( isset ( static :: VALID_ELEMENT_PSEUDO_SELECTORS [ $element ] ) ) {
2022-09-10 14:38:12 +02:00
foreach ( static :: VALID_ELEMENT_PSEUDO_SELECTORS [ $element ] as $pseudo_selector ) {
$schema_styles_elements [ $element ][ $pseudo_selector ] = $styles_non_top_level ;
}
}
2021-05-24 19:39:57 +02:00
}
2022-09-10 14:38:12 +02:00
2021-05-24 19:39:57 +02:00
$schema_styles_blocks = array ();
2021-05-24 10:37:55 +02:00
$schema_settings_blocks = array ();
2021-11-08 20:19:58 +01:00
foreach ( $valid_block_names as $block ) {
2023-02-01 14:43:18 +01:00
// Build the schema for each block style variation.
$style_variation_names = array ();
if (
! empty ( $input [ 'styles' ][ 'blocks' ][ $block ][ 'variations' ] ) &&
2023-06-14 09:42:19 +02:00
is_array ( $input [ 'styles' ][ 'blocks' ][ $block ][ 'variations' ] ) &&
isset ( $valid_variations [ $block ] )
2023-02-01 14:43:18 +01:00
) {
2023-06-14 09:42:19 +02:00
$style_variation_names = array_intersect (
array_keys ( $input [ 'styles' ][ 'blocks' ][ $block ][ 'variations' ] ),
$valid_variations [ $block ]
);
2023-02-01 14:43:18 +01:00
}
$schema_styles_variations = array ();
if ( ! empty ( $style_variation_names ) ) {
$schema_styles_variations = array_fill_keys ( $style_variation_names , $styles_non_top_level );
}
$schema_settings_blocks [ $block ] = static :: VALID_SETTINGS ;
$schema_styles_blocks [ $block ] = $styles_non_top_level ;
$schema_styles_blocks [ $block ][ 'elements' ] = $schema_styles_elements ;
$schema_styles_blocks [ $block ][ 'variations' ] = $schema_styles_variations ;
2021-05-24 10:37:55 +02:00
}
2022-09-10 14:38:12 +02:00
2024-01-31 11:55:10 +01:00
$schema [ 'styles' ] = static :: VALID_STYLES ;
$schema [ 'styles' ][ 'blocks' ] = $schema_styles_blocks ;
$schema [ 'styles' ][ 'elements' ] = $schema_styles_elements ;
$schema [ 'settings' ] = static :: VALID_SETTINGS ;
$schema [ 'settings' ][ 'blocks' ] = $schema_settings_blocks ;
$schema [ 'settings' ][ 'typography' ][ 'fontFamilies' ] = static :: schema_in_root_and_per_origin ( static :: FONT_FAMILY_SCHEMA );
2021-05-24 10:37:55 +02:00
// Remove anything that's not present in the schema.
2021-05-24 19:39:57 +02:00
foreach ( array ( 'styles' , 'settings' ) as $subtree ) {
2021-05-24 10:37:55 +02:00
if ( ! isset ( $input [ $subtree ] ) ) {
continue ;
}
if ( ! is_array ( $input [ $subtree ] ) ) {
unset ( $output [ $subtree ] );
continue ;
}
2022-02-17 10:04:05 +01:00
$result = static :: remove_keys_not_in_schema ( $input [ $subtree ], $schema [ $subtree ] );
2021-05-24 10:37:55 +02:00
if ( empty ( $result ) ) {
unset ( $output [ $subtree ] );
} else {
2023-06-21 09:56:18 +02:00
$output [ $subtree ] = static :: resolve_custom_css_format ( $result );
2021-05-24 10:37:55 +02:00
}
}
return $output ;
}
2021-11-30 01:24:27 +01:00
2022-09-10 14:38:12 +02:00
/**
* Appends a sub - selector to an existing one .
*
* Given the compounded $selector " h1, h2, h3 "
* and the $to_append selector " .some-class " the result will be
* " h1.some-class, h2.some-class, h3.some-class " .
*
* @ since 5.8 . 0
* @ since 6.1 . 0 Added append position .
2023-06-20 19:54:19 +02:00
* @ since 6.3 . 0 Removed append position parameter .
2022-09-10 14:38:12 +02:00
*
* @ param string $selector Original selector .
* @ param string $to_append Selector to append .
2022-10-07 14:01:13 +02:00
* @ return string The new selector .
2022-09-10 14:38:12 +02:00
*/
2023-06-20 19:54:19 +02:00
protected static function append_to_selector ( $selector , $to_append ) {
2023-06-12 13:22:23 +02:00
if ( ! str_contains ( $selector , ',' ) ) {
2023-06-20 19:54:19 +02:00
return $selector . $to_append ;
2023-06-12 13:22:23 +02:00
}
2022-09-10 14:38:12 +02:00
$new_selectors = array ();
$selectors = explode ( ',' , $selector );
foreach ( $selectors as $sel ) {
2023-06-20 19:54:19 +02:00
$new_selectors [] = $sel . $to_append ;
}
return implode ( ',' , $new_selectors );
}
/**
* Prepends a sub - selector to an existing one .
*
* Given the compounded $selector " h1, h2, h3 "
* and the $to_prepend selector " .some-class " the result will be
* " .some-class h1, .some-class h2, .some-class h3 " .
*
* @ since 6.3 . 0
*
* @ param string $selector Original selector .
* @ param string $to_prepend Selector to prepend .
* @ return string The new selector .
*/
protected static function prepend_to_selector ( $selector , $to_prepend ) {
if ( ! str_contains ( $selector , ',' ) ) {
return $to_prepend . $selector ;
}
$new_selectors = array ();
$selectors = explode ( ',' , $selector );
foreach ( $selectors as $sel ) {
$new_selectors [] = $to_prepend . $sel ;
2022-09-10 14:38:12 +02:00
}
return implode ( ',' , $new_selectors );
}
2021-05-24 19:39:57 +02:00
/**
* Returns the metadata for each block .
*
* Example :
*
2021-06-23 21:05:57 +02:00
* {
* 'core/paragraph' : {
* 'selector' : 'p' ,
* 'elements' : {
* 'link' => 'link selector' ,
* 'etc' => 'element selector'
* }
* },
* 'core/heading' : {
* 'selector' : 'h1' ,
* 'elements' : {}
2021-11-08 20:19:58 +01:00
* },
* 'core/image' : {
* 'selector' : '.wp-block-image' ,
* 'duotone' : 'img' ,
2021-06-23 21:05:57 +02:00
* 'elements' : {}
* }
2021-05-24 19:39:57 +02:00
* }
*
* @ since 5.8 . 0
2021-12-04 13:58:01 +01:00
* @ since 5.9 . 0 Added `duotone` key with CSS selector .
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
* @ since 6.1 . 0 Added `features` key with block support feature level selectors .
2023-06-27 10:48:24 +02:00
* @ since 6.3 . 0 Refactored and stabilized selectors API .
2021-05-24 19:39:57 +02:00
*
* @ return array Block metadata .
*/
2022-02-17 10:04:05 +01:00
protected static function get_blocks_metadata () {
2022-10-04 17:50:12 +02:00
$registry = WP_Block_Type_Registry :: get_instance ();
$blocks = $registry -> get_all_registered ();
// Is there metadata for all currently registered blocks?
$blocks = array_diff_key ( $blocks , static :: $blocks_metadata );
if ( empty ( $blocks ) ) {
2022-02-17 10:04:05 +01:00
return static :: $blocks_metadata ;
2021-05-24 19:39:57 +02:00
}
foreach ( $blocks as $block_name => $block_type ) {
2023-06-27 10:48:24 +02:00
$root_selector = wp_get_block_css_selector ( $block_type );
2021-05-24 19:39:57 +02:00
2023-06-27 10:48:24 +02:00
static :: $blocks_metadata [ $block_name ][ 'selector' ] = $root_selector ;
static :: $blocks_metadata [ $block_name ][ 'selectors' ] = static :: get_block_selectors ( $block_type , $root_selector );
$elements = static :: get_block_element_selectors ( $root_selector );
if ( ! empty ( $elements ) ) {
static :: $blocks_metadata [ $block_name ][ 'elements' ] = $elements ;
2021-11-08 20:19:58 +01:00
}
2023-06-27 10:48:24 +02:00
// The block may or may not have a duotone selector.
$duotone_selector = wp_get_block_css_selector ( $block_type , 'filter.duotone' );
// Keep backwards compatibility for support.color.__experimentalDuotone.
if ( null === $duotone_selector ) {
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
$duotone_support = isset ( $block_type -> supports [ 'color' ][ '__experimentalDuotone' ] )
? $block_type -> supports [ 'color' ][ '__experimentalDuotone' ]
: null ;
2023-06-27 10:48:24 +02:00
if ( $duotone_support ) {
$root_selector = wp_get_block_css_selector ( $block_type );
2024-01-25 11:43:12 +01:00
$duotone_selector = static :: scope_selector ( $root_selector , $duotone_support );
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
}
}
2023-06-27 10:48:24 +02:00
if ( null !== $duotone_selector ) {
static :: $blocks_metadata [ $block_name ][ 'duotone' ] = $duotone_selector ;
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
}
2023-02-01 14:43:18 +01:00
// If the block has style variations, append their selectors to the block metadata.
if ( ! empty ( $block_type -> styles ) ) {
$style_selectors = array ();
foreach ( $block_type -> styles as $style ) {
2024-02-07 09:53:13 +01:00
$style_selectors [ $style [ 'name' ] ] = static :: get_block_style_variation_selector ( $style [ 'name' ], static :: $blocks_metadata [ $block_name ][ 'selector' ] );
2023-02-01 14:43:18 +01:00
}
static :: $blocks_metadata [ $block_name ][ 'styleVariations' ] = $style_selectors ;
}
2021-05-24 19:39:57 +02:00
}
2022-02-17 10:04:05 +01:00
return static :: $blocks_metadata ;
2021-05-24 19:39:57 +02:00
}
2021-05-24 10:37:55 +02:00
/**
* Given a tree , removes the keys that are not present in the schema .
*
* It is recursive and modifies the input in - place .
*
2021-05-24 15:25:56 +02:00
* @ since 5.8 . 0
*
2021-06-30 21:00:58 +02:00
* @ param array $tree Input to process .
2021-05-24 10:37:55 +02:00
* @ param array $schema Schema to adhere to .
2022-10-07 14:01:13 +02:00
* @ return array The modified $tree .
2021-05-24 10:37:55 +02:00
*/
2022-02-17 10:04:05 +01:00
protected static function remove_keys_not_in_schema ( $tree , $schema ) {
2024-01-31 11:55:10 +01:00
if ( ! is_array ( $tree ) ) {
return $tree ;
}
2021-05-24 10:37:55 +02:00
2024-01-31 11:55:10 +01:00
foreach ( $tree as $key => $value ) {
// Remove keys not in the schema or with null/empty values.
if ( ! array_key_exists ( $key , $schema ) ) {
unset ( $tree [ $key ] );
2021-05-24 10:37:55 +02:00
continue ;
}
2024-01-31 11:55:10 +01:00
// Check if the value is an array and requires further processing.
if ( is_array ( $value ) && is_array ( $schema [ $key ] ) ) {
// Determine if it is an associative or indexed array.
$schema_is_assoc = self :: is_assoc ( $value );
2021-05-24 10:37:55 +02:00
2024-01-31 11:55:10 +01:00
if ( $schema_is_assoc ) {
// If associative, process as a single object.
$tree [ $key ] = self :: remove_keys_not_in_schema ( $value , $schema [ $key ] );
if ( empty ( $tree [ $key ] ) ) {
unset ( $tree [ $key ] );
}
} else {
// If indexed, process each item in the array.
foreach ( $value as $item_key => $item_value ) {
if ( isset ( $schema [ $key ][ 0 ] ) && is_array ( $schema [ $key ][ 0 ] ) ) {
$tree [ $key ][ $item_key ] = self :: remove_keys_not_in_schema ( $item_value , $schema [ $key ][ 0 ] );
} else {
// If the schema does not define a further structure, keep the value as is.
$tree [ $key ][ $item_key ] = $item_value ;
}
}
2021-05-24 10:37:55 +02:00
}
} elseif ( is_array ( $schema [ $key ] ) && ! is_array ( $tree [ $key ] ) ) {
unset ( $tree [ $key ] );
}
}
return $tree ;
}
2024-01-31 11:55:10 +01:00
/**
* Checks if the given array is associative .
*
* @ since 6.5 . 0
* @ param array $data The array to check .
* @ return bool True if the array is associative , false otherwise .
*/
protected static function is_assoc ( $data ) {
if ( array () === $data ) {
return false ;
}
return array_keys ( $data ) !== range ( 0 , count ( $data ) - 1 );
}
2021-05-24 10:37:55 +02:00
/**
* Returns the existing settings for each block .
*
* Example :
*
2021-05-24 15:25:56 +02:00
* {
* 'root' : {
* 'color' : {
* 'custom' : true
* }
* },
* 'core/paragraph' : {
* 'spacing' : {
* 'customPadding' : true
* }
* }
2021-05-24 10:37:55 +02:00
* }
2021-05-24 15:25:56 +02:00
*
* @ since 5.8 . 0
2021-05-24 10:37:55 +02:00
*
* @ return array Settings per block .
*/
public function get_settings () {
if ( ! isset ( $this -> theme_json [ 'settings' ] ) ) {
return array ();
} else {
return $this -> theme_json [ 'settings' ];
}
}
2021-05-24 19:39:57 +02:00
/**
* Returns the stylesheet that results of processing
* the theme . json structure this object represents .
*
* @ since 5.8 . 0
2023-05-03 21:46:21 +02:00
* @ since 5.9 . 0 Removed the `$type` parameter , added the `$types` and `$origins` parameters .
2023-06-28 05:49:27 +02:00
* @ since 6.3 . 0 Add fallback layout styles for Post Template when block gap support isn ' t available .
2021-05-24 19:39:57 +02:00
*
2023-05-03 20:48:22 +02:00
* @ param string [] $types Types of styles to load . Will load all by default . It accepts :
* - `variables` : only the CSS Custom Properties for presets & custom ones .
* - `styles` : only the styles section in theme . json .
* - `presets` : only the classes for the presets .
* @ param string [] $origins A list of origins to include . By default it includes VALID_ORIGINS .
* @ param array $options An array of options for now used for internal purposes only ( may change without notice ) .
* The options currently supported are 'scope' that makes sure all style are scoped to a
* given selector , and root_selector which overwrites and forces a given selector to be
* used on the root node .
2022-10-07 14:01:13 +02:00
* @ return string The resulting stylesheet .
2021-05-24 19:39:57 +02:00
*/
2023-02-07 13:42:20 +01:00
public function get_stylesheet ( $types = array ( 'variables' , 'styles' , 'presets' ), $origins = null , $options = array () ) {
2022-02-17 10:04:05 +01:00
if ( null === $origins ) {
$origins = static :: VALID_ORIGINS ;
}
2021-11-08 20:19:58 +01:00
if ( is_string ( $types ) ) {
// Dispatch error and map old arguments to new ones.
2021-12-04 13:58:01 +01:00
_deprecated_argument ( __FUNCTION__ , '5.9.0' );
2021-11-08 20:19:58 +01:00
if ( 'block_styles' === $types ) {
$types = array ( 'styles' , 'presets' );
} elseif ( 'css_variables' === $types ) {
$types = array ( 'variables' );
} else {
$types = array ( 'variables' , 'styles' , 'presets' );
}
}
2022-02-17 10:04:05 +01:00
$blocks_metadata = static :: get_blocks_metadata ();
$style_nodes = static :: get_style_nodes ( $this -> theme_json , $blocks_metadata );
$setting_nodes = static :: get_setting_nodes ( $this -> theme_json , $blocks_metadata );
2021-05-24 19:39:57 +02:00
2023-02-07 13:42:20 +01:00
$root_style_key = array_search ( static :: ROOT_BLOCK_SELECTOR , array_column ( $style_nodes , 'selector' ), true );
$root_settings_key = array_search ( static :: ROOT_BLOCK_SELECTOR , array_column ( $setting_nodes , 'selector' ), true );
if ( ! empty ( $options [ 'scope' ] ) ) {
foreach ( $setting_nodes as & $node ) {
$node [ 'selector' ] = static :: scope_selector ( $options [ 'scope' ], $node [ 'selector' ] );
}
foreach ( $style_nodes as & $node ) {
$node [ 'selector' ] = static :: scope_selector ( $options [ 'scope' ], $node [ 'selector' ] );
}
2024-01-23 18:11:11 +01:00
unset ( $node );
2023-02-07 13:42:20 +01:00
}
if ( ! empty ( $options [ 'root_selector' ] ) ) {
if ( false !== $root_settings_key ) {
$setting_nodes [ $root_settings_key ][ 'selector' ] = $options [ 'root_selector' ];
}
if ( false !== $root_style_key ) {
2024-01-25 11:43:12 +01:00
$style_nodes [ $root_style_key ][ 'selector' ] = $options [ 'root_selector' ];
2023-02-07 13:42:20 +01:00
}
}
2021-11-08 20:19:58 +01:00
$stylesheet = '' ;
if ( in_array ( 'variables' , $types , true ) ) {
$stylesheet .= $this -> get_css_variables ( $setting_nodes , $origins );
}
if ( in_array ( 'styles' , $types , true ) ) {
2023-02-07 13:42:20 +01:00
if ( false !== $root_style_key ) {
$stylesheet .= $this -> get_root_layout_rules ( $style_nodes [ $root_style_key ][ 'selector' ], $style_nodes [ $root_style_key ] );
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
}
2021-11-08 20:19:58 +01:00
$stylesheet .= $this -> get_block_classes ( $style_nodes );
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
} elseif ( in_array ( 'base-layout-styles' , $types , true ) ) {
2023-06-28 05:49:27 +02:00
$root_selector = static :: ROOT_BLOCK_SELECTOR ;
$columns_selector = '.wp-block-columns' ;
$post_template_selector = '.wp-block-post-template' ;
2023-02-07 13:42:20 +01:00
if ( ! empty ( $options [ 'scope' ] ) ) {
2023-06-28 05:49:27 +02:00
$root_selector = static :: scope_selector ( $options [ 'scope' ], $root_selector );
$columns_selector = static :: scope_selector ( $options [ 'scope' ], $columns_selector );
$post_template_selector = static :: scope_selector ( $options [ 'scope' ], $post_template_selector );
2023-02-07 13:42:20 +01:00
}
if ( ! empty ( $options [ 'root_selector' ] ) ) {
$root_selector = $options [ 'root_selector' ];
}
2023-07-09 23:40:23 +02:00
/*
* Base layout styles are provided as part of `styles` , so only output separately if explicitly requested .
* For backwards compatibility , the Columns block is explicitly included , to support a different default gap value .
*/
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
$base_styles_nodes = array (
array (
'path' => array ( 'styles' ),
2023-02-07 13:42:20 +01:00
'selector' => $root_selector ,
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
),
array (
'path' => array ( 'styles' , 'blocks' , 'core/columns' ),
2023-02-07 13:42:20 +01:00
'selector' => $columns_selector ,
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
'name' => 'core/columns' ,
),
2023-06-28 05:49:27 +02:00
array (
'path' => array ( 'styles' , 'blocks' , 'core/post-template' ),
'selector' => $post_template_selector ,
'name' => 'core/post-template' ,
),
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
);
foreach ( $base_styles_nodes as $base_style_node ) {
$stylesheet .= $this -> get_layout_styles ( $base_style_node );
}
2021-05-24 19:39:57 +02:00
}
2021-11-08 20:19:58 +01:00
if ( in_array ( 'presets' , $types , true ) ) {
$stylesheet .= $this -> get_preset_classes ( $setting_nodes , $origins );
}
return $stylesheet ;
}
2023-02-03 19:25:22 +01:00
/**
* Processes the CSS , to apply nesting .
*
* @ since 6.2 . 0
*
* @ param string $css The CSS to process .
* @ param string $selector The selector to nest .
* @ return string The processed CSS .
*/
protected function process_blocks_custom_css ( $css , $selector ) {
$processed_css = '' ;
// Split CSS nested rules.
$parts = explode ( '&' , $css );
foreach ( $parts as $part ) {
2023-10-10 05:43:22 +02:00
$is_root_css = ( ! str_contains ( $part , '{' ) );
if ( $is_root_css ) {
// If the part doesn't contain braces, it applies to the root level.
$processed_css .= trim ( $selector ) . '{' . trim ( $part ) . '}' ;
} else {
// If the part contains braces, it's a nested CSS rule.
$part = explode ( '{' , str_replace ( '}' , '' , $part ) );
if ( count ( $part ) !== 2 ) {
continue ;
}
$nested_selector = $part [ 0 ];
$css_value = $part [ 1 ];
$part_selector = str_starts_with ( $nested_selector , ' ' )
? static :: scope_selector ( $selector , $nested_selector )
: static :: append_to_selector ( $selector , $nested_selector );
$processed_css .= $part_selector . '{' . trim ( $css_value ) . '}' ;
}
2023-02-03 19:25:22 +01:00
}
return $processed_css ;
}
Editor: Add support for custom CSS in global styles.
This changeset introduces functions `wp_get_global_styles_custom_css()` and `wp_enqueue_global_styles_custom_css()`, which allow accessing and enqueuing custom CSS added via global styles.
Custom CSS via global styles is handled separately from custom CSS via the Customizer. If a site uses both features, the custom CSS from both sources will be loaded. The global styles custom CSS is then loaded after the Customizer custom CSS, so if there are any conflicts between the rules, the global styles take precedence.
Similarly to e.g. [55185], the result is cached in a non-persistent cache, except when `WP_DEBUG` is on to avoid interrupting the theme developer's workflow.
Props glendaviesnz, oandregal, ntsekouras, mamaduka, davidbaumwald, hellofromtonya, flixos90.
Fixes #57536.
Built from https://develop.svn.wordpress.org/trunk@55192
git-svn-id: http://core.svn.wordpress.org/trunk@54725 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-02 19:52:17 +01:00
/**
2023-05-03 20:48:22 +02:00
* Returns the global styles custom CSS .
Editor: Add support for custom CSS in global styles.
This changeset introduces functions `wp_get_global_styles_custom_css()` and `wp_enqueue_global_styles_custom_css()`, which allow accessing and enqueuing custom CSS added via global styles.
Custom CSS via global styles is handled separately from custom CSS via the Customizer. If a site uses both features, the custom CSS from both sources will be loaded. The global styles custom CSS is then loaded after the Customizer custom CSS, so if there are any conflicts between the rules, the global styles take precedence.
Similarly to e.g. [55185], the result is cached in a non-persistent cache, except when `WP_DEBUG` is on to avoid interrupting the theme developer's workflow.
Props glendaviesnz, oandregal, ntsekouras, mamaduka, davidbaumwald, hellofromtonya, flixos90.
Fixes #57536.
Built from https://develop.svn.wordpress.org/trunk@55192
git-svn-id: http://core.svn.wordpress.org/trunk@54725 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-02 19:52:17 +01:00
*
* @ since 6.2 . 0
*
2023-02-03 19:25:22 +01:00
* @ return string The global styles custom CSS .
Editor: Add support for custom CSS in global styles.
This changeset introduces functions `wp_get_global_styles_custom_css()` and `wp_enqueue_global_styles_custom_css()`, which allow accessing and enqueuing custom CSS added via global styles.
Custom CSS via global styles is handled separately from custom CSS via the Customizer. If a site uses both features, the custom CSS from both sources will be loaded. The global styles custom CSS is then loaded after the Customizer custom CSS, so if there are any conflicts between the rules, the global styles take precedence.
Similarly to e.g. [55185], the result is cached in a non-persistent cache, except when `WP_DEBUG` is on to avoid interrupting the theme developer's workflow.
Props glendaviesnz, oandregal, ntsekouras, mamaduka, davidbaumwald, hellofromtonya, flixos90.
Fixes #57536.
Built from https://develop.svn.wordpress.org/trunk@55192
git-svn-id: http://core.svn.wordpress.org/trunk@54725 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-02 19:52:17 +01:00
*/
public function get_custom_css () {
// Add the global styles root CSS.
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
$stylesheet = isset ( $this -> theme_json [ 'styles' ][ 'css' ] ) ? $this -> theme_json [ 'styles' ][ 'css' ] : '' ;
Editor: Add support for custom CSS in global styles.
This changeset introduces functions `wp_get_global_styles_custom_css()` and `wp_enqueue_global_styles_custom_css()`, which allow accessing and enqueuing custom CSS added via global styles.
Custom CSS via global styles is handled separately from custom CSS via the Customizer. If a site uses both features, the custom CSS from both sources will be loaded. The global styles custom CSS is then loaded after the Customizer custom CSS, so if there are any conflicts between the rules, the global styles take precedence.
Similarly to e.g. [55185], the result is cached in a non-persistent cache, except when `WP_DEBUG` is on to avoid interrupting the theme developer's workflow.
Props glendaviesnz, oandregal, ntsekouras, mamaduka, davidbaumwald, hellofromtonya, flixos90.
Fixes #57536.
Built from https://develop.svn.wordpress.org/trunk@55192
git-svn-id: http://core.svn.wordpress.org/trunk@54725 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-02 19:52:17 +01:00
// Add the global styles block CSS.
if ( isset ( $this -> theme_json [ 'styles' ][ 'blocks' ] ) ) {
foreach ( $this -> theme_json [ 'styles' ][ 'blocks' ] as $name => $node ) {
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
$custom_block_css = isset ( $this -> theme_json [ 'styles' ][ 'blocks' ][ $name ][ 'css' ] )
? $this -> theme_json [ 'styles' ][ 'blocks' ][ $name ][ 'css' ]
: null ;
Editor: Add support for custom CSS in global styles.
This changeset introduces functions `wp_get_global_styles_custom_css()` and `wp_enqueue_global_styles_custom_css()`, which allow accessing and enqueuing custom CSS added via global styles.
Custom CSS via global styles is handled separately from custom CSS via the Customizer. If a site uses both features, the custom CSS from both sources will be loaded. The global styles custom CSS is then loaded after the Customizer custom CSS, so if there are any conflicts between the rules, the global styles take precedence.
Similarly to e.g. [55185], the result is cached in a non-persistent cache, except when `WP_DEBUG` is on to avoid interrupting the theme developer's workflow.
Props glendaviesnz, oandregal, ntsekouras, mamaduka, davidbaumwald, hellofromtonya, flixos90.
Fixes #57536.
Built from https://develop.svn.wordpress.org/trunk@55192
git-svn-id: http://core.svn.wordpress.org/trunk@54725 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-02 19:52:17 +01:00
if ( $custom_block_css ) {
$selector = static :: $blocks_metadata [ $name ][ 'selector' ];
$stylesheet .= $this -> process_blocks_custom_css ( $custom_block_css , $selector );
}
}
}
return $stylesheet ;
}
2021-11-08 20:19:58 +01:00
/**
2022-01-21 00:53:05 +01:00
* Returns the page templates of the active theme .
2021-11-08 20:19:58 +01:00
*
* @ since 5.9 . 0
*
* @ return array
*/
public function get_custom_templates () {
$custom_templates = array ();
2021-11-09 00:10:59 +01:00
if ( ! isset ( $this -> theme_json [ 'customTemplates' ] ) || ! is_array ( $this -> theme_json [ 'customTemplates' ] ) ) {
2021-11-08 20:19:58 +01:00
return $custom_templates ;
}
foreach ( $this -> theme_json [ 'customTemplates' ] as $item ) {
if ( isset ( $item [ 'name' ] ) ) {
$custom_templates [ $item [ 'name' ] ] = array (
'title' => isset ( $item [ 'title' ] ) ? $item [ 'title' ] : '' ,
'postTypes' => isset ( $item [ 'postTypes' ] ) ? $item [ 'postTypes' ] : array ( 'page' ),
);
}
}
return $custom_templates ;
}
/**
2022-01-21 00:53:05 +01:00
* Returns the template part data of active theme .
2021-11-08 20:19:58 +01:00
*
* @ since 5.9 . 0
*
* @ return array
*/
public function get_template_parts () {
$template_parts = array ();
2021-11-09 00:10:59 +01:00
if ( ! isset ( $this -> theme_json [ 'templateParts' ] ) || ! is_array ( $this -> theme_json [ 'templateParts' ] ) ) {
2021-11-08 20:19:58 +01:00
return $template_parts ;
}
foreach ( $this -> theme_json [ 'templateParts' ] as $item ) {
if ( isset ( $item [ 'name' ] ) ) {
$template_parts [ $item [ 'name' ] ] = array (
'title' => isset ( $item [ 'title' ] ) ? $item [ 'title' ] : '' ,
'area' => isset ( $item [ 'area' ] ) ? $item [ 'area' ] : '' ,
);
}
}
return $template_parts ;
2021-05-24 19:39:57 +02:00
}
/**
* Converts each style section into a list of rulesets
* containing the block styles to be appended to the stylesheet .
*
* See glossary at https :// developer . mozilla . org / en - US / docs / Web / CSS / Syntax
*
* For each section this creates a new ruleset such as :
*
* block - selector {
* style - property - one : value ;
* }
*
2021-12-04 16:57:01 +01:00
* @ since 5.8 . 0 As `get_block_styles()` .
2021-12-04 13:58:01 +01:00
* @ since 5.9 . 0 Renamed from `get_block_styles()` to `get_block_classes()`
* and no longer returns preset classes .
2021-12-04 16:57:01 +01:00
* Removed the `$setting_nodes` parameter .
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
* @ since 6.1 . 0 Moved most internal logic to `get_styles_for_block()` .
2021-05-24 19:39:57 +02:00
*
2021-11-08 20:19:58 +01:00
* @ param array $style_nodes Nodes with styles .
2021-05-24 19:39:57 +02:00
* @ return string The new stylesheet .
*/
2022-02-17 10:04:05 +01:00
protected function get_block_classes ( $style_nodes ) {
2021-05-24 19:39:57 +02:00
$block_rules = '' ;
2021-11-08 20:19:58 +01:00
2021-05-24 19:39:57 +02:00
foreach ( $style_nodes as $metadata ) {
if ( null === $metadata [ 'selector' ] ) {
continue ;
}
2022-09-10 14:38:12 +02:00
$block_rules .= static :: get_styles_for_block ( $metadata );
2021-05-24 19:39:57 +02:00
}
2021-11-08 20:19:58 +01:00
return $block_rules ;
}
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
/**
2022-10-07 14:01:13 +02:00
* Gets the CSS layout rules for a particular block from theme . json layout definitions .
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
*
* @ since 6.1 . 0
2023-06-21 07:32:19 +02:00
* @ since 6.3 . 0 Reduced specificity for layout margin rules .
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
*
* @ param array $block_metadata Metadata about the block to get styles for .
* @ return string Layout styles for the block .
*/
protected function get_layout_styles ( $block_metadata ) {
$block_rules = '' ;
$block_type = null ;
// Skip outputting layout styles if explicitly disabled.
if ( current_theme_supports ( 'disable-layout-styles' ) ) {
return $block_rules ;
}
if ( isset ( $block_metadata [ 'name' ] ) ) {
$block_type = WP_Block_Type_Registry :: get_instance () -> get_registered ( $block_metadata [ 'name' ] );
2023-08-10 18:48:19 +02:00
if ( ! block_has_support ( $block_type , 'layout' , false ) && ! block_has_support ( $block_type , '__experimentalLayout' , false ) ) {
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
return $block_rules ;
}
}
$selector = isset ( $block_metadata [ 'selector' ] ) ? $block_metadata [ 'selector' ] : '' ;
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
$has_block_gap_support = isset ( $this -> theme_json [ 'settings' ][ 'spacing' ][ 'blockGap' ] );
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
$has_fallback_gap_support = ! $has_block_gap_support ; // This setting isn't useful yet: it exists as a placeholder for a future explicit fallback gap styles support.
$node = _wp_array_get ( $this -> theme_json , $block_metadata [ 'path' ], array () );
2023-06-27 09:25:22 +02:00
$layout_definitions = wp_get_layout_definitions ();
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
$layout_selector_pattern = '/^[a-zA-Z0-9\-\.\ *+>:\(\)]*$/' ; // Allow alphanumeric classnames, spaces, wildcard, sibling, child combinator and pseudo class selectors.
2023-07-09 23:40:23 +02:00
/*
* Gap styles will only be output if the theme has block gap support , or supports a fallback gap .
* Default layout gap styles will be skipped for themes that do not explicitly opt - in to blockGap with a `true` or `false` value .
*/
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
if ( $has_block_gap_support || $has_fallback_gap_support ) {
$block_gap_value = null ;
// Use a fallback gap value if block gap support is not available.
if ( ! $has_block_gap_support ) {
$block_gap_value = static :: ROOT_BLOCK_SELECTOR === $selector ? '0.5em' : null ;
if ( ! empty ( $block_type ) ) {
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
$block_gap_value = isset ( $block_type -> supports [ 'spacing' ][ 'blockGap' ][ '__experimentalDefault' ] )
? $block_type -> supports [ 'spacing' ][ 'blockGap' ][ '__experimentalDefault' ]
: null ;
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
}
} else {
$block_gap_value = static :: get_property_value ( $node , array ( 'spacing' , 'blockGap' ) );
}
// Support split row / column values and concatenate to a shorthand value.
if ( is_array ( $block_gap_value ) ) {
if ( isset ( $block_gap_value [ 'top' ] ) && isset ( $block_gap_value [ 'left' ] ) ) {
$gap_row = static :: get_property_value ( $node , array ( 'spacing' , 'blockGap' , 'top' ) );
$gap_column = static :: get_property_value ( $node , array ( 'spacing' , 'blockGap' , 'left' ) );
$block_gap_value = $gap_row === $gap_column ? $gap_row : $gap_row . ' ' . $gap_column ;
} else {
// Skip outputting gap value if not all sides are provided.
$block_gap_value = null ;
}
}
// If the block should have custom gap, add the gap styles.
if ( null !== $block_gap_value && false !== $block_gap_value && '' !== $block_gap_value ) {
foreach ( $layout_definitions as $layout_definition_key => $layout_definition ) {
2023-06-28 05:49:27 +02:00
// Allow outputting fallback gap styles for flex and grid layout types when block gap support isn't available.
if ( ! $has_block_gap_support && 'flex' !== $layout_definition_key && 'grid' !== $layout_definition_key ) {
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
continue ;
}
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
$class_name = isset ( $layout_definition [ 'className' ] ) ? $layout_definition [ 'className' ] : false ;
$spacing_rules = isset ( $layout_definition [ 'spacingStyles' ] ) ? $layout_definition [ 'spacingStyles' ] : array ();
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
if (
! empty ( $class_name ) &&
! empty ( $spacing_rules )
) {
foreach ( $spacing_rules as $spacing_rule ) {
$declarations = array ();
if (
isset ( $spacing_rule [ 'selector' ] ) &&
preg_match ( $layout_selector_pattern , $spacing_rule [ 'selector' ] ) &&
! empty ( $spacing_rule [ 'rules' ] )
) {
// Iterate over each of the styling rules and substitute non-string values such as `null` with the real `blockGap` value.
foreach ( $spacing_rule [ 'rules' ] as $css_property => $css_value ) {
$current_css_value = is_string ( $css_value ) ? $css_value : $block_gap_value ;
if ( static :: is_safe_css_declaration ( $css_property , $current_css_value ) ) {
$declarations [] = array (
'name' => $css_property ,
'value' => $current_css_value ,
);
}
}
if ( ! $has_block_gap_support ) {
// For fallback gap styles, use lower specificity, to ensure styles do not unintentionally override theme styles.
$format = static :: ROOT_BLOCK_SELECTOR === $selector ? ':where(.%2$s%3$s)' : ':where(%1$s.%2$s%3$s)' ;
$layout_selector = sprintf (
$format ,
$selector ,
$class_name ,
$spacing_rule [ 'selector' ]
);
} else {
2023-06-21 07:32:19 +02:00
$format = static :: ROOT_BLOCK_SELECTOR === $selector ? ':where(%s .%s) %s' : '%s-%s%s' ;
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
$layout_selector = sprintf (
$format ,
$selector ,
$class_name ,
$spacing_rule [ 'selector' ]
);
}
$block_rules .= static :: to_ruleset ( $layout_selector , $declarations );
}
}
}
}
}
}
// Output base styles.
if (
static :: ROOT_BLOCK_SELECTOR === $selector
) {
$valid_display_modes = array ( 'block' , 'flex' , 'grid' );
foreach ( $layout_definitions as $layout_definition ) {
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
$class_name = isset ( $layout_definition [ 'className' ] ) ? $layout_definition [ 'className' ] : false ;
$base_style_rules = isset ( $layout_definition [ 'baseStyles' ] ) ? $layout_definition [ 'baseStyles' ] : array ();
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
if (
! empty ( $class_name ) &&
2023-06-22 06:06:26 +02:00
is_array ( $base_style_rules )
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
) {
// Output display mode. This requires special handling as `display` is not exposed in `safe_style_css_filter`.
if (
! empty ( $layout_definition [ 'displayMode' ] ) &&
is_string ( $layout_definition [ 'displayMode' ] ) &&
in_array ( $layout_definition [ 'displayMode' ], $valid_display_modes , true )
) {
$layout_selector = sprintf (
'%s .%s' ,
$selector ,
$class_name
);
$block_rules .= static :: to_ruleset (
$layout_selector ,
array (
array (
'name' => 'display' ,
'value' => $layout_definition [ 'displayMode' ],
),
)
);
}
foreach ( $base_style_rules as $base_style_rule ) {
$declarations = array ();
if (
isset ( $base_style_rule [ 'selector' ] ) &&
preg_match ( $layout_selector_pattern , $base_style_rule [ 'selector' ] ) &&
! empty ( $base_style_rule [ 'rules' ] )
) {
foreach ( $base_style_rule [ 'rules' ] as $css_property => $css_value ) {
if ( static :: is_safe_css_declaration ( $css_property , $css_value ) ) {
$declarations [] = array (
'name' => $css_property ,
'value' => $css_value ,
);
}
}
$layout_selector = sprintf (
'%s .%s%s' ,
$selector ,
$class_name ,
$base_style_rule [ 'selector' ]
);
$block_rules .= static :: to_ruleset ( $layout_selector , $declarations );
}
}
}
}
}
return $block_rules ;
}
2021-11-08 20:19:58 +01:00
/**
* Creates new rulesets as classes for each preset value such as :
*
* . has - value - color {
* color : value ;
* }
*
* . has - value - background - color {
* background - color : value ;
* }
*
* . has - value - font - size {
* font - size : value ;
* }
*
* . has - value - gradient - background {
* background : value ;
* }
*
* p . has - value - gradient - background {
* background : value ;
* }
*
* @ since 5.9 . 0
*
2023-05-03 20:48:22 +02:00
* @ param array $setting_nodes Nodes with settings .
* @ param string [] $origins List of origins to process presets from .
2021-11-08 20:19:58 +01:00
* @ return string The new stylesheet .
*/
2022-02-17 10:04:05 +01:00
protected function get_preset_classes ( $setting_nodes , $origins ) {
2021-05-24 19:39:57 +02:00
$preset_rules = '' ;
2021-11-08 20:19:58 +01:00
2021-05-24 19:39:57 +02:00
foreach ( $setting_nodes as $metadata ) {
if ( null === $metadata [ 'selector' ] ) {
continue ;
}
$selector = $metadata [ 'selector' ];
$node = _wp_array_get ( $this -> theme_json , $metadata [ 'path' ], array () );
2022-02-17 10:04:05 +01:00
$preset_rules .= static :: compute_preset_classes ( $node , $selector , $origins );
2021-05-24 19:39:57 +02:00
}
2021-11-08 20:19:58 +01:00
return $preset_rules ;
2021-05-24 19:39:57 +02:00
}
/**
* Converts each styles section into a list of rulesets
* to be appended to the stylesheet .
* These rulesets contain all the css variables ( custom variables and preset variables ) .
*
* See glossary at https :// developer . mozilla . org / en - US / docs / Web / CSS / Syntax
*
* For each section this creates a new ruleset such as :
*
2021-06-23 21:05:57 +02:00
* block - selector {
* -- wp -- preset -- category -- slug : value ;
* -- wp -- custom -- variable : value ;
* }
2021-05-24 19:39:57 +02:00
*
* @ since 5.8 . 0
2021-12-04 13:58:01 +01:00
* @ since 5.9 . 0 Added the `$origins` parameter .
2021-05-24 19:39:57 +02:00
*
2023-05-03 20:48:22 +02:00
* @ param array $nodes Nodes with settings .
* @ param string [] $origins List of origins to process .
2021-05-24 19:39:57 +02:00
* @ return string The new stylesheet .
*/
2022-02-17 10:04:05 +01:00
protected function get_css_variables ( $nodes , $origins ) {
2021-05-24 19:39:57 +02:00
$stylesheet = '' ;
foreach ( $nodes as $metadata ) {
if ( null === $metadata [ 'selector' ] ) {
continue ;
}
$selector = $metadata [ 'selector' ];
2022-11-11 02:50:11 +01:00
$node = _wp_array_get ( $this -> theme_json , $metadata [ 'path' ], array () );
$declarations = static :: compute_preset_vars ( $node , $origins );
$theme_vars_declarations = static :: compute_theme_vars ( $node );
foreach ( $theme_vars_declarations as $theme_vars_declaration ) {
$declarations [] = $theme_vars_declaration ;
}
2021-05-24 19:39:57 +02:00
2022-02-17 10:04:05 +01:00
$stylesheet .= static :: to_ruleset ( $selector , $declarations );
2021-05-24 19:39:57 +02:00
}
return $stylesheet ;
}
/**
* Given a selector and a declaration list ,
* creates the corresponding ruleset .
*
* @ since 5.8 . 0
*
2021-06-30 21:00:58 +02:00
* @ param string $selector CSS selector .
2021-05-24 19:39:57 +02:00
* @ param array $declarations List of declarations .
2022-10-07 14:01:13 +02:00
* @ return string The resulting CSS ruleset .
2021-05-24 19:39:57 +02:00
*/
2022-02-17 10:04:05 +01:00
protected static function to_ruleset ( $selector , $declarations ) {
2021-05-24 19:39:57 +02:00
if ( empty ( $declarations ) ) {
return '' ;
}
$declaration_block = array_reduce (
$declarations ,
2021-08-26 14:59:02 +02:00
static function ( $carry , $element ) {
2021-05-24 19:39:57 +02:00
return $carry .= $element [ 'name' ] . ': ' . $element [ 'value' ] . ';' ; },
''
);
return $selector . '{' . $declaration_block . '}' ;
}
/**
2022-10-07 14:01:13 +02:00
* Given a settings array , returns the generated rulesets
2021-05-24 19:39:57 +02:00
* for the preset classes .
*
* @ since 5.8 . 0
2021-12-04 13:58:01 +01:00
* @ since 5.9 . 0 Added the `$origins` parameter .
2021-05-24 19:39:57 +02:00
*
2023-05-03 20:48:22 +02:00
* @ param array $settings Settings to process .
* @ param string $selector Selector wrapping the classes .
* @ param string [] $origins List of origins to process .
2021-05-24 19:39:57 +02:00
* @ return string The result of processing the presets .
*/
2022-02-17 10:04:05 +01:00
protected static function compute_preset_classes ( $settings , $selector , $origins ) {
if ( static :: ROOT_BLOCK_SELECTOR === $selector ) {
2023-07-09 23:40:23 +02:00
/*
* Classes at the global level do not need any CSS prefixed ,
* and we don ' t want to increase its specificity .
*/
2021-05-24 19:39:57 +02:00
$selector = '' ;
}
$stylesheet = '' ;
2022-02-17 10:04:05 +01:00
foreach ( static :: PRESETS_METADATA as $preset_metadata ) {
2023-09-08 02:26:21 +02:00
if ( empty ( $preset_metadata [ 'classes' ] ) ) {
continue ;
}
2022-02-17 10:04:05 +01:00
$slugs = static :: get_settings_slugs ( $settings , $preset_metadata , $origins );
2021-11-08 20:19:58 +01:00
foreach ( $preset_metadata [ 'classes' ] as $class => $property ) {
foreach ( $slugs as $slug ) {
2023-06-20 19:54:19 +02:00
$css_var = static :: replace_slug_in_string ( $preset_metadata [ 'css_vars' ], $slug );
$class_name = static :: replace_slug_in_string ( $class , $slug );
// $selector is often empty, so we can save ourselves the `append_to_selector()` call then.
$new_selector = '' === $selector ? $class_name : static :: append_to_selector ( $selector , $class_name );
$stylesheet .= static :: to_ruleset (
$new_selector ,
2021-05-24 19:39:57 +02:00
array (
array (
2021-11-08 20:19:58 +01:00
'name' => $property ,
'value' => 'var(' . $css_var . ') !important' ,
2021-05-24 19:39:57 +02:00
),
)
);
}
}
}
return $stylesheet ;
}
2021-11-08 20:19:58 +01:00
/**
* Function that scopes a selector with another one . This works a bit like
* SCSS nesting except the `&` operator isn ' t supported .
*
* < code >
* $scope = '.a, .b .c' ;
* $selector = '> .x, .y' ;
* $merged = scope_selector ( $scope , $selector );
* // $merged is '.a > .x, .a .y, .b .c > .x, .b .c .y'
* </ code >
*
* @ since 5.9 . 0
*
* @ param string $scope Selector to scope to .
* @ param string $selector Original selector .
* @ return string Scoped selector .
*/
2023-02-07 13:42:20 +01:00
public static function scope_selector ( $scope , $selector ) {
2021-11-08 20:19:58 +01:00
$scopes = explode ( ',' , $scope );
$selectors = explode ( ',' , $selector );
$selectors_scoped = array ();
foreach ( $scopes as $outer ) {
foreach ( $selectors as $inner ) {
2023-02-07 13:42:20 +01:00
$outer = trim ( $outer );
$inner = trim ( $inner );
if ( ! empty ( $outer ) && ! empty ( $inner ) ) {
$selectors_scoped [] = $outer . ' ' . $inner ;
} elseif ( empty ( $outer ) ) {
$selectors_scoped [] = $inner ;
} elseif ( empty ( $inner ) ) {
$selectors_scoped [] = $outer ;
}
2021-11-08 20:19:58 +01:00
}
}
2023-02-07 13:42:20 +01:00
$result = implode ( ', ' , $selectors_scoped );
return $result ;
2021-11-08 20:19:58 +01:00
}
/**
* Gets preset values keyed by slugs based on settings and metadata .
*
* < code >
* $settings = array (
* 'typography' => array (
* 'fontFamilies' => array (
* array (
* 'slug' => 'sansSerif' ,
* 'fontFamily' => '"Helvetica Neue", sans-serif' ,
* ),
* array (
* 'slug' => 'serif' ,
* 'colors' => 'Georgia, serif' ,
* )
* ),
* ),
* );
* $meta = array (
* 'path' => array ( 'typography' , 'fontFamilies' ),
* 'value_key' => 'fontFamily' ,
* );
* $values_by_slug = get_settings_values_by_slug ();
* // $values_by_slug === array(
* // 'sans-serif' => '"Helvetica Neue", sans-serif',
* // 'serif' => 'Georgia, serif',
* // );
* </ code >
*
* @ since 5.9 . 0
*
2023-05-03 20:48:22 +02:00
* @ param array $settings Settings to process .
* @ param array $preset_metadata One of the PRESETS_METADATA values .
* @ param string [] $origins List of origins to process .
2021-11-08 20:19:58 +01:00
* @ return array Array of presets where each key is a slug and each value is the preset value .
*/
2022-02-17 10:04:05 +01:00
protected static function get_settings_values_by_slug ( $settings , $preset_metadata , $origins ) {
2021-11-08 20:19:58 +01:00
$preset_per_origin = _wp_array_get ( $settings , $preset_metadata [ 'path' ], array () );
$result = array ();
foreach ( $origins as $origin ) {
if ( ! isset ( $preset_per_origin [ $origin ] ) ) {
continue ;
}
foreach ( $preset_per_origin [ $origin ] as $preset ) {
$slug = _wp_to_kebab_case ( $preset [ 'slug' ] );
$value = '' ;
2022-02-17 19:47:02 +01:00
if ( isset ( $preset_metadata [ 'value_key' ], $preset [ $preset_metadata [ 'value_key' ] ] ) ) {
2021-11-08 20:19:58 +01:00
$value_key = $preset_metadata [ 'value_key' ];
$value = $preset [ $value_key ];
} elseif (
isset ( $preset_metadata [ 'value_func' ] ) &&
is_callable ( $preset_metadata [ 'value_func' ] )
) {
$value_func = $preset_metadata [ 'value_func' ];
$value = call_user_func ( $value_func , $preset );
} else {
// If we don't have a value, then don't add it to the result.
continue ;
}
$result [ $slug ] = $value ;
}
}
return $result ;
}
/**
* Similar to get_settings_values_by_slug , but doesn ' t compute the value .
*
* @ since 5.9 . 0
*
2023-05-03 20:48:22 +02:00
* @ param array $settings Settings to process .
* @ param array $preset_metadata One of the PRESETS_METADATA values .
* @ param string [] $origins List of origins to process .
2021-11-08 20:19:58 +01:00
* @ return array Array of presets where the key and value are both the slug .
*/
2022-02-17 10:04:05 +01:00
protected static function get_settings_slugs ( $settings , $preset_metadata , $origins = null ) {
if ( null === $origins ) {
$origins = static :: VALID_ORIGINS ;
}
2021-11-08 20:19:58 +01:00
$preset_per_origin = _wp_array_get ( $settings , $preset_metadata [ 'path' ], array () );
$result = array ();
foreach ( $origins as $origin ) {
if ( ! isset ( $preset_per_origin [ $origin ] ) ) {
continue ;
}
foreach ( $preset_per_origin [ $origin ] as $preset ) {
$slug = _wp_to_kebab_case ( $preset [ 'slug' ] );
// Use the array as a set so we don't get duplicates.
$result [ $slug ] = $slug ;
}
}
return $result ;
}
/**
2022-10-07 14:01:13 +02:00
* Transforms a slug into a CSS Custom Property .
2021-11-08 20:19:58 +01:00
*
* @ since 5.9 . 0
*
* @ param string $input String to replace .
2021-12-04 13:58:01 +01:00
* @ param string $slug The slug value to use to generate the custom property .
* @ return string The CSS Custom Property . Something along the lines of `--wp--preset--color--black` .
2021-11-08 20:19:58 +01:00
*/
2022-02-17 10:04:05 +01:00
protected static function replace_slug_in_string ( $input , $slug ) {
2021-11-08 20:19:58 +01:00
return strtr ( $input , array ( '$slug' => $slug ) );
}
2021-05-24 19:39:57 +02:00
/**
2022-10-07 14:01:13 +02:00
* Given the block settings , extracts the CSS Custom Properties
2021-05-24 19:39:57 +02:00
* for the presets and adds them to the $declarations array
* following the format :
*
2021-06-23 21:05:57 +02:00
* array (
* 'name' => 'property_name' ,
* 'value' => ' property_value ,
* )
2021-05-24 19:39:57 +02:00
*
* @ since 5.8 . 0
2021-12-04 13:58:01 +01:00
* @ since 5.9 . 0 Added the `$origins` parameter .
2021-05-24 19:39:57 +02:00
*
2023-05-03 20:48:22 +02:00
* @ param array $settings Settings to process .
* @ param string [] $origins List of origins to process .
2022-10-07 14:01:13 +02:00
* @ return array The modified $declarations .
2021-05-24 19:39:57 +02:00
*/
2022-02-17 10:04:05 +01:00
protected static function compute_preset_vars ( $settings , $origins ) {
2021-05-24 19:39:57 +02:00
$declarations = array ();
2022-02-17 10:04:05 +01:00
foreach ( static :: PRESETS_METADATA as $preset_metadata ) {
2023-09-08 02:26:21 +02:00
if ( empty ( $preset_metadata [ 'css_vars' ] ) ) {
continue ;
}
2022-02-17 10:04:05 +01:00
$values_by_slug = static :: get_settings_values_by_slug ( $settings , $preset_metadata , $origins );
2021-11-08 20:19:58 +01:00
foreach ( $values_by_slug as $slug => $value ) {
2021-05-24 19:39:57 +02:00
$declarations [] = array (
2022-02-17 10:04:05 +01:00
'name' => static :: replace_slug_in_string ( $preset_metadata [ 'css_vars' ], $slug ),
2021-06-15 10:52:30 +02:00
'value' => $value ,
2021-05-24 19:39:57 +02:00
);
}
}
return $declarations ;
}
/**
2022-10-07 14:01:13 +02:00
* Given an array of settings , extracts the CSS Custom Properties
2021-05-24 19:39:57 +02:00
* for the custom values and adds them to the $declarations
* array following the format :
*
2021-06-23 21:05:57 +02:00
* array (
* 'name' => 'property_name' ,
* 'value' => ' property_value ,
* )
2021-05-24 19:39:57 +02:00
*
* @ since 5.8 . 0
*
* @ param array $settings Settings to process .
2022-10-07 14:01:13 +02:00
* @ return array The modified $declarations .
2021-05-24 19:39:57 +02:00
*/
2022-02-17 10:04:05 +01:00
protected static function compute_theme_vars ( $settings ) {
2021-05-24 19:39:57 +02:00
$declarations = array ();
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
$custom_values = isset ( $settings [ 'custom' ] ) ? $settings [ 'custom' ] : array ();
2022-02-17 10:04:05 +01:00
$css_vars = static :: flatten_tree ( $custom_values );
2021-05-24 19:39:57 +02:00
foreach ( $css_vars as $key => $value ) {
$declarations [] = array (
'name' => '--wp--custom--' . $key ,
'value' => $value ,
);
}
return $declarations ;
}
/**
* Given a tree , it creates a flattened one
* by merging the keys and binding the leaf values
* to the new keys .
*
* It also transforms camelCase names into kebab - case
* and substitutes '/' by '-' .
*
* This is thought to be useful to generate
* CSS Custom Properties from a tree ,
* although there ' s nothing in the implementation
* of this function that requires that format .
*
* For example , assuming the given prefix is '--wp'
* and the token is '--' , for this input tree :
*
2021-06-23 21:05:57 +02:00
* {
* 'some/property' : 'value' ,
* 'nestedProperty' : {
* 'sub-property' : 'value'
* }
* }
2021-05-24 19:39:57 +02:00
*
* it ' ll return this output :
*
2021-06-23 21:05:57 +02:00
* {
* '--wp--some-property' : 'value' ,
* '--wp--nested-property--sub-property' : 'value'
* }
2021-05-24 19:39:57 +02:00
*
* @ since 5.8 . 0
*
2021-06-30 21:00:58 +02:00
* @ param array $tree Input tree to process .
* @ param string $prefix Optional . Prefix to prepend to each variable . Default empty string .
* @ param string $token Optional . Token to use between levels . Default '--' .
2021-05-24 19:39:57 +02:00
* @ return array The flattened tree .
*/
2022-02-17 10:04:05 +01:00
protected static function flatten_tree ( $tree , $prefix = '' , $token = '--' ) {
2021-05-24 19:39:57 +02:00
$result = array ();
foreach ( $tree as $property => $value ) {
$new_key = $prefix . str_replace (
'/' ,
'-' ,
2021-12-21 08:02:34 +01:00
strtolower ( _wp_to_kebab_case ( $property ) )
2021-05-24 19:39:57 +02:00
);
if ( is_array ( $value ) ) {
2022-11-11 02:50:11 +01:00
$new_prefix = $new_key . $token ;
$flattened_subtree = static :: flatten_tree ( $value , $new_prefix , $token );
foreach ( $flattened_subtree as $subtree_key => $subtree_value ) {
$result [ $subtree_key ] = $subtree_value ;
}
2021-05-24 19:39:57 +02:00
} else {
$result [ $new_key ] = $value ;
}
}
return $result ;
}
/**
* Given a styles array , it extracts the style properties
* and adds them to the $declarations array following the format :
*
2021-06-23 21:05:57 +02:00
* array (
* 'name' => 'property_name' ,
* 'value' => ' property_value ,
* )
2021-05-24 19:39:57 +02:00
*
* @ since 5.8 . 0
2021-12-04 13:58:01 +01:00
* @ since 5.9 . 0 Added the `$settings` and `$properties` parameters .
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
* @ since 6.1 . 0 Added `$theme_json` , `$selector` , and `$use_root_padding` parameters .
2024-01-31 03:54:17 +01:00
* @ since 6.5 . 0 Output a `min-height: unset` rule when `aspect-ratio` is set .
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
*
* @ param array $styles Styles to process .
* @ param array $settings Theme settings .
* @ param array $properties Properties metadata .
* @ param array $theme_json Theme JSON array .
* @ param string $selector The style block selector .
* @ param boolean $use_root_padding Whether to add custom properties at root level .
* @ return array Returns the modified $declarations .
2021-05-24 19:39:57 +02:00
*/
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
protected static function compute_style_properties ( $styles , $settings = array (), $properties = null , $theme_json = null , $selector = null , $use_root_padding = null ) {
2022-02-17 10:04:05 +01:00
if ( null === $properties ) {
$properties = static :: PROPERTIES_METADATA ;
}
2021-05-24 19:39:57 +02:00
$declarations = array ();
if ( empty ( $styles ) ) {
return $declarations ;
}
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
$root_variable_duplicates = array ();
2021-11-08 20:19:58 +01:00
foreach ( $properties as $css_property => $value_path ) {
2022-09-10 14:38:12 +02:00
$value = static :: get_property_value ( $styles , $value_path , $theme_json );
2021-11-08 20:19:58 +01:00
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
if ( str_starts_with ( $css_property , '--wp--style--root--' ) && ( static :: ROOT_BLOCK_SELECTOR !== $selector || ! $use_root_padding ) ) {
continue ;
}
2023-07-09 23:40:23 +02:00
/*
* Root - level padding styles don ' t currently support strings with CSS shorthand values .
* This may change : https :// github . com / WordPress / gutenberg / issues / 40132.
*/
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
if ( '--wp--style--root--padding' === $css_property && is_string ( $value ) ) {
continue ;
}
if ( str_starts_with ( $css_property , '--wp--style--root--' ) && $use_root_padding ) {
$root_variable_duplicates [] = substr ( $css_property , strlen ( '--wp--style--root--' ) );
}
2023-07-09 23:40:23 +02:00
/*
* Look up protected properties , keyed by value path .
* Skip protected properties that are explicitly set to `null` .
*/
2021-11-08 20:19:58 +01:00
if ( is_array ( $value_path ) ) {
$path_string = implode ( '.' , $value_path );
if (
2023-08-01 22:31:25 +02:00
isset ( static :: PROTECTED_PROPERTIES [ $path_string ] ) &&
2022-02-17 10:04:05 +01:00
_wp_array_get ( $settings , static :: PROTECTED_PROPERTIES [ $path_string ], null ) === null
2021-11-08 20:19:58 +01:00
) {
continue ;
2021-05-24 19:39:57 +02:00
}
}
2021-11-08 20:19:58 +01:00
// Skip if empty and not "0" or value represents array of longhand values.
$has_missing_value = empty ( $value ) && ! is_numeric ( $value );
if ( $has_missing_value || is_array ( $value ) ) {
2021-05-24 19:39:57 +02:00
continue ;
}
2022-10-11 20:44:13 +02:00
// Calculates fluid typography rules where available.
if ( 'font-size' === $css_property ) {
/*
* wp_get_typography_font_size_value () will check
* if fluid typography has been activated and also
* whether the incoming value can be converted to a fluid value .
* Values that already have a clamp () function will not pass the test ,
* and therefore the original $value will be returned .
*/
$value = wp_get_typography_font_size_value ( array ( 'size' => $value ) );
}
2024-01-31 03:54:17 +01:00
if ( 'aspect-ratio' === $css_property ) {
// For aspect ratio to work, other dimensions rules must be unset.
// This ensures that a fixed height does not override the aspect ratio.
$declarations [] = array (
'name' => 'min-height' ,
'value' => 'unset' ,
);
}
2021-05-24 19:39:57 +02:00
$declarations [] = array (
2021-11-08 20:19:58 +01:00
'name' => $css_property ,
2021-05-24 19:39:57 +02:00
'value' => $value ,
);
}
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
// If a variable value is added to the root, the corresponding property should be removed.
foreach ( $root_variable_duplicates as $duplicate ) {
$discard = array_search ( $duplicate , array_column ( $declarations , 'name' ), true );
if ( is_numeric ( $discard ) ) {
array_splice ( $declarations , $discard , 1 );
}
}
2021-05-24 19:39:57 +02:00
return $declarations ;
}
/**
* Returns the style property for the given path .
*
2022-09-10 14:38:12 +02:00
* It also converts references to a path to the value
* stored at that location , e . g .
* { " ref " : " style.color.background " } => " #fff " .
*
2021-05-24 19:39:57 +02:00
* @ since 5.8 . 0
2021-12-04 13:58:01 +01:00
* @ since 5.9 . 0 Added support for values of array type , which are returned as is .
2022-09-10 14:38:12 +02:00
* @ since 6.1 . 0 Added the `$theme_json` parameter .
2023-06-21 09:56:18 +02:00
* @ since 6.3 . 0 It no longer converts the internal format " var:preset|color|secondary "
* to the standard form " --wp--preset--color--secondary " .
* This is already done by the sanitize method ,
* so every property will be in the standard form .
2021-05-24 19:39:57 +02:00
*
* @ param array $styles Styles subtree .
2021-06-30 21:00:58 +02:00
* @ param array $path Which property to process .
2022-09-10 14:38:12 +02:00
* @ param array $theme_json Theme JSON array .
2021-12-04 13:58:01 +01:00
* @ return string | array Style property value .
2021-05-24 19:39:57 +02:00
*/
2022-09-10 14:38:12 +02:00
protected static function get_property_value ( $styles , $path , $theme_json = null ) {
2022-09-30 02:40:11 +02:00
$value = _wp_array_get ( $styles , $path , '' );
if ( '' === $value || null === $value ) {
// No need to process the value further.
return '' ;
}
2021-05-24 19:39:57 +02:00
2022-09-10 14:38:12 +02:00
/*
* This converts references to a path to the value at that path
* where the values is an array with a " ref " key , pointing to a path .
* For example : { " ref " : " style.color.background " } => " #fff " .
*/
2022-11-11 02:50:11 +01:00
if ( is_array ( $value ) && isset ( $value [ 'ref' ] ) ) {
2022-09-10 14:38:12 +02:00
$value_path = explode ( '.' , $value [ 'ref' ] );
$ref_value = _wp_array_get ( $theme_json , $value_path );
// Only use the ref value if we find anything.
if ( ! empty ( $ref_value ) && is_string ( $ref_value ) ) {
$value = $ref_value ;
}
2022-11-11 02:50:11 +01:00
if ( is_array ( $ref_value ) && isset ( $ref_value [ 'ref' ] ) ) {
2022-09-10 14:38:12 +02:00
$path_string = json_encode ( $path );
$ref_value_string = json_encode ( $ref_value );
_doing_it_wrong (
'get_property_value' ,
sprintf (
/* translators: 1: theme.json, 2: Value name, 3: Value path, 4: Another value name. */
__ ( 'Your %1$s file uses a dynamic value (%2$s) for the path at %3$s. However, the value at %3$s is also a dynamic value (pointing to %4$s) and pointing to another dynamic value is not supported. Please update %3$s to point directly to %4$s.' ),
'theme.json' ,
$ref_value_string ,
$path_string ,
$ref_value [ 'ref' ]
),
'6.1.0'
);
}
}
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
if ( is_array ( $value ) ) {
2021-05-24 19:39:57 +02:00
return $value ;
}
return $value ;
}
2021-05-24 10:37:55 +02:00
/**
* Builds metadata for the setting nodes , which returns in the form of :
*
2021-06-23 21:05:57 +02:00
* [
* [
* 'path' => [ 'path' , 'to' , 'some' , 'node' ],
* 'selector' => 'CSS selector for some node'
* ],
* [
* 'path' => [ 'path' , 'to' , 'other' , 'node' ],
* 'selector' => 'CSS selector for other node'
* ],
* ]
2021-05-24 10:37:55 +02:00
*
2021-05-24 15:25:56 +02:00
* @ since 5.8 . 0
2021-05-24 10:37:55 +02:00
*
2021-05-24 15:25:56 +02:00
* @ param array $theme_json The tree to extract setting nodes from .
2021-06-30 21:00:58 +02:00
* @ param array $selectors List of selectors per block .
2022-10-07 14:01:13 +02:00
* @ return array An array of setting nodes metadata .
2021-05-24 10:37:55 +02:00
*/
2022-02-17 10:04:05 +01:00
protected static function get_setting_nodes ( $theme_json , $selectors = array () ) {
2021-05-24 10:37:55 +02:00
$nodes = array ();
if ( ! isset ( $theme_json [ 'settings' ] ) ) {
return $nodes ;
}
// Top-level.
$nodes [] = array (
2021-05-24 19:39:57 +02:00
'path' => array ( 'settings' ),
2022-02-17 10:04:05 +01:00
'selector' => static :: ROOT_BLOCK_SELECTOR ,
2021-05-24 10:37:55 +02:00
);
// Calculate paths for blocks.
if ( ! isset ( $theme_json [ 'settings' ][ 'blocks' ] ) ) {
return $nodes ;
}
foreach ( $theme_json [ 'settings' ][ 'blocks' ] as $name => $node ) {
2021-05-24 19:39:57 +02:00
$selector = null ;
if ( isset ( $selectors [ $name ][ 'selector' ] ) ) {
$selector = $selectors [ $name ][ 'selector' ];
}
2021-05-24 10:37:55 +02:00
$nodes [] = array (
2021-05-24 19:39:57 +02:00
'path' => array ( 'settings' , 'blocks' , $name ),
'selector' => $selector ,
2021-05-24 10:37:55 +02:00
);
}
return $nodes ;
}
2021-05-24 19:39:57 +02:00
/**
* Builds metadata for the style nodes , which returns in the form of :
*
2021-06-23 21:05:57 +02:00
* [
* [
* 'path' => [ 'path' , 'to' , 'some' , 'node' ],
2021-11-08 20:19:58 +01:00
* 'selector' => 'CSS selector for some node' ,
* 'duotone' => 'CSS selector for duotone for some node'
2021-06-23 21:05:57 +02:00
* ],
* [
* 'path' => [ 'path' , 'to' , 'other' , 'node' ],
2021-11-08 20:19:58 +01:00
* 'selector' => 'CSS selector for other node' ,
* 'duotone' => null
2021-06-23 21:05:57 +02:00
* ],
* ]
2021-05-24 19:39:57 +02:00
*
* @ since 5.8 . 0
*
* @ param array $theme_json The tree to extract style nodes from .
2021-06-30 21:00:58 +02:00
* @ param array $selectors List of selectors per block .
2022-10-07 14:01:13 +02:00
* @ return array An array of style nodes metadata .
2021-05-24 19:39:57 +02:00
*/
2022-02-17 10:04:05 +01:00
protected static function get_style_nodes ( $theme_json , $selectors = array () ) {
2021-05-24 19:39:57 +02:00
$nodes = array ();
if ( ! isset ( $theme_json [ 'styles' ] ) ) {
return $nodes ;
}
// Top-level.
$nodes [] = array (
'path' => array ( 'styles' ),
2022-02-17 10:04:05 +01:00
'selector' => static :: ROOT_BLOCK_SELECTOR ,
2021-05-24 19:39:57 +02:00
);
if ( isset ( $theme_json [ 'styles' ][ 'elements' ] ) ) {
Global Styles: Add support for `heading`, `button`, and `caption` elements.
This enables themes to:
* Set style rules for all heading elements together rather than having to do it individually.
* Style captions in `theme.json` by adding this into your `theme.json` file:
{{{
{
"styles": {
"elements": {
"caption": {
"color": {
"background": "red",
"text": "yellow"
}
}
}
}
}
}}}
This commit backports the original PRs from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/41981 #41981: Global Styles: Add support for heading elements]
* [https://github.com/WordPress/gutenberg/pull/41140 #41140: Global Styles: Add support for caption elements]
Follow-up to [50973].
Props cbravobernal, scruffian, madhudollu, mikachan, zieladam, bph, poena, andraganescu, ndiego, bgardner.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54105
git-svn-id: http://core.svn.wordpress.org/trunk@53664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-08 18:44:11 +02:00
foreach ( self :: ELEMENTS as $element => $selector ) {
if ( ! isset ( $theme_json [ 'styles' ][ 'elements' ][ $element ] ) ) {
continue ;
}
2021-05-24 19:39:57 +02:00
$nodes [] = array (
'path' => array ( 'styles' , 'elements' , $element ),
2022-02-17 10:04:05 +01:00
'selector' => static :: ELEMENTS [ $element ],
2021-05-24 19:39:57 +02:00
);
2022-09-10 14:38:12 +02:00
2023-08-01 22:31:25 +02:00
// Handle any pseudo selectors for the element.
if ( isset ( static :: VALID_ELEMENT_PSEUDO_SELECTORS [ $element ] ) ) {
2022-09-10 14:38:12 +02:00
foreach ( static :: VALID_ELEMENT_PSEUDO_SELECTORS [ $element ] as $pseudo_selector ) {
if ( isset ( $theme_json [ 'styles' ][ 'elements' ][ $element ][ $pseudo_selector ] ) ) {
$nodes [] = array (
'path' => array ( 'styles' , 'elements' , $element ),
'selector' => static :: append_to_selector ( static :: ELEMENTS [ $element ], $pseudo_selector ),
);
}
}
}
2021-05-24 19:39:57 +02:00
}
}
// Blocks.
if ( ! isset ( $theme_json [ 'styles' ][ 'blocks' ] ) ) {
return $nodes ;
}
2022-11-11 02:50:11 +01:00
$block_nodes = static :: get_block_nodes ( $theme_json );
foreach ( $block_nodes as $block_node ) {
$nodes [] = $block_node ;
}
2022-09-10 14:38:12 +02:00
/**
* Filters the list of style nodes with metadata .
*
* This allows for things like loading block CSS independently .
*
* @ since 6.1 . 0
*
* @ param array $nodes Style nodes with metadata .
*/
2022-10-11 22:08:12 +02:00
return apply_filters ( 'wp_theme_json_get_style_nodes' , $nodes );
2022-09-10 14:38:12 +02:00
}
/**
* A public helper to get the block nodes from a theme . json file .
*
* @ since 6.1 . 0
*
* @ return array The block nodes in theme . json .
*/
public function get_styles_block_nodes () {
return static :: get_block_nodes ( $this -> theme_json );
}
2022-11-11 18:11:10 +01:00
/**
* Returns a filtered declarations array if there is a separator block with only a background
* style defined in theme . json by adding a color attribute to reflect the changes in the front .
*
* @ since 6.1 . 1
*
* @ param array $declarations List of declarations .
* @ return array $declarations List of declarations filtered .
*/
private static function update_separator_declarations ( $declarations ) {
$background_color = '' ;
$border_color_matches = false ;
$text_color_matches = false ;
foreach ( $declarations as $declaration ) {
if ( 'background-color' === $declaration [ 'name' ] && ! $background_color && isset ( $declaration [ 'value' ] ) ) {
$background_color = $declaration [ 'value' ];
} elseif ( 'border-color' === $declaration [ 'name' ] ) {
$border_color_matches = true ;
} elseif ( 'color' === $declaration [ 'name' ] ) {
$text_color_matches = true ;
}
if ( $background_color && $border_color_matches && $text_color_matches ) {
break ;
}
}
if ( $background_color && ! $border_color_matches && ! $text_color_matches ) {
$declarations [] = array (
'name' => 'color' ,
'value' => $background_color ,
);
}
return $declarations ;
}
2022-09-10 14:38:12 +02:00
/**
* An internal method to get the block nodes from a theme . json file .
*
* @ since 6.1 . 0
2023-06-27 10:48:24 +02:00
* @ since 6.3 . 0 Refactored and stabilized selectors API .
2022-09-10 14:38:12 +02:00
*
* @ param array $theme_json The theme . json converted to an array .
* @ return array The block nodes in theme . json .
*/
private static function get_block_nodes ( $theme_json ) {
$selectors = static :: get_blocks_metadata ();
$nodes = array ();
if ( ! isset ( $theme_json [ 'styles' ] ) ) {
return $nodes ;
}
// Blocks.
if ( ! isset ( $theme_json [ 'styles' ][ 'blocks' ] ) ) {
return $nodes ;
}
2021-05-24 19:39:57 +02:00
foreach ( $theme_json [ 'styles' ][ 'blocks' ] as $name => $node ) {
$selector = null ;
if ( isset ( $selectors [ $name ][ 'selector' ] ) ) {
$selector = $selectors [ $name ][ 'selector' ];
}
2021-11-08 20:19:58 +01:00
$duotone_selector = null ;
if ( isset ( $selectors [ $name ][ 'duotone' ] ) ) {
$duotone_selector = $selectors [ $name ][ 'duotone' ];
}
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
$feature_selectors = null ;
2023-06-27 10:48:24 +02:00
if ( isset ( $selectors [ $name ][ 'selectors' ] ) ) {
$feature_selectors = $selectors [ $name ][ 'selectors' ];
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
}
2023-02-01 14:43:18 +01:00
$variation_selectors = array ();
if ( isset ( $node [ 'variations' ] ) ) {
foreach ( $node [ 'variations' ] as $variation => $node ) {
$variation_selectors [] = array (
'path' => array ( 'styles' , 'blocks' , $name , 'variations' , $variation ),
'selector' => $selectors [ $name ][ 'styleVariations' ][ $variation ],
);
}
}
2021-05-24 19:39:57 +02:00
$nodes [] = array (
2023-02-01 14:43:18 +01:00
'name' => $name ,
'path' => array ( 'styles' , 'blocks' , $name ),
'selector' => $selector ,
2023-06-27 10:48:24 +02:00
'selectors' => $feature_selectors ,
2023-02-01 14:43:18 +01:00
'duotone' => $duotone_selector ,
'features' => $feature_selectors ,
'variations' => $variation_selectors ,
2021-05-24 19:39:57 +02:00
);
if ( isset ( $theme_json [ 'styles' ][ 'blocks' ][ $name ][ 'elements' ] ) ) {
foreach ( $theme_json [ 'styles' ][ 'blocks' ][ $name ][ 'elements' ] as $element => $node ) {
$nodes [] = array (
'path' => array ( 'styles' , 'blocks' , $name , 'elements' , $element ),
'selector' => $selectors [ $name ][ 'elements' ][ $element ],
);
2022-09-10 14:38:12 +02:00
2023-08-01 22:31:25 +02:00
// Handle any pseudo selectors for the element.
if ( isset ( static :: VALID_ELEMENT_PSEUDO_SELECTORS [ $element ] ) ) {
2022-09-10 14:38:12 +02:00
foreach ( static :: VALID_ELEMENT_PSEUDO_SELECTORS [ $element ] as $pseudo_selector ) {
if ( isset ( $theme_json [ 'styles' ][ 'blocks' ][ $name ][ 'elements' ][ $element ][ $pseudo_selector ] ) ) {
$nodes [] = array (
'path' => array ( 'styles' , 'blocks' , $name , 'elements' , $element ),
'selector' => static :: append_to_selector ( $selectors [ $name ][ 'elements' ][ $element ], $pseudo_selector ),
);
}
}
}
2021-05-24 19:39:57 +02:00
}
}
}
return $nodes ;
}
2022-09-10 14:38:12 +02:00
/**
* Gets the CSS rules for a particular block from theme . json .
*
* @ since 6.1 . 0
*
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
* @ param array $block_metadata Metadata about the block to get styles for .
*
* @ return string Styles for the block .
2022-09-10 14:38:12 +02:00
*/
public function get_styles_for_block ( $block_metadata ) {
2023-06-27 10:48:24 +02:00
$node = _wp_array_get ( $this -> theme_json , $block_metadata [ 'path' ], array () );
$use_root_padding = isset ( $this -> theme_json [ 'settings' ][ 'useRootPaddingAwareAlignments' ] ) && true === $this -> theme_json [ 'settings' ][ 'useRootPaddingAwareAlignments' ];
$selector = $block_metadata [ 'selector' ];
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
$settings = isset ( $this -> theme_json [ 'settings' ] ) ? $this -> theme_json [ 'settings' ] : array ();
2023-06-27 10:48:24 +02:00
$feature_declarations = static :: get_feature_declarations_for_node ( $block_metadata , $node );
2022-09-10 14:38:12 +02:00
2023-02-01 14:43:18 +01:00
// If there are style variations, generate the declarations for them, including any feature selectors the block may have.
$style_variation_declarations = array ();
if ( ! empty ( $block_metadata [ 'variations' ] ) ) {
foreach ( $block_metadata [ 'variations' ] as $style_variation ) {
2023-06-27 10:48:24 +02:00
$style_variation_node = _wp_array_get ( $this -> theme_json , $style_variation [ 'path' ], array () );
$clean_style_variation_selector = trim ( $style_variation [ 'selector' ] );
// Generate any feature/subfeature style declarations for the current style variation.
$variation_declarations = static :: get_feature_declarations_for_node ( $block_metadata , $style_variation_node );
// Combine selectors with style variation's selector and add to overall style variation declarations.
foreach ( $variation_declarations as $current_selector => $new_declarations ) {
// If current selector includes block classname, remove it but leave the whitespace in.
$shortened_selector = str_replace ( $block_metadata [ 'selector' ] . ' ' , ' ' , $current_selector );
// Prepend the variation selector to the current selector.
$split_selectors = explode ( ',' , $shortened_selector );
$updated_selectors = array_map (
2023-09-12 17:23:18 +02:00
static function ( $split_selector ) use ( $clean_style_variation_selector ) {
2023-06-27 10:48:24 +02:00
return $clean_style_variation_selector . $split_selector ;
},
$split_selectors
);
$combined_selectors = implode ( ',' , $updated_selectors );
// Add the new declarations to the overall results under the modified selector.
$style_variation_declarations [ $combined_selectors ] = $new_declarations ;
2023-02-01 14:43:18 +01:00
}
2023-06-27 10:48:24 +02:00
2023-02-01 14:43:18 +01:00
// Compute declarations for remaining styles not covered by feature level selectors.
2023-06-27 10:48:24 +02:00
$style_variation_declarations [ $style_variation [ 'selector' ] ] = static :: compute_style_properties ( $style_variation_node , $settings , null , $this -> theme_json );
2023-02-01 14:43:18 +01:00
}
}
2022-09-10 14:38:12 +02:00
/*
* Get a reference to element name from path .
* $block_metadata [ 'path' ] = array ( 'styles' , 'elements' , 'link' );
* Make sure that $block_metadata [ 'path' ] describes an element node , like [ 'styles' , 'element' , 'link' ] .
* Skip non - element paths like just [ 'styles' ] .
*/
$is_processing_element = in_array ( 'elements' , $block_metadata [ 'path' ], true );
$current_element = $is_processing_element ? $block_metadata [ 'path' ][ count ( $block_metadata [ 'path' ] ) - 1 ] : null ;
$element_pseudo_allowed = array ();
2023-08-01 22:31:25 +02:00
if ( isset ( static :: VALID_ELEMENT_PSEUDO_SELECTORS [ $current_element ] ) ) {
2022-09-10 14:38:12 +02:00
$element_pseudo_allowed = static :: VALID_ELEMENT_PSEUDO_SELECTORS [ $current_element ];
}
/*
* Check for allowed pseudo classes ( e . g . " :hover " ) from the $selector ( " a:hover " ) .
* This also resets the array keys .
*/
$pseudo_matches = array_values (
array_filter (
$element_pseudo_allowed ,
2023-09-12 17:23:18 +02:00
static function ( $pseudo_selector ) use ( $selector ) {
2022-09-10 14:38:12 +02:00
return str_contains ( $selector , $pseudo_selector );
}
)
);
$pseudo_selector = isset ( $pseudo_matches [ 0 ] ) ? $pseudo_matches [ 0 ] : null ;
/*
* If the current selector is a pseudo selector that ' s defined in the allow list for the current
* element then compute the style properties for it .
* Otherwise just compute the styles for the default selector as normal .
*/
if ( $pseudo_selector && isset ( $node [ $pseudo_selector ] ) &&
2023-08-01 22:31:25 +02:00
isset ( static :: VALID_ELEMENT_PSEUDO_SELECTORS [ $current_element ] )
2022-09-10 14:38:12 +02:00
&& in_array ( $pseudo_selector , static :: VALID_ELEMENT_PSEUDO_SELECTORS [ $current_element ], true )
) {
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
$declarations = static :: compute_style_properties ( $node [ $pseudo_selector ], $settings , null , $this -> theme_json , $selector , $use_root_padding );
2022-09-10 14:38:12 +02:00
} else {
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
$declarations = static :: compute_style_properties ( $node , $settings , null , $this -> theme_json , $selector , $use_root_padding );
2022-09-10 14:38:12 +02:00
}
$block_rules = '' ;
/*
* 1. Separate the declarations that use the general selector
* from the ones using the duotone selector .
*/
$declarations_duotone = array ();
foreach ( $declarations as $index => $declaration ) {
if ( 'filter' === $declaration [ 'name' ] ) {
unset ( $declarations [ $index ] );
$declarations_duotone [] = $declaration ;
}
}
2022-11-11 18:11:10 +01:00
// Update declarations if there are separators with only background color defined.
if ( '.wp-block-separator' === $selector ) {
$declarations = static :: update_separator_declarations ( $declarations );
}
2022-09-10 14:38:12 +02:00
// 2. Generate and append the rules that use the general selector.
$block_rules .= static :: to_ruleset ( $selector , $declarations );
// 3. Generate and append the rules that use the duotone selector.
if ( isset ( $block_metadata [ 'duotone' ] ) && ! empty ( $declarations_duotone ) ) {
2023-06-27 10:48:24 +02:00
$block_rules .= static :: to_ruleset ( $block_metadata [ 'duotone' ], $declarations_duotone );
2022-09-10 14:38:12 +02:00
}
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
// 4. Generate Layout block gap styles.
if (
static :: ROOT_BLOCK_SELECTOR !== $selector &&
! empty ( $block_metadata [ 'name' ] )
) {
$block_rules .= $this -> get_layout_styles ( $block_metadata );
}
// 5. Generate and append the feature level rulesets.
foreach ( $feature_declarations as $feature_selector => $individual_feature_declarations ) {
$block_rules .= static :: to_ruleset ( $feature_selector , $individual_feature_declarations );
2022-09-10 14:38:12 +02:00
}
2023-02-01 14:43:18 +01:00
// 6. Generate and append the style variation rulesets.
foreach ( $style_variation_declarations as $style_variation_selector => $individual_style_variation_declarations ) {
$block_rules .= static :: to_ruleset ( $style_variation_selector , $individual_style_variation_declarations );
}
2022-09-10 14:38:12 +02:00
return $block_rules ;
}
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
/**
* Outputs the CSS for layout rules on the root .
*
* @ since 6.1 . 0
*
* @ param string $selector The root node selector .
* @ param array $block_metadata The metadata for the root block .
* @ return string The additional root rules CSS .
*/
public function get_root_layout_rules ( $selector , $block_metadata ) {
$css = '' ;
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
$settings = isset ( $this -> theme_json [ 'settings' ] ) ? $this -> theme_json [ 'settings' ] : array ();
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
$use_root_padding = isset ( $this -> theme_json [ 'settings' ][ 'useRootPaddingAwareAlignments' ] ) && true === $this -> theme_json [ 'settings' ][ 'useRootPaddingAwareAlignments' ];
/*
* Reset default browser margin on the root body element .
* This is set on the root selector ** before ** generating the ruleset
* from the `theme.json` . This is to ensure that if the `theme.json` declares
* `margin` in its `spacing` declaration for the `body` element then these
* user - generated values take precedence in the CSS cascade .
* @ link https :// github . com / WordPress / gutenberg / issues / 36147.
*/
$css .= 'body { margin: 0;' ;
/*
* If there are content and wide widths in theme . json , output them
* as custom properties on the body element so all blocks can use them .
*/
if ( isset ( $settings [ 'layout' ][ 'contentSize' ] ) || isset ( $settings [ 'layout' ][ 'wideSize' ] ) ) {
$content_size = isset ( $settings [ 'layout' ][ 'contentSize' ] ) ? $settings [ 'layout' ][ 'contentSize' ] : $settings [ 'layout' ][ 'wideSize' ];
$content_size = static :: is_safe_css_declaration ( 'max-width' , $content_size ) ? $content_size : 'initial' ;
$wide_size = isset ( $settings [ 'layout' ][ 'wideSize' ] ) ? $settings [ 'layout' ][ 'wideSize' ] : $settings [ 'layout' ][ 'contentSize' ];
$wide_size = static :: is_safe_css_declaration ( 'max-width' , $wide_size ) ? $wide_size : 'initial' ;
$css .= '--wp--style--global--content-size: ' . $content_size . ';' ;
$css .= '--wp--style--global--wide-size: ' . $wide_size . ';' ;
}
$css .= ' }' ;
if ( $use_root_padding ) {
// Top and bottom padding are applied to the outer block container.
$css .= '.wp-site-blocks { padding-top: var(--wp--style--root--padding-top); padding-bottom: var(--wp--style--root--padding-bottom); }' ;
// Right and left padding are applied to the first container with `.has-global-padding` class.
$css .= '.has-global-padding { padding-right: var(--wp--style--root--padding-right); padding-left: var(--wp--style--root--padding-left); }' ;
// Nested containers with `.has-global-padding` class do not get padding.
2023-09-19 03:45:21 +02:00
$css .= '.has-global-padding :where(.has-global-padding:not(.wp-block-block)) { padding-right: 0; padding-left: 0; }' ;
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
// Alignfull children of the container with left and right padding have negative margins so they can still be full width.
$css .= '.has-global-padding > .alignfull { margin-right: calc(var(--wp--style--root--padding-right) * -1); margin-left: calc(var(--wp--style--root--padding-left) * -1); }' ;
// The above rule is negated for alignfull children of nested containers.
2023-09-19 03:45:21 +02:00
$css .= '.has-global-padding :where(.has-global-padding:not(.wp-block-block)) > .alignfull { margin-right: 0; margin-left: 0; }' ;
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
// Some of the children of alignfull blocks without content width should also get padding: text blocks and non-alignfull container blocks.
2023-09-08 02:51:18 +02:00
$css .= '.has-global-padding > .alignfull:where(:not(.has-global-padding):not(.is-layout-flex):not(.is-layout-grid)) > :where([class*="wp-block-"]:not(.alignfull):not([class*="__"]),p,h1,h2,h3,h4,h5,h6,ul,ol) { padding-right: var(--wp--style--root--padding-right); padding-left: var(--wp--style--root--padding-left); }' ;
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
// The above rule also has to be negated for blocks inside nested `.has-global-padding` blocks.
$css .= '.has-global-padding :where(.has-global-padding) > .alignfull:where(:not(.has-global-padding)) > :where([class*="wp-block-"]:not(.alignfull):not([class*="__"]),p,h1,h2,h3,h4,h5,h6,ul,ol) { padding-right: 0; padding-left: 0; }' ;
}
$css .= '.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }' ;
$css .= '.wp-site-blocks > .alignright { float: right; margin-left: 2em; }' ;
$css .= '.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }' ;
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
$block_gap_value = isset ( $this -> theme_json [ 'styles' ][ 'spacing' ][ 'blockGap' ] ) ? $this -> theme_json [ 'styles' ][ 'spacing' ][ 'blockGap' ] : '0.5em' ;
$has_block_gap_support = isset ( $this -> theme_json [ 'settings' ][ 'spacing' ][ 'blockGap' ] );
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
if ( $has_block_gap_support ) {
$block_gap_value = static :: get_property_value ( $this -> theme_json , array ( 'styles' , 'spacing' , 'blockGap' ) );
2023-06-21 07:32:19 +02:00
$css .= " :where(.wp-site-blocks) > * { margin-block-start: $block_gap_value ; margin-block-end: 0; } " ;
$css .= ':where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }' ;
$css .= ':where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }' ;
Editor: Backport foundation for Layout block support refactor (part 1).
Backports the following changes from the Gutenberg repository:
* [WordPress/gutenberg/40875 gutenberg/40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42087 gutenberg/42087] Theme.json: Add block support feature level selectors for blocks gutenberg/42087
* [WordPress/gutenberg/43792 gutenberg/43792] Global Styles: Split root layout rules into a different function gutenberg/43792
* [WordPress/gutenberg/42544 gutenberg/42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg/42544
* [WordPress/gutenberg/42665 gutenberg/42665] Layout: Reduce specificity of fallback blockGap styles gutenberg/42665
* [WordPress/gutenberg/42085 gutenberg/42085] Core CSS support for root padding and alignfull blocks gutenberg/42085
Notes:
* It doesn't entirely port over PR 40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting `layout.php`.
* [54159] was reverted in [54160] due to PHPUnit test failures for tests added by the commit. Later, tests passed when applied on top of `trunk`. There were various outages today of upstream `wp-env` dependencies, which likely were the root cause of the earlier failures. For historical tracking and to make sure, recommitting [54159] but instead on top of current `trunk`. See PR 3205 for more details.
* Giving additional props for those who did a deep dive investigation into the failed tests.
Follow-up to [54160], [54159].
Props andrewserong, aaronrobertshaw, isabel_brison, bernhard-reiter, hellofromTonya.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54162
git-svn-id: http://core.svn.wordpress.org/trunk@53721 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2022-09-14 20:44:09 +02:00
// For backwards compatibility, ensure the legacy block gap CSS variable is still available.
$css .= " $selector { --wp--style--block-gap: $block_gap_value ; } " ;
}
$css .= $this -> get_layout_styles ( $block_metadata );
return $css ;
}
2022-04-11 12:38:00 +02:00
/**
* For metadata values that can either be booleans or paths to booleans , gets the value .
*
Docs: Update code examples formatting in `WP_HTML_Tag_Processor` documentation.
Per the [https://developer.wordpress.org/coding-standards/inline-documentation-standards/php/#description documentation standards], code samples should be created by indenting every line of the code by 4 spaces, with a blank line before and after. This matches the format used by the rest of core.
Follow-up to [55203], [55304], [55718], [55724].
Props juanmaguitar, coffee2code, azaozz, costdev, dmsnell, johnbillion, SergeyBiryukov.
Fixes #58028.
Built from https://develop.svn.wordpress.org/trunk@55727
git-svn-id: http://core.svn.wordpress.org/trunk@55239 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-05-08 19:32:24 +02:00
* $data = array (
* 'color' => array (
* 'defaultPalette' => true
* )
* );
2022-04-11 12:38:00 +02:00
*
Docs: Update code examples formatting in `WP_HTML_Tag_Processor` documentation.
Per the [https://developer.wordpress.org/coding-standards/inline-documentation-standards/php/#description documentation standards], code samples should be created by indenting every line of the code by 4 spaces, with a blank line before and after. This matches the format used by the rest of core.
Follow-up to [55203], [55304], [55718], [55724].
Props juanmaguitar, coffee2code, azaozz, costdev, dmsnell, johnbillion, SergeyBiryukov.
Fixes #58028.
Built from https://develop.svn.wordpress.org/trunk@55727
git-svn-id: http://core.svn.wordpress.org/trunk@55239 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-05-08 19:32:24 +02:00
* static :: get_metadata_boolean ( $data , false );
* // => false
2022-04-11 12:38:00 +02:00
*
Docs: Update code examples formatting in `WP_HTML_Tag_Processor` documentation.
Per the [https://developer.wordpress.org/coding-standards/inline-documentation-standards/php/#description documentation standards], code samples should be created by indenting every line of the code by 4 spaces, with a blank line before and after. This matches the format used by the rest of core.
Follow-up to [55203], [55304], [55718], [55724].
Props juanmaguitar, coffee2code, azaozz, costdev, dmsnell, johnbillion, SergeyBiryukov.
Fixes #58028.
Built from https://develop.svn.wordpress.org/trunk@55727
git-svn-id: http://core.svn.wordpress.org/trunk@55239 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-05-08 19:32:24 +02:00
* static :: get_metadata_boolean ( $data , array ( 'color' , 'defaultPalette' ) );
* // => true
2022-04-11 12:38:00 +02:00
*
* @ since 6.0 . 0
*
Code Modernization: Rename parameters that use reserved keywords in `wp-includes/class-wp-theme-json.php`.
While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names.
This commit renames the `$default` parameter to `$default_value` in `WP_Theme_JSON::get_metadata_boolean()`.
Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215], [53216], [53220], [53230], [53232], [53236], [53239], [53240], [53242], [53243], [53245], [53246], [53257], [53269], [53270], [53271], [53272], [53273], [53274], [53275], [53276], [53277], [53281], [53283], [53284], [53285], [53287], [53364], [53365], [54927], [54929], [54930], [54931], [54932], [54933], [54938], [54943], [54944], [54945], [54946], [54947], [54948], [54950], [54951], [54952], [54956], [54959], [54960], [54961], [54962], [54964], [54965], [54969], [54970], [54971], [54972], [54996], [55000], [55011], [55013], [55014], [55015], [55016], [55017], [55020], [55021], [55023], [55027], [55028], [55034], [55036], [55037], [55038], [55039], [55049], [55050], [55060], [55062], [55064], [55065], [55076], [55077], [55078], [55081], [55090], [55100], [55104], [55112], [55115], [55116], [55117], [55119], [55120], [55126], [55127].
Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See #56788.
Built from https://develop.svn.wordpress.org/trunk@55129
git-svn-id: http://core.svn.wordpress.org/trunk@54662 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-01-24 16:45:11 +01:00
* @ param array $data The data to inspect .
* @ param bool | array $path Boolean or path to a boolean .
* @ param bool $default_value Default value if the referenced path is missing .
* Default false .
2022-04-28 11:59:13 +02:00
* @ return bool Value of boolean metadata .
2022-04-11 12:38:00 +02:00
*/
Code Modernization: Rename parameters that use reserved keywords in `wp-includes/class-wp-theme-json.php`.
While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names.
This commit renames the `$default` parameter to `$default_value` in `WP_Theme_JSON::get_metadata_boolean()`.
Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215], [53216], [53220], [53230], [53232], [53236], [53239], [53240], [53242], [53243], [53245], [53246], [53257], [53269], [53270], [53271], [53272], [53273], [53274], [53275], [53276], [53277], [53281], [53283], [53284], [53285], [53287], [53364], [53365], [54927], [54929], [54930], [54931], [54932], [54933], [54938], [54943], [54944], [54945], [54946], [54947], [54948], [54950], [54951], [54952], [54956], [54959], [54960], [54961], [54962], [54964], [54965], [54969], [54970], [54971], [54972], [54996], [55000], [55011], [55013], [55014], [55015], [55016], [55017], [55020], [55021], [55023], [55027], [55028], [55034], [55036], [55037], [55038], [55039], [55049], [55050], [55060], [55062], [55064], [55065], [55076], [55077], [55078], [55081], [55090], [55100], [55104], [55112], [55115], [55116], [55117], [55119], [55120], [55126], [55127].
Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See #56788.
Built from https://develop.svn.wordpress.org/trunk@55129
git-svn-id: http://core.svn.wordpress.org/trunk@54662 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-01-24 16:45:11 +01:00
protected static function get_metadata_boolean ( $data , $path , $default_value = false ) {
2022-04-11 12:38:00 +02:00
if ( is_bool ( $path ) ) {
return $path ;
}
if ( is_array ( $path ) ) {
$value = _wp_array_get ( $data , $path );
if ( null !== $value ) {
return $value ;
}
}
Code Modernization: Rename parameters that use reserved keywords in `wp-includes/class-wp-theme-json.php`.
While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names.
This commit renames the `$default` parameter to `$default_value` in `WP_Theme_JSON::get_metadata_boolean()`.
Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215], [53216], [53220], [53230], [53232], [53236], [53239], [53240], [53242], [53243], [53245], [53246], [53257], [53269], [53270], [53271], [53272], [53273], [53274], [53275], [53276], [53277], [53281], [53283], [53284], [53285], [53287], [53364], [53365], [54927], [54929], [54930], [54931], [54932], [54933], [54938], [54943], [54944], [54945], [54946], [54947], [54948], [54950], [54951], [54952], [54956], [54959], [54960], [54961], [54962], [54964], [54965], [54969], [54970], [54971], [54972], [54996], [55000], [55011], [55013], [55014], [55015], [55016], [55017], [55020], [55021], [55023], [55027], [55028], [55034], [55036], [55037], [55038], [55039], [55049], [55050], [55060], [55062], [55064], [55065], [55076], [55077], [55078], [55081], [55090], [55100], [55104], [55112], [55115], [55116], [55117], [55119], [55120], [55126], [55127].
Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See #56788.
Built from https://develop.svn.wordpress.org/trunk@55129
git-svn-id: http://core.svn.wordpress.org/trunk@54662 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-01-24 16:45:11 +01:00
return $default_value ;
2022-04-11 12:38:00 +02:00
}
2021-05-24 10:37:55 +02:00
/**
2022-10-07 14:01:13 +02:00
* Merges new incoming data .
2021-05-24 10:37:55 +02:00
*
2021-06-30 18:23:57 +02:00
* @ since 5.8 . 0
2021-11-08 20:19:58 +01:00
* @ since 5.9 . 0 Duotone preset also has origins .
2021-06-30 18:23:57 +02:00
*
2021-05-24 10:37:55 +02:00
* @ param WP_Theme_JSON $incoming Data to merge .
*/
2021-06-15 10:52:30 +02:00
public function merge ( $incoming ) {
$incoming_data = $incoming -> get_raw_data ();
$this -> theme_json = array_replace_recursive ( $this -> theme_json , $incoming_data );
2021-05-24 20:57:55 +02:00
2021-06-16 11:42:56 +02:00
/*
2021-11-30 01:24:27 +01:00
* The array_replace_recursive algorithm merges at the leaf level ,
* but we don ' t want leaf arrays to be merged , so we overwrite it .
*
* For leaf values that are sequential arrays it will use the numeric indexes for replacement .
* We rather replace the existing with the incoming value , if it exists .
* This is the case of spacing . units .
*
* For leaf values that are associative arrays it will merge them as expected .
* This is also not the behavior we want for the current associative arrays ( presets ) .
* We rather replace the existing with the incoming value , if it exists .
* This happens , for example , when we merge data from theme . json upon existing
* theme supports or when we merge anything coming from the same source twice .
* This is the case of color . palette , color . gradients , color . duotone ,
* typography . fontSizes , or typography . fontFamilies .
*
* Additionally , for some preset types , we also want to make sure the
* values they introduce don ' t conflict with default values . We do so
* by checking the incoming slugs for theme presets and compare them
2022-01-18 21:29:06 +01:00
* with the equivalent default presets : if a slug is present as a default
2021-11-30 01:24:27 +01:00
* we remove it from the theme presets .
2021-06-16 11:42:56 +02:00
*/
2022-02-17 10:04:05 +01:00
$nodes = static :: get_setting_nodes ( $incoming_data );
$slugs_global = static :: get_default_slugs ( $this -> theme_json , array ( 'settings' ) );
2021-11-30 01:24:27 +01:00
foreach ( $nodes as $node ) {
// Replace the spacing.units.
2022-11-11 02:50:11 +01:00
$path = $node [ 'path' ];
$path [] = 'spacing' ;
$path [] = 'units' ;
2021-11-30 01:24:27 +01:00
$content = _wp_array_get ( $incoming_data , $path , null );
if ( isset ( $content ) ) {
_wp_array_set ( $this -> theme_json , $path , $content );
}
2021-05-24 10:37:55 +02:00
2021-11-30 01:24:27 +01:00
// Replace the presets.
2022-02-17 10:04:05 +01:00
foreach ( static :: PRESETS_METADATA as $preset ) {
2022-04-11 12:38:00 +02:00
$override_preset = ! static :: get_metadata_boolean ( $this -> theme_json [ 'settings' ], $preset [ 'prevent_override' ], true );
2021-12-14 02:57:26 +01:00
2022-02-17 10:04:05 +01:00
foreach ( static :: VALID_ORIGINS as $origin ) {
2022-11-11 02:50:11 +01:00
$base_path = $node [ 'path' ];
foreach ( $preset [ 'path' ] as $leaf ) {
$base_path [] = $leaf ;
}
$path = $base_path ;
$path [] = $origin ;
$content = _wp_array_get ( $incoming_data , $path , null );
2021-11-30 01:24:27 +01:00
if ( ! isset ( $content ) ) {
continue ;
}
2021-12-21 07:02:06 +01:00
if ( 'theme' === $origin && $preset [ 'use_default_names' ] ) {
2022-11-11 02:50:11 +01:00
foreach ( $content as $key => $item ) {
if ( ! isset ( $item [ 'name' ] ) ) {
2022-02-17 10:04:05 +01:00
$name = static :: get_name_from_defaults ( $item [ 'slug' ], $base_path );
2021-12-21 07:02:06 +01:00
if ( null !== $name ) {
2022-11-11 02:50:11 +01:00
$content [ $key ][ 'name' ] = $name ;
2021-12-21 07:02:06 +01:00
}
}
}
}
2021-11-30 01:24:27 +01:00
if (
( 'theme' !== $origin ) ||
2021-12-14 02:57:26 +01:00
( 'theme' === $origin && $override_preset )
2021-11-30 01:24:27 +01:00
) {
_wp_array_set ( $this -> theme_json , $path , $content );
2021-12-14 02:57:26 +01:00
} else {
2022-11-11 02:50:11 +01:00
$slugs_node = static :: get_default_slugs ( $this -> theme_json , $node [ 'path' ] );
$slugs = array_merge_recursive ( $slugs_global , $slugs_node );
2021-12-14 02:57:26 +01:00
$slugs_for_preset = _wp_array_get ( $slugs , $preset [ 'path' ], array () );
2022-02-17 10:04:05 +01:00
$content = static :: filter_slugs ( $content , $slugs_for_preset );
2021-11-30 01:24:27 +01:00
_wp_array_set ( $this -> theme_json , $path , $content );
}
2021-05-24 10:37:55 +02:00
}
}
}
2021-11-30 01:24:27 +01:00
}
2022-02-17 17:18:03 +01:00
/**
* Converts all filter ( duotone ) presets into SVGs .
*
* @ since 5.9 . 1
*
* @ param array $origins List of origins to process .
* @ return string SVG filters .
*/
public function get_svg_filters ( $origins ) {
$blocks_metadata = static :: get_blocks_metadata ();
$setting_nodes = static :: get_setting_nodes ( $this -> theme_json , $blocks_metadata );
2022-02-24 00:17:01 +01:00
$filters = '' ;
2022-02-17 17:18:03 +01:00
foreach ( $setting_nodes as $metadata ) {
$node = _wp_array_get ( $this -> theme_json , $metadata [ 'path' ], array () );
if ( empty ( $node [ 'color' ][ 'duotone' ] ) ) {
continue ;
}
$duotone_presets = $node [ 'color' ][ 'duotone' ];
foreach ( $origins as $origin ) {
if ( ! isset ( $duotone_presets [ $origin ] ) ) {
continue ;
}
foreach ( $duotone_presets [ $origin ] as $duotone_preset ) {
$filters .= wp_get_duotone_filter_svg ( $duotone_preset );
}
}
}
return $filters ;
}
2021-11-30 01:24:27 +01:00
/**
2022-10-07 14:01:13 +02:00
* Determines whether a presets should be overridden or not .
2021-12-14 02:57:26 +01:00
*
* @ since 5.9 . 0
2022-04-11 12:38:00 +02:00
* @ deprecated 6.0 . 0 Use { @ see 'get_metadata_boolean' } instead .
2021-12-14 02:57:26 +01:00
*
* @ param array $theme_json The theme . json like structure to inspect .
2022-04-11 12:38:00 +02:00
* @ param array $path Path to inspect .
* @ param bool | array $override Data to compute whether to override the preset .
2023-08-18 19:29:20 +02:00
* @ return bool
2021-12-14 02:57:26 +01:00
*/
2022-02-17 10:04:05 +01:00
protected static function should_override_preset ( $theme_json , $path , $override ) {
2022-04-11 12:38:00 +02:00
_deprecated_function ( __METHOD__ , '6.0.0' , 'get_metadata_boolean' );
2021-12-14 02:57:26 +01:00
if ( is_bool ( $override ) ) {
return $override ;
}
/*
* The relationship between whether to override the defaults
* and whether the defaults are enabled is inverse :
*
2022-02-08 17:11:03 +01:00
* - If defaults are enabled => theme presets should not be overridden
* - If defaults are disabled => theme presets should be overridden
2021-12-14 02:57:26 +01:00
*
* For example , a theme sets defaultPalette to false ,
* making the default palette hidden from the user .
* In that case , we want all the theme presets to be present ,
* so they should override the defaults .
*/
if ( is_array ( $override ) ) {
$value = _wp_array_get ( $theme_json , array_merge ( $path , $override ) );
if ( isset ( $value ) ) {
return ! $value ;
}
// Search the top-level key if none was found for this node.
$value = _wp_array_get ( $theme_json , array_merge ( array ( 'settings' ), $override ) );
if ( isset ( $value ) ) {
return ! $value ;
}
return true ;
}
}
/**
* Returns the default slugs for all the presets in an associative array
2021-11-30 01:24:27 +01:00
* whose keys are the preset paths and the leafs is the list of slugs .
*
* For example :
*
2023-05-03 21:46:21 +02:00
* array (
* 'color' => array (
* 'palette' => array ( 'slug-1' , 'slug-2' ),
* 'gradients' => array ( 'slug-3' , 'slug-4' ),
* ),
* )
2021-11-30 01:24:27 +01:00
*
* @ since 5.9 . 0
*
2021-12-14 02:57:26 +01:00
* @ param array $data A theme . json like structure .
* @ param array $node_path The path to inspect . It 's ' settings ' by default .
* @ return array
2021-11-30 01:24:27 +01:00
*/
2022-02-17 10:04:05 +01:00
protected static function get_default_slugs ( $data , $node_path ) {
2021-11-30 01:24:27 +01:00
$slugs = array ();
2022-02-17 10:04:05 +01:00
foreach ( static :: PRESETS_METADATA as $metadata ) {
2022-11-11 02:50:11 +01:00
$path = $node_path ;
foreach ( $metadata [ 'path' ] as $leaf ) {
$path [] = $leaf ;
}
$path [] = 'default' ;
2021-12-14 02:57:26 +01:00
$preset = _wp_array_get ( $data , $path , null );
2021-11-30 01:24:27 +01:00
if ( ! isset ( $preset ) ) {
continue ;
}
2021-12-14 02:57:26 +01:00
$slugs_for_preset = array ();
2022-10-06 17:27:13 +02:00
foreach ( $preset as $item ) {
if ( isset ( $item [ 'slug' ] ) ) {
$slugs_for_preset [] = $item [ 'slug' ];
}
}
2021-11-30 01:24:27 +01:00
_wp_array_set ( $slugs , $metadata [ 'path' ], $slugs_for_preset );
}
return $slugs ;
}
2021-12-21 07:02:06 +01:00
/**
2022-10-07 14:01:13 +02:00
* Gets a `default` ' s preset name by a provided slug .
2021-12-21 07:02:06 +01:00
*
* @ since 5.9 . 0
*
* @ param string $slug The slug we want to find a match from default presets .
* @ param array $base_path The path to inspect . It 's ' settings ' by default .
* @ return string | null
*/
2022-02-17 10:04:05 +01:00
protected function get_name_from_defaults ( $slug , $base_path ) {
2022-11-11 02:50:11 +01:00
$path = $base_path ;
$path [] = 'default' ;
2021-12-21 07:02:06 +01:00
$default_content = _wp_array_get ( $this -> theme_json , $path , null );
if ( ! $default_content ) {
return null ;
}
foreach ( $default_content as $item ) {
if ( $slug === $item [ 'slug' ] ) {
return $item [ 'name' ];
}
}
return null ;
}
2021-11-30 01:24:27 +01:00
/**
* Removes the preset values whose slug is equal to any of given slugs .
*
* @ since 5.9 . 0
*
2021-12-04 13:58:01 +01:00
* @ param array $node The node with the presets to validate .
2022-02-08 17:11:03 +01:00
* @ param array $slugs The slugs that should not be overridden .
2021-12-04 13:58:01 +01:00
* @ return array The new node .
2021-11-30 01:24:27 +01:00
*/
2022-02-17 10:04:05 +01:00
protected static function filter_slugs ( $node , $slugs ) {
2021-12-14 02:57:26 +01:00
if ( empty ( $slugs ) ) {
2021-11-30 01:24:27 +01:00
return $node ;
}
$new_node = array ();
foreach ( $node as $value ) {
2021-12-14 02:57:26 +01:00
if ( isset ( $value [ 'slug' ] ) && ! in_array ( $value [ 'slug' ], $slugs , true ) ) {
2021-11-30 01:24:27 +01:00
$new_node [] = $value ;
}
}
2021-11-08 20:19:58 +01:00
2021-11-30 01:24:27 +01:00
return $new_node ;
2021-11-08 20:19:58 +01:00
}
/**
* Removes insecure data from theme . json .
*
* @ since 5.9 . 0
2023-10-04 21:03:26 +02:00
* @ since 6.3 . 2 Preserves global styles block variations when securing styles .
2021-11-08 20:19:58 +01:00
*
* @ param array $theme_json Structure to sanitize .
* @ return array Sanitized structure .
*/
public static function remove_insecure_properties ( $theme_json ) {
$sanitized = array ();
$theme_json = WP_Theme_JSON_Schema :: migrate ( $theme_json );
2022-02-17 10:04:05 +01:00
$valid_block_names = array_keys ( static :: get_blocks_metadata () );
$valid_element_names = array_keys ( static :: ELEMENTS );
2023-06-14 09:42:19 +02:00
$valid_variations = array ();
foreach ( self :: get_blocks_metadata () as $block_name => $block_meta ) {
if ( ! isset ( $block_meta [ 'styleVariations' ] ) ) {
continue ;
}
$valid_variations [ $block_name ] = array_keys ( $block_meta [ 'styleVariations' ] );
}
2022-09-10 14:38:12 +02:00
2023-06-14 09:42:19 +02:00
$theme_json = static :: sanitize ( $theme_json , $valid_block_names , $valid_element_names , $valid_variations );
2021-11-08 20:19:58 +01:00
2022-02-17 10:04:05 +01:00
$blocks_metadata = static :: get_blocks_metadata ();
$style_nodes = static :: get_style_nodes ( $theme_json , $blocks_metadata );
2022-09-10 14:38:12 +02:00
2021-11-08 20:19:58 +01:00
foreach ( $style_nodes as $metadata ) {
$input = _wp_array_get ( $theme_json , $metadata [ 'path' ], array () );
if ( empty ( $input ) ) {
continue ;
}
Editor: Add support for custom CSS in global styles.
This changeset introduces functions `wp_get_global_styles_custom_css()` and `wp_enqueue_global_styles_custom_css()`, which allow accessing and enqueuing custom CSS added via global styles.
Custom CSS via global styles is handled separately from custom CSS via the Customizer. If a site uses both features, the custom CSS from both sources will be loaded. The global styles custom CSS is then loaded after the Customizer custom CSS, so if there are any conflicts between the rules, the global styles take precedence.
Similarly to e.g. [55185], the result is cached in a non-persistent cache, except when `WP_DEBUG` is on to avoid interrupting the theme developer's workflow.
Props glendaviesnz, oandregal, ntsekouras, mamaduka, davidbaumwald, hellofromtonya, flixos90.
Fixes #57536.
Built from https://develop.svn.wordpress.org/trunk@55192
git-svn-id: http://core.svn.wordpress.org/trunk@54725 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-02-02 19:52:17 +01:00
// The global styles custom CSS is not sanitized, but can only be edited by users with 'edit_css' capability.
if ( isset ( $input [ 'css' ] ) && current_user_can ( 'edit_css' ) ) {
$output = $input ;
} else {
$output = static :: remove_insecure_styles ( $input );
}
2022-09-10 14:38:12 +02:00
/*
* Get a reference to element name from path .
* $metadata [ 'path' ] = array ( 'styles' , 'elements' , 'link' );
*/
$current_element = $metadata [ 'path' ][ count ( $metadata [ 'path' ] ) - 1 ];
/*
* $output is stripped of pseudo selectors . Re - add and process them
* or insecure styles here .
*/
2023-08-01 22:31:25 +02:00
if ( isset ( static :: VALID_ELEMENT_PSEUDO_SELECTORS [ $current_element ] ) ) {
2022-09-10 14:38:12 +02:00
foreach ( static :: VALID_ELEMENT_PSEUDO_SELECTORS [ $current_element ] as $pseudo_selector ) {
if ( isset ( $input [ $pseudo_selector ] ) ) {
$output [ $pseudo_selector ] = static :: remove_insecure_styles ( $input [ $pseudo_selector ] );
}
}
}
2021-11-08 20:19:58 +01:00
if ( ! empty ( $output ) ) {
_wp_array_set ( $sanitized , $metadata [ 'path' ], $output );
}
2023-09-01 04:53:19 +02:00
if ( isset ( $metadata [ 'variations' ] ) ) {
foreach ( $metadata [ 'variations' ] as $variation ) {
$variation_input = _wp_array_get ( $theme_json , $variation [ 'path' ], array () );
if ( empty ( $variation_input ) ) {
continue ;
}
$variation_output = static :: remove_insecure_styles ( $variation_input );
if ( ! empty ( $variation_output ) ) {
_wp_array_set ( $sanitized , $variation [ 'path' ], $variation_output );
}
}
}
2021-11-08 20:19:58 +01:00
}
2022-02-17 10:04:05 +01:00
$setting_nodes = static :: get_setting_nodes ( $theme_json );
2021-11-08 20:19:58 +01:00
foreach ( $setting_nodes as $metadata ) {
$input = _wp_array_get ( $theme_json , $metadata [ 'path' ], array () );
if ( empty ( $input ) ) {
continue ;
}
2022-02-17 10:04:05 +01:00
$output = static :: remove_insecure_settings ( $input );
2021-11-08 20:19:58 +01:00
if ( ! empty ( $output ) ) {
_wp_array_set ( $sanitized , $metadata [ 'path' ], $output );
}
}
if ( empty ( $sanitized [ 'styles' ] ) ) {
unset ( $theme_json [ 'styles' ] );
} else {
$theme_json [ 'styles' ] = $sanitized [ 'styles' ];
}
if ( empty ( $sanitized [ 'settings' ] ) ) {
unset ( $theme_json [ 'settings' ] );
} else {
$theme_json [ 'settings' ] = $sanitized [ 'settings' ];
}
return $theme_json ;
}
/**
* Processes a setting node and returns the same node
* without the insecure settings .
*
* @ since 5.9 . 0
*
* @ param array $input Node to process .
* @ return array
*/
2022-02-17 10:04:05 +01:00
protected static function remove_insecure_settings ( $input ) {
2021-11-08 20:19:58 +01:00
$output = array ();
2022-02-17 10:04:05 +01:00
foreach ( static :: PRESETS_METADATA as $preset_metadata ) {
foreach ( static :: VALID_ORIGINS as $origin ) {
2022-11-11 02:50:11 +01:00
$path_with_origin = $preset_metadata [ 'path' ];
$path_with_origin [] = $origin ;
$presets = _wp_array_get ( $input , $path_with_origin , null );
2021-11-23 06:40:38 +01:00
if ( null === $presets ) {
continue ;
}
2021-11-08 20:19:58 +01:00
2021-11-23 06:40:38 +01:00
$escaped_preset = array ();
foreach ( $presets as $preset ) {
if (
esc_attr ( esc_html ( $preset [ 'name' ] ) ) === $preset [ 'name' ] &&
sanitize_html_class ( $preset [ 'slug' ] ) === $preset [ 'slug' ]
2021-11-08 20:19:58 +01:00
) {
2021-11-23 06:40:38 +01:00
$value = null ;
2022-02-17 19:47:02 +01:00
if ( isset ( $preset_metadata [ 'value_key' ], $preset [ $preset_metadata [ 'value_key' ] ] ) ) {
2021-11-23 06:40:38 +01:00
$value = $preset [ $preset_metadata [ 'value_key' ] ];
} elseif (
isset ( $preset_metadata [ 'value_func' ] ) &&
is_callable ( $preset_metadata [ 'value_func' ] )
) {
$value = call_user_func ( $preset_metadata [ 'value_func' ], $preset );
}
2021-11-08 20:19:58 +01:00
2021-11-23 06:40:38 +01:00
$preset_is_valid = true ;
foreach ( $preset_metadata [ 'properties' ] as $property ) {
2022-02-17 10:04:05 +01:00
if ( ! static :: is_safe_css_declaration ( $property , $value ) ) {
2021-11-23 06:40:38 +01:00
$preset_is_valid = false ;
break ;
}
2021-11-08 20:19:58 +01:00
}
2021-11-23 06:40:38 +01:00
if ( $preset_is_valid ) {
$escaped_preset [] = $preset ;
}
2021-11-08 20:19:58 +01:00
}
}
2021-11-23 06:40:38 +01:00
if ( ! empty ( $escaped_preset ) ) {
_wp_array_set ( $output , $path_with_origin , $escaped_preset );
}
2021-11-08 20:19:58 +01:00
}
}
2023-02-15 04:57:17 +01:00
// Ensure indirect properties not included in any `PRESETS_METADATA` value are allowed.
static :: remove_indirect_properties ( $input , $output );
2021-11-08 20:19:58 +01:00
return $output ;
}
/**
* Processes a style node and returns the same node
* without the insecure styles .
*
* @ since 5.9 . 0
*
* @ param array $input Node to process .
* @ return array
*/
2022-02-17 10:04:05 +01:00
protected static function remove_insecure_styles ( $input ) {
2021-11-08 20:19:58 +01:00
$output = array ();
2022-02-17 10:04:05 +01:00
$declarations = static :: compute_style_properties ( $input );
2021-11-08 20:19:58 +01:00
foreach ( $declarations as $declaration ) {
2022-02-17 10:04:05 +01:00
if ( static :: is_safe_css_declaration ( $declaration [ 'name' ], $declaration [ 'value' ] ) ) {
$path = static :: PROPERTIES_METADATA [ $declaration [ 'name' ] ];
2021-11-08 20:19:58 +01:00
2023-07-09 23:40:23 +02:00
/*
* Check the value isn ' t an array before adding so as to not
* double up shorthand and longhand styles .
*/
2021-11-08 20:19:58 +01:00
$value = _wp_array_get ( $input , $path , array () );
if ( ! is_array ( $value ) ) {
_wp_array_set ( $output , $path , $value );
}
}
}
2023-02-15 04:57:17 +01:00
// Ensure indirect properties not handled by `compute_style_properties` are allowed.
static :: remove_indirect_properties ( $input , $output );
2021-11-08 20:19:58 +01:00
return $output ;
}
/**
* Checks that a declaration provided by the user is safe .
*
* @ since 5.9 . 0
*
2021-12-04 13:58:01 +01:00
* @ param string $property_name Property name in a CSS declaration , i . e . the `color` in `color: red` .
2021-11-08 20:19:58 +01:00
* @ param string $property_value Value in a CSS declaration , i . e . the `red` in `color: red` .
2021-12-04 13:58:01 +01:00
* @ return bool
2021-11-08 20:19:58 +01:00
*/
2022-02-17 10:04:05 +01:00
protected static function is_safe_css_declaration ( $property_name , $property_value ) {
2021-11-08 20:19:58 +01:00
$style_to_validate = $property_name . ': ' . $property_value ;
$filtered = esc_html ( safecss_filter_attr ( $style_to_validate ) );
return ! empty ( trim ( $filtered ) );
2021-05-24 10:37:55 +02:00
}
2023-02-15 04:57:17 +01:00
/**
* Removes indirect properties from the given input node and
* sets in the given output node .
*
2023-02-15 23:56:20 +01:00
* @ since 6.2 . 0
2023-02-15 04:57:17 +01:00
*
* @ param array $input Node to process .
* @ param array $output The processed node . Passed by reference .
*/
private static function remove_indirect_properties ( $input , & $output ) {
foreach ( static :: INDIRECT_PROPERTIES_METADATA as $property => $paths ) {
foreach ( $paths as $path ) {
$value = _wp_array_get ( $input , $path );
if (
is_string ( $value ) &&
static :: is_safe_css_declaration ( $property , $value )
) {
_wp_array_set ( $output , $path , $value );
}
}
}
}
2021-05-24 10:37:55 +02:00
/**
* Returns the raw data .
*
2021-05-24 15:25:56 +02:00
* @ since 5.8 . 0
*
2021-05-24 10:37:55 +02:00
* @ return array Raw data .
*/
public function get_raw_data () {
return $this -> theme_json ;
}
/**
* Transforms the given editor settings according the
* add_theme_support format to the theme . json format .
*
2021-05-24 15:25:56 +02:00
* @ since 5.8 . 0
2021-05-24 10:37:55 +02:00
*
2021-05-24 15:25:56 +02:00
* @ param array $settings Existing editor settings .
2021-05-24 10:37:55 +02:00
* @ return array Config that adheres to the theme . json schema .
*/
public static function get_from_editor_settings ( $settings ) {
$theme_settings = array (
2022-02-17 10:04:05 +01:00
'version' => static :: LATEST_SCHEMA ,
2021-05-24 10:37:55 +02:00
'settings' => array (),
);
// Deprecated theme supports.
if ( isset ( $settings [ 'disableCustomColors' ] ) ) {
if ( ! isset ( $theme_settings [ 'settings' ][ 'color' ] ) ) {
$theme_settings [ 'settings' ][ 'color' ] = array ();
}
$theme_settings [ 'settings' ][ 'color' ][ 'custom' ] = ! $settings [ 'disableCustomColors' ];
}
if ( isset ( $settings [ 'disableCustomGradients' ] ) ) {
if ( ! isset ( $theme_settings [ 'settings' ][ 'color' ] ) ) {
$theme_settings [ 'settings' ][ 'color' ] = array ();
}
$theme_settings [ 'settings' ][ 'color' ][ 'customGradient' ] = ! $settings [ 'disableCustomGradients' ];
}
if ( isset ( $settings [ 'disableCustomFontSizes' ] ) ) {
if ( ! isset ( $theme_settings [ 'settings' ][ 'typography' ] ) ) {
$theme_settings [ 'settings' ][ 'typography' ] = array ();
}
$theme_settings [ 'settings' ][ 'typography' ][ 'customFontSize' ] = ! $settings [ 'disableCustomFontSizes' ];
}
if ( isset ( $settings [ 'enableCustomLineHeight' ] ) ) {
if ( ! isset ( $theme_settings [ 'settings' ][ 'typography' ] ) ) {
$theme_settings [ 'settings' ][ 'typography' ] = array ();
}
2021-11-08 20:19:58 +01:00
$theme_settings [ 'settings' ][ 'typography' ][ 'lineHeight' ] = $settings [ 'enableCustomLineHeight' ];
2021-05-24 10:37:55 +02:00
}
if ( isset ( $settings [ 'enableCustomUnits' ] ) ) {
if ( ! isset ( $theme_settings [ 'settings' ][ 'spacing' ] ) ) {
$theme_settings [ 'settings' ][ 'spacing' ] = array ();
}
$theme_settings [ 'settings' ][ 'spacing' ][ 'units' ] = ( true === $settings [ 'enableCustomUnits' ] ) ?
2021-07-15 20:55:29 +02:00
array ( 'px' , 'em' , 'rem' , 'vh' , 'vw' , '%' ) :
2021-05-24 10:37:55 +02:00
$settings [ 'enableCustomUnits' ];
}
if ( isset ( $settings [ 'colors' ] ) ) {
if ( ! isset ( $theme_settings [ 'settings' ][ 'color' ] ) ) {
$theme_settings [ 'settings' ][ 'color' ] = array ();
}
$theme_settings [ 'settings' ][ 'color' ][ 'palette' ] = $settings [ 'colors' ];
}
if ( isset ( $settings [ 'gradients' ] ) ) {
if ( ! isset ( $theme_settings [ 'settings' ][ 'color' ] ) ) {
$theme_settings [ 'settings' ][ 'color' ] = array ();
}
$theme_settings [ 'settings' ][ 'color' ][ 'gradients' ] = $settings [ 'gradients' ];
}
if ( isset ( $settings [ 'fontSizes' ] ) ) {
$font_sizes = $settings [ 'fontSizes' ];
// Back-compatibility for presets without units.
foreach ( $font_sizes as $key => $font_size ) {
if ( is_numeric ( $font_size [ 'size' ] ) ) {
$font_sizes [ $key ][ 'size' ] = $font_size [ 'size' ] . 'px' ;
}
}
if ( ! isset ( $theme_settings [ 'settings' ][ 'typography' ] ) ) {
$theme_settings [ 'settings' ][ 'typography' ] = array ();
}
$theme_settings [ 'settings' ][ 'typography' ][ 'fontSizes' ] = $font_sizes ;
}
if ( isset ( $settings [ 'enableCustomSpacing' ] ) ) {
if ( ! isset ( $theme_settings [ 'settings' ][ 'spacing' ] ) ) {
$theme_settings [ 'settings' ][ 'spacing' ] = array ();
}
2021-11-08 20:19:58 +01:00
$theme_settings [ 'settings' ][ 'spacing' ][ 'padding' ] = $settings [ 'enableCustomSpacing' ];
2021-05-24 10:37:55 +02:00
}
return $theme_settings ;
}
2022-04-11 12:38:00 +02:00
/**
* Returns the current theme ' s wanted patterns ( slugs ) to be
* registered from Pattern Directory .
*
* @ since 6.0 . 0
*
* @ return string []
*/
public function get_patterns () {
if ( isset ( $this -> theme_json [ 'patterns' ] ) && is_array ( $this -> theme_json [ 'patterns' ] ) ) {
return $this -> theme_json [ 'patterns' ];
}
return array ();
}
/**
* Returns a valid theme . json as provided by a theme .
*
* Unlike get_raw_data () this returns the presets flattened , as provided by a theme .
* This also uses appearanceTools instead of their opt - ins if all of them are true .
*
* @ since 6.0 . 0
*
* @ return array
*/
public function get_data () {
$output = $this -> theme_json ;
$nodes = static :: get_setting_nodes ( $output );
/**
* Flatten the theme & custom origins into a single one .
*
* For example , the following :
*
* {
* " settings " : {
* " color " : {
* " palette " : {
* " theme " : [ {} ],
* " custom " : [ {} ]
* }
* }
* }
* }
*
* will be converted to :
*
* {
* " settings " : {
* " color " : {
* " palette " : [ {} ]
* }
* }
* }
*/
foreach ( $nodes as $node ) {
foreach ( static :: PRESETS_METADATA as $preset_metadata ) {
2022-11-11 02:50:11 +01:00
$path = $node [ 'path' ];
foreach ( $preset_metadata [ 'path' ] as $preset_metadata_path ) {
$path [] = $preset_metadata_path ;
}
2022-04-11 12:38:00 +02:00
$preset = _wp_array_get ( $output , $path , null );
if ( null === $preset ) {
continue ;
}
$items = array ();
if ( isset ( $preset [ 'theme' ] ) ) {
foreach ( $preset [ 'theme' ] as $item ) {
$slug = $item [ 'slug' ];
unset ( $item [ 'slug' ] );
$items [ $slug ] = $item ;
}
}
if ( isset ( $preset [ 'custom' ] ) ) {
foreach ( $preset [ 'custom' ] as $item ) {
$slug = $item [ 'slug' ];
unset ( $item [ 'slug' ] );
$items [ $slug ] = $item ;
}
}
$flattened_preset = array ();
foreach ( $items as $slug => $value ) {
2022-09-30 16:48:12 +02:00
$flattened_preset [] = array_merge ( array ( 'slug' => ( string ) $slug ), $value );
2022-04-11 12:38:00 +02:00
}
_wp_array_set ( $output , $path , $flattened_preset );
}
}
2023-07-09 23:40:23 +02:00
/*
* If all of the static :: APPEARANCE_TOOLS_OPT_INS are true ,
* this code unsets them and sets 'appearanceTools' instead .
*/
2022-04-11 12:38:00 +02:00
foreach ( $nodes as $node ) {
$all_opt_ins_are_set = true ;
foreach ( static :: APPEARANCE_TOOLS_OPT_INS as $opt_in_path ) {
2022-11-11 02:50:11 +01:00
$full_path = $node [ 'path' ];
foreach ( $opt_in_path as $opt_in_path_item ) {
$full_path [] = $opt_in_path_item ;
}
2023-07-09 23:40:23 +02:00
/*
* Use " unset prop " as a marker instead of " null " because
* " null " can be a valid value for some props ( e . g . blockGap ) .
*/
2022-04-11 12:38:00 +02:00
$opt_in_value = _wp_array_get ( $output , $full_path , 'unset prop' );
if ( 'unset prop' === $opt_in_value ) {
$all_opt_ins_are_set = false ;
break ;
}
}
if ( $all_opt_ins_are_set ) {
2022-11-11 02:50:11 +01:00
$node_path_with_appearance_tools = $node [ 'path' ];
$node_path_with_appearance_tools [] = 'appearanceTools' ;
_wp_array_set ( $output , $node_path_with_appearance_tools , true );
2022-04-11 12:38:00 +02:00
foreach ( static :: APPEARANCE_TOOLS_OPT_INS as $opt_in_path ) {
2022-11-11 02:50:11 +01:00
$full_path = $node [ 'path' ];
foreach ( $opt_in_path as $opt_in_path_item ) {
$full_path [] = $opt_in_path_item ;
}
2023-07-09 23:40:23 +02:00
/*
* Use " unset prop " as a marker instead of " null " because
* " null " can be a valid value for some props ( e . g . blockGap ) .
*/
2022-04-11 12:38:00 +02:00
$opt_in_value = _wp_array_get ( $output , $full_path , 'unset prop' );
if ( true !== $opt_in_value ) {
continue ;
}
2023-07-09 23:40:23 +02:00
/*
* The following could be improved to be path independent .
* At the moment it relies on a couple of assumptions :
*
* - all opt - ins having a path of size 2.
* - there ' s two sources of settings : the top - level and the block - level .
*/
2022-04-11 12:38:00 +02:00
if (
( 1 === count ( $node [ 'path' ] ) ) &&
( 'settings' === $node [ 'path' ][ 0 ] )
) {
// Top-level settings.
unset ( $output [ 'settings' ][ $opt_in_path [ 0 ] ][ $opt_in_path [ 1 ] ] );
if ( empty ( $output [ 'settings' ][ $opt_in_path [ 0 ] ] ) ) {
unset ( $output [ 'settings' ][ $opt_in_path [ 0 ] ] );
}
} elseif (
( 3 === count ( $node [ 'path' ] ) ) &&
( 'settings' === $node [ 'path' ][ 0 ] ) &&
( 'blocks' === $node [ 'path' ][ 1 ] )
) {
// Block-level settings.
$block_name = $node [ 'path' ][ 2 ];
unset ( $output [ 'settings' ][ 'blocks' ][ $block_name ][ $opt_in_path [ 0 ] ][ $opt_in_path [ 1 ] ] );
if ( empty ( $output [ 'settings' ][ 'blocks' ][ $block_name ][ $opt_in_path [ 0 ] ] ) ) {
unset ( $output [ 'settings' ][ 'blocks' ][ $block_name ][ $opt_in_path [ 0 ] ] );
}
}
}
}
}
wp_recursive_ksort ( $output );
return $output ;
}
2022-09-21 13:43:13 +02:00
/**
* Sets the spacingSizes array based on the spacingScale values from theme . json .
*
* @ since 6.1 . 0
*
* @ return null | void
*/
public function set_spacing_sizes () {
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
$spacing_scale = isset ( $this -> theme_json [ 'settings' ][ 'spacing' ][ 'spacingScale' ] )
? $this -> theme_json [ 'settings' ][ 'spacing' ][ 'spacingScale' ]
: array ();
2022-09-21 13:43:13 +02:00
2022-11-10 23:16:15 +01:00
if ( ! isset ( $spacing_scale [ 'steps' ] )
|| ! is_numeric ( $spacing_scale [ 'steps' ] )
2022-09-21 13:43:13 +02:00
|| ! isset ( $spacing_scale [ 'mediumStep' ] )
|| ! isset ( $spacing_scale [ 'unit' ] )
|| ! isset ( $spacing_scale [ 'operator' ] )
|| ! isset ( $spacing_scale [ 'increment' ] )
|| ! isset ( $spacing_scale [ 'steps' ] )
|| ! is_numeric ( $spacing_scale [ 'increment' ] )
|| ! is_numeric ( $spacing_scale [ 'mediumStep' ] )
|| ( '+' !== $spacing_scale [ 'operator' ] && '*' !== $spacing_scale [ 'operator' ] ) ) {
if ( ! empty ( $spacing_scale ) ) {
2023-11-25 22:19:30 +01:00
trigger_error (
sprintf (
/* translators: 1: theme.json, 2: settings.spacing.spacingScale */
__ ( 'Some of the %1$s %2$s values are invalid' ),
'theme.json' ,
'settings.spacing.spacingScale'
),
E_USER_NOTICE
);
2022-09-21 13:43:13 +02:00
}
return null ;
}
// If theme authors want to prevent the generation of the core spacing scale they can set their theme.json spacingScale.steps to 0.
if ( 0 === $spacing_scale [ 'steps' ] ) {
return null ;
}
$unit = '%' === $spacing_scale [ 'unit' ] ? '%' : sanitize_title ( $spacing_scale [ 'unit' ] );
$current_step = $spacing_scale [ 'mediumStep' ];
$steps_mid_point = round ( $spacing_scale [ 'steps' ] / 2 , 0 );
$x_small_count = null ;
$below_sizes = array ();
$slug = 40 ;
$remainder = 0 ;
for ( $below_midpoint_count = $steps_mid_point - 1 ; $spacing_scale [ 'steps' ] > 1 && $slug > 0 && $below_midpoint_count > 0 ; $below_midpoint_count -- ) {
if ( '+' === $spacing_scale [ 'operator' ] ) {
$current_step -= $spacing_scale [ 'increment' ];
} elseif ( $spacing_scale [ 'increment' ] > 1 ) {
$current_step /= $spacing_scale [ 'increment' ];
} else {
$current_step *= $spacing_scale [ 'increment' ];
}
if ( $current_step <= 0 ) {
$remainder = $below_midpoint_count ;
break ;
}
$below_sizes [] = array (
/* translators: %s: Digit to indicate multiple of sizing, eg. 2X-Small. */
'name' => $below_midpoint_count === $steps_mid_point - 1 ? __ ( 'Small' ) : sprintf ( __ ( '%sX-Small' ), ( string ) $x_small_count ),
'slug' => ( string ) $slug ,
'size' => round ( $current_step , 2 ) . $unit ,
);
if ( $below_midpoint_count === $steps_mid_point - 2 ) {
$x_small_count = 2 ;
}
if ( $below_midpoint_count < $steps_mid_point - 2 ) {
2023-09-09 11:28:26 +02:00
++ $x_small_count ;
2022-09-21 13:43:13 +02:00
}
$slug -= 10 ;
}
$below_sizes = array_reverse ( $below_sizes );
$below_sizes [] = array (
'name' => __ ( 'Medium' ),
'slug' => '50' ,
'size' => $spacing_scale [ 'mediumStep' ] . $unit ,
);
$current_step = $spacing_scale [ 'mediumStep' ];
$x_large_count = null ;
$above_sizes = array ();
$slug = 60 ;
$steps_above = ( $spacing_scale [ 'steps' ] - $steps_mid_point ) + $remainder ;
for ( $above_midpoint_count = 0 ; $above_midpoint_count < $steps_above ; $above_midpoint_count ++ ) {
$current_step = '+' === $spacing_scale [ 'operator' ]
? $current_step + $spacing_scale [ 'increment' ]
: ( $spacing_scale [ 'increment' ] >= 1 ? $current_step * $spacing_scale [ 'increment' ] : $current_step / $spacing_scale [ 'increment' ] );
$above_sizes [] = array (
/* translators: %s: Digit to indicate multiple of sizing, eg. 2X-Large. */
'name' => 0 === $above_midpoint_count ? __ ( 'Large' ) : sprintf ( __ ( '%sX-Large' ), ( string ) $x_large_count ),
'slug' => ( string ) $slug ,
'size' => round ( $current_step , 2 ) . $unit ,
);
if ( 1 === $above_midpoint_count ) {
$x_large_count = 2 ;
}
if ( $above_midpoint_count > 1 ) {
2023-09-09 11:28:26 +02:00
++ $x_large_count ;
2022-09-21 13:43:13 +02:00
}
$slug += 10 ;
}
2022-11-11 02:50:11 +01:00
$spacing_sizes = $below_sizes ;
foreach ( $above_sizes as $above_sizes_item ) {
$spacing_sizes [] = $above_sizes_item ;
}
2022-09-21 13:43:13 +02:00
2023-05-03 21:46:21 +02:00
// If there are 7 or fewer steps in the scale revert to numbers for labels instead of t-shirt sizes.
2022-09-21 13:43:13 +02:00
if ( $spacing_scale [ 'steps' ] <= 7 ) {
for ( $spacing_sizes_count = 0 ; $spacing_sizes_count < count ( $spacing_sizes ); $spacing_sizes_count ++ ) {
$spacing_sizes [ $spacing_sizes_count ][ 'name' ] = ( string ) ( $spacing_sizes_count + 1 );
}
}
_wp_array_set ( $this -> theme_json , array ( 'settings' , 'spacing' , 'spacingSizes' , 'default' ), $spacing_sizes );
}
2023-06-21 09:56:18 +02:00
/**
* This is used to convert the internal representation of variables to the CSS representation .
* For example , `var:preset|color|vivid-green-cyan` becomes `var(--wp--preset--color--vivid-green-cyan)` .
*
* @ since 6.3 . 0
* @ param string $value The variable such as var : preset | color | vivid - green - cyan to convert .
* @ return string The converted variable .
*/
private static function convert_custom_properties ( $value ) {
$prefix = 'var:' ;
$prefix_len = strlen ( $prefix );
$token_in = '|' ;
$token_out = '--' ;
2023-06-22 16:14:25 +02:00
if ( str_starts_with ( $value , $prefix ) ) {
2023-06-21 09:56:18 +02:00
$unwrapped_name = str_replace (
$token_in ,
$token_out ,
substr ( $value , $prefix_len )
);
$value = " var(--wp-- $unwrapped_name ) " ;
}
return $value ;
}
/**
* Given a tree , converts the internal representation of variables to the CSS representation .
* It is recursive and modifies the input in - place .
*
* @ since 6.3 . 0
* @ param array $tree Input to process .
* @ return array The modified $tree .
*/
private static function resolve_custom_css_format ( $tree ) {
$prefix = 'var:' ;
foreach ( $tree as $key => $data ) {
2023-06-22 16:14:25 +02:00
if ( is_string ( $data ) && str_starts_with ( $data , $prefix ) ) {
2023-06-21 09:56:18 +02:00
$tree [ $key ] = self :: convert_custom_properties ( $data );
} elseif ( is_array ( $data ) ) {
$tree [ $key ] = self :: resolve_custom_css_format ( $data );
}
}
return $tree ;
}
2023-06-27 10:48:24 +02:00
/**
* Returns the selectors metadata for a block .
*
* @ since 6.3 . 0
*
* @ param object $block_type The block type .
* @ param string $root_selector The block ' s root selector .
*
* @ return array The custom selectors set by the block .
*/
protected static function get_block_selectors ( $block_type , $root_selector ) {
if ( ! empty ( $block_type -> selectors ) ) {
return $block_type -> selectors ;
}
$selectors = array ( 'root' => $root_selector );
foreach ( static :: BLOCK_SUPPORT_FEATURE_LEVEL_SELECTORS as $key => $feature ) {
$feature_selector = wp_get_block_css_selector ( $block_type , $key );
if ( null !== $feature_selector ) {
$selectors [ $feature ] = array ( 'root' => $feature_selector );
}
}
return $selectors ;
}
/**
* Generates all the element selectors for a block .
*
* @ since 6.3 . 0
*
* @ param string $root_selector The block ' s root CSS selector .
* @ return array The block ' s element selectors .
*/
protected static function get_block_element_selectors ( $root_selector ) {
2023-07-09 23:40:23 +02:00
/*
* Assign defaults , then override those that the block sets by itself .
* If the block selector is compounded , will append the element to each
* individual block selector .
*/
2023-07-10 00:17:22 +02:00
$block_selectors = explode ( ',' , $root_selector );
$element_selectors = array ();
2023-06-27 10:48:24 +02:00
foreach ( static :: ELEMENTS as $el_name => $el_selector ) {
$element_selector = array ();
foreach ( $block_selectors as $selector ) {
if ( $selector === $el_selector ) {
$element_selector = array ( $el_selector );
break ;
}
$element_selector [] = static :: prepend_to_selector ( $el_selector , $selector . ' ' );
}
$element_selectors [ $el_name ] = implode ( ',' , $element_selector );
}
return $element_selectors ;
}
/**
* Generates style declarations for a node ' s features e . g . , color , border ,
* typography etc . that have custom selectors in their related block ' s
* metadata .
*
* @ since 6.3 . 0
*
* @ param object $metadata The related block metadata containing selectors .
* @ param object $node A merged theme . json node for block or variation .
*
* @ return array The style declarations for the node ' s features with custom
* selectors .
*/
protected function get_feature_declarations_for_node ( $metadata , & $node ) {
$declarations = array ();
if ( ! isset ( $metadata [ 'selectors' ] ) ) {
return $declarations ;
}
Editor: Reduce the use of the `_wp_array_get()` function to improve performance.
`_wp_array_get()` is an expensive function, and it's called thousands of times on each page view on the front end. While the function performance was slightly improved in #58376, it is still called more times than it should be.
This commit aims to further optimize its usage:
* In many cases, `_wp_array_get()` can be replaced with a much simpler and faster `isset()` check.
* The `isset()` function is capable of checking nested arrays, so `isset( $foo['a']['b']['c'] )` will return false even if `$foo['a']` is unset, without throwing any errors or warnings.
* When `_wp_array_get()` cannot be directly replaced with `isset()`, it would be good practice to wrap it in an `isset()` function so that `_wp_array_get()` only runs when it needs to.
Original PR from Gutenberg repository:
* [https://github.com/WordPress/gutenberg/pull/51116 #51116 Performance improvement: Reduce the use of the _wp_array_get() function]
Follow-up to [55851], [56382].
Props aristath, jrf, spacedmonkey, mukesh27, swissspidy, hellofromTonya.
Fixes #59405.
Built from https://develop.svn.wordpress.org/trunk@56709
git-svn-id: http://core.svn.wordpress.org/trunk@56221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2023-09-26 15:47:20 +02:00
$settings = isset ( $this -> theme_json [ 'settings' ] )
? $this -> theme_json [ 'settings' ]
: array ();
2023-06-27 10:48:24 +02:00
foreach ( $metadata [ 'selectors' ] as $feature => $feature_selectors ) {
2023-07-09 23:40:23 +02:00
/*
* Skip if this is the block 's root selector or the block doesn' t
* have any styles for the feature .
*/
2023-06-27 10:48:24 +02:00
if ( 'root' === $feature || empty ( $node [ $feature ] ) ) {
continue ;
}
if ( is_array ( $feature_selectors ) ) {
foreach ( $feature_selectors as $subfeature => $subfeature_selector ) {
if ( 'root' === $subfeature || empty ( $node [ $feature ][ $subfeature ] ) ) {
continue ;
}
2023-07-09 23:40:23 +02:00
/*
* Create temporary node containing only the subfeature data
* to leverage existing `compute_style_properties` function .
*/
2023-06-27 10:48:24 +02:00
$subfeature_node = array (
$feature => array (
$subfeature => $node [ $feature ][ $subfeature ],
),
);
// Generate style declarations.
$new_declarations = static :: compute_style_properties ( $subfeature_node , $settings , null , $this -> theme_json );
// Merge subfeature declarations into feature declarations.
if ( isset ( $declarations [ $subfeature_selector ] ) ) {
foreach ( $new_declarations as $new_declaration ) {
$declarations [ $subfeature_selector ][] = $new_declaration ;
}
} else {
$declarations [ $subfeature_selector ] = $new_declarations ;
}
2023-07-09 23:40:23 +02:00
/*
* Remove the subfeature from the block ' s node now its
* styles will be included under its own selector not the
* block ' s .
*/
2023-06-27 10:48:24 +02:00
unset ( $node [ $feature ][ $subfeature ] );
}
}
2023-07-09 23:40:23 +02:00
/*
* Now subfeatures have been processed and removed we can process
* feature root selector or simple string selector .
*/
2023-06-27 10:48:24 +02:00
if (
is_string ( $feature_selectors ) ||
( isset ( $feature_selectors [ 'root' ] ) && $feature_selectors [ 'root' ] )
) {
$feature_selector = is_string ( $feature_selectors ) ? $feature_selectors : $feature_selectors [ 'root' ];
2023-07-09 23:40:23 +02:00
/*
* Create temporary node containing only the feature data
* to leverage existing `compute_style_properties` function .
*/
2023-06-27 10:48:24 +02:00
$feature_node = array ( $feature => $node [ $feature ] );
// Generate the style declarations.
$new_declarations = static :: compute_style_properties ( $feature_node , $settings , null , $this -> theme_json );
2023-07-09 23:40:23 +02:00
/*
* Merge new declarations with any that already exist for
* the feature selector . This may occur when multiple block
* support features use the same custom selector .
*/
2023-06-27 10:48:24 +02:00
if ( isset ( $declarations [ $feature_selector ] ) ) {
foreach ( $new_declarations as $new_declaration ) {
$declarations [ $feature_selector ][] = $new_declaration ;
}
} else {
$declarations [ $feature_selector ] = $new_declarations ;
}
2023-07-09 23:40:23 +02:00
/*
* Remove the feature from the block ' s node now its styles
* will be included under its own selector not the block ' s .
*/
2023-06-27 10:48:24 +02:00
unset ( $node [ $feature ] );
}
}
return $declarations ;
}
2023-06-22 10:44:26 +02:00
/**
* Replaces CSS variables with their values in place .
*
* @ since 6.3 . 0
2024-02-27 11:15:13 +01:00
* @ since 6.5 . 0 Check for empty style before processing its value .
*
2023-06-22 10:44:26 +02:00
* @ param array $styles CSS declarations to convert .
* @ param array $values key => value pairs to use for replacement .
* @ return array
*/
private static function convert_variables_to_value ( $styles , $values ) {
foreach ( $styles as $key => $style ) {
2024-02-27 11:15:13 +01:00
if ( empty ( $style ) ) {
continue ;
}
2023-06-22 10:44:26 +02:00
if ( is_array ( $style ) ) {
$styles [ $key ] = self :: convert_variables_to_value ( $style , $values );
continue ;
}
if ( 0 <= strpos ( $style , 'var(' ) ) {
// find all the variables in the string in the form of var(--variable-name, fallback), with fallback in the second capture group.
$has_matches = preg_match_all ( '/var\(([^),]+)?,?\s?(\S+)?\)/' , $style , $var_parts );
if ( $has_matches ) {
$resolved_style = $styles [ $key ];
foreach ( $var_parts [ 1 ] as $index => $var_part ) {
$key_in_values = 'var(' . $var_part . ')' ;
$rule_to_replace = $var_parts [ 0 ][ $index ]; // the css rule to replace e.g. var(--wp--preset--color--vivid-green-cyan).
$fallback = $var_parts [ 2 ][ $index ]; // the fallback value.
$resolved_style = str_replace (
array (
$rule_to_replace ,
$fallback ,
),
array (
isset ( $values [ $key_in_values ] ) ? $values [ $key_in_values ] : $rule_to_replace ,
isset ( $values [ $fallback ] ) ? $values [ $fallback ] : $fallback ,
),
$resolved_style
);
}
$styles [ $key ] = $resolved_style ;
}
}
}
return $styles ;
}
/**
* Resolves the values of CSS variables in the given styles .
*
* @ since 6.3 . 0
* @ param WP_Theme_JSON $theme_json The theme json resolver .
*
* @ return WP_Theme_JSON The $theme_json with resolved variables .
*/
public static function resolve_variables ( $theme_json ) {
$settings = $theme_json -> get_settings ();
$styles = $theme_json -> get_raw_data ()[ 'styles' ];
$preset_vars = static :: compute_preset_vars ( $settings , static :: VALID_ORIGINS );
$theme_vars = static :: compute_theme_vars ( $settings );
$vars = array_reduce (
array_merge ( $preset_vars , $theme_vars ),
2023-09-12 17:23:18 +02:00
function ( $carry , $item ) {
2023-06-22 10:44:26 +02:00
$name = $item [ 'name' ];
$carry [ " var( { $name } ) " ] = $item [ 'value' ];
return $carry ;
},
array ()
);
$theme_json -> theme_json [ 'styles' ] = self :: convert_variables_to_value ( $styles , $vars );
return $theme_json ;
}
2024-02-07 09:53:13 +01:00
/**
* Generates a selector for a block style variation .
*
* @ since 6.5 . 0
*
* @ param string $variation_name Name of the block style variation .
* @ param string $block_selector CSS selector for the block .
* @ return string Block selector with block style variation selector added to it .
*/
protected static function get_block_style_variation_selector ( $variation_name , $block_selector ) {
$variation_class = " .is-style- $variation_name " ;
if ( ! $block_selector ) {
return $variation_class ;
}
$limit = 1 ;
$selector_parts = explode ( ',' , $block_selector );
$result = array ();
foreach ( $selector_parts as $part ) {
$result [] = preg_replace_callback (
'/((?::\([^)]+\))?\s*)([^\s:]+)/' ,
function ( $matches ) use ( $variation_class ) {
return $matches [ 1 ] . $matches [ 2 ] . $variation_class ;
},
$part ,
$limit
);
}
return implode ( ',' , $result );
}
2021-05-24 10:37:55 +02:00
}