Backports: WordPress 6.6.2 (#65050)

* Fix canvas issues by removing VisualEditor’s height (#63724) Unlinked contributors: wp-seopress. Co-authored-by: t-hamano <[email protected]> Co-authored-by: carolinan <[email protected]> * Post Editor: Prevent popover from being hidden by metabox (#63939) * Post Editor: Prevent popover from being hidden by metabox * Use `.interface-interface-skeleton__content` instead of `.interface-interface-skeleton__body` Co-authored-by: t-hamano <[email protected]> Co-authored-by: stokesman <[email protected]> Co-authored-by: talldan <[email protected]> Co-authored-by: Rishit30G <[email protected]> Co-authored-by: dhananjaykuber <[email protected]> * Global Styles: Fix block custom CSS pseudo element selectors (#63980) Unlinked contributors: harlet. Co-authored-by: aaronrobertshaw <[email protected]> Co-authored-by: andrewserong <[email protected]> Co-authored-by: ramonjd <[email protected]> Co-authored-by: dballari <[email protected]> Co-authored-by: wongjn <[email protected]> * Avoid errors for post types without a 'menu_icon' (#64015) Unlinked contributors: karan4official. Co-authored-by: Mamaduka <[email protected]> Co-authored-by: t-hamano <[email protected]> * Data Views: Don't render action modal when there are no eligible items (#64250) Co-authored-by: Mamaduka <[email protected]> Co-authored-by: youknowriad <[email protected]> * Post editor: apply space below content using a pseudo-element instead of padding-bottom (#64639) Co-authored-by: talldan <[email protected]> Co-authored-by: stokesman <[email protected]> Co-authored-by: t-hamano <[email protected]> Co-authored-by: carolinan <[email protected]> Co-authored-by: PC888 <[email protected]> * Featured Image Block: Reduce CSS specificity (#64463) Co-authored-by: dsas <[email protected]> Co-authored-by: aaronrobertshaw <[email protected]> Co-authored-by: talldan <[email protected]> Co-authored-by: ramonjd <[email protected]> Co-authored-by: andrewserong <[email protected]> * Inserter: use lighter grammar parse to check allowed status (#64902) Co-authored-by: ellatrix <[email protected]> Co-authored-by: Mamaduka <[email protected]> Co-authored-by: jsnajdr <[email protected]> Co-authored-by: tyxla <[email protected]> * Prepare JSON schemas for Draft 7 update (#63582) Co-authored-by: ajlende <[email protected]> Co-authored-by: t-hamano <[email protected]> Co-authored-by: scruffian <[email protected]> * Fix missing ref support for textAlign and textColumns in theme.json schema (#63625) * Add missing ref support for textAlign and textColumns * Update the theme.json reference docs Co-authored-by: ajlende <[email protected]> Co-authored-by: t-hamano <[email protected]> Co-authored-by: jeryj <[email protected]> * Don't allow duplicating template parts in non-block-based themes (#64379) Co-authored-by: t-hamano <[email protected]> Co-authored-by: Mamaduka <[email protected]> Co-authored-by: MadtownLems <[email protected]> * Fix bumped specificity for layout styles in non-iframed editor (#64076) * Fix too specific layout styles in non-iframed editor * Ensure first/last child rules take precedence * Adjust selectors so that `> :first-child`/`> :last-child` still has 0,2,0 specificity to override theme.json spacing * Update tests * Update client side layout selectors to match theme json * Add backport changelog ---- Co-authored-by: talldan <[email protected]> Co-authored-by: andrewserong <[email protected]> Co-authored-by: ramonjd <[email protected]> Co-authored-by: aaronrobertshaw <[email protected]> * Update postcss-prefixwrap dependency to 1.51.0 to fix prefixing in `:where` selectors (#64458) * Update postcss-prefixwrap dependency to 1.51.0 to fix prefixing in :where selectors * Add extra test for :where with a pseudo selector ---- Co-authored-by: talldan <[email protected]> Co-authored-by: aaronrobertshaw <[email protected]> Co-authored-by: andrewserong <[email protected]> Co-authored-by: andreiglingeanu <[email protected]> * Revert "Update postcss-prefixwrap dependency to 1.51.0 to fix prefixing in `:where` selectors (#64458)" This reverts commit 53a370e. * Update postcss-prefixwrap dependency to 1.51.0 to fix prefixing in `:where` selectors (#64458) * Update postcss-prefixwrap dependency to 1.51.0 to fix prefixing in :where selectors * Add extra test for :where with a pseudo selector ---- Co-authored-by: talldan <[email protected]> Co-authored-by: aaronrobertshaw <[email protected]> Co-authored-by: andrewserong <[email protected]> Co-authored-by: andreiglingeanu <[email protected]> * Post Editor: fix click space after post content to append (#64992) * Fix minimally * Revise comment * Stop propagation and don’t prevent default * Insert default block if no blocks are present * re-build package lock to match format * Revert "Inserter: use lighter grammar parse to check allowed status (#64902)" This reverts commit 9b9bbe8. --------- Co-authored-by: Mitchell Austin <[email protected]> Co-authored-by: t-hamano <[email protected]> Co-authored-by: carolinan <[email protected]> Co-authored-by: Aki Hamano <[email protected]> Co-authored-by: stokesman <[email protected]> Co-authored-by: talldan <[email protected]> Co-authored-by: Rishit30G <[email protected]> Co-authored-by: dhananjaykuber <[email protected]> Co-authored-by: Aaron Robertshaw <[email protected]> Co-authored-by: aaronrobertshaw <[email protected]> Co-authored-by: andrewserong <[email protected]> Co-authored-by: ramonjd <[email protected]> Co-authored-by: dballari <[email protected]> Co-authored-by: wongjn <[email protected]> Co-authored-by: George Mamadashvili <[email protected]> Co-authored-by: Mamaduka <[email protected]> Co-authored-by: youknowriad <[email protected]> Co-authored-by: Daniel Richards <[email protected]> Co-authored-by: PC888 <[email protected]> Co-authored-by: Dean Sas <[email protected]> Co-authored-by: dsas <[email protected]> Co-authored-by: Ella <[email protected]> Co-authored-by: ellatrix <[email protected]> Co-authored-by: jsnajdr <[email protected]> Co-authored-by: tyxla <[email protected]> Co-authored-by: Alex Lende <[email protected]> Co-authored-by: ajlende <[email protected]> Co-authored-by: scruffian <[email protected]> Co-authored-by: jeryj <[email protected]> Co-authored-by: MadtownLems <[email protected]>
WordPress · Sep 4, 2024 · d019d3c · d019d3c
1 parent c7f1e8e
commit d019d3c
Show file tree

Hide file tree

Showing 23 changed files with 345 additions and 134 deletions.
diff --git a/backport-changelog/6.6/7097.md b/backport-changelog/6.6/7097.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7097
+
+* https://github.com/WordPress/gutenberg/pull/63980
diff --git a/backport-changelog/6.6/7145.md b/backport-changelog/6.6/7145.md
@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/7145
+
+* https://github.com/WordPress/gutenberg/pull/64076
diff --git a/bin/api-docs/gen-theme-reference.js → bin/api-docs/gen-theme-reference.mjs b/bin/api-docs/gen-theme-reference.js → bin/api-docs/gen-theme-reference.mjs
@@ -7,8 +7,13 @@
 /**
  * External dependencies
  */
-const path = require( 'path' );
-const fs = require( 'fs' );
+import path from 'path';
+import fs from 'fs';
+import url from 'url';
+import $RefParser from '@apidevtools/json-schema-ref-parser';
+
+const __dirname = path.dirname( url.fileURLToPath( import.meta.url ) );
+
 /**
  * Path to root project directory.
  *
@@ -58,7 +63,7 @@ const END_TOKEN = '<!-- END TOKEN Autogenerated - DO NOT EDIT -->';
  */
 const TOKEN_PATTERN = new RegExp( START_TOKEN + '[^]*' + END_TOKEN );
 
-const themejson = require( THEME_JSON_SCHEMA_FILE );
+const themejson = await $RefParser.dereference( THEME_JSON_SCHEMA_FILE );
 
 /**
  * Convert object keys to an array.
@@ -74,42 +79,6 @@ const keys = ( maybeObject ) => {
 	return Object.keys( maybeObject );
 };
 
-/**
- * Get definition from ref.
- *
- * @param {string} ref
- * @return {Object} definition
- * @throws {Error} If the referenced definition is not found in 'themejson.definitions'.
- *
- * @example
- * getDefinition( '#/definitions/typographyProperties/properties/fontFamily' )
- *  // returns themejson.definitions.typographyProperties.properties.fontFamily
- */
-const resolveDefinitionRef = ( ref ) => {
-	const refParts = ref.split( '/' );
-	const definition = refParts[ refParts.length - 1 ];
-	if ( ! themejson.definitions[ definition ] ) {
-		throw new Error( `Can't resolve '${ ref }'. Definition not found` );
-	}
-	return themejson.definitions[ definition ];
-};
-
-/**
- * Get properties from an array.
- *
- * @param {Object} items
- * @return {Object} properties
- */
-const getPropertiesFromArray = ( items ) => {
-	// if its a $ref resolve it
-	if ( items.$ref ) {
-		return resolveDefinitionRef( items.$ref ).properties;
-	}
-
-	// otherwise just return the properties
-	return items.properties;
-};
-
 /**
  * Convert settings properties to markup.
  *
@@ -133,9 +102,7 @@ const getSettingsPropertiesMarkup = ( struct ) => {
 		let type = props[ key ].type || '';
 		let ps =
 			props[ key ].type === 'array'
-				? keys( getPropertiesFromArray( props[ key ].items ) )
-						.sort()
-						.join( ', ' )
+				? keys( props[ key ].items.properties ).sort().join( ', ' )
 				: '';
 
 		/*
@@ -154,9 +121,7 @@ const getSettingsPropertiesMarkup = ( struct ) => {
 					.map( ( item ) =>
 						item?.type === 'object' && item?.properties
 							? '_{' +
-							  keys( getPropertiesFromArray( item ) )
-									.sort()
-									.join( ', ' ) +
+							  keys( item.properties ).sort().join( ', ' ) +
 							  '}_'
 							: ''
 					)
@@ -244,10 +209,6 @@ const formatType = ( prop ) => {
 			if ( item.type ) {
 				types.push( item.type );
 			}
-			// refComplete is always an object
-			if ( item.$ref && item.$ref === '#/definitions/refComplete' ) {
-				types.push( 'object' );
-			}
 		} );
 
 		type = [ ...new Set( types ) ].join( ', ' );

diff --git a/lib/class-wp-theme-json-gutenberg.php b/lib/class-wp-theme-json-gutenberg.php
@@ -1372,9 +1372,16 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 	protected function process_blocks_custom_css( $css, $selector ) {
 		$processed_css = '';
 
+		if ( empty( $css ) ) {
+			return $processed_css;
+		}
+
 		// Split CSS nested rules.
 		$parts = explode( '&', $css );
 		foreach ( $parts as $part ) {
+			if ( empty( $part ) ) {
+				continue;
+			}
 			$is_root_css = ( ! str_contains( $part, '{' ) );
 			if ( $is_root_css ) {
 				// If the part doesn't contain braces, it applies to the root level.
@@ -1387,11 +1394,24 @@ protected function process_blocks_custom_css( $css, $selector ) {
 				}
 				$nested_selector = $part[0];
 				$css_value       = $part[1];
-				$part_selector   = str_starts_with( $nested_selector, ' ' )
+
+				/*
+				 * Handle pseudo elements such as ::before, ::after etc. Regex will also
+				 * capture any leading combinator such as >, +, or ~, as well as spaces.
+				 * This allows pseudo elements as descendants e.g. `.parent ::before`.
+				 */
+				$matches            = array();
+				$has_pseudo_element = preg_match( '/([>+~\s]*::[a-zA-Z-]+)/', $nested_selector, $matches );
+				$pseudo_part        = $has_pseudo_element ? $matches[1] : '';
+				$nested_selector    = $has_pseudo_element ? str_replace( $pseudo_part, '', $nested_selector ) : $nested_selector;
+
+				// Finalize selector and re-append pseudo element if required.
+				$part_selector  = str_starts_with( $nested_selector, ' ' )
 					? static::scope_selector( $selector, $nested_selector )
 					: static::append_to_selector( $selector, $nested_selector );
-				$final_selector  = ":root :where($part_selector)";
-				$processed_css  .= $final_selector . '{' . trim( $css_value ) . '}';
+				$final_selector = ":root :where($part_selector)$pseudo_part";
+
+				$processed_css .= $final_selector . '{' . trim( $css_value ) . '}';
 			}
 		}
 		return $processed_css;
