@wordpress/editor 13.5.0 → 13.7.0

package/build-module/utils/terms.js

@@ -1,11 +1,6 @@
-/**
- * External dependencies
- */
-import { groupBy } from 'lodash';
 /**
  * WordPress dependencies
  */
-
 import { decodeEntities } from '@wordpress/html-entities';
 /**
  * Returns terms in a tree form.
@@ -22,13 +17,30 @@ export function buildTermsTree(flatTerms) {
       parent: null,
       ...term
     };
-  });
-  const termsByParent = groupBy(flatTermsWithParentAndChildren, 'parent');
+  }); // All terms should have a `parent` because we're about to index them by it.
 
-  if (termsByParent.null && termsByParent.null.length) {
+  if (flatTermsWithParentAndChildren.some(_ref => {
+    let {
+      parent
+    } = _ref;
+    return parent === null;
+  })) {
     return flatTermsWithParentAndChildren;
   }
 
+  const termsByParent = flatTermsWithParentAndChildren.reduce((acc, term) => {
+    const {
+      parent
+    } = term;
+
+    if (!acc[parent]) {
+      acc[parent] = [];
+    }
+
+    acc[parent].push(term);
+    return acc;
+  }, {});
+
   const fillWithChildren = terms => {
     return terms.map(term => {
       const children = termsByParent[term.id];

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

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/editor/src/utils/terms.js"],"names":["groupBy","decodeEntities","buildTermsTree","flatTerms","flatTermsWithParentAndChildren","map","term","children","parent","termsByParent","null","length","fillWithChildren","terms","id","unescapeString","arg","unescapeTerm","name","unescapeTerms"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,OAAT,QAAwB,QAAxB;AAEA;AACA;AACA;;AACA,SAASC,cAAT,QAA+B,0BAA/B;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AACA,OAAO,SAASC,cAAT,CAAyBC,SAAzB,EAAqC;AAC3C,QAAMC,8BAA8B,GAAGD,SAAS,CAACE,GAAV,CAAiBC,IAAF,IAAY;AACjE,WAAO;AACNC,MAAAA,QAAQ,EAAE,EADJ;AAENC,MAAAA,MAAM,EAAE,IAFF;AAGN,SAAGF;AAHG,KAAP;AAKA,GANsC,CAAvC;AAQA,QAAMG,aAAa,GAAGT,OAAO,CAAEI,8BAAF,EAAkC,QAAlC,CAA7B;;AACA,MAAKK,aAAa,CAACC,IAAd,IAAsBD,aAAa,CAACC,IAAd,CAAmBC,MAA9C,EAAuD;AACtD,WAAOP,8BAAP;AACA;;AACD,QAAMQ,gBAAgB,GAAKC,KAAF,IAAa;AACrC,WAAOA,KAAK,CAACR,GAAN,CAAaC,IAAF,IAAY;AAC7B,YAAMC,QAAQ,GAAGE,aAAa,CAAEH,IAAI,CAACQ,EAAP,CAA9B;AACA,aAAO,EACN,GAAGR,IADG;AAENC,QAAAA,QAAQ,EACPA,QAAQ,IAAIA,QAAQ,CAACI,MAArB,GACGC,gBAAgB,CAAEL,QAAF,CADnB,GAEG;AALE,OAAP;AAOA,KATM,CAAP;AAUA,GAXD;;AAaA,SAAOK,gBAAgB,CAAEH,aAAa,CAAE,GAAF,CAAb,IAAwB,EAA1B,CAAvB;AACA;AAED,OAAO,MAAMM,cAAc,GAAKC,GAAF,IAAW;AACxC,SAAOf,cAAc,CAAEe,GAAF,CAArB;AACA,CAFM;AAIP;AACA;AACA;AACA;AACA;AACA;AACA;;AACA,OAAO,MAAMC,YAAY,GAAKX,IAAF,IAAY;AACvC,SAAO,EACN,GAAGA,IADG;AAENY,IAAAA,IAAI,EAAEH,cAAc,CAAET,IAAI,CAACY,IAAP;AAFd,GAAP;AAIA,CALM;AAOP;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AACA,OAAO,MAAMC,aAAa,GAAKN,KAAF,IAAa;AACzC,SAAO,CAAEA,KAAF,aAAEA,KAAF,cAAEA,KAAF,GAAW,EAAX,EAAgBR,GAAhB,CAAqBY,YAArB,CAAP;AACA,CAFM","sourcesContent":["/**\n * External dependencies\n */\nimport { groupBy } from 'lodash';\n\n/**\n * WordPress dependencies\n */\nimport { decodeEntities } from '@wordpress/html-entities';\n\n/**\n * Returns terms in a tree form.\n *\n * @param {Array} flatTerms Array of terms in flat format.\n *\n * @return {Array} Array of terms in tree format.\n */\nexport function buildTermsTree( flatTerms ) {\n\tconst flatTermsWithParentAndChildren = flatTerms.map( ( term ) => {\n\t\treturn {\n\t\t\tchildren: [],\n\t\t\tparent: null,\n\t\t\t...term,\n\t\t};\n\t} );\n\n\tconst termsByParent = groupBy( flatTermsWithParentAndChildren, 'parent' );\n\tif ( termsByParent.null && termsByParent.null.length ) {\n\t\treturn flatTermsWithParentAndChildren;\n\t}\n\tconst fillWithChildren = ( terms ) => {\n\t\treturn terms.map( ( term ) => {\n\t\t\tconst children = termsByParent[ term.id ];\n\t\t\treturn {\n\t\t\t\t...term,\n\t\t\t\tchildren:\n\t\t\t\t\tchildren && children.length\n\t\t\t\t\t\t? fillWithChildren( children )\n\t\t\t\t\t\t: [],\n\t\t\t};\n\t\t} );\n\t};\n\n\treturn fillWithChildren( termsByParent[ '0' ] || [] );\n}\n\nexport const unescapeString = ( arg ) => {\n\treturn decodeEntities( arg );\n};\n\n/**\n * Returns a term object with name unescaped.\n *\n * @param {Object} term The term object to unescape.\n *\n * @return {Object} Term object with name property unescaped.\n */\nexport const unescapeTerm = ( term ) => {\n\treturn {\n\t\t...term,\n\t\tname: unescapeString( term.name ),\n\t};\n};\n\n/**\n * Returns an array of term objects with names unescaped.\n * The unescape of each term is performed using the unescapeTerm function.\n *\n * @param {Object[]} terms Array of term objects to unescape.\n *\n * @return {Object[]} Array of term objects unescaped.\n */\nexport const unescapeTerms = ( terms ) => {\n\treturn ( terms ?? [] ).map( unescapeTerm );\n};\n"]}
+{"version":3,"sources":["@wordpress/editor/src/utils/terms.js"],"names":["decodeEntities","buildTermsTree","flatTerms","flatTermsWithParentAndChildren","map","term","children","parent","some","termsByParent","reduce","acc","push","fillWithChildren","terms","id","length","unescapeString","arg","unescapeTerm","name","unescapeTerms"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,cAAT,QAA+B,0BAA/B;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;;AACA,OAAO,SAASC,cAAT,CAAyBC,SAAzB,EAAqC;AAC3C,QAAMC,8BAA8B,GAAGD,SAAS,CAACE,GAAV,CAAiBC,IAAF,IAAY;AACjE,WAAO;AACNC,MAAAA,QAAQ,EAAE,EADJ;AAENC,MAAAA,MAAM,EAAE,IAFF;AAGN,SAAGF;AAHG,KAAP;AAKA,GANsC,CAAvC,CAD2C,CAS3C;;AACA,MACCF,8BAA8B,CAACK,IAA/B,CAAqC;AAAA,QAAE;AAAED,MAAAA;AAAF,KAAF;AAAA,WAAkBA,MAAM,KAAK,IAA7B;AAAA,GAArC,CADD,EAEE;AACD,WAAOJ,8BAAP;AACA;;AAED,QAAMM,aAAa,GAAGN,8BAA8B,CAACO,MAA/B,CACrB,CAAEC,GAAF,EAAON,IAAP,KAAiB;AAChB,UAAM;AAAEE,MAAAA;AAAF,QAAaF,IAAnB;;AACA,QAAK,CAAEM,GAAG,CAAEJ,MAAF,CAAV,EAAuB;AACtBI,MAAAA,GAAG,CAAEJ,MAAF,CAAH,GAAgB,EAAhB;AACA;;AACDI,IAAAA,GAAG,CAAEJ,MAAF,CAAH,CAAcK,IAAd,CAAoBP,IAApB;AACA,WAAOM,GAAP;AACA,GARoB,EASrB,EATqB,CAAtB;;AAYA,QAAME,gBAAgB,GAAKC,KAAF,IAAa;AACrC,WAAOA,KAAK,CAACV,GAAN,CAAaC,IAAF,IAAY;AAC7B,YAAMC,QAAQ,GAAGG,aAAa,CAAEJ,IAAI,CAACU,EAAP,CAA9B;AACA,aAAO,EACN,GAAGV,IADG;AAENC,QAAAA,QAAQ,EACPA,QAAQ,IAAIA,QAAQ,CAACU,MAArB,GACGH,gBAAgB,CAAEP,QAAF,CADnB,GAEG;AALE,OAAP;AAOA,KATM,CAAP;AAUA,GAXD;;AAaA,SAAOO,gBAAgB,CAAEJ,aAAa,CAAE,GAAF,CAAb,IAAwB,EAA1B,CAAvB;AACA;AAED,OAAO,MAAMQ,cAAc,GAAKC,GAAF,IAAW;AACxC,SAAOlB,cAAc,CAAEkB,GAAF,CAArB;AACA,CAFM;AAIP;AACA;AACA;AACA;AACA;AACA;AACA;;AACA,OAAO,MAAMC,YAAY,GAAKd,IAAF,IAAY;AACvC,SAAO,EACN,GAAGA,IADG;AAENe,IAAAA,IAAI,EAAEH,cAAc,CAAEZ,IAAI,CAACe,IAAP;AAFd,GAAP;AAIA,CALM;AAOP;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AACA,OAAO,MAAMC,aAAa,GAAKP,KAAF,IAAa;AACzC,SAAO,CAAEA,KAAF,aAAEA,KAAF,cAAEA,KAAF,GAAW,EAAX,EAAgBV,GAAhB,CAAqBe,YAArB,CAAP;AACA,CAFM","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { decodeEntities } from '@wordpress/html-entities';\n\n/**\n * Returns terms in a tree form.\n *\n * @param {Array} flatTerms Array of terms in flat format.\n *\n * @return {Array} Array of terms in tree format.\n */\nexport function buildTermsTree( flatTerms ) {\n\tconst flatTermsWithParentAndChildren = flatTerms.map( ( term ) => {\n\t\treturn {\n\t\t\tchildren: [],\n\t\t\tparent: null,\n\t\t\t...term,\n\t\t};\n\t} );\n\n\t// All terms should have a `parent` because we're about to index them by it.\n\tif (\n\t\tflatTermsWithParentAndChildren.some( ( { parent } ) => parent === null )\n\t) {\n\t\treturn flatTermsWithParentAndChildren;\n\t}\n\n\tconst termsByParent = flatTermsWithParentAndChildren.reduce(\n\t\t( acc, term ) => {\n\t\t\tconst { parent } = term;\n\t\t\tif ( ! acc[ parent ] ) {\n\t\t\t\tacc[ parent ] = [];\n\t\t\t}\n\t\t\tacc[ parent ].push( term );\n\t\t\treturn acc;\n\t\t},\n\t\t{}\n\t);\n\n\tconst fillWithChildren = ( terms ) => {\n\t\treturn terms.map( ( term ) => {\n\t\t\tconst children = termsByParent[ term.id ];\n\t\t\treturn {\n\t\t\t\t...term,\n\t\t\t\tchildren:\n\t\t\t\t\tchildren && children.length\n\t\t\t\t\t\t? fillWithChildren( children )\n\t\t\t\t\t\t: [],\n\t\t\t};\n\t\t} );\n\t};\n\n\treturn fillWithChildren( termsByParent[ '0' ] || [] );\n}\n\nexport const unescapeString = ( arg ) => {\n\treturn decodeEntities( arg );\n};\n\n/**\n * Returns a term object with name unescaped.\n *\n * @param {Object} term The term object to unescape.\n *\n * @return {Object} Term object with name property unescaped.\n */\nexport const unescapeTerm = ( term ) => {\n\treturn {\n\t\t...term,\n\t\tname: unescapeString( term.name ),\n\t};\n};\n\n/**\n * Returns an array of term objects with names unescaped.\n * The unescape of each term is performed using the unescapeTerm function.\n *\n * @param {Object[]} terms Array of term objects to unescape.\n *\n * @return {Object[]} Array of term objects unescaped.\n */\nexport const unescapeTerms = ( terms ) => {\n\treturn ( terms ?? [] ).map( unescapeTerm );\n};\n"]}

package/build-style/style-rtl.css

@@ -367,9 +367,6 @@
     max-width: 480px;
   }
 }
-.editor-post-locked-modal .components-modal__content {
-  display: flex;
-}
 
 .editor-post-locked-modal__buttons {
   margin-top: 24px;
@@ -378,7 +375,7 @@
 .editor-post-locked-modal__avatar {
   border-radius: 2px;
   margin-top: 16px;
-  margin-left: 24px;
+  min-width: initial !important;
 }
 
 .editor-post-publish-button__button.has-changes-dot::before {

package/build-style/style.css

@@ -367,9 +367,6 @@
     max-width: 480px;
   }
 }
-.editor-post-locked-modal .components-modal__content {
-  display: flex;
-}
 
 .editor-post-locked-modal__buttons {
   margin-top: 24px;
@@ -378,7 +375,7 @@
 .editor-post-locked-modal__avatar {
   border-radius: 2px;
   margin-top: 16px;
-  margin-right: 24px;
+  min-width: initial !important;
 }
 
 .editor-post-publish-button__button.has-changes-dot::before {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/editor",
-	"version": "13.5.0",
+	"version": "13.7.0",
 	"description": "Enhanced block editor for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -31,34 +31,34 @@
 	],
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^3.28.0",
-		"@wordpress/api-fetch": "^6.25.0",
-		"@wordpress/blob": "^3.28.0",
-		"@wordpress/block-editor": "^11.5.0",
-		"@wordpress/blocks": "^12.5.0",
-		"@wordpress/components": "^23.5.0",
-		"@wordpress/compose": "^6.5.0",
-		"@wordpress/core-data": "^6.5.0",
-		"@wordpress/data": "^8.5.0",
-		"@wordpress/date": "^4.28.0",
-		"@wordpress/deprecated": "^3.28.0",
-		"@wordpress/dom": "^3.28.0",
-		"@wordpress/element": "^5.5.0",
-		"@wordpress/hooks": "^3.28.0",
-		"@wordpress/html-entities": "^3.28.0",
-		"@wordpress/i18n": "^4.28.0",
-		"@wordpress/icons": "^9.19.0",
-		"@wordpress/keyboard-shortcuts": "^4.5.0",
-		"@wordpress/keycodes": "^3.28.0",
-		"@wordpress/media-utils": "^4.19.0",
-		"@wordpress/notices": "^3.28.0",
-		"@wordpress/preferences": "^3.5.0",
-		"@wordpress/private-apis": "^0.10.0",
-		"@wordpress/reusable-blocks": "^4.5.0",
-		"@wordpress/rich-text": "^6.5.0",
-		"@wordpress/server-side-render": "^4.5.0",
-		"@wordpress/url": "^3.29.0",
-		"@wordpress/wordcount": "^3.28.0",
+		"@wordpress/a11y": "^3.30.0",
+		"@wordpress/api-fetch": "^6.27.0",
+		"@wordpress/blob": "^3.30.0",
+		"@wordpress/block-editor": "^11.7.0",
+		"@wordpress/blocks": "^12.7.0",
+		"@wordpress/components": "^23.7.0",
+		"@wordpress/compose": "^6.7.0",
+		"@wordpress/core-data": "^6.7.0",
+		"@wordpress/data": "^9.0.0",
+		"@wordpress/date": "^4.30.0",
+		"@wordpress/deprecated": "^3.30.0",
+		"@wordpress/dom": "^3.30.0",
+		"@wordpress/element": "^5.7.0",
+		"@wordpress/hooks": "^3.30.0",
+		"@wordpress/html-entities": "^3.30.0",
+		"@wordpress/i18n": "^4.30.0",
+		"@wordpress/icons": "^9.21.0",
+		"@wordpress/keyboard-shortcuts": "^4.7.0",
+		"@wordpress/keycodes": "^3.30.0",
+		"@wordpress/media-utils": "^4.21.0",
+		"@wordpress/notices": "^3.30.0",
+		"@wordpress/preferences": "^3.7.0",
+		"@wordpress/private-apis": "^0.12.0",
+		"@wordpress/reusable-blocks": "^4.7.0",
+		"@wordpress/rich-text": "^6.7.0",
+		"@wordpress/server-side-render": "^4.7.0",
+		"@wordpress/url": "^3.31.0",
+		"@wordpress/wordcount": "^3.30.0",
 		"classnames": "^2.3.1",
 		"date-fns": "^2.28.0",
 		"escape-html": "^1.0.3",
@@ -75,5 +75,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "d5e03a74b79e3ca84afda24375474a103a063ee4"
+	"gitHead": "d5c28a67b11e91e3e4b8e90346bfcb90909364d6"
 }

package/src/components/autosave-monitor/test/index.js

@@ -8,10 +8,13 @@ import { render } from '@testing-library/react';
  */
 import { AutosaveMonitor } from '../';
 
+jest.useFakeTimers();
+jest.spyOn( global, 'clearTimeout' );
+jest.spyOn( global, 'setTimeout' );
+
 describe( 'AutosaveMonitor', () => {
 	let setAutosaveTimerSpy;
 	beforeEach( () => {
-		jest.useFakeTimers( 'legacy' );
 		setAutosaveTimerSpy = jest.spyOn(
 			AutosaveMonitor.prototype,
 			'setAutosaveTimer'
@@ -19,9 +22,6 @@ describe( 'AutosaveMonitor', () => {
 	} );
 
 	afterEach( () => {
-		jest.runOnlyPendingTimers();
-		jest.useRealTimers();
-
 		setAutosaveTimerSpy.mockClear();
 	} );
 

package/src/components/editor-help/index.native.js

@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-import { kebabCase } from 'lodash';
 import { SafeAreaView, ScrollView, StyleSheet, View } from 'react-native';
 import { TransitionPresets } from '@react-navigation/stack';
 
@@ -40,18 +39,31 @@ import HelpSectionTitle from './help-section-title';
 const HELP_TOPICS = [
 	{
 		label: __( 'What is a block?' ),
+		slug: 'what-is-a-block',
 		icon: helpFilled,
 		view: <IntroToBlocks />,
 	},
 	{
 		label: __( 'Add blocks' ),
+		slug: 'add-blocks',
 		icon: plusCircleFilled,
 		view: <AddBlocks />,
 	},
-	{ label: __( 'Move blocks' ), icon: moveBlocksIcon, view: <MoveBlocks /> },
-	{ label: __( 'Remove blocks' ), icon: trash, view: <RemoveBlocks /> },
+	{
+		label: __( 'Move blocks' ),
+		slug: 'move-blocks',
+		icon: moveBlocksIcon,
+		view: <MoveBlocks />,
+	},
+	{
+		label: __( 'Remove blocks' ),
+		slug: 'remove-blocks',
+		icon: trash,
+		view: <RemoveBlocks />,
+	},
 	{
 		label: __( 'Customize blocks' ),
+		slug: 'customize-blocks',
 		icon: cog,
 		view: <CustomizeBlocks />,
 	},
@@ -141,24 +153,20 @@ function EditorHelpTopics( { close, isVisible, onClose, showSupport } ) {
 												{ /* Print out help topics. */ }
 												{ HELP_TOPICS.map(
 													(
-														{ label, icon },
+														{ label, icon, slug },
 														index
 													) => {
-														const labelSlug =
-															kebabCase( label );
 														const isLastItem =
 															index ===
 															HELP_TOPICS.length -
 																1;
 														return (
 															<HelpTopicRow
-																key={
-																	labelSlug
-																}
+																key={ slug }
 																label={ label }
 																icon={ icon }
 																screenName={
-																	labelSlug
+																	slug
 																}
 																isLastItem={
 																	isLastItem
@@ -177,12 +185,11 @@ function EditorHelpTopics( { close, isVisible, onClose, showSupport } ) {
 						</View>
 					</BottomSheet.NavigationScreen>
 					{ /* Print out help detail screens. */ }
-					{ HELP_TOPICS.map( ( { view, label } ) => {
-						const labelSlug = kebabCase( label );
+					{ HELP_TOPICS.map( ( { view, label, slug } ) => {
 						return (
 							<HelpDetailNavigationScreen
-								key={ labelSlug }
-								name={ labelSlug }
+								key={ slug }
+								name={ slug }
 								content={ view }
 								label={ label }
 								options={ {

package/src/components/media-categories/index.js

@@ -131,7 +131,7 @@ const getOpenverseCaption = ( item ) => {
 			  )
 			: sprintf(
 					// translators: %1s: Link attributes for a given Openverse media work; %2s: Works's licence e.g: "CC0 1.0".
-					_x( '<a %1$s>Work</a>/ %3$s', 'caption' ),
+					_x( '<a %1$s>Work</a>/ %2$s', 'caption' ),
 					getExternalLinkAttributes( foreignLandingUrl ),
 					licenseUrl
 						? getExternalLink(

package/src/components/post-locked-modal/index.js

@@ -6,8 +6,7 @@ import {
 	Modal,
 	Button,
 	ExternalLink,
-	Flex,
-	FlexItem,
+	__experimentalHStack as HStack,
 } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { addQueryArgs } from '@wordpress/url';
@@ -175,55 +174,30 @@ export default function PostLockedModal() {
 			isDismissible={ false }
 			className="editor-post-locked-modal"
 		>
-			{ !! userAvatar && (
-				<img
-					src={ userAvatar }
-					alt={ __( 'Avatar' ) }
-					className="editor-post-locked-modal__avatar"
-					width={ 64 }
-					height={ 64 }
-				/>
-			) }
-			<div>
-				{ !! isTakeover && (
-					<p>
-						{ createInterpolateElement(
-							userDisplayName
-								? sprintf(
-										/* translators: %s: user's display name */
-										__(
-											'<strong>%s</strong> now has editing control of this post (<PreviewLink />). Don’t worry, your changes up to this moment have been saved.'
-										),
-										userDisplayName
-								  )
-								: __(
-										'Another user now has editing control of this post (<PreviewLink />). Don’t worry, your changes up to this moment have been saved.'
-								  ),
-							{
-								strong: <strong />,
-								PreviewLink: (
-									<ExternalLink href={ previewLink }>
-										{ __( 'preview' ) }
-									</ExternalLink>
-								),
-							}
-						) }
-					</p>
+			<HStack alignment="top" spacing={ 6 }>
+				{ !! userAvatar && (
+					<img
+						src={ userAvatar }
+						alt={ __( 'Avatar' ) }
+						className="editor-post-locked-modal__avatar"
+						width={ 64 }
+						height={ 64 }
+					/>
 				) }
-				{ ! isTakeover && (
-					<>
+				<div>
+					{ !! isTakeover && (
 						<p>
 							{ createInterpolateElement(
 								userDisplayName
 									? sprintf(
 											/* translators: %s: user's display name */
 											__(
-												'<strong>%s</strong> is currently working on this post (<PreviewLink />), which means you cannot make changes, unless you take over.'
+												'<strong>%s</strong> now has editing control of this post (<PreviewLink />). Don’t worry, your changes up to this moment have been saved.'
 											),
 											userDisplayName
 									  )
 									: __(
-											'Another user is currently working on this post (<PreviewLink />), which means you cannot make changes, unless you take over.'
+											'Another user now has editing control of this post (<PreviewLink />). Don’t worry, your changes up to this moment have been saved.'
 									  ),
 								{
 									strong: <strong />,
@@ -235,33 +209,55 @@ export default function PostLockedModal() {
 								}
 							) }
 						</p>
-						<p>
-							{ __(
-								'If you take over, the other user will lose editing control to the post, but their changes will be saved.'
-							) }
-						</p>
-					</>
-				) }
-
-				<Flex
-					className="editor-post-locked-modal__buttons"
-					justify="flex-end"
-					expanded={ false }
-				>
+					) }
 					{ ! isTakeover && (
-						<FlexItem>
+						<>
+							<p>
+								{ createInterpolateElement(
+									userDisplayName
+										? sprintf(
+												/* translators: %s: user's display name */
+												__(
+													'<strong>%s</strong> is currently working on this post (<PreviewLink />), which means you cannot make changes, unless you take over.'
+												),
+												userDisplayName
+										  )
+										: __(
+												'Another user is currently working on this post (<PreviewLink />), which means you cannot make changes, unless you take over.'
+										  ),
+									{
+										strong: <strong />,
+										PreviewLink: (
+											<ExternalLink href={ previewLink }>
+												{ __( 'preview' ) }
+											</ExternalLink>
+										),
+									}
+								) }
+							</p>
+							<p>
+								{ __(
+									'If you take over, the other user will lose editing control to the post, but their changes will be saved.'
+								) }
+							</p>
+						</>
+					) }
+
+					<HStack
+						className="editor-post-locked-modal__buttons"
+						justify="flex-end"
+					>
+						{ ! isTakeover && (
 							<Button variant="tertiary" href={ unlockUrl }>
 								{ __( 'Take over' ) }
 							</Button>
-						</FlexItem>
-					) }
-					<FlexItem>
+						) }
 						<Button variant="primary" href={ allPostsUrl }>
 							{ allPostsLabel }
 						</Button>
-					</FlexItem>
-				</Flex>
-			</div>
+					</HStack>
+				</div>
+			</HStack>
 		</Modal>
 	);
 }

package/src/components/post-locked-modal/style.scss

@@ -2,10 +2,6 @@
 	@include break-small() {
 		max-width: $break-mobile;
 	}
-
-	.components-modal__content {
-		display: flex;
-	}
 }
 
 .editor-post-locked-modal__buttons {
@@ -15,5 +11,5 @@
 .editor-post-locked-modal__avatar {
 	border-radius: $radius-block-ui;
 	margin-top: $grid-unit-20;
-	margin-right: $grid-unit-30;
+	min-width: initial !important;
 }

package/src/components/post-publish-panel/postpublish.js

@@ -17,6 +17,7 @@ import PostScheduleLabel from '../post-schedule/label';
 import { store as editorStore } from '../../store';
 
 const POSTNAME = '%postname%';
+const PAGENAME = '%pagename%';
 
 /**
  * Returns URL for a future post.
@@ -33,6 +34,10 @@ const getFuturePostUrl = ( post ) => {
 		return post.permalink_template.replace( POSTNAME, slug );
 	}
 
+	if ( post.permalink_template.includes( PAGENAME ) ) {
+		return post.permalink_template.replace( PAGENAME, slug );
+	}
+
 	return post.permalink_template;
 };
 

package/src/components/post-text-editor/test/index.js

@@ -38,8 +38,6 @@ jest.mock( '@wordpress/data/src/components/use-dispatch', () => {
 	};
 } );
 
-jest.useRealTimers();
-
 describe( 'PostTextEditor', () => {
 	beforeEach( () => {
 		useSelect.mockImplementation( () => 'Hello World' );

package/src/components/post-type-support-check/index.js

@@ -27,7 +27,7 @@ export function PostTypeSupportCheck( { postType, children, supportKeys } ) {
 	if ( postType ) {
 		isSupported = (
 			Array.isArray( supportKeys ) ? supportKeys : [ supportKeys ]
-		 ).some( ( key ) => !! postType.supports[ key ] );
+		).some( ( key ) => !! postType.supports[ key ] );
 	}
 
 	if ( ! isSupported ) {

package/src/components/provider/use-block-editor-settings.js

@@ -62,6 +62,7 @@ const BLOCK_EDITOR_SETTINGS = [
 	'locale',
 	'maxWidth',
 	'onUpdateDefaultBlockStyles',
+	'postContentAttributes',
 	'postsPerPage',
 	'readOnly',
 	'styles',

package/src/components/theme-support-check/index.js

@@ -17,7 +17,7 @@ export function ThemeSupportCheck( {
 } ) {
 	const isSupported = (
 		Array.isArray( supportKeys ) ? supportKeys : [ supportKeys ]
-	 ).some( ( key ) => {
+	).some( ( key ) => {
 		const supported = themeSupports?.[ key ] ?? false;
 		// 'post-thumbnails' can be boolean or an array of post types.
 		// In the latter case, we need to verify `postType` exists

package/src/store/test/actions.js

@@ -15,8 +15,6 @@ import { store as preferencesStore } from '@wordpress/preferences';
 import * as actions from '../actions';
 import { store as editorStore } from '..';
 
-jest.useRealTimers();
-
 const postId = 44;
 
 const postTypeConfig = {

package/src/utils/terms.js

@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import { groupBy } from 'lodash';
-
 /**
  * WordPress dependencies
  */
@@ -24,10 +19,25 @@ export function buildTermsTree( flatTerms ) {
 		};
 	} );
 
-	const termsByParent = groupBy( flatTermsWithParentAndChildren, 'parent' );
-	if ( termsByParent.null && termsByParent.null.length ) {
+	// All terms should have a `parent` because we're about to index them by it.
+	if (
+		flatTermsWithParentAndChildren.some( ( { parent } ) => parent === null )
+	) {
 		return flatTermsWithParentAndChildren;
 	}
+
+	const termsByParent = flatTermsWithParentAndChildren.reduce(
+		( acc, term ) => {
+			const { parent } = term;
+			if ( ! acc[ parent ] ) {
+				acc[ parent ] = [];
+			}
+			acc[ parent ].push( term );
+			return acc;
+		},
+		{}
+	);
+
 	const fillWithChildren = ( terms ) => {
 		return terms.map( ( term ) => {
 			const children = termsByParent[ term.id ];