) }
+
diff --git a/packages/element/CHANGELOG.md b/packages/element/CHANGELOG.md
index 7514c762e47176..ca297797354854 100644
--- a/packages/element/CHANGELOG.md
+++ b/packages/element/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.29.0 (2024-02-21)
+
## 5.28.0 (2024-02-09)
## 5.27.0 (2024-01-24)
diff --git a/packages/element/package.json b/packages/element/package.json
index f4d154291bc1df..9ef5121df75b42 100644
--- a/packages/element/package.json
+++ b/packages/element/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/element",
- "version": "5.28.0",
+ "version": "5.29.0",
"description": "Element React module for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/env/CHANGELOG.md b/packages/env/CHANGELOG.md
index 502b7e43bd2068..6b02f7bca0e75f 100644
--- a/packages/env/CHANGELOG.md
+++ b/packages/env/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 9.4.0 (2024-02-21)
+
### Bug fix
- Fix `mariadb` version to LTS [#59237](https://github.com/WordPress/gutenberg/pull/59237)
diff --git a/packages/env/package.json b/packages/env/package.json
index 05c43ee62accba..bc7a93d27405f2 100644
--- a/packages/env/package.json
+++ b/packages/env/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/env",
- "version": "9.3.0",
+ "version": "9.4.0",
"description": "A zero-config, self contained local WordPress environment for development and testing.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/escape-html/CHANGELOG.md b/packages/escape-html/CHANGELOG.md
index 84f826c61c49dd..b6d6b7d3a10fab 100644
--- a/packages/escape-html/CHANGELOG.md
+++ b/packages/escape-html/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 2.52.0 (2024-02-21)
+
## 2.51.0 (2024-02-09)
## 2.50.0 (2024-01-24)
diff --git a/packages/escape-html/package.json b/packages/escape-html/package.json
index 693cec9d75ada2..7a4df0e142c484 100644
--- a/packages/escape-html/package.json
+++ b/packages/escape-html/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/escape-html",
- "version": "2.51.0",
+ "version": "2.52.0",
"description": "Escape HTML utils.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md
index 50cd88789c9477..8d5b3b2d3c7bba 100644
--- a/packages/eslint-plugin/CHANGELOG.md
+++ b/packages/eslint-plugin/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 17.9.0 (2024-02-21)
+
## 17.8.0 (2024-02-09)
## 17.7.0 (2024-01-24)
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index e81a7f1ab554a0..8c97454f4a1f59 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/eslint-plugin",
- "version": "17.8.0",
+ "version": "17.9.0",
"description": "ESLint plugin for WordPress development.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/format-library/CHANGELOG.md b/packages/format-library/CHANGELOG.md
index 073ec6e9c3b6cb..5b6fba69c2ba9a 100644
--- a/packages/format-library/CHANGELOG.md
+++ b/packages/format-library/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.29.0 (2024-02-21)
+
## 4.28.0 (2024-02-09)
## 4.27.0 (2024-01-24)
diff --git a/packages/format-library/package.json b/packages/format-library/package.json
index 1746144bf327bb..0fbb1b83425488 100644
--- a/packages/format-library/package.json
+++ b/packages/format-library/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/format-library",
- "version": "4.28.1",
+ "version": "4.29.0",
"description": "Format library for the WordPress editor.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/hooks/CHANGELOG.md b/packages/hooks/CHANGELOG.md
index 358bab0a9c0139..1ff46818895f2c 100644
--- a/packages/hooks/CHANGELOG.md
+++ b/packages/hooks/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 3.52.0 (2024-02-21)
+
## 3.51.0 (2024-02-09)
## 3.50.0 (2024-01-24)
diff --git a/packages/hooks/package.json b/packages/hooks/package.json
index 24e02cbec7f921..5ecabc528d07d4 100644
--- a/packages/hooks/package.json
+++ b/packages/hooks/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/hooks",
- "version": "3.51.0",
+ "version": "3.52.0",
"description": "WordPress hooks library.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/html-entities/CHANGELOG.md b/packages/html-entities/CHANGELOG.md
index b87f89d3226ad5..a8713e6080264f 100644
--- a/packages/html-entities/CHANGELOG.md
+++ b/packages/html-entities/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 3.52.0 (2024-02-21)
+
## 3.51.0 (2024-02-09)
## 3.50.0 (2024-01-24)
diff --git a/packages/html-entities/package.json b/packages/html-entities/package.json
index a5a05ab918d6ca..29cd2620147256 100644
--- a/packages/html-entities/package.json
+++ b/packages/html-entities/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/html-entities",
- "version": "3.51.0",
+ "version": "3.52.0",
"description": "HTML entity utilities for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md
index af8703b7deb36e..4ec2dd266d41f6 100644
--- a/packages/i18n/CHANGELOG.md
+++ b/packages/i18n/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.52.0 (2024-02-21)
+
## 4.51.0 (2024-02-09)
## 4.50.0 (2024-01-24)
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index b603ae42b98899..e1d90d3da33f8f 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/i18n",
- "version": "4.51.0",
+ "version": "4.52.0",
"description": "WordPress internationalization (i18n) library.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md
index 7c11f50bf875e4..83ebe17a33cb38 100644
--- a/packages/icons/CHANGELOG.md
+++ b/packages/icons/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 9.43.0 (2024-02-21)
+
## 9.42.0 (2024-02-09)
## 9.41.0 (2024-01-24)
diff --git a/packages/icons/package.json b/packages/icons/package.json
index 0890dfddc02296..55d32d1ebe91b7 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/icons",
- "version": "9.42.0",
+ "version": "9.43.0",
"description": "WordPress Icons package, based on dashicon.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/interactivity-router/CHANGELOG.md b/packages/interactivity-router/CHANGELOG.md
index b1b7afcea13553..72a9dd459a688c 100644
--- a/packages/interactivity-router/CHANGELOG.md
+++ b/packages/interactivity-router/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 1.2.0 (2024-02-21)
+
## 1.1.0 (2024-02-09)
### New Features
diff --git a/packages/interactivity-router/package.json b/packages/interactivity-router/package.json
index 221af0478dcaa6..88c62dadb601e7 100644
--- a/packages/interactivity-router/package.json
+++ b/packages/interactivity-router/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/interactivity-router",
- "version": "1.1.0",
+ "version": "1.2.0",
"description": "Package that exposes state and actions from the `core/router` store, part of the Interactivity API.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index 0f905e735edf8e..8e48ead8429d3b 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -2,9 +2,12 @@
## Unreleased
+## 5.1.0 (2024-02-21)
+
### Bug Fixes
- Only add proxies to plain objects inside the store. ([#59039](https://github.com/WordPress/gutenberg/pull/59039))
+- Improve context merges using proxies. ([59187](https://github.com/WordPress/gutenberg/pull/59187))
## 5.0.0 (2024-02-09)
diff --git a/packages/interactivity/package.json b/packages/interactivity/package.json
index 52a84c3fa12e3d..a1e99dd8075c91 100644
--- a/packages/interactivity/package.json
+++ b/packages/interactivity/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/interactivity",
- "version": "5.0.0",
+ "version": "5.1.0",
"description": "Package that provides a standard and simple way to handle the frontend interactivity of Gutenberg blocks.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/interactivity/src/directives.js b/packages/interactivity/src/directives.js
index 9184fb1d6d8035..67ad50a4595807 100644
--- a/packages/interactivity/src/directives.js
+++ b/packages/interactivity/src/directives.js
@@ -14,23 +14,118 @@ import { useWatch, useInit } from './utils';
import { directive, getScope, getEvaluate } from './hooks';
import { kebabToCamelCase } from './utils/kebab-to-camelcase';
-const isObject = ( item ) =>
- item && typeof item === 'object' && ! Array.isArray( item );
+// Assigned objects should be ignore during proxification.
+const contextAssignedObjects = new WeakMap();
-const mergeDeepSignals = ( target, source, overwrite ) => {
+const isPlainObject = ( item ) =>
+ item && typeof item === 'object' && item.constructor === Object;
+
+const descriptor = Reflect.getOwnPropertyDescriptor;
+
+/**
+ * Wrap a context object with a proxy to reproduce the context stack. The proxy
+ * uses the passed `inherited` context as a fallback to look up for properties
+ * that don't exist in the given context. Also, updated properties are modified
+ * where they are defined, or added to the main context when they don't exist.
+ *
+ * By default, all plain objects inside the context are wrapped, unless it is
+ * listed in the `ignore` option.
+ *
+ * @param {Object} current Current context.
+ * @param {Object} inherited Inherited context, used as fallback.
+ *
+ * @return {Object} The wrapped context object.
+ */
+const proxifyContext = ( current, inherited = {} ) =>
+ new Proxy( current, {
+ get: ( target, k ) => {
+ // Subscribe to the inherited and current props.
+ const inheritedProp = inherited[ k ];
+ const currentProp = target[ k ];
+
+ // Return the inherited prop when missing in target.
+ if ( ! ( k in target ) && k in inherited ) {
+ return inheritedProp;
+ }
+
+ // Proxify plain objects that are not listed in `ignore`.
+ if (
+ k in target &&
+ ! contextAssignedObjects.get( target )?.has( k ) &&
+ isPlainObject( peek( target, k ) )
+ ) {
+ return proxifyContext( currentProp, inheritedProp );
+ }
+
+ // For other cases, return the value from target.
+ return currentProp;
+ },
+ set: ( target, k, value ) => {
+ const obj =
+ k in target || ! ( k in inherited ) ? target : inherited;
+
+ // Values that are objects should not be proxified so they point to
+ // the original object and don't inherit unexpected properties.
+ if ( value && typeof value === 'object' ) {
+ if ( ! contextAssignedObjects.has( obj ) ) {
+ contextAssignedObjects.set( obj, new Set() );
+ }
+ contextAssignedObjects.get( obj ).add( k );
+ }
+
+ obj[ k ] = value;
+ return true;
+ },
+ ownKeys: ( target ) => [
+ ...new Set( [
+ ...Object.keys( inherited ),
+ ...Object.keys( target ),
+ ] ),
+ ],
+ getOwnPropertyDescriptor: ( target, k ) =>
+ descriptor( target, k ) || descriptor( inherited, k ),
+ } );
+
+/**
+ * Recursively update values within a deepSignal object.
+ *
+ * @param {Object} target A deepSignal instance.
+ * @param {Object} source Object with properties to update in `target`
+ */
+const updateSignals = ( target, source ) => {
for ( const k in source ) {
- if ( isObject( peek( target, k ) ) && isObject( peek( source, k ) ) ) {
- mergeDeepSignals(
- target[ `$${ k }` ].peek(),
- source[ `$${ k }` ].peek(),
- overwrite
- );
- } else if ( overwrite || typeof peek( target, k ) === 'undefined' ) {
- target[ `$${ k }` ] = source[ `$${ k }` ];
+ if (
+ isPlainObject( peek( target, k ) ) &&
+ isPlainObject( peek( source, k ) )
+ ) {
+ updateSignals( target[ `$${ k }` ].peek(), source[ k ] );
+ } else {
+ target[ k ] = source[ k ];
}
}
};
+/**
+ * Recursively clone the passed object.
+ *
+ * @param {Object} source Source object.
+ * @return {Object} Cloned object.
+ */
+const deepClone = ( source ) => {
+ if ( isPlainObject( source ) ) {
+ return Object.fromEntries(
+ Object.entries( source ).map( ( [ key, value ] ) => [
+ key,
+ deepClone( value ),
+ ] )
+ );
+ }
+ if ( Array.isArray( source ) ) {
+ return source.map( ( i ) => deepClone( i ) );
+ }
+ return source;
+};
+
const newRule =
/(?:([\u0080-\uFFFF\w-%@]+) *:? *([^{;]+?);|([^;}{]*?) *{)|(}\s*)/g;
const ruleClean = /\/\*[^]*?\*\/| +/g;
@@ -105,22 +200,18 @@ export default () => {
( { suffix } ) => suffix === 'default'
);
- currentValue.current = useMemo( () => {
- if ( ! defaultEntry ) return null;
- const { namespace, value } = defaultEntry;
- const newValue = deepSignal( { [ namespace ]: value } );
- mergeDeepSignals( newValue, inheritedValue );
- mergeDeepSignals( currentValue.current, newValue, true );
- return currentValue.current;
- }, [ inheritedValue, defaultEntry ] );
+ // No change should be made if `defaultEntry` does not exist.
+ const contextStack = useMemo( () => {
+ if ( defaultEntry ) {
+ const { namespace, value } = defaultEntry;
+ updateSignals( currentValue.current, {
+ [ namespace ]: deepClone( value ),
+ } );
+ }
+ return proxifyContext( currentValue.current, inheritedValue );
+ }, [ defaultEntry, inheritedValue ] );
- if ( currentValue.current ) {
- return (
-
- { children }
-
- );
- }
+ return
{ children };
},
{ priority: 5 }
);
@@ -358,15 +449,16 @@ export default () => {
const list = evaluate( entry );
return list.map( ( item ) => {
- const mergedContext = deepSignal( {} );
-
const itemProp =
suffix === 'default' ? 'item' : kebabToCamelCase( suffix );
- const newValue = deepSignal( {
- [ namespace ]: { [ itemProp ]: item },
- } );
- mergeDeepSignals( newValue, inheritedValue );
- mergeDeepSignals( mergedContext, newValue, true );
+ const itemContext = deepSignal( { [ namespace ]: {} } );
+ const mergedContext = proxifyContext(
+ itemContext,
+ inheritedValue
+ );
+
+ // Set the item after proxifying the context.
+ mergedContext[ namespace ][ itemProp ] = item;
const scope = { ...getScope(), context: mergedContext };
const key = eachKey
diff --git a/packages/interface/CHANGELOG.md b/packages/interface/CHANGELOG.md
index ad5b5200cb2d41..1c833f546a3aac 100644
--- a/packages/interface/CHANGELOG.md
+++ b/packages/interface/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.29.0 (2024-02-21)
+
## 5.28.0 (2024-02-09)
## 5.27.0 (2024-01-24)
diff --git a/packages/interface/package.json b/packages/interface/package.json
index e34b8733d46e2a..c5fa6421ab48a1 100644
--- a/packages/interface/package.json
+++ b/packages/interface/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/interface",
- "version": "5.28.1",
+ "version": "5.29.0",
"description": "Interface module for WordPress. The package contains shared functionality across the modern JavaScript-based WordPress screens.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/is-shallow-equal/CHANGELOG.md b/packages/is-shallow-equal/CHANGELOG.md
index 68bc10f7de3ef6..cea51945511ff1 100644
--- a/packages/is-shallow-equal/CHANGELOG.md
+++ b/packages/is-shallow-equal/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.52.0 (2024-02-21)
+
## 4.51.0 (2024-02-09)
## 4.50.0 (2024-01-24)
diff --git a/packages/is-shallow-equal/package.json b/packages/is-shallow-equal/package.json
index 396d2a26c6bd69..a8034a753c38d9 100644
--- a/packages/is-shallow-equal/package.json
+++ b/packages/is-shallow-equal/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/is-shallow-equal",
- "version": "4.51.0",
+ "version": "4.52.0",
"description": "Test for shallow equality between two objects or arrays.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/jest-console/CHANGELOG.md b/packages/jest-console/CHANGELOG.md
index 07fc65b3c86f0d..2e111256fb580f 100644
--- a/packages/jest-console/CHANGELOG.md
+++ b/packages/jest-console/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 7.23.0 (2024-02-21)
+
## 7.22.0 (2024-02-09)
## 7.21.0 (2024-01-24)
diff --git a/packages/jest-console/package.json b/packages/jest-console/package.json
index aa83126c35d55c..ff1f639b4f7bbe 100644
--- a/packages/jest-console/package.json
+++ b/packages/jest-console/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/jest-console",
- "version": "7.22.0",
+ "version": "7.23.0",
"description": "Custom Jest matchers for the Console object.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/jest-preset-default/CHANGELOG.md b/packages/jest-preset-default/CHANGELOG.md
index 7835494e83f9a5..da92fd0919592a 100644
--- a/packages/jest-preset-default/CHANGELOG.md
+++ b/packages/jest-preset-default/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 11.23.0 (2024-02-21)
+
## 11.22.0 (2024-02-09)
## 11.21.0 (2024-01-24)
diff --git a/packages/jest-preset-default/package.json b/packages/jest-preset-default/package.json
index 094e3fa554b089..b692a0c9a5e739 100644
--- a/packages/jest-preset-default/package.json
+++ b/packages/jest-preset-default/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/jest-preset-default",
- "version": "11.22.0",
+ "version": "11.23.0",
"description": "Default Jest preset for WordPress development.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/jest-puppeteer-axe/CHANGELOG.md b/packages/jest-puppeteer-axe/CHANGELOG.md
index 05f72aef8f9b4f..2eeb7bf3214202 100644
--- a/packages/jest-puppeteer-axe/CHANGELOG.md
+++ b/packages/jest-puppeteer-axe/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 6.23.0 (2024-02-21)
+
## 6.22.0 (2024-02-09)
## 6.21.0 (2024-01-24)
diff --git a/packages/jest-puppeteer-axe/package.json b/packages/jest-puppeteer-axe/package.json
index b18d5aceb07b6a..a24f3e40c3a191 100644
--- a/packages/jest-puppeteer-axe/package.json
+++ b/packages/jest-puppeteer-axe/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/jest-puppeteer-axe",
- "version": "6.22.0",
+ "version": "6.23.0",
"description": "Axe API integration with Jest and Puppeteer.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/keyboard-shortcuts/CHANGELOG.md b/packages/keyboard-shortcuts/CHANGELOG.md
index b4debd88c351e6..4b105e54a1372c 100644
--- a/packages/keyboard-shortcuts/CHANGELOG.md
+++ b/packages/keyboard-shortcuts/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.29.0 (2024-02-21)
+
## 4.28.0 (2024-02-09)
## 4.27.0 (2024-01-24)
diff --git a/packages/keyboard-shortcuts/package.json b/packages/keyboard-shortcuts/package.json
index f27479bc4b96a0..a2064a89133683 100644
--- a/packages/keyboard-shortcuts/package.json
+++ b/packages/keyboard-shortcuts/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/keyboard-shortcuts",
- "version": "4.28.0",
+ "version": "4.29.0",
"description": "Handling keyboard shortcuts.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/keycodes/CHANGELOG.md b/packages/keycodes/CHANGELOG.md
index 1fe36a68e20c77..723e8b9a01c78c 100644
--- a/packages/keycodes/CHANGELOG.md
+++ b/packages/keycodes/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 3.52.0 (2024-02-21)
+
## 3.51.0 (2024-02-09)
## 3.50.0 (2024-01-24)
diff --git a/packages/keycodes/package.json b/packages/keycodes/package.json
index 3f275c782c09a1..17f33eda840928 100644
--- a/packages/keycodes/package.json
+++ b/packages/keycodes/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/keycodes",
- "version": "3.51.0",
+ "version": "3.52.0",
"description": "Keycodes utilities for WordPress. Used to check for keyboard events across browsers/operating systems.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/lazy-import/CHANGELOG.md b/packages/lazy-import/CHANGELOG.md
index 1d3cd3a9485bb3..a8dbb98c2b7cda 100644
--- a/packages/lazy-import/CHANGELOG.md
+++ b/packages/lazy-import/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 1.39.0 (2024-02-21)
+
## 1.38.0 (2024-02-09)
## 1.37.0 (2024-01-24)
diff --git a/packages/lazy-import/package.json b/packages/lazy-import/package.json
index a1339c3200e48e..cc11ffffb7fc89 100644
--- a/packages/lazy-import/package.json
+++ b/packages/lazy-import/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/lazy-import",
- "version": "1.38.0",
+ "version": "1.39.0",
"description": "Lazily import a module, installing it automatically if missing.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/list-reusable-blocks/CHANGELOG.md b/packages/list-reusable-blocks/CHANGELOG.md
index c17390b24b785d..d745f680abce69 100644
--- a/packages/list-reusable-blocks/CHANGELOG.md
+++ b/packages/list-reusable-blocks/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.29.0 (2024-02-21)
+
## 4.28.0 (2024-02-09)
## 4.27.0 (2024-01-24)
diff --git a/packages/list-reusable-blocks/package.json b/packages/list-reusable-blocks/package.json
index e794f9ddd1293e..ef39dc594b1510 100644
--- a/packages/list-reusable-blocks/package.json
+++ b/packages/list-reusable-blocks/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/list-reusable-blocks",
- "version": "4.28.1",
+ "version": "4.29.0",
"description": "Adding Export/Import support to the reusable blocks listing.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/media-utils/CHANGELOG.md b/packages/media-utils/CHANGELOG.md
index 3555253438aba7..5297d73e1d23e6 100644
--- a/packages/media-utils/CHANGELOG.md
+++ b/packages/media-utils/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.43.0 (2024-02-21)
+
## 4.42.0 (2024-02-09)
## 4.41.0 (2024-01-24)
diff --git a/packages/media-utils/package.json b/packages/media-utils/package.json
index aae31e60fd8bda..8a00ea8e32e3e4 100644
--- a/packages/media-utils/package.json
+++ b/packages/media-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/media-utils",
- "version": "4.42.0",
+ "version": "4.43.0",
"description": "WordPress Media Upload Utils.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/notices/CHANGELOG.md b/packages/notices/CHANGELOG.md
index 69e6c0dec5c351..15b8ae8ad3da19 100644
--- a/packages/notices/CHANGELOG.md
+++ b/packages/notices/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.20.0 (2024-02-21)
+
## 4.19.0 (2024-02-09)
## 4.18.0 (2024-01-24)
diff --git a/packages/notices/package.json b/packages/notices/package.json
index cee5923303e1d8..1f3949095234f1 100644
--- a/packages/notices/package.json
+++ b/packages/notices/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/notices",
- "version": "4.19.0",
+ "version": "4.20.0",
"description": "State management for notices.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/npm-package-json-lint-config/CHANGELOG.md b/packages/npm-package-json-lint-config/CHANGELOG.md
index 55c72cbb4fea38..93fcd06946aa17 100644
--- a/packages/npm-package-json-lint-config/CHANGELOG.md
+++ b/packages/npm-package-json-lint-config/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.37.0 (2024-02-21)
+
## 4.36.0 (2024-02-09)
## 4.35.0 (2024-01-24)
diff --git a/packages/npm-package-json-lint-config/package.json b/packages/npm-package-json-lint-config/package.json
index 36ede2247f8cc4..ef1e918187dea5 100644
--- a/packages/npm-package-json-lint-config/package.json
+++ b/packages/npm-package-json-lint-config/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/npm-package-json-lint-config",
- "version": "4.36.0",
+ "version": "4.37.0",
"description": "WordPress npm-package-json-lint shareable configuration.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/nux/CHANGELOG.md b/packages/nux/CHANGELOG.md
index 93207b2af4f6c2..3941e02a6a6826 100644
--- a/packages/nux/CHANGELOG.md
+++ b/packages/nux/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 8.14.0 (2024-02-21)
+
## 8.13.0 (2024-02-09)
## 8.12.0 (2024-01-24)
diff --git a/packages/nux/package.json b/packages/nux/package.json
index e294dbde824495..b9fb837831c0c5 100644
--- a/packages/nux/package.json
+++ b/packages/nux/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/nux",
- "version": "8.13.1",
+ "version": "8.14.0",
"description": "NUX (New User eXperience) module for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/patterns/CHANGELOG.md b/packages/patterns/CHANGELOG.md
index 365bdec431e029..c6d3d0d7690648 100644
--- a/packages/patterns/CHANGELOG.md
+++ b/packages/patterns/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 1.13.0 (2024-02-21)
+
## 1.12.0 (2024-02-09)
## 1.11.0 (2024-01-24)
diff --git a/packages/patterns/package.json b/packages/patterns/package.json
index 143ed6e319ff5f..eaef15fe2a9327 100644
--- a/packages/patterns/package.json
+++ b/packages/patterns/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/patterns",
- "version": "1.12.1",
+ "version": "1.13.0",
"description": "Management of user pattern editing.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/patterns/src/components/partial-syncing-controls.js b/packages/patterns/src/components/partial-syncing-controls.js
index f55ee7bdc26d36..7b3e5cb312e82e 100644
--- a/packages/patterns/src/components/partial-syncing-controls.js
+++ b/packages/patterns/src/components/partial-syncing-controls.js
@@ -17,7 +17,7 @@ import { PARTIAL_SYNCING_SUPPORTED_BLOCKS } from '../constants';
function PartialSyncingControls( { name, attributes, setAttributes } ) {
const syncedAttributes = PARTIAL_SYNCING_SUPPORTED_BLOCKS[ name ];
- const attributeSources = Object.keys( syncedAttributes ).map(
+ const attributeSources = syncedAttributes.map(
( attributeName ) =>
attributes.metadata?.bindings?.[ attributeName ]?.source
);
@@ -36,7 +36,7 @@ function PartialSyncingControls( { name, attributes, setAttributes } ) {
};
if ( ! isChecked ) {
- for ( const attributeName of Object.keys( syncedAttributes ) ) {
+ for ( const attributeName of syncedAttributes ) {
if (
updatedBindings[ attributeName ]?.source ===
'core/pattern-overrides'
@@ -56,7 +56,7 @@ function PartialSyncingControls( { name, attributes, setAttributes } ) {
return;
}
- for ( const attributeName of Object.keys( syncedAttributes ) ) {
+ for ( const attributeName of syncedAttributes ) {
if ( ! updatedBindings[ attributeName ] ) {
updatedBindings[ attributeName ] = {
source: 'core/pattern-overrides',
diff --git a/packages/patterns/src/constants.js b/packages/patterns/src/constants.js
index 24401e24fdd3bc..99d6a0fa975a8d 100644
--- a/packages/patterns/src/constants.js
+++ b/packages/patterns/src/constants.js
@@ -1,8 +1,3 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-
export const PATTERN_TYPES = {
theme: 'pattern',
user: 'wp_block',
@@ -22,18 +17,8 @@ export const PATTERN_SYNC_TYPES = {
// TODO: This should not be hardcoded. Maybe there should be a config and/or an UI.
export const PARTIAL_SYNCING_SUPPORTED_BLOCKS = {
- 'core/paragraph': { content: __( 'Content' ) },
- 'core/heading': { content: __( 'Content' ) },
- 'core/button': {
- text: __( 'Text' ),
- url: __( 'URL' ),
- linkTarget: __( 'Link Target' ),
- rel: __( 'Link Relationship' ),
- },
- 'core/image': {
- id: __( 'Image ID' ),
- url: __( 'URL' ),
- title: __( 'Title' ),
- alt: __( 'Alt Text' ),
- },
+ 'core/paragraph': [ 'content' ],
+ 'core/heading': [ 'content' ],
+ 'core/button': [ 'text', 'url', 'linkTarget', 'rel' ],
+ 'core/image': [ 'id', 'url', 'title', 'alt' ],
};
diff --git a/packages/plugins/CHANGELOG.md b/packages/plugins/CHANGELOG.md
index 50d2858ebbb3c2..2f5a250fe33379 100644
--- a/packages/plugins/CHANGELOG.md
+++ b/packages/plugins/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 6.20.0 (2024-02-21)
+
## 6.19.0 (2024-02-09)
## 6.18.0 (2024-01-24)
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
index 3e54c1d07c8c61..e020f83ac52320 100644
--- a/packages/plugins/package.json
+++ b/packages/plugins/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/plugins",
- "version": "6.19.1",
+ "version": "6.20.0",
"description": "Plugins module for WordPress.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/postcss-plugins-preset/CHANGELOG.md b/packages/postcss-plugins-preset/CHANGELOG.md
index a7a77c748f2c22..81aaf1480aa027 100644
--- a/packages/postcss-plugins-preset/CHANGELOG.md
+++ b/packages/postcss-plugins-preset/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 4.36.0 (2024-02-21)
+
## 4.35.0 (2024-02-09)
## 4.34.0 (2024-01-24)
diff --git a/packages/postcss-plugins-preset/package.json b/packages/postcss-plugins-preset/package.json
index 102f28724d73f5..6dc98a9bea2d0c 100644
--- a/packages/postcss-plugins-preset/package.json
+++ b/packages/postcss-plugins-preset/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/postcss-plugins-preset",
- "version": "4.35.0",
+ "version": "4.36.0",
"description": "PostCSS sharable plugins preset for WordPress development.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/postcss-themes/CHANGELOG.md b/packages/postcss-themes/CHANGELOG.md
index a33c3ad3c2597a..5315e1d63eb9f1 100644
--- a/packages/postcss-themes/CHANGELOG.md
+++ b/packages/postcss-themes/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 5.35.0 (2024-02-21)
+
## 5.34.0 (2024-02-09)
## 5.33.0 (2024-01-24)
diff --git a/packages/postcss-themes/package.json b/packages/postcss-themes/package.json
index 05492332e29f8d..98b8289f6498af 100644
--- a/packages/postcss-themes/package.json
+++ b/packages/postcss-themes/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/postcss-themes",
- "version": "5.34.0",
+ "version": "5.35.0",
"description": "PostCSS plugin to generate theme colors.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/preferences-persistence/CHANGELOG.md b/packages/preferences-persistence/CHANGELOG.md
index 65a0471d1b9aa9..ce470b0820f4fa 100644
--- a/packages/preferences-persistence/CHANGELOG.md
+++ b/packages/preferences-persistence/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 1.44.0 (2024-02-21)
+
## 1.43.0 (2024-02-09)
## 1.42.0 (2024-01-24)
diff --git a/packages/preferences-persistence/package.json b/packages/preferences-persistence/package.json
index dd508dd6103b0e..ba673dc218fc18 100644
--- a/packages/preferences-persistence/package.json
+++ b/packages/preferences-persistence/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/preferences-persistence",
- "version": "1.43.0",
+ "version": "1.44.0",
"description": "Persistence utilities for `wordpress/preferences`.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/preferences/CHANGELOG.md b/packages/preferences/CHANGELOG.md
index 25877cbe19b963..c4b6181f7a6282 100644
--- a/packages/preferences/CHANGELOG.md
+++ b/packages/preferences/CHANGELOG.md
@@ -2,6 +2,8 @@
## Unreleased
+## 3.29.0 (2024-02-21)
+
## 3.28.0 (2024-02-09)
## 3.27.0 (2024-01-24)
diff --git a/packages/preferences/package.json b/packages/preferences/package.json
index 5aab74a778c938..e5e8f80ff882f5 100644
--- a/packages/preferences/package.json
+++ b/packages/preferences/package.json
@@ -1,6 +1,6 @@
{
"name": "@wordpress/preferences",
- "version": "3.28.1",
+ "version": "3.29.0",
"description": "Utilities for managing WordPress preferences.",
"author": "The WordPress Contributors",
"license": "GPL-2.0-or-later",
diff --git a/packages/preferences/src/components/preferences-modal-tabs/index.js b/packages/preferences/src/components/preferences-modal-tabs/index.js
index 4797b50985f03a..f48d715dc1bf8a 100644
--- a/packages/preferences/src/components/preferences-modal-tabs/index.js
+++ b/packages/preferences/src/components/preferences-modal-tabs/index.js
@@ -66,7 +66,7 @@ export default function PreferencesModalTabs( { sections } ) {
modalContent = (
assertEquals( 'var(--wp--preset--color--s)', $styles['blocks']['core/quote']['variations']['plain']['color']['background'], 'Style variations: Assert the internal variables are convert to CSS custom variables.' );
}
+ /*
+ * Tests that the theme.json file is correctly parsed and the variables are resolved.
+ *
+ * @ticket 58588
+ *
+ * @covers WP_Theme_JSON_Gutenberg::resolve_variables
+ * @covers WP_Theme_JSON_Gutenberg::convert_variables_to_value
+ */
public function test_resolve_variables() {
$primary_color = '#9DFF20';
$secondary_color = '#9DFF21';
@@ -4961,6 +4969,7 @@ public function test_resolve_variables() {
$raw_color_value = '#efefef';
$large_font = '18px';
$small_font = '12px';
+ $spacing = 'clamp(1.5rem, 5vw, 2rem)';
$theme_json = new WP_Theme_JSON_Gutenberg(
array(
'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
@@ -5000,6 +5009,15 @@ public function test_resolve_variables() {
),
),
),
+ 'spacing' => array(
+ 'spacingSizes' => array(
+ array(
+ 'size' => $spacing,
+ 'name' => '100',
+ 'slug' => '100',
+ ),
+ ),
+ ),
),
'styles' => array(
'color' => array(
@@ -5062,6 +5080,16 @@ public function test_resolve_variables() {
),
),
),
+ 'core/post-template' => array(
+ 'spacing' => array(
+ 'blockGap' => null,
+ ),
+ ),
+ 'core/columns' => array(
+ 'spacing' => array(
+ 'blockGap' => 'var(--wp--preset--spacing--100)',
+ ),
+ ),
),
),
)
@@ -5105,6 +5133,12 @@ public function test_resolve_variables() {
$this->assertEquals( $small_font, $styles['blocks']['core/quote']['variations']['plain']['typography']['fontSize'], 'Block variations: font-size' );
$this->assertEquals( $secondary_color, $styles['blocks']['core/quote']['variations']['plain']['color']['background'], 'Block variations: color' );
+ /*
+ * WP_Theme_JSON_Gutenberg::resolve_variables may be called with merged data from WP_Theme_JSON_Resolver_Gutenberg::get_merged_data()
+ * WP_Theme_JSON_Resolver_Gutenberg::get_block_data() sets blockGap for supported blocks to `null` if the value is not defined.
+ */
+ $this->assertNull( $styles['blocks']['core/post-template']['spacing']['blockGap'], 'core/post-template block: blockGap' );
+ $this->assertEquals( $spacing, $styles['blocks']['core/columns']['spacing']['blockGap'], 'core/columns block: blockGap' );
}
/**
diff --git a/test/e2e/specs/editor/blocks/buttons.spec.js b/test/e2e/specs/editor/blocks/buttons.spec.js
index dcddfca2b5b284..f62732470d9747 100644
--- a/test/e2e/specs/editor/blocks/buttons.spec.js
+++ b/test/e2e/specs/editor/blocks/buttons.spec.js
@@ -405,4 +405,80 @@ test.describe( 'Buttons', () => {
`
);
} );
+
+ test.describe( 'Block transforms', () => {
+ test.describe( 'FROM paragraph', () => {
+ test( 'should preserve the content', async ( { editor } ) => {
+ await editor.insertBlock( {
+ name: 'core/paragraph',
+ attributes: {
+ content: 'initial content',
+ },
+ } );
+ await editor.transformBlockTo( 'core/buttons' );
+ const buttonBlock = ( await editor.getBlocks() )[ 0 ]
+ .innerBlocks[ 0 ];
+ expect( buttonBlock.name ).toBe( 'core/button' );
+ expect( buttonBlock.attributes.text ).toBe( 'initial content' );
+ } );
+
+ test( 'should preserve the metadata attribute', async ( {
+ editor,
+ } ) => {
+ await editor.insertBlock( {
+ name: 'core/paragraph',
+ attributes: {
+ content: 'initial content',
+ metadata: {
+ name: 'Custom name',
+ },
+ },
+ } );
+
+ await editor.transformBlockTo( 'core/buttons' );
+ const buttonBlock = ( await editor.getBlocks() )[ 0 ]
+ .innerBlocks[ 0 ];
+ expect( buttonBlock.name ).toBe( 'core/button' );
+ expect( buttonBlock.attributes.metadata ).toMatchObject( {
+ name: 'Custom name',
+ } );
+ } );
+
+ test( 'should preserve the block bindings', async ( {
+ editor,
+ } ) => {
+ await editor.insertBlock( {
+ name: 'core/paragraph',
+ attributes: {
+ content: 'initial content',
+ metadata: {
+ bindings: {
+ content: {
+ source: 'core/post-meta',
+ args: {
+ key: 'custom_field',
+ },
+ },
+ },
+ },
+ },
+ } );
+
+ await editor.transformBlockTo( 'core/buttons' );
+ const buttonBlock = ( await editor.getBlocks() )[ 0 ]
+ .innerBlocks[ 0 ];
+ expect( buttonBlock.name ).toBe( 'core/button' );
+ expect(
+ buttonBlock.attributes.metadata.bindings
+ ).toMatchObject( {
+ text: {
+ source: 'core/post-meta',
+ args: {
+ key: 'custom_field',
+ },
+ },
+ } );
+ } );
+ } );
+ } );
} );
diff --git a/test/e2e/specs/editor/blocks/code.spec.js b/test/e2e/specs/editor/blocks/code.spec.js
index 6abfb15d10b83b..ba5af46f69cfd5 100644
--- a/test/e2e/specs/editor/blocks/code.spec.js
+++ b/test/e2e/specs/editor/blocks/code.spec.js
@@ -46,4 +46,120 @@ test.describe( 'Code', () => {
expect( await editor.getEditedPostContent() ).toMatchSnapshot();
} );
+
+ test.describe( 'Block transforms', () => {
+ test.describe( 'FROM paragraph', () => {
+ test( 'should preserve the content', async ( { editor } ) => {
+ await editor.insertBlock( {
+ name: 'core/paragraph',
+ attributes: {
+ content: 'initial content',
+ },
+ } );
+ await editor.transformBlockTo( 'core/code' );
+ const codeBlock = ( await editor.getBlocks() )[ 0 ];
+ expect( codeBlock.name ).toBe( 'core/code' );
+ expect( codeBlock.attributes.content ).toBe(
+ 'initial content'
+ );
+ } );
+
+ test( 'should preserve the metadata name attribute', async ( {
+ editor,
+ } ) => {
+ await editor.insertBlock( {
+ name: 'core/paragraph',
+ attributes: {
+ content: 'initial content',
+ metadata: {
+ name: 'Custom name',
+ },
+ },
+ } );
+
+ await editor.transformBlockTo( 'core/code' );
+ const codeBlock = ( await editor.getBlocks() )[ 0 ];
+ expect( codeBlock.name ).toBe( 'core/code' );
+ expect( codeBlock.attributes.metadata ).toMatchObject( {
+ name: 'Custom name',
+ } );
+ } );
+ } );
+
+ test.describe( 'FROM HTML', () => {
+ test( 'should preserve the content', async ( { editor } ) => {
+ await editor.insertBlock( {
+ name: 'core/html',
+ attributes: {
+ content: 'initial content',
+ },
+ } );
+ await editor.transformBlockTo( 'core/code' );
+ const codeBlock = ( await editor.getBlocks() )[ 0 ];
+ expect( codeBlock.name ).toBe( 'core/code' );
+ expect( codeBlock.attributes.content ).toBe(
+ 'initial content'
+ );
+ } );
+
+ test( 'should preserve the metadata name attribute', async ( {
+ editor,
+ } ) => {
+ await editor.insertBlock( {
+ name: 'core/html',
+ attributes: {
+ content: 'initial content',
+ metadata: {
+ name: 'Custom name',
+ },
+ },
+ } );
+
+ await editor.transformBlockTo( 'core/code' );
+ const codeBlock = ( await editor.getBlocks() )[ 0 ];
+ expect( codeBlock.name ).toBe( 'core/code' );
+ expect( codeBlock.attributes.metadata ).toMatchObject( {
+ name: 'Custom name',
+ } );
+ } );
+ } );
+
+ test.describe( 'TO paragraph', () => {
+ test( 'should preserve the content', async ( { editor } ) => {
+ await editor.insertBlock( {
+ name: 'core/code',
+ attributes: {
+ content: 'initial content',
+ },
+ } );
+ await editor.transformBlockTo( 'core/paragraph' );
+ const codeBlock = ( await editor.getBlocks() )[ 0 ];
+ expect( codeBlock.name ).toBe( 'core/paragraph' );
+ expect( codeBlock.attributes.content ).toBe(
+ 'initial content'
+ );
+ } );
+
+ test( 'should preserve the metadata name attribute', async ( {
+ editor,
+ } ) => {
+ await editor.insertBlock( {
+ name: 'core/code',
+ attributes: {
+ content: 'initial content',
+ metadata: {
+ name: 'Custom name',
+ },
+ },
+ } );
+
+ await editor.transformBlockTo( 'core/paragraph' );
+ const codeBlock = ( await editor.getBlocks() )[ 0 ];
+ expect( codeBlock.name ).toBe( 'core/paragraph' );
+ expect( codeBlock.attributes.metadata ).toMatchObject( {
+ name: 'Custom name',
+ } );
+ } );
+ } );
+ } );
} );
diff --git a/test/e2e/specs/editor/blocks/heading.spec.js b/test/e2e/specs/editor/blocks/heading.spec.js
index 705bce2c3f2c9a..f0271a8f6e8978 100644
--- a/test/e2e/specs/editor/blocks/heading.spec.js
+++ b/test/e2e/specs/editor/blocks/heading.spec.js
@@ -291,4 +291,184 @@ test.describe( 'Heading', () => {
},
] );
} );
+
+ test.describe( 'Block transforms', () => {
+ test.describe( 'FROM paragraph', () => {
+ test( 'should preserve the content', async ( { editor } ) => {
+ await editor.insertBlock( {
+ name: 'core/paragraph',
+ attributes: {
+ content: 'initial content',
+ },
+ } );
+ await editor.transformBlockTo( 'core/heading' );
+ const headingBlock = ( await editor.getBlocks() )[ 0 ];
+ expect( headingBlock.name ).toBe( 'core/heading' );
+ expect( headingBlock.attributes.content ).toBe(
+ 'initial content'
+ );
+ } );
+
+ test( 'should preserve the text align attribute', async ( {
+ editor,
+ } ) => {
+ await editor.insertBlock( {
+ name: 'core/paragraph',
+ attributes: {
+ align: 'right',
+ content: 'initial content',
+ },
+ } );
+ await editor.transformBlockTo( 'core/heading' );
+ const headingBlock = ( await editor.getBlocks() )[ 0 ];
+ expect( headingBlock.name ).toBe( 'core/heading' );
+ expect( headingBlock.attributes.textAlign ).toBe( 'right' );
+ } );
+
+ test( 'should preserve the metadata attribute', async ( {
+ editor,
+ } ) => {
+ await editor.insertBlock( {
+ name: 'core/paragraph',
+ attributes: {
+ content: 'initial content',
+ metadata: {
+ name: 'Custom name',
+ },
+ },
+ } );
+
+ await editor.transformBlockTo( 'core/heading' );
+ const headingBlock = ( await editor.getBlocks() )[ 0 ];
+ expect( headingBlock.name ).toBe( 'core/heading' );
+ expect( headingBlock.attributes.metadata ).toMatchObject( {
+ name: 'Custom name',
+ } );
+ } );
+
+ test( 'should preserve the block bindings', async ( {
+ editor,
+ } ) => {
+ await editor.insertBlock( {
+ name: 'core/paragraph',
+ attributes: {
+ content: 'initial content',
+ metadata: {
+ bindings: {
+ content: {
+ source: 'core/post-meta',
+ args: {
+ key: 'custom_field',
+ },
+ },
+ },
+ },
+ },
+ } );
+
+ await editor.transformBlockTo( 'core/heading' );
+ const headingBlock = ( await editor.getBlocks() )[ 0 ];
+ expect( headingBlock.name ).toBe( 'core/heading' );
+ expect(
+ headingBlock.attributes.metadata.bindings
+ ).toMatchObject( {
+ content: {
+ source: 'core/post-meta',
+ args: {
+ key: 'custom_field',
+ },
+ },
+ } );
+ } );
+ } );
+
+ test.describe( 'TO paragraph', () => {
+ test( 'should preserve the content', async ( { editor } ) => {
+ await editor.insertBlock( {
+ name: 'core/heading',
+ attributes: {
+ content: 'initial content',
+ },
+ } );
+ await editor.transformBlockTo( 'core/paragraph' );
+ const paragraphBlock = ( await editor.getBlocks() )[ 0 ];
+ expect( paragraphBlock.name ).toBe( 'core/paragraph' );
+ expect( paragraphBlock.attributes.content ).toBe(
+ 'initial content'
+ );
+ } );
+
+ test( 'should preserve the text align attribute', async ( {
+ editor,
+ } ) => {
+ await editor.insertBlock( {
+ name: 'core/heading',
+ attributes: {
+ textAlign: 'right',
+ content: 'initial content',
+ },
+ } );
+ await editor.transformBlockTo( 'core/paragraph' );
+ const paragraphBlock = ( await editor.getBlocks() )[ 0 ];
+ expect( paragraphBlock.name ).toBe( 'core/paragraph' );
+ expect( paragraphBlock.attributes.align ).toBe( 'right' );
+ } );
+
+ test( 'should preserve the metadata attribute', async ( {
+ editor,
+ } ) => {
+ await editor.insertBlock( {
+ name: 'core/heading',
+ attributes: {
+ content: 'initial content',
+ metadata: {
+ name: 'Custom name',
+ },
+ },
+ } );
+
+ await editor.transformBlockTo( 'core/paragraph' );
+ const paragraphBlock = ( await editor.getBlocks() )[ 0 ];
+ expect( paragraphBlock.name ).toBe( 'core/paragraph' );
+ expect( paragraphBlock.attributes.metadata ).toMatchObject( {
+ name: 'Custom name',
+ } );
+ } );
+
+ test( 'should preserve the block bindings', async ( {
+ editor,
+ } ) => {
+ await editor.insertBlock( {
+ name: 'core/heading',
+ attributes: {
+ content: 'initial content',
+ metadata: {
+ bindings: {
+ content: {
+ source: 'core/post-meta',
+ args: {
+ key: 'custom_field',
+ },
+ },
+ },
+ },
+ },
+ } );
+
+ await editor.transformBlockTo( 'core/paragraph' );
+ const paragraphBlock = ( await editor.getBlocks() )[ 0 ];
+ expect( paragraphBlock.name ).toBe( 'core/paragraph' );
+ expect(
+ paragraphBlock.attributes.metadata.bindings
+ ).toMatchObject( {
+ content: {
+ source: 'core/post-meta',
+ args: {
+ key: 'custom_field',
+ },
+ },
+ } );
+ } );
+ } );
+ } );
} );
diff --git a/test/e2e/specs/interactivity/directive-context.spec.ts b/test/e2e/specs/interactivity/directive-context.spec.ts
index 95300dc53bf864..3a566e7c2d9619 100644
--- a/test/e2e/specs/interactivity/directive-context.spec.ts
+++ b/test/e2e/specs/interactivity/directive-context.spec.ts
@@ -136,6 +136,27 @@ test.describe( 'data-wp-context', () => {
expect( parentContext.obj.prop5 ).toBe( 'modifiedFromParent' );
} );
+ test( 'new inherited properties update child contexts', async ( {
+ page,
+ } ) => {
+ const childContextBefore = await parseContent(
+ page.getByTestId( 'child context' )
+ );
+ expect( childContextBefore.new ).toBeUndefined();
+
+ await page.getByTestId( 'parent new' ).click();
+
+ const childContextAfter = await parseContent(
+ page.getByTestId( 'child context' )
+ );
+ expect( childContextAfter.new ).toBe( 'modifiedFromParent' );
+
+ const parentContext = await parseContent(
+ page.getByTestId( 'parent context' )
+ );
+ expect( parentContext.new ).toBe( 'modifiedFromParent' );
+ } );
+
test( 'Array properties are shadowed', async ( { page } ) => {
const parentContext = await parseContent(
page.getByTestId( 'parent context' )
@@ -149,6 +170,52 @@ test.describe( 'data-wp-context', () => {
expect( childContext.array ).toMatchObject( [ 4, 5, 6 ] );
} );
+ test( 'overwritten objects updates inherited values', async ( {
+ page,
+ } ) => {
+ await page.getByTestId( 'parent replace' ).click();
+
+ const childContext = await parseContent(
+ page.getByTestId( 'child context' )
+ );
+
+ expect( childContext.obj.prop4 ).toBeUndefined();
+ expect( childContext.obj.prop5 ).toBe( 'child' );
+ expect( childContext.obj.prop6 ).toBe( 'child' );
+ expect( childContext.obj.overwritten ).toBe( true );
+
+ const parentContext = await parseContent(
+ page.getByTestId( 'parent context' )
+ );
+
+ expect( parentContext.obj.prop4 ).toBeUndefined();
+ expect( parentContext.obj.prop5 ).toBeUndefined();
+ expect( parentContext.obj.prop6 ).toBeUndefined();
+ expect( parentContext.obj.overwritten ).toBe( true );
+ } );
+
+ test( 'overwritten objects do not inherit values', async ( { page } ) => {
+ await page.getByTestId( 'child replace' ).click();
+
+ const childContext = await parseContent(
+ page.getByTestId( 'child context' )
+ );
+
+ expect( childContext.obj.prop4 ).toBeUndefined();
+ expect( childContext.obj.prop5 ).toBeUndefined();
+ expect( childContext.obj.prop6 ).toBeUndefined();
+ expect( childContext.obj.overwritten ).toBe( true );
+
+ const parentContext = await parseContent(
+ page.getByTestId( 'parent context' )
+ );
+
+ expect( parentContext.obj.prop4 ).toBe( 'parent' );
+ expect( parentContext.obj.prop5 ).toBe( 'parent' );
+ expect( parentContext.obj.prop6 ).toBeUndefined();
+ expect( parentContext.obj.overwritten ).toBeUndefined();
+ } );
+
test( 'can be accessed in other directives on the same element', async ( {
page,
} ) => {
@@ -181,6 +248,39 @@ test.describe( 'data-wp-context', () => {
await expect( element ).toHaveText( 'some new text' );
} );
+ test( 'should update values when navigating back or forward', async ( {
+ page,
+ } ) => {
+ const element = page.getByTestId( 'navigation text' );
+ await page.getByTestId( 'navigate' ).click();
+ await expect( element ).toHaveText( 'second page' );
+ await page.goBack();
+ await expect( element ).toHaveText( 'first page' );
+ await page.goForward();
+ await expect( element ).toHaveText( 'second page' );
+ } );
+
+ test( 'should inherit values on navigation', async ( { page } ) => {
+ const text = page.getByTestId( 'navigation inherited text' );
+ const text2 = page.getByTestId( 'navigation inherited text2' );
+ await expect( text ).toHaveText( 'first page' );
+ await expect( text2 ).toBeEmpty();
+ await page.getByTestId( 'toggle text' ).click();
+ await expect( text ).toHaveText( 'changed dynamically' );
+ await page.getByTestId( 'add text2' ).click();
+ await expect( text2 ).toHaveText( 'some new text' );
+ await page.getByTestId( 'navigate' ).click();
+ await expect( text ).toHaveText( 'second page' );
+ await expect( text2 ).toHaveText( 'second page' );
+ await page.goBack();
+ await expect( text ).toHaveText( 'first page' );
+ // text2 maintains its value as it is not defined in the first page.
+ await expect( text2 ).toHaveText( 'second page' );
+ await page.goForward();
+ await expect( text ).toHaveText( 'second page' );
+ await expect( text2 ).toHaveText( 'second page' );
+ } );
+
test( 'should maintain the same context reference on async actions', async ( {
page,
} ) => {
@@ -199,4 +299,18 @@ test.describe( 'data-wp-context', () => {
const element = page.getByTestId( 'non-default suffix context' );
await expect( element ).toHaveText( '' );
} );
+
+ test( 'references to objects are kept', async ( { page } ) => {
+ const selected = page.getByTestId( 'selected' );
+ const select1 = page.getByTestId( 'select 1' );
+ const select2 = page.getByTestId( 'select 2' );
+
+ await expect( selected ).toBeEmpty();
+
+ await select1.click();
+ await expect( selected ).toHaveText( 'Text 1' );
+
+ await select2.click();
+ await expect( selected ).toHaveText( 'Text 2' );
+ } );
} );
diff --git a/test/e2e/specs/site-editor/block-removal.spec.js b/test/e2e/specs/site-editor/block-removal.spec.js
index bf63e089c8a0bf..2b149bcc69bf3e 100644
--- a/test/e2e/specs/site-editor/block-removal.spec.js
+++ b/test/e2e/specs/site-editor/block-removal.spec.js
@@ -35,7 +35,7 @@ test.describe( 'Site editor block removal prompt', () => {
// Expect the block removal prompt to have appeared
await expect(
page.getByText(
- 'Deleting these blocks will stop your post or page content from displaying on this template. It is not recommended.'
+ 'Some of the deleted blocks will stop your post or page content from displaying on this template. It is not recommended.'
)
).toBeVisible();
} );
@@ -59,7 +59,7 @@ test.describe( 'Site editor block removal prompt', () => {
// Expect the block removal prompt to have appeared
await expect(
page.getByText(
- 'Deleting this block will stop your post or page content from displaying on this template. It is not recommended.'
+ 'Some of the deleted blocks will stop your post or page content from displaying on this template. It is not recommended.'
)
).toBeVisible();
} );
diff --git a/test/performance/specs/site-editor.spec.js b/test/performance/specs/site-editor.spec.js
index 458d41cbeb9a04..89e8d9d3477762 100644
--- a/test/performance/specs/site-editor.spec.js
+++ b/test/performance/specs/site-editor.spec.js
@@ -228,11 +228,32 @@ test.describe( 'Site Editor Performance', () => {
canvas: 'edit',
} );
await editor.openDocumentSettingsSidebar();
- await page
- .getByRole( 'button', {
- name: 'Actions',
- } )
- .click();
+
+ /*
+ * https://github.com/WordPress/gutenberg/pull/55091 updated the HTML by
+ * removing the replace template button in sidebar-edit-mode/template-panel/replace-template-button.js
+ * with a "transform into" list. https://github.com/WordPress/gutenberg/pull/59259 made these tests
+ * compatible with the new UI, however, the performance tests compare previous versions of the UI.
+ *
+ * The following code is a workaround to test the performance of the new UI.
+ * `actionsButtonElement` is used to check if the old UI is present.
+ * If there is a Replace template button (old UI), click it, otherwise, click the "transform into" button.
+ * Once the performance tests are updated to compare compatible versions this code can be removed.
+ */
+ // eslint-disable-next-line no-restricted-syntax
+ const isActionsButtonVisible = await page
+ .locator(
+ '.edit-site-template-card__actions button[aria-label="Actions"]'
+ )
+ .isVisible();
+
+ if ( isActionsButtonVisible ) {
+ await page
+ .getByRole( 'button', {
+ name: 'Actions',
+ } )
+ .click();
+ }
// Wait for the browser to be idle before starting the monitoring.
// eslint-disable-next-line no-restricted-syntax
@@ -240,9 +261,15 @@ test.describe( 'Site Editor Performance', () => {
const startTime = performance.now();
- await page
- .getByRole( 'menuitem', { name: 'Replace template' } )
- .click();
+ if ( isActionsButtonVisible ) {
+ await page
+ .getByRole( 'menuitem', { name: 'Replace template' } )
+ .click();
+ } else {
+ await page
+ .getByRole( 'button', { name: 'Transform into:' } )
+ .click();
+ }
const patterns = [
'Blogging home template',