@wordpress/block-editor 15.7.0 → 15.8.0

package/build-module/utils/selection.js

@@ -1,5 +1,6 @@
+// packages/block-editor/src/utils/selection.js
 import { RichTextData } from "@wordpress/rich-text";
-const START_OF_SELECTED_AREA = "\x86";
+var START_OF_SELECTED_AREA = "\x86";
 function retrieveSelectedAttribute(blockAttributes) {
   if (!blockAttributes) {
     return;

package/build-module/utils/selection.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../src/utils/selection.js"],
   "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { RichTextData } from '@wordpress/rich-text';\n\n/**\n * A robust way to retain selection position through various\n * transforms is to insert a special character at the position and\n * then recover it.\n */\nexport const START_OF_SELECTED_AREA = '\\u0086';\n\n/**\n * Retrieve the block attribute that contains the selection position.\n *\n * @param {Object} blockAttributes Block attributes.\n * @return {string|void} The name of the block attribute that was previously selected.\n */\nexport function retrieveSelectedAttribute( blockAttributes ) {\n\tif ( ! blockAttributes ) {\n\t\treturn;\n\t}\n\n\treturn Object.keys( blockAttributes ).find( ( name ) => {\n\t\tconst value = blockAttributes[ name ];\n\t\treturn (\n\t\t\t( typeof value === 'string' || value instanceof RichTextData ) &&\n\t\t\t// To do: refactor this to use rich text's selection instead, so we\n\t\t\t// no longer have to use on this hack inserting a special character.\n\t\t\tvalue.toString().indexOf( START_OF_SELECTED_AREA ) !== -1\n\t\t);\n\t} );\n}\n\nexport function findRichTextAttributeKey( blockType ) {\n\tfor ( const [ key, value ] of Object.entries( blockType.attributes ) ) {\n\t\tif ( value.source === 'rich-text' || value.source === 'html' ) {\n\t\t\treturn key;\n\t\t}\n\t}\n}\n"],
-  "mappings": "AAGA,SAAS,oBAAoB;AAOtB,MAAM,yBAAyB;AAQ/B,SAAS,0BAA2B,iBAAkB;AAC5D,MAAK,CAAE,iBAAkB;AACxB;AAAA,EACD;AAEA,SAAO,OAAO,KAAM,eAAgB,EAAE,KAAM,CAAE,SAAU;AACvD,UAAM,QAAQ,gBAAiB,IAAK;AACpC,YACG,OAAO,UAAU,YAAY,iBAAiB;AAAA;AAAA,IAGhD,MAAM,SAAS,EAAE,QAAS,sBAAuB,MAAM;AAAA,EAEzD,CAAE;AACH;AAEO,SAAS,yBAA0B,WAAY;AACrD,aAAY,CAAE,KAAK,KAAM,KAAK,OAAO,QAAS,UAAU,UAAW,GAAI;AACtE,QAAK,MAAM,WAAW,eAAe,MAAM,WAAW,QAAS;AAC9D,aAAO;AAAA,IACR;AAAA,EACD;AACD;",
+  "mappings": ";AAGA,SAAS,oBAAoB;AAOtB,IAAM,yBAAyB;AAQ/B,SAAS,0BAA2B,iBAAkB;AAC5D,MAAK,CAAE,iBAAkB;AACxB;AAAA,EACD;AAEA,SAAO,OAAO,KAAM,eAAgB,EAAE,KAAM,CAAE,SAAU;AACvD,UAAM,QAAQ,gBAAiB,IAAK;AACpC,YACG,OAAO,UAAU,YAAY,iBAAiB;AAAA;AAAA,IAGhD,MAAM,SAAS,EAAE,QAAS,sBAAuB,MAAM;AAAA,EAEzD,CAAE;AACH;AAEO,SAAS,yBAA0B,WAAY;AACrD,aAAY,CAAE,KAAK,KAAM,KAAK,OAAO,QAAS,UAAU,UAAW,GAAI;AACtE,QAAK,MAAM,WAAW,eAAe,MAAM,WAAW,QAAS;AAC9D,aAAO;AAAA,IACR;AAAA,EACD;AACD;",
   "names": []
 }

package/build-module/utils/sorting.js

@@ -1,4 +1,5 @@
-const comparator = (field, items, order) => {
+// packages/block-editor/src/utils/sorting.js
+var comparator = (field, items, order) => {
   return (a, b) => {
     let cmpA, cmpB;
     if (typeof field === "function") {

package/build-module/utils/sorting.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../src/utils/sorting.js"],
   "sourcesContent": ["/**\n * Recursive stable sorting comparator function.\n *\n * @param {string|Function} field Field to sort by.\n * @param {Array}           items Items to sort.\n * @param {string}          order Order, 'asc' or 'desc'.\n * @return {Function} Comparison function to be used in a `.sort()`.\n */\nconst comparator = ( field, items, order ) => {\n\treturn ( a, b ) => {\n\t\tlet cmpA, cmpB;\n\n\t\tif ( typeof field === 'function' ) {\n\t\t\tcmpA = field( a );\n\t\t\tcmpB = field( b );\n\t\t} else {\n\t\t\tcmpA = a[ field ];\n\t\t\tcmpB = b[ field ];\n\t\t}\n\n\t\tif ( cmpA > cmpB ) {\n\t\t\treturn order === 'asc' ? 1 : -1;\n\t\t} else if ( cmpB > cmpA ) {\n\t\t\treturn order === 'asc' ? -1 : 1;\n\t\t}\n\n\t\tconst orderA = items.findIndex( ( item ) => item === a );\n\t\tconst orderB = items.findIndex( ( item ) => item === b );\n\n\t\t// Stable sort: maintaining original array order\n\t\tif ( orderA > orderB ) {\n\t\t\treturn 1;\n\t\t} else if ( orderB > orderA ) {\n\t\t\treturn -1;\n\t\t}\n\n\t\treturn 0;\n\t};\n};\n\n/**\n * Order items by a certain key.\n * Supports decorator functions that allow complex picking of a comparison field.\n * Sorts in ascending order by default, but supports descending as well.\n * Stable sort - maintains original order of equal items.\n *\n * @param {Array}           items Items to order.\n * @param {string|Function} field Field to order by.\n * @param {string}          order Sorting order, `asc` or `desc`.\n * @return {Array} Sorted items.\n */\nexport function orderBy( items, field, order = 'asc' ) {\n\treturn items.concat().sort( comparator( field, items, order ) );\n}\n"],
-  "mappings": "AAQA,MAAM,aAAa,CAAE,OAAO,OAAO,UAAW;AAC7C,SAAO,CAAE,GAAG,MAAO;AAClB,QAAI,MAAM;AAEV,QAAK,OAAO,UAAU,YAAa;AAClC,aAAO,MAAO,CAAE;AAChB,aAAO,MAAO,CAAE;AAAA,IACjB,OAAO;AACN,aAAO,EAAG,KAAM;AAChB,aAAO,EAAG,KAAM;AAAA,IACjB;AAEA,QAAK,OAAO,MAAO;AAClB,aAAO,UAAU,QAAQ,IAAI;AAAA,IAC9B,WAAY,OAAO,MAAO;AACzB,aAAO,UAAU,QAAQ,KAAK;AAAA,IAC/B;AAEA,UAAM,SAAS,MAAM,UAAW,CAAE,SAAU,SAAS,CAAE;AACvD,UAAM,SAAS,MAAM,UAAW,CAAE,SAAU,SAAS,CAAE;AAGvD,QAAK,SAAS,QAAS;AACtB,aAAO;AAAA,IACR,WAAY,SAAS,QAAS;AAC7B,aAAO;AAAA,IACR;AAEA,WAAO;AAAA,EACR;AACD;AAaO,SAAS,QAAS,OAAO,OAAO,QAAQ,OAAQ;AACtD,SAAO,MAAM,OAAO,EAAE,KAAM,WAAY,OAAO,OAAO,KAAM,CAAE;AAC/D;",
+  "mappings": ";AAQA,IAAM,aAAa,CAAE,OAAO,OAAO,UAAW;AAC7C,SAAO,CAAE,GAAG,MAAO;AAClB,QAAI,MAAM;AAEV,QAAK,OAAO,UAAU,YAAa;AAClC,aAAO,MAAO,CAAE;AAChB,aAAO,MAAO,CAAE;AAAA,IACjB,OAAO;AACN,aAAO,EAAG,KAAM;AAChB,aAAO,EAAG,KAAM;AAAA,IACjB;AAEA,QAAK,OAAO,MAAO;AAClB,aAAO,UAAU,QAAQ,IAAI;AAAA,IAC9B,WAAY,OAAO,MAAO;AACzB,aAAO,UAAU,QAAQ,KAAK;AAAA,IAC/B;AAEA,UAAM,SAAS,MAAM,UAAW,CAAE,SAAU,SAAS,CAAE;AACvD,UAAM,SAAS,MAAM,UAAW,CAAE,SAAU,SAAS,CAAE;AAGvD,QAAK,SAAS,QAAS;AACtB,aAAO;AAAA,IACR,WAAY,SAAS,QAAS;AAC7B,aAAO;AAAA,IACR;AAEA,WAAO;AAAA,EACR;AACD;AAaO,SAAS,QAAS,OAAO,OAAO,QAAQ,OAAQ;AACtD,SAAO,MAAM,OAAO,EAAE,KAAM,WAAY,OAAO,OAAO,KAAM,CAAE;AAC/D;",
   "names": []
 }

package/build-module/utils/transform-styles/index.js

@@ -1,10 +1,11 @@
+// packages/block-editor/src/utils/transform-styles/index.js
 import * as parsel from "parsel-js";
 import Processor from "postcss/lib/processor";
 import CssSyntaxError from "postcss/lib/css-syntax-error";
 import prefixSelector from "postcss-prefix-selector";
 import rebaseUrl from "postcss-urlrebase";
-const cacheByWrapperSelector = /* @__PURE__ */ new Map();
-const ROOT_SELECTOR_TOKENS = [
+var cacheByWrapperSelector = /* @__PURE__ */ new Map();
+var ROOT_SELECTOR_TOKENS = [
   { type: "type", content: "body" },
   { type: "type", content: "html" },
   { type: "pseudo-class", content: ":root" },
@@ -86,7 +87,7 @@ function transformStyle({ css, ignoredSelectors = [], baseURL }, wrapperSelector
     return null;
   }
 }
-const transformStyles = (styles, wrapperSelector = "", transformOptions) => {
+var transformStyles = (styles, wrapperSelector = "", transformOptions) => {
   let cache = cacheByWrapperSelector.get(wrapperSelector);
   if (!cache) {
     cache = /* @__PURE__ */ new WeakMap();

package/build-module/utils/transform-styles/index.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../../src/utils/transform-styles/index.js"],
   "sourcesContent": ["/**\n * External dependencies\n */\nimport * as parsel from 'parsel-js';\nimport Processor from 'postcss/lib/processor';\nimport CssSyntaxError from 'postcss/lib/css-syntax-error';\nimport prefixSelector from 'postcss-prefix-selector';\nimport rebaseUrl from 'postcss-urlrebase';\n\nconst cacheByWrapperSelector = new Map();\n\nconst ROOT_SELECTOR_TOKENS = [\n\t{ type: 'type', content: 'body' },\n\t{ type: 'type', content: 'html' },\n\t{ type: 'pseudo-class', content: ':root' },\n\t{ type: 'pseudo-class', content: ':where(body)' },\n\t{ type: 'pseudo-class', content: ':where(:root)' },\n\t{ type: 'pseudo-class', content: ':where(html)' },\n];\n\n/**\n * Prefixes root selectors in a way that ensures consistent specificity.\n * This requires special handling, since prefixing a classname before\n * html, body, or :root will generally result in an invalid selector.\n *\n * Some libraries will simply replace the root selector with the prefix\n * instead, but this results in inconsistent specificity.\n *\n * This function instead inserts the prefix after the root tags but before\n * any other part of the selector. This results in consistent specificity:\n * - If a `:where()` selector is used for the prefix, all selectors output\n *   by `transformStyles` will have no specificity increase.\n * - If a classname, id, or something else is used as the prefix, all selectors\n *   will have the same specificity bump when transformed.\n *\n * @param {string} prefix   The prefix.\n * @param {string} selector The selector.\n *\n * @return {string} The prefixed root selector.\n */\nfunction prefixRootSelector( prefix, selector ) {\n\t// Use a tokenizer, since regular expressions are unreliable.\n\tconst tokenized = parsel.tokenize( selector );\n\n\t// Find the last token that contains a root selector by walking back\n\t// through the tokens.\n\tconst lastRootIndex = tokenized.findLastIndex( ( { content, type } ) => {\n\t\treturn ROOT_SELECTOR_TOKENS.some(\n\t\t\t( rootSelector ) =>\n\t\t\t\tcontent === rootSelector.content && type === rootSelector.type\n\t\t);\n\t} );\n\n\t// Walk forwards to find the combinator after the last root.\n\t// This is where the root ends and the rest of the selector begins,\n\t// and the index to insert before.\n\t// Doing it this way takes into account that a root selector like\n\t// 'body' may have additional id/class/pseudo-class/attribute-selector\n\t// parts chained to it, which is difficult to quantify using a regex.\n\tlet insertionPoint = -1;\n\tfor ( let i = lastRootIndex + 1; i < tokenized.length; i++ ) {\n\t\tif ( tokenized[ i ].type === 'combinator' ) {\n\t\t\tinsertionPoint = i;\n\t\t\tbreak;\n\t\t}\n\t}\n\n\t// Tokenize and insert the prefix with a ' ' combinator before it.\n\tconst tokenizedPrefix = parsel.tokenize( prefix );\n\ttokenized.splice(\n\t\t// Insert at the insertion point, or the end.\n\t\tinsertionPoint === -1 ? tokenized.length : insertionPoint,\n\t\t0,\n\t\t{\n\t\t\ttype: 'combinator',\n\t\t\tcontent: ' ',\n\t\t},\n\t\t...tokenizedPrefix\n\t);\n\n\treturn parsel.stringify( tokenized );\n}\n\nfunction transformStyle(\n\t{ css, ignoredSelectors = [], baseURL },\n\twrapperSelector = '',\n\ttransformOptions\n) {\n\t// When there is no wrapper selector and no base URL, there is no need\n\t// to transform the CSS. This is most cases because in the default\n\t// iframed editor, no wrapping is needed, and not many styles\n\t// provide a base URL.\n\tif ( ! wrapperSelector && ! baseURL ) {\n\t\treturn css;\n\t}\n\n\ttry {\n\t\tconst excludedSelectors = [\n\t\t\t...ignoredSelectors,\n\t\t\t...( transformOptions?.ignoredSelectors ?? [] ),\n\t\t\twrapperSelector,\n\t\t];\n\n\t\treturn new Processor(\n\t\t\t[\n\t\t\t\twrapperSelector &&\n\t\t\t\t\tprefixSelector( {\n\t\t\t\t\t\tprefix: wrapperSelector,\n\t\t\t\t\t\ttransform( prefix, selector, prefixedSelector ) {\n\t\t\t\t\t\t\t// For backwards compatibility, don't use the `exclude` option\n\t\t\t\t\t\t\t// of postcss-prefix-selector, instead handle it here to match\n\t\t\t\t\t\t\t// the behavior of the old library (postcss-prefix-wrap) that\n\t\t\t\t\t\t\t// `transformStyle` previously used.\n\t\t\t\t\t\t\tif (\n\t\t\t\t\t\t\t\texcludedSelectors.some( ( excludedSelector ) =>\n\t\t\t\t\t\t\t\t\texcludedSelector instanceof RegExp\n\t\t\t\t\t\t\t\t\t\t? selector.match( excludedSelector )\n\t\t\t\t\t\t\t\t\t\t: selector.includes( excludedSelector )\n\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t) {\n\t\t\t\t\t\t\t\treturn selector;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\tconst hasRootSelector = ROOT_SELECTOR_TOKENS.some(\n\t\t\t\t\t\t\t\t( rootSelector ) =>\n\t\t\t\t\t\t\t\t\tselector.startsWith( rootSelector.content )\n\t\t\t\t\t\t\t);\n\n\t\t\t\t\t\t\t// Reorganize root selectors such that the root part comes before the prefix,\n\t\t\t\t\t\t\t// but the prefix still comes before the remaining part of the selector.\n\t\t\t\t\t\t\tif ( hasRootSelector ) {\n\t\t\t\t\t\t\t\treturn prefixRootSelector( prefix, selector );\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\treturn prefixedSelector;\n\t\t\t\t\t\t},\n\t\t\t\t\t} ),\n\t\t\t\tbaseURL && rebaseUrl( { rootUrl: baseURL } ),\n\t\t\t].filter( Boolean )\n\t\t).process( css, {} ).css; // use sync PostCSS API\n\t} catch ( error ) {\n\t\tif ( error instanceof CssSyntaxError ) {\n\t\t\t// eslint-disable-next-line no-console\n\t\t\tconsole.warn(\n\t\t\t\t'wp.blockEditor.transformStyles Failed to transform CSS.',\n\t\t\t\terror.message + '\\n' + error.showSourceCode( false )\n\t\t\t);\n\t\t} else {\n\t\t\t// eslint-disable-next-line no-console\n\t\t\tconsole.warn(\n\t\t\t\t'wp.blockEditor.transformStyles Failed to transform CSS.',\n\t\t\t\terror\n\t\t\t);\n\t\t}\n\n\t\treturn null;\n\t}\n}\n\n/**\n * @typedef {Object} EditorStyle\n * @property {string}    css              the CSS block(s), as a single string.\n * @property {?string}   baseURL          the base URL to be used as the reference when rewriting urls.\n * @property {?string[]} ignoredSelectors the selectors not to wrap.\n */\n\n/**\n * @typedef {Object} TransformOptions\n * @property {?string[]} ignoredSelectors the selectors not to wrap.\n */\n\n/**\n * Applies a series of CSS rule transforms to wrap selectors inside a given class and/or rewrite URLs depending on the parameters passed.\n *\n * @param {EditorStyle[]}    styles           CSS rules.\n * @param {string}           wrapperSelector  Wrapper selector.\n * @param {TransformOptions} transformOptions Additional options for style transformation.\n * @return {Array} converted rules.\n */\nconst transformStyles = ( styles, wrapperSelector = '', transformOptions ) => {\n\tlet cache = cacheByWrapperSelector.get( wrapperSelector );\n\tif ( ! cache ) {\n\t\tcache = new WeakMap();\n\t\tcacheByWrapperSelector.set( wrapperSelector, cache );\n\t}\n\treturn styles.map( ( style ) => {\n\t\tlet css = cache.get( style );\n\t\tif ( ! css ) {\n\t\t\tcss = transformStyle( style, wrapperSelector, transformOptions );\n\t\t\tcache.set( style, css );\n\t\t}\n\t\treturn css;\n\t} );\n};\n\nexport default transformStyles;\n"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/build-module/utils/use-notify-copy.js

@@ -1,3 +1,4 @@
+// packages/block-editor/src/utils/use-notify-copy.js
 import { useCallback } from "@wordpress/element";
 import { store as blocksStore } from "@wordpress/blocks";
 import { useDispatch, useSelect } from "@wordpress/data";

package/build-module/utils/use-notify-copy.js.map

@@ -2,6 +2,6 @@
   "version": 3,
   "sources": ["../../src/utils/use-notify-copy.js"],
   "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { useCallback } from '@wordpress/element';\nimport { store as blocksStore } from '@wordpress/blocks';\nimport { useDispatch, useSelect } from '@wordpress/data';\nimport { __, _n, sprintf } from '@wordpress/i18n';\nimport { store as noticesStore } from '@wordpress/notices';\n\n/**\n * Internal dependencies\n */\nimport { store as blockEditorStore } from '../store';\n\nexport function useNotifyCopy() {\n\tconst { getBlockName } = useSelect( blockEditorStore );\n\tconst { getBlockType } = useSelect( blocksStore );\n\tconst { createSuccessNotice } = useDispatch( noticesStore );\n\n\treturn useCallback(\n\t\t( eventType, selectedBlockClientIds ) => {\n\t\t\tlet notice = '';\n\n\t\t\tif ( eventType === 'copyStyles' ) {\n\t\t\t\tnotice = __( 'Styles copied to clipboard.' );\n\t\t\t} else if ( selectedBlockClientIds.length === 1 ) {\n\t\t\t\tconst clientId = selectedBlockClientIds[ 0 ];\n\t\t\t\tconst title = getBlockType( getBlockName( clientId ) )?.title;\n\n\t\t\t\tif ( eventType === 'copy' ) {\n\t\t\t\t\tnotice = sprintf(\n\t\t\t\t\t\t// Translators: %s: Name of the block being copied, e.g. \"Paragraph\".\n\t\t\t\t\t\t__( 'Copied \"%s\" to clipboard.' ),\n\t\t\t\t\t\ttitle\n\t\t\t\t\t);\n\t\t\t\t} else {\n\t\t\t\t\tnotice = sprintf(\n\t\t\t\t\t\t// Translators: %s: Name of the block being cut, e.g. \"Paragraph\".\n\t\t\t\t\t\t__( 'Moved \"%s\" to clipboard.' ),\n\t\t\t\t\t\ttitle\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t} else if ( eventType === 'copy' ) {\n\t\t\t\tnotice = sprintf(\n\t\t\t\t\t// Translators: %d: Number of blocks being copied.\n\t\t\t\t\t_n(\n\t\t\t\t\t\t'Copied %d block to clipboard.',\n\t\t\t\t\t\t'Copied %d blocks to clipboard.',\n\t\t\t\t\t\tselectedBlockClientIds.length\n\t\t\t\t\t),\n\t\t\t\t\tselectedBlockClientIds.length\n\t\t\t\t);\n\t\t\t} else {\n\t\t\t\tnotice = sprintf(\n\t\t\t\t\t// Translators: %d: Number of blocks being moved.\n\t\t\t\t\t_n(\n\t\t\t\t\t\t'Moved %d block to clipboard.',\n\t\t\t\t\t\t'Moved %d blocks to clipboard.',\n\t\t\t\t\t\tselectedBlockClientIds.length\n\t\t\t\t\t),\n\t\t\t\t\tselectedBlockClientIds.length\n\t\t\t\t);\n\t\t\t}\n\n\t\t\tcreateSuccessNotice( notice, {\n\t\t\t\ttype: 'snackbar',\n\t\t\t} );\n\t\t},\n\t\t[ createSuccessNotice, getBlockName, getBlockType ]\n\t);\n}\n"],
-  "mappings": "AAGA,SAAS,mBAAmB;AAC5B,SAAS,SAAS,mBAAmB;AACrC,SAAS,aAAa,iBAAiB;AACvC,SAAS,IAAI,IAAI,eAAe;AAChC,SAAS,SAAS,oBAAoB;AAKtC,SAAS,SAAS,wBAAwB;AAEnC,SAAS,gBAAgB;AAC/B,QAAM,EAAE,aAAa,IAAI,UAAW,gBAAiB;AACrD,QAAM,EAAE,aAAa,IAAI,UAAW,WAAY;AAChD,QAAM,EAAE,oBAAoB,IAAI,YAAa,YAAa;AAE1D,SAAO;AAAA,IACN,CAAE,WAAW,2BAA4B;AACxC,UAAI,SAAS;AAEb,UAAK,cAAc,cAAe;AACjC,iBAAS,GAAI,6BAA8B;AAAA,MAC5C,WAAY,uBAAuB,WAAW,GAAI;AACjD,cAAM,WAAW,uBAAwB,CAAE;AAC3C,cAAM,QAAQ,aAAc,aAAc,QAAS,CAAE,GAAG;AAExD,YAAK,cAAc,QAAS;AAC3B,mBAAS;AAAA;AAAA,YAER,GAAI,2BAA4B;AAAA,YAChC;AAAA,UACD;AAAA,QACD,OAAO;AACN,mBAAS;AAAA;AAAA,YAER,GAAI,0BAA2B;AAAA,YAC/B;AAAA,UACD;AAAA,QACD;AAAA,MACD,WAAY,cAAc,QAAS;AAClC,iBAAS;AAAA;AAAA,UAER;AAAA,YACC;AAAA,YACA;AAAA,YACA,uBAAuB;AAAA,UACxB;AAAA,UACA,uBAAuB;AAAA,QACxB;AAAA,MACD,OAAO;AACN,iBAAS;AAAA;AAAA,UAER;AAAA,YACC;AAAA,YACA;AAAA,YACA,uBAAuB;AAAA,UACxB;AAAA,UACA,uBAAuB;AAAA,QACxB;AAAA,MACD;AAEA,0BAAqB,QAAQ;AAAA,QAC5B,MAAM;AAAA,MACP,CAAE;AAAA,IACH;AAAA,IACA,CAAE,qBAAqB,cAAc,YAAa;AAAA,EACnD;AACD;",
+  "mappings": ";AAGA,SAAS,mBAAmB;AAC5B,SAAS,SAAS,mBAAmB;AACrC,SAAS,aAAa,iBAAiB;AACvC,SAAS,IAAI,IAAI,eAAe;AAChC,SAAS,SAAS,oBAAoB;AAKtC,SAAS,SAAS,wBAAwB;AAEnC,SAAS,gBAAgB;AAC/B,QAAM,EAAE,aAAa,IAAI,UAAW,gBAAiB;AACrD,QAAM,EAAE,aAAa,IAAI,UAAW,WAAY;AAChD,QAAM,EAAE,oBAAoB,IAAI,YAAa,YAAa;AAE1D,SAAO;AAAA,IACN,CAAE,WAAW,2BAA4B;AACxC,UAAI,SAAS;AAEb,UAAK,cAAc,cAAe;AACjC,iBAAS,GAAI,6BAA8B;AAAA,MAC5C,WAAY,uBAAuB,WAAW,GAAI;AACjD,cAAM,WAAW,uBAAwB,CAAE;AAC3C,cAAM,QAAQ,aAAc,aAAc,QAAS,CAAE,GAAG;AAExD,YAAK,cAAc,QAAS;AAC3B,mBAAS;AAAA;AAAA,YAER,GAAI,2BAA4B;AAAA,YAChC;AAAA,UACD;AAAA,QACD,OAAO;AACN,mBAAS;AAAA;AAAA,YAER,GAAI,0BAA2B;AAAA,YAC/B;AAAA,UACD;AAAA,QACD;AAAA,MACD,WAAY,cAAc,QAAS;AAClC,iBAAS;AAAA;AAAA,UAER;AAAA,YACC;AAAA,YACA;AAAA,YACA,uBAAuB;AAAA,UACxB;AAAA,UACA,uBAAuB;AAAA,QACxB;AAAA,MACD,OAAO;AACN,iBAAS;AAAA;AAAA,UAER;AAAA,YACC;AAAA,YACA;AAAA,YACA,uBAAuB;AAAA,UACxB;AAAA,UACA,uBAAuB;AAAA,QACxB;AAAA,MACD;AAEA,0BAAqB,QAAQ;AAAA,QAC5B,MAAM;AAAA,MACP,CAAE;AAAA,IACH;AAAA,IACA,CAAE,qBAAqB,cAAc,YAAa;AAAA,EACnD;AACD;",
   "names": []
 }

package/build-style/content-rtl.css

@@ -361,9 +361,7 @@ _::-webkit-full-page-media, _:future, :root [data-has-multi-selection=true] .blo
   opacity: 1;
 }
 
-.is-focus-mode .block-editor-block-list__block.is-content-locked.has-child-selected, .is-focus-mode .block-editor-block-list__block.is-content-locked.has-child-selected .block-editor-block-list__block,
-.is-focus-mode .block-editor-block-list__block.is-content-locked-temporarily-editing-as-blocks.has-child-selected,
-.is-focus-mode .block-editor-block-list__block.is-content-locked-temporarily-editing-as-blocks.has-child-selected .block-editor-block-list__block {
+.is-focus-mode .block-editor-block-list__block.is-editing-content-only-section.has-child-selected, .is-focus-mode .block-editor-block-list__block.is-editing-content-only-section.has-child-selected .block-editor-block-list__block {
   opacity: 1;
 }
 

package/build-style/content.css

@@ -361,9 +361,7 @@ _::-webkit-full-page-media, _:future, :root [data-has-multi-selection=true] .blo
   opacity: 1;
 }
 
-.is-focus-mode .block-editor-block-list__block.is-content-locked.has-child-selected, .is-focus-mode .block-editor-block-list__block.is-content-locked.has-child-selected .block-editor-block-list__block,
-.is-focus-mode .block-editor-block-list__block.is-content-locked-temporarily-editing-as-blocks.has-child-selected,
-.is-focus-mode .block-editor-block-list__block.is-content-locked-temporarily-editing-as-blocks.has-child-selected .block-editor-block-list__block {
+.is-focus-mode .block-editor-block-list__block.is-editing-content-only-section.has-child-selected, .is-focus-mode .block-editor-block-list__block.is-editing-content-only-section.has-child-selected .block-editor-block-list__block {
   opacity: 1;
 }
 

package/build-style/style-rtl.css

@@ -360,8 +360,10 @@ iframe[name=editor-canvas] {
   border-top: 1px solid #ddd;
 }
 
-.block-editor-block-inspector-edit-contents-button {
-  margin-top: 8px;
+.block-editor-block-inspector-edit-contents {
+  margin: 0 16px 16px 16px;
+}
+.block-editor-block-inspector-edit-contents .block-editor-block-inspector-edit-contents__button {
   justify-content: center;
 }
 
@@ -659,6 +661,19 @@ iframe[name=editor-canvas] {
   display: flex;
   padding: 16px;
 }
+.block-editor-block-card.is-parent {
+  padding-bottom: 4px;
+}
+.block-editor-block-card.is-child {
+  padding-top: 4px;
+}
+
+.block-editor-block-card__parent-select-button {
+  padding: 0;
+  align-items: start;
+  text-align: start;
+  height: auto !important;
+}
 
 .block-editor-block-card__title {
   font-weight: 499;
@@ -677,7 +692,8 @@ iframe[name=editor-canvas] {
   padding: 3px 0;
 }
 
-.block-editor-block-card .block-editor-block-icon {
+.block-editor-block-card .block-editor-block-icon,
+.block-editor-block-card__child-indicator-icon {
   flex: 0 0 24px;
   margin-right: 0;
   margin-left: 12px;
@@ -1192,45 +1208,6 @@ iframe[name=editor-canvas] {
   box-sizing: border-box !important;
 }
 
-.block-editor-block-switcher {
-  position: relative;
-}
-.block-editor-block-switcher .components-button.components-dropdown-menu__toggle.has-icon.has-icon {
-  min-width: 36px;
-}
-
-.block-editor-block-switcher__no-switcher-icon,
-.block-editor-block-switcher__toggle {
-  position: relative;
-}
-
-.components-button.block-editor-block-switcher__toggle,
-.components-button.block-editor-block-switcher__no-switcher-icon {
-  margin: 0;
-  display: block;
-  height: 48px;
-}
-.components-button.block-editor-block-switcher__toggle .block-editor-block-icon,
-.components-button.block-editor-block-switcher__no-switcher-icon .block-editor-block-icon {
-  margin: auto;
-}
-
-.components-button.block-editor-block-switcher__no-switcher-icon {
-  display: flex;
-}
-.components-button.block-editor-block-switcher__no-switcher-icon .block-editor-block-icon {
-  margin-left: auto;
-  margin-right: auto;
-  min-width: 24px !important;
-}
-
-.components-button.block-editor-block-switcher__no-switcher-icon[aria-disabled=true] {
-  color: #1e1e1e;
-}
-.components-button.block-editor-block-switcher__no-switcher-icon[aria-disabled=true]:hover {
-  color: #1e1e1e;
-}
-
 .components-popover.block-editor-block-switcher__popover .components-popover__content {
   min-width: 300px;
 }
@@ -1274,25 +1251,6 @@ iframe[name=editor-canvas] {
   font-weight: 499;
 }
 
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__no-switcher-icon {
-  min-width: 36px;
-}
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__no-switcher-icon,
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__toggle {
-  height: 48px;
-}
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__no-switcher-icon .block-editor-block-icon,
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__no-switcher-icon .block-editor-block-switcher__transform,
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__toggle .block-editor-block-icon,
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__toggle .block-editor-block-switcher__transform {
-  width: 48px;
-  height: 48px;
-}
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__no-switcher-icon .block-editor-block-switcher__transform,
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__toggle .block-editor-block-switcher__transform {
-  padding: 12px;
-}
-
 .block-editor-block-switcher__preview-patterns-container {
   padding-bottom: 16px;
 }
@@ -1497,44 +1455,19 @@ iframe[name=editor-canvas] {
   width: 100%;
 }
 
-.block-editor-block-variation-transforms:where(fieldset) {
-  border: 0;
-  padding: 0;
-  margin: 0;
-}
-
 .block-editor-block-variation-transforms {
   box-sizing: border-box;
   padding: 0 52px 16px 16px;
-  width: 100%;
-}
-.block-editor-block-variation-transforms .components-dropdown-menu__toggle {
-  border: 1px solid #757575;
-  border-radius: 2px;
-  min-height: 30px;
-  width: 100%;
-  position: relative;
-  text-align: right;
-  justify-content: right;
-  padding: 6px 12px;
-}
-.block-editor-block-variation-transforms .components-dropdown-menu__toggle.components-dropdown-menu__toggle {
-  padding-left: 24px;
-}
-.block-editor-block-variation-transforms .components-dropdown-menu__toggle:focus:not(:disabled) {
-  border-color: var(--wp-admin-theme-color);
-  box-shadow: 0 0 0 calc(var(--wp-admin-border-width-focus) - 1px) var(--wp-admin-theme-color);
 }
-.block-editor-block-variation-transforms .components-dropdown-menu__toggle svg {
-  height: 100%;
+.block-editor-block-variation-transforms:where(fieldset) {
+  border: 0;
   padding: 0;
-  position: absolute;
-  left: 0;
-  top: 0;
+  margin: 0;
 }
 
-.block-editor-block-variation-transforms__popover .components-popover__content {
-  min-width: 230px;
+.block-editor-block-variation-transforms__button {
+  width: 100%;
+  justify-content: center;
 }
 
 .components-border-radius-control__header {
@@ -3577,10 +3510,13 @@ div.block-editor-bindings__panel button:hover .block-editor-bindings__item span
   background: color-mix(in srgb, var(--wp-block-synced-color) 10%, transparent);
   border-radius: 2px;
 }
-.block-editor-block-toolbar.is-synced .block-editor-block-switcher .components-button .block-editor-block-icon, .block-editor-block-toolbar.is-connected .block-editor-block-switcher .components-button .block-editor-block-icon {
-  color: var(--wp-block-synced-color);
+.block-editor-block-toolbar .components-button.block-editor-block-toolbar__block-icon-button[aria-disabled=true] {
+  color: #1e1e1e;
+}
+.block-editor-block-toolbar .components-button.block-editor-block-toolbar__block-icon-button[aria-disabled=true]:hover {
+  color: #1e1e1e;
 }
-.block-editor-block-toolbar.is-synced .block-editor-block-switcher__no-switcher-icon[aria-disabled=true] .block-editor-block-icon, .block-editor-block-toolbar.is-connected .block-editor-block-switcher__no-switcher-icon[aria-disabled=true] .block-editor-block-icon {
+.block-editor-block-toolbar.is-synced .block-editor-block-toolbar__block-icon, .block-editor-block-toolbar.is-connected .block-editor-block-toolbar__block-icon {
   color: var(--wp-block-synced-color);
 }
 .block-editor-block-toolbar > :last-child,
@@ -3674,15 +3610,15 @@ div.block-editor-bindings__panel button:hover .block-editor-bindings__item span
   width: 2px;
 }
 
-.block-editor-block-toolbar__block-controls .block-editor-block-switcher .components-dropdown-menu__toggle .block-editor-block-icon,
-.block-editor-block-toolbar__block-controls .block-editor-block-switcher__no-switcher-icon .block-editor-block-icon {
-  width: 24px !important;
-  margin: 0 !important;
-}
 .block-editor-block-toolbar__block-controls .components-toolbar-group {
   padding: 0;
 }
 
+.block-editor-block-toolbar__pattern-overrides-popover .components-popover__content {
+  min-width: 260px;
+  padding: 16px;
+}
+
 .block-editor-block-toolbar .components-toolbar-group,
 .block-editor-block-toolbar .components-toolbar,
 .block-editor-rich-text__inline-format-toolbar-group .components-toolbar-group,
@@ -3709,8 +3645,7 @@ div.block-editor-bindings__panel button:hover .block-editor-bindings__item span
   padding-right: 6px;
   padding-left: 6px;
 }
-.show-icon-labels .block-editor-block-switcher .components-dropdown-menu__toggle .block-editor-block-icon,
-.show-icon-labels .block-editor-block-switcher__no-switcher-icon .block-editor-block-icon {
+.show-icon-labels .block-editor-block-icon {
   width: 0 !important;
   height: 0 !important;
   min-width: 0 !important;

package/build-style/style.css

@@ -360,8 +360,10 @@ iframe[name=editor-canvas] {
   border-top: 1px solid #ddd;
 }
 
-.block-editor-block-inspector-edit-contents-button {
-  margin-top: 8px;
+.block-editor-block-inspector-edit-contents {
+  margin: 0 16px 16px 16px;
+}
+.block-editor-block-inspector-edit-contents .block-editor-block-inspector-edit-contents__button {
   justify-content: center;
 }
 
@@ -659,6 +661,19 @@ iframe[name=editor-canvas] {
   display: flex;
   padding: 16px;
 }
+.block-editor-block-card.is-parent {
+  padding-bottom: 4px;
+}
+.block-editor-block-card.is-child {
+  padding-top: 4px;
+}
+
+.block-editor-block-card__parent-select-button {
+  padding: 0;
+  align-items: start;
+  text-align: start;
+  height: auto !important;
+}
 
 .block-editor-block-card__title {
   font-weight: 499;
@@ -677,7 +692,8 @@ iframe[name=editor-canvas] {
   padding: 3px 0;
 }
 
-.block-editor-block-card .block-editor-block-icon {
+.block-editor-block-card .block-editor-block-icon,
+.block-editor-block-card__child-indicator-icon {
   flex: 0 0 24px;
   margin-left: 0;
   margin-right: 12px;
@@ -1192,45 +1208,6 @@ iframe[name=editor-canvas] {
   box-sizing: border-box !important;
 }
 
-.block-editor-block-switcher {
-  position: relative;
-}
-.block-editor-block-switcher .components-button.components-dropdown-menu__toggle.has-icon.has-icon {
-  min-width: 36px;
-}
-
-.block-editor-block-switcher__no-switcher-icon,
-.block-editor-block-switcher__toggle {
-  position: relative;
-}
-
-.components-button.block-editor-block-switcher__toggle,
-.components-button.block-editor-block-switcher__no-switcher-icon {
-  margin: 0;
-  display: block;
-  height: 48px;
-}
-.components-button.block-editor-block-switcher__toggle .block-editor-block-icon,
-.components-button.block-editor-block-switcher__no-switcher-icon .block-editor-block-icon {
-  margin: auto;
-}
-
-.components-button.block-editor-block-switcher__no-switcher-icon {
-  display: flex;
-}
-.components-button.block-editor-block-switcher__no-switcher-icon .block-editor-block-icon {
-  margin-right: auto;
-  margin-left: auto;
-  min-width: 24px !important;
-}
-
-.components-button.block-editor-block-switcher__no-switcher-icon[aria-disabled=true] {
-  color: #1e1e1e;
-}
-.components-button.block-editor-block-switcher__no-switcher-icon[aria-disabled=true]:hover {
-  color: #1e1e1e;
-}
-
 .components-popover.block-editor-block-switcher__popover .components-popover__content {
   min-width: 300px;
 }
@@ -1274,25 +1251,6 @@ iframe[name=editor-canvas] {
   font-weight: 499;
 }
 
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__no-switcher-icon {
-  min-width: 36px;
-}
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__no-switcher-icon,
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__toggle {
-  height: 48px;
-}
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__no-switcher-icon .block-editor-block-icon,
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__no-switcher-icon .block-editor-block-switcher__transform,
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__toggle .block-editor-block-icon,
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__toggle .block-editor-block-switcher__transform {
-  width: 48px;
-  height: 48px;
-}
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__no-switcher-icon .block-editor-block-switcher__transform,
-.block-editor-block-contextual-toolbar .components-button.block-editor-block-switcher__toggle .block-editor-block-switcher__transform {
-  padding: 12px;
-}
-
 .block-editor-block-switcher__preview-patterns-container {
   padding-bottom: 16px;
 }
@@ -1497,44 +1455,19 @@ iframe[name=editor-canvas] {
   width: 100%;
 }
 
-.block-editor-block-variation-transforms:where(fieldset) {
-  border: 0;
-  padding: 0;
-  margin: 0;
-}
-
 .block-editor-block-variation-transforms {
   box-sizing: border-box;
   padding: 0 16px 16px 52px;
-  width: 100%;
-}
-.block-editor-block-variation-transforms .components-dropdown-menu__toggle {
-  border: 1px solid #757575;
-  border-radius: 2px;
-  min-height: 30px;
-  width: 100%;
-  position: relative;
-  text-align: left;
-  justify-content: left;
-  padding: 6px 12px;
-}
-.block-editor-block-variation-transforms .components-dropdown-menu__toggle.components-dropdown-menu__toggle {
-  padding-right: 24px;
-}
-.block-editor-block-variation-transforms .components-dropdown-menu__toggle:focus:not(:disabled) {
-  border-color: var(--wp-admin-theme-color);
-  box-shadow: 0 0 0 calc(var(--wp-admin-border-width-focus) - 1px) var(--wp-admin-theme-color);
 }
-.block-editor-block-variation-transforms .components-dropdown-menu__toggle svg {
-  height: 100%;
+.block-editor-block-variation-transforms:where(fieldset) {
+  border: 0;
   padding: 0;
-  position: absolute;
-  right: 0;
-  top: 0;
+  margin: 0;
 }
 
-.block-editor-block-variation-transforms__popover .components-popover__content {
-  min-width: 230px;
+.block-editor-block-variation-transforms__button {
+  width: 100%;
+  justify-content: center;
 }
 
 .components-border-radius-control__header {
@@ -3579,10 +3512,13 @@ div.block-editor-bindings__panel button:hover .block-editor-bindings__item span
   background: color-mix(in srgb, var(--wp-block-synced-color) 10%, transparent);
   border-radius: 2px;
 }
-.block-editor-block-toolbar.is-synced .block-editor-block-switcher .components-button .block-editor-block-icon, .block-editor-block-toolbar.is-connected .block-editor-block-switcher .components-button .block-editor-block-icon {
-  color: var(--wp-block-synced-color);
+.block-editor-block-toolbar .components-button.block-editor-block-toolbar__block-icon-button[aria-disabled=true] {
+  color: #1e1e1e;
+}
+.block-editor-block-toolbar .components-button.block-editor-block-toolbar__block-icon-button[aria-disabled=true]:hover {
+  color: #1e1e1e;
 }
-.block-editor-block-toolbar.is-synced .block-editor-block-switcher__no-switcher-icon[aria-disabled=true] .block-editor-block-icon, .block-editor-block-toolbar.is-connected .block-editor-block-switcher__no-switcher-icon[aria-disabled=true] .block-editor-block-icon {
+.block-editor-block-toolbar.is-synced .block-editor-block-toolbar__block-icon, .block-editor-block-toolbar.is-connected .block-editor-block-toolbar__block-icon {
   color: var(--wp-block-synced-color);
 }
 .block-editor-block-toolbar > :last-child,
@@ -3676,15 +3612,15 @@ div.block-editor-bindings__panel button:hover .block-editor-bindings__item span
   width: 2px;
 }
 
-.block-editor-block-toolbar__block-controls .block-editor-block-switcher .components-dropdown-menu__toggle .block-editor-block-icon,
-.block-editor-block-toolbar__block-controls .block-editor-block-switcher__no-switcher-icon .block-editor-block-icon {
-  width: 24px !important;
-  margin: 0 !important;
-}
 .block-editor-block-toolbar__block-controls .components-toolbar-group {
   padding: 0;
 }
 
+.block-editor-block-toolbar__pattern-overrides-popover .components-popover__content {
+  min-width: 260px;
+  padding: 16px;
+}
+
 .block-editor-block-toolbar .components-toolbar-group,
 .block-editor-block-toolbar .components-toolbar,
 .block-editor-rich-text__inline-format-toolbar-group .components-toolbar-group,
@@ -3711,8 +3647,7 @@ div.block-editor-bindings__panel button:hover .block-editor-bindings__item span
   padding-left: 6px;
   padding-right: 6px;
 }
-.show-icon-labels .block-editor-block-switcher .components-dropdown-menu__toggle .block-editor-block-icon,
-.show-icon-labels .block-editor-block-switcher__no-switcher-icon .block-editor-block-icon {
+.show-icon-labels .block-editor-block-icon {
   width: 0 !important;
   height: 0 !important;
   min-width: 0 !important;