@@ -1651,7 +1671,7 @@ protected function get_layout_styles( $block_metadata, $types = array() ) {
 										$spacing_rule['selector']
 									);
 								} else {
-									$format          = static::ROOT_BLOCK_SELECTOR === $selector ? '.%2$s %3$s' : '%1$s-%2$s %3$s';
+									$format          = static::ROOT_BLOCK_SELECTOR === $selector ? ':root :where(.%2$s)%3$s' : ':root :where(%1$s-%2$s)%3$s';
 									$layout_selector = sprintf(
 										$format,
 										$selector,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -97,6 +97,7 @@
 	"devDependencies": {
 		"@actions/core": "1.9.1",
 		"@actions/github": "5.0.0",
+		"@apidevtools/json-schema-ref-parser": "11.6.4",
 		"@ariakit/test": "^0.3.7",
 		"@babel/core": "7.24.3",
 		"@babel/plugin-proposal-export-namespace-from": "7.18.9",
@@ -281,7 +282,7 @@
 		"docs:blocks": "node ./bin/api-docs/gen-block-lib-list.js",
 		"docs:build": "npm-run-all docs:gen docs:blocks docs:api-ref docs:theme-ref",
 		"docs:gen": "node ./docs/tool/index.js",
-		"docs:theme-ref": "node ./bin/api-docs/gen-theme-reference.js",
+		"docs:theme-ref": "node ./bin/api-docs/gen-theme-reference.mjs",
 		"env": "wp-env",
 		"fixtures:clean": "rimraf \"test/integration/fixtures/blocks/*.+(json|serialized.html)\"",
 		"fixtures:generate": "cross-env GENERATE_MISSING_FIXTURES=y npm run test:unit test/integration/full-content/ && npm run format test/integration/fixtures/blocks/*.json",

diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
@@ -73,7 +73,7 @@
 		"fast-deep-equal": "^3.1.3",
 		"memize": "^2.1.0",
 		"postcss": "^8.4.21",
-		"postcss-prefixwrap": "^1.41.0",
+		"postcss-prefixwrap": "^1.51.0",
 		"postcss-urlrebase": "^1.0.0",
 		"react-autosize-textarea": "^7.1.0",
 		"react-easy-crop": "^5.0.6",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		https://github.com/WordPress/wordpress-develop/pull/7097

		* https://github.com/WordPress/gutenberg/pull/63980