@wordpress/edit-site 6.33.2 → 6.33.3-next.36001005c.0

package/build-style/style.css

@@ -403,7 +403,7 @@
 }
 .dataviews-title-field {
   font-size: 13px;
-  font-weight: 500;
+  font-weight: 499;
   color: #2f2f2f;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -500,7 +500,7 @@
 
 .dataviews-bulk-actions-footer__item-count {
   color: #1e1e1e;
-  font-weight: 500;
+  font-weight: 499;
   font-size: 11px;
   text-transform: uppercase;
 }
@@ -616,7 +616,7 @@
 }
 
 .dataviews-filters__summary-chip-container .dataviews-filters__summary-chip .dataviews-filters-__summary-filter-text-name {
-  font-weight: 500;
+  font-weight: 499;
 }
 
 .dataviews-filters__summary-chip-container .dataviews-filters__summary-chip-remove {
@@ -1135,14 +1135,14 @@
 }
 .dataviews-pagination__page-select {
   font-size: 11px;
-  font-weight: 500;
+  font-weight: 499;
   text-transform: uppercase;
 }
 
 @media (min-width: 600px) {
   .dataviews-pagination__page-select .components-select-control__input {
     font-size: 11px !important;
-    font-weight: 500;
+    font-weight: 499;
   }
 }
 .dataviews-action-modal {
@@ -1474,7 +1474,7 @@
 
 .dataviews-view-grid__group-header {
   font-size: 15px;
-  font-weight: 500;
+  font-weight: 499;
   color: #1e1e1e;
   margin: 0 0 8px 0;
   padding: 0 48px;
@@ -1703,7 +1703,7 @@ div.dataviews-view-list {
 
 .dataviews-view-list__group-header {
   font-size: 15px;
-  font-weight: 500;
+  font-weight: 499;
   color: #1e1e1e;
   margin: 0 0 8px 0;
   padding: 0 24px;
@@ -1865,7 +1865,7 @@ div.dataviews-view-list {
   padding-left: 12px;
   font-size: 11px;
   text-transform: uppercase;
-  font-weight: 500;
+  font-weight: 499;
 }
 
 .dataviews-view-table thead th:has(.dataviews-view-table-header-button):not(:first-child) {
@@ -1898,7 +1898,7 @@ div.dataviews-view-list {
   padding: 4px 8px;
   font-size: 11px;
   text-transform: uppercase;
-  font-weight: 500;
+  font-weight: 499;
 }
 
 .dataviews-view-table .dataviews-view-table-header-button:not(:hover) {
@@ -1998,7 +1998,7 @@ div.dataviews-view-list {
 }
 
 .dataviews-view-table__group-header-row .dataviews-view-table__group-header-cell {
-  font-weight: 500;
+  font-weight: 499;
   padding: 12px 48px;
   color: #1e1e1e;
 }
@@ -2156,7 +2156,7 @@ div.dataviews-view-list {
 
 .dataviews-view-picker-grid-group__header {
   font-size: 15px;
-  font-weight: 500;
+  font-weight: 499;
   color: #1e1e1e;
   margin: 0 0 8px 0;
   padding: 0 48px;
@@ -2278,7 +2278,7 @@ div.dataviews-view-list {
 
 .dataforms-layouts-card__field-header-label {
   font-family: -apple-system, "system-ui", "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-  font-weight: 500;
+  font-weight: 499;
   font-size: 15px;
   line-height: 20px;
 }
@@ -2956,7 +2956,7 @@ fieldset.fields-controls__featured-image .fields-controls__featured-image-remove
 .edit-site-global-styles-subtitle {
   margin-bottom: 0 !important;
   text-transform: uppercase;
-  font-weight: 500 !important;
+  font-weight: 499 !important;
   font-size: 11px !important;
 }
 
@@ -3302,11 +3302,11 @@ fieldset.fields-controls__featured-image .fields-controls__featured-image-remove
 
 .edit-site-global-styles-sidebar .components-navigation__menu-title-heading {
   font-size: 15.6px;
-  font-weight: 500;
+  font-weight: 499;
 }
 
 .edit-site-global-styles-sidebar .components-navigation__item > button span {
-  font-weight: 500;
+  font-weight: 499;
 }
 
 .edit-site-global-styles-sidebar .block-editor-panel-color-gradient-settings {
@@ -4038,7 +4038,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
 .edit-site-sidebar-navigation-item.components-item[aria-current=true] {
   background: #2f2f2f;
   color: #fff;
-  font-weight: 500;
+  font-weight: 499;
 }
 .edit-site-sidebar-navigation-item.components-item:focus-visible {
   transform: translateZ(0);
@@ -4113,7 +4113,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   color: #ddd;
   font-size: 11px;
   text-transform: uppercase;
-  font-weight: 500;
+  font-weight: 499;
 }
 
 .edit-site-sidebar-navigation-screen__content .edit-site-global-styles-variations_item .edit-site-global-styles-variations_item-preview {
@@ -4201,7 +4201,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
 }
 .edit-site-sidebar-navigation-screen-patterns__group-header h2 {
   font-size: 11px;
-  font-weight: 500;
+  font-weight: 499;
   text-transform: uppercase;
 }
 
@@ -4274,7 +4274,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
 }
 .edit-site-sidebar-dataviews-dataview-item.is-selected {
   background: #2f2f2f;
-  font-weight: 500;
+  font-weight: 499;
   color: #fff;
 }
 
@@ -4305,7 +4305,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   display: block;
   flex-grow: 1;
   font-size: 15px;
-  font-weight: 500;
+  font-weight: 499;
   overflow: hidden;
   padding-right: 16px;
   margin-left: -4px;
@@ -4608,7 +4608,7 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
 }
 .font-library-modal .font-library-modal__subtitle {
   text-transform: uppercase;
-  font-weight: 500;
+  font-weight: 499;
   font-size: 11px;
 }
 .font-library-modal .components-navigator-screen {
@@ -4643,13 +4643,13 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
 
 .font-library-modal__page-selection {
   font-size: 11px;
-  font-weight: 500;
+  font-weight: 499;
   text-transform: uppercase;
 }
 @media (min-width: 600px) {
   .font-library-modal__page-selection .components-select-control__input {
     font-size: 11px !important;
-    font-weight: 500;
+    font-weight: 499;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "6.33.2",
+	"version": "6.33.3-next.36001005c.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -37,48 +37,49 @@
 	"wpScript": true,
 	"dependencies": {
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "^4.33.0",
-		"@wordpress/admin-ui": "^1.1.0",
-		"@wordpress/api-fetch": "^7.33.0",
-		"@wordpress/base-styles": "^6.9.0",
-		"@wordpress/blob": "^4.33.0",
-		"@wordpress/block-editor": "^15.6.0",
-		"@wordpress/block-library": "^9.33.1",
-		"@wordpress/blocks": "^15.6.0",
-		"@wordpress/commands": "^1.33.0",
-		"@wordpress/components": "^30.6.0",
-		"@wordpress/compose": "^7.33.0",
-		"@wordpress/core-data": "^7.33.0",
-		"@wordpress/data": "^10.33.0",
-		"@wordpress/dataviews": "^10.1.0",
-		"@wordpress/date": "^5.33.0",
-		"@wordpress/deprecated": "^4.33.0",
-		"@wordpress/dom": "^4.33.0",
-		"@wordpress/editor": "^14.33.2",
-		"@wordpress/element": "^6.33.0",
-		"@wordpress/escape-html": "^3.33.0",
-		"@wordpress/fields": "^0.25.2",
-		"@wordpress/hooks": "^4.33.0",
-		"@wordpress/html-entities": "^4.33.0",
-		"@wordpress/i18n": "^6.6.0",
-		"@wordpress/icons": "^11.0.0",
-		"@wordpress/keyboard-shortcuts": "^5.33.0",
-		"@wordpress/keycodes": "^4.33.0",
-		"@wordpress/media-utils": "^5.33.0",
-		"@wordpress/notices": "^5.33.0",
-		"@wordpress/patterns": "^2.33.0",
-		"@wordpress/plugins": "^7.33.0",
-		"@wordpress/preferences": "^4.33.0",
-		"@wordpress/primitives": "^4.33.0",
-		"@wordpress/private-apis": "^1.33.0",
-		"@wordpress/reusable-blocks": "^5.33.0",
-		"@wordpress/router": "^1.33.0",
-		"@wordpress/style-engine": "^2.33.0",
-		"@wordpress/url": "^4.33.0",
-		"@wordpress/viewport": "^6.33.0",
-		"@wordpress/views": "^1.0.1",
-		"@wordpress/widgets": "^4.33.0",
-		"@wordpress/wordcount": "^4.33.0",
+		"@wordpress/a11y": "^4.33.1-next.36001005c.0",
+		"@wordpress/admin-ui": "^1.1.1-next.36001005c.0",
+		"@wordpress/api-fetch": "^7.33.1-next.36001005c.0",
+		"@wordpress/base-styles": "^6.10.1-next.36001005c.0",
+		"@wordpress/blob": "^4.33.1-next.36001005c.0",
+		"@wordpress/block-editor": "^15.6.1-next.36001005c.0",
+		"@wordpress/block-library": "^9.33.2-next.36001005c.0",
+		"@wordpress/blocks": "^15.6.1-next.36001005c.0",
+		"@wordpress/commands": "^1.33.1-next.36001005c.0",
+		"@wordpress/components": "^30.7.1-next.36001005c.0",
+		"@wordpress/compose": "^7.33.1-next.36001005c.0",
+		"@wordpress/core-data": "^7.33.1-next.36001005c.0",
+		"@wordpress/data": "^10.33.1-next.36001005c.0",
+		"@wordpress/dataviews": "^10.1.1-next.36001005c.0",
+		"@wordpress/date": "^5.33.1-next.36001005c.0",
+		"@wordpress/deprecated": "^4.33.1-next.36001005c.0",
+		"@wordpress/dom": "^4.33.1-next.36001005c.0",
+		"@wordpress/editor": "^14.33.3-next.36001005c.0",
+		"@wordpress/element": "^6.33.1-next.36001005c.0",
+		"@wordpress/escape-html": "^3.33.1-next.36001005c.0",
+		"@wordpress/fields": "^0.25.3-next.36001005c.0",
+		"@wordpress/global-styles-engine": "^1.0.1-next.36001005c.0",
+		"@wordpress/hooks": "^4.33.1-next.36001005c.0",
+		"@wordpress/html-entities": "^4.33.1-next.36001005c.0",
+		"@wordpress/i18n": "^6.6.1-next.36001005c.0",
+		"@wordpress/icons": "^11.0.1-next.36001005c.0",
+		"@wordpress/keyboard-shortcuts": "^5.33.1-next.36001005c.0",
+		"@wordpress/keycodes": "^4.33.1-next.36001005c.0",
+		"@wordpress/media-utils": "^5.33.1-next.36001005c.0",
+		"@wordpress/notices": "^5.33.1-next.36001005c.0",
+		"@wordpress/patterns": "^2.33.1-next.36001005c.0",
+		"@wordpress/plugins": "^7.33.1-next.36001005c.0",
+		"@wordpress/preferences": "^4.33.1-next.36001005c.0",
+		"@wordpress/primitives": "^4.33.1-next.36001005c.0",
+		"@wordpress/private-apis": "^1.33.1-next.36001005c.0",
+		"@wordpress/reusable-blocks": "^5.33.1-next.36001005c.0",
+		"@wordpress/router": "^1.33.1-next.36001005c.0",
+		"@wordpress/style-engine": "^2.33.1-next.36001005c.0",
+		"@wordpress/url": "^4.33.1-next.36001005c.0",
+		"@wordpress/viewport": "^6.33.1-next.36001005c.0",
+		"@wordpress/views": "^1.0.2-next.36001005c.0",
+		"@wordpress/widgets": "^4.33.1-next.36001005c.0",
+		"@wordpress/wordcount": "^4.33.1-next.36001005c.0",
 		"change-case": "^4.1.2",
 		"clsx": "^2.1.1",
 		"colord": "^2.9.2",
@@ -93,5 +94,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "2a8c29e6550fa1a246bfce534fbcc545d035a9a7"
+	"gitHead": "b73a8a22e779c59efb8f911e32b681652f237d60"
 }

package/src/components/global-styles/font-library-modal/style.scss

@@ -27,7 +27,7 @@ $footer-height: 70px;
 
 	.font-library-modal__subtitle {
 		text-transform: uppercase;
-		font-weight: 500;
+		font-weight: $font-weight-medium;
 		font-size: 11px;
 	}
 
@@ -68,13 +68,13 @@ $footer-height: 70px;
 
 .font-library-modal__page-selection {
 	font-size: 11px;
-	font-weight: 500;
+	font-weight: $font-weight-medium;
 	text-transform: uppercase;
 
 	@include break-small() {
 		.components-select-control__input {
 			font-size: 11px !important;
-			font-weight: 500;
+			font-weight: $font-weight-medium;
 		}
 	}
 }

package/src/components/global-styles/style.scss

@@ -85,7 +85,7 @@
 	// Need to override the too specific styles for complementary areas.
 	margin-bottom: 0 !important;
 	text-transform: uppercase;
-	font-weight: 500 !important;
+	font-weight: $font-weight-medium !important;
 	font-size: 11px !important;
 }
 

package/src/components/global-styles-renderer/index.js

@@ -3,15 +3,12 @@
  */
 import { useEffect } from '@wordpress/element';
 import { useSelect, useDispatch } from '@wordpress/data';
-import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
  */
 import { store as editSiteStore } from '../../store';
-import { unlock } from '../../lock-unlock';
-
-const { useGlobalStylesOutput } = unlock( blockEditorPrivateApis );
+import { useGlobalStylesOutput } from '../../hooks/use-global-styles-output';
 
 function useGlobalStylesRenderer( disableRootPadding ) {
 	const [ styles, settings ] = useGlobalStylesOutput( disableRootPadding );

package/src/components/global-styles-sidebar/style.scss

@@ -21,11 +21,11 @@
 
 .edit-site-global-styles-sidebar .components-navigation__menu-title-heading {
 	font-size: $default-font-size * 1.2;
-	font-weight: 500;
+	font-weight: $font-weight-medium;
 }
 
 .edit-site-global-styles-sidebar .components-navigation__item > button span {
-	font-weight: 500;
+	font-weight: $font-weight-medium;
 }
 
 .edit-site-global-styles-sidebar .block-editor-panel-color-gradient-settings {

package/src/components/revisions/index.js

@@ -20,11 +20,11 @@ import { useContext, useMemo } from '@wordpress/element';
 
 import { unlock } from '../../lock-unlock';
 import EditorCanvasContainer from '../editor-canvas-container';
+import { useGlobalStylesOutputWithConfig } from '../../hooks/use-global-styles-output';
 
 const {
 	ExperimentalBlockEditorProvider,
 	GlobalStylesContext,
-	useGlobalStylesOutputWithConfig,
 	__unstableBlockStyleVariationOverridesWithConfig,
 } = unlock( blockEditorPrivateApis );
 const { mergeBaseAndUserConfigs } = unlock( editorPrivateApis );

package/src/components/sidebar-navigation-screen/style.scss

@@ -76,7 +76,7 @@
 	color: $gray-300;
 	font-size: 11px;
 	text-transform: uppercase;
-	font-weight: 500;
+	font-weight: $font-weight-medium;
 }
 
 .edit-site-sidebar-navigation-screen__content .edit-site-global-styles-variations_item {

package/src/components/sidebar-navigation-screen-patterns/style.scss

@@ -22,7 +22,7 @@
 
 	h2 {
 		font-size: 11px;
-		font-weight: 500;
+		font-weight: $font-weight-medium;
 		text-transform: uppercase;
 	}
 }

package/src/components/site-hub/style.scss

@@ -29,7 +29,7 @@
 	display: block;
 	flex-grow: 1;
 	font-size: 15px;
-	font-weight: 500;
+	font-weight: $font-weight-medium;
 	overflow: hidden;
 	// Add space for the ↗ to render.
 	padding-right: $grid-unit-20;

package/src/components/style-book/index.js

@@ -56,13 +56,10 @@ import {
 	STYLE_BOOK_COLOR_GROUPS,
 	STYLE_BOOK_PREVIEW_CATEGORIES,
 } from '../style-book/constants';
+import { useGlobalStylesOutputWithConfig } from '../../hooks/use-global-styles-output';
 
-const {
-	ExperimentalBlockEditorProvider,
-	useGlobalStyle,
-	GlobalStylesContext,
-	useGlobalStylesOutputWithConfig,
-} = unlock( blockEditorPrivateApis );
+const { ExperimentalBlockEditorProvider, useGlobalStyle, GlobalStylesContext } =
+	unlock( blockEditorPrivateApis );
 const { mergeBaseAndUserConfigs } = unlock( editorPrivateApis );
 
 const { Tabs } = unlock( componentsPrivateApis );
@@ -227,19 +224,29 @@ function applyBlockVariationsToExamples( examples, variation ) {
 	if ( ! variation ) {
 		return examples;
 	}
-
-	return examples.map( ( example ) => ( {
-		...example,
-		variation,
-		blocks: {
-			...example.blocks,
-			attributes: {
-				...example.blocks.attributes,
-				style: undefined,
-				className: getVariationClassName( variation ),
-			},
-		},
-	} ) );
+	return examples.map( ( example ) => {
+		return {
+			...example,
+			variation,
+			blocks: Array.isArray( example.blocks )
+				? example.blocks.map( ( block ) => ( {
+						...block,
+						attributes: {
+							...block.attributes,
+							style: undefined,
+							className: getVariationClassName( variation ),
+						},
+				  } ) )
+				: {
+						...example.blocks,
+						attributes: {
+							...example.blocks.attributes,
+							style: undefined,
+							className: getVariationClassName( variation ),
+						},
+				  },
+		};
+	} );
 }
 
 function StyleBook( {

package/src/hooks/use-global-styles-output.js

@@ -0,0 +1,80 @@
+/**
+ * WordPress dependencies
+ */
+import { getBlockTypes, store as blocksStore } from '@wordpress/blocks';
+import { useSelect } from '@wordpress/data';
+import { useContext, useMemo } from '@wordpress/element';
+import { generateGlobalStyles } from '@wordpress/global-styles-engine';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { store as editSiteStore } from '../store';
+import { unlock } from '../lock-unlock';
+
+const { GlobalStylesContext, useGlobalSetting } = unlock(
+	blockEditorPrivateApis
+);
+
+/**
+ * Returns the global styles output based on the provided global styles config.
+ *
+ * @param {Object}  mergedConfig       The merged global styles config.
+ * @param {boolean} disableRootPadding Disable root padding styles.
+ *
+ * @return {Array} Array of stylesheets and settings.
+ */
+export function useGlobalStylesOutputWithConfig(
+	mergedConfig = {},
+	disableRootPadding = false
+) {
+	const [ blockGap ] = useGlobalSetting( 'spacing.blockGap' );
+	const hasBlockGapSupport = blockGap !== null;
+	const hasFallbackGapSupport = ! hasBlockGapSupport;
+
+	const { disableLayoutStyles, getBlockStyles } = useSelect( ( select ) => {
+		const { getSettings } = select( editSiteStore );
+		const { getBlockStyles: getBlockStylesSelector } =
+			select( blocksStore );
+		return {
+			disableLayoutStyles: !! getSettings()?.disableLayoutStyles,
+			getBlockStyles: getBlockStylesSelector,
+		};
+	}, [] );
+
+	return useMemo( () => {
+		if ( ! mergedConfig?.styles || ! mergedConfig?.settings ) {
+			return [ [], {} ];
+		}
+
+		const blockTypes = getBlockTypes();
+
+		return generateGlobalStyles( mergedConfig, blockTypes, {
+			hasBlockGapSupport,
+			hasFallbackGapSupport,
+			disableLayoutStyles,
+			disableRootPadding,
+			getBlockStyles,
+		} );
+	}, [
+		hasBlockGapSupport,
+		hasFallbackGapSupport,
+		mergedConfig,
+		disableLayoutStyles,
+		disableRootPadding,
+		getBlockStyles,
+	] );
+}
+
+/**
+ * Returns the global styles output based on the current state of global styles config loaded in the editor context.
+ *
+ * @param {boolean} disableRootPadding Disable root padding styles.
+ *
+ * @return {Array} Array of stylesheets and settings.
+ */
+export function useGlobalStylesOutput( disableRootPadding = false ) {
+	const { merged: mergedConfig } = useContext( GlobalStylesContext );
+	return useGlobalStylesOutputWithConfig( mergedConfig, disableRootPadding );
+}

package/tsconfig.json

@@ -21,6 +21,7 @@
 		{ "path": "../element" },
 		{ "path": "../escape-html" },
 		{ "path": "../fields" },
+		{ "path": "../global-styles-engine" },
 		{ "path": "../hooks" },
 		{ "path": "../html-entities" },
 		{ "path": "../i18n" },