@wordpress/edit-site 5.3.2 → 5.3.3

package/build-module/{experiments.js → private-apis.js}

@@ -1,9 +1,9 @@
 /**
  * WordPress dependencies
  */
-import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/experiments';
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
 export const {
   lock,
   unlock
 } = __dangerousOptInToUnstableAPIsOnlyForCoreModules('I know using unstable features means my plugin or theme will inevitably break on the next WordPress release.', '@wordpress/edit-site');
-//# sourceMappingURL=experiments.js.map
+//# sourceMappingURL=private-apis.js.map

package/build-module/private-apis.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["@wordpress/edit-site/src/private-apis.js"],"names":["__dangerousOptInToUnstableAPIsOnlyForCoreModules","lock","unlock"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,gDAAT,QAAiE,yBAAjE;AAEA,OAAO,MAAM;AAAEC,EAAAA,IAAF;AAAQC,EAAAA;AAAR,IACZF,gDAAgD,CAC/C,8GAD+C,EAE/C,sBAF+C,CAD1C","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';\n\nexport const { lock, unlock } =\n\t__dangerousOptInToUnstableAPIsOnlyForCoreModules(\n\t\t'I know using unstable features means my plugin or theme will inevitably break on the next WordPress release.',\n\t\t'@wordpress/edit-site'\n\t);\n"]}

package/build-module/store/index.js

@@ -12,7 +12,7 @@ import * as privateActions from './private-actions';
 import * as selectors from './selectors';
 import * as privateSelectors from './private-selectors';
 import { STORE_NAME } from './constants';
-import { unlock } from '../experiments';
+import { unlock } from '../private-apis';
 export const storeConfig = {
   reducer,
   actions,

package/build-module/store/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/edit-site/src/store/index.js"],"names":["createReduxStore","register","reducer","actions","privateActions","selectors","privateSelectors","STORE_NAME","unlock","storeConfig","store","registerPrivateSelectors","registerPrivateActions"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,gBAAT,EAA2BC,QAA3B,QAA2C,iBAA3C;AAEA;AACA;AACA;;AACA,OAAOC,OAAP,MAAoB,WAApB;AACA,OAAO,KAAKC,OAAZ,MAAyB,WAAzB;AACA,OAAO,KAAKC,cAAZ,MAAgC,mBAAhC;AACA,OAAO,KAAKC,SAAZ,MAA2B,aAA3B;AACA,OAAO,KAAKC,gBAAZ,MAAkC,qBAAlC;AACA,SAASC,UAAT,QAA2B,aAA3B;AACA,SAASC,MAAT,QAAuB,gBAAvB;AAEA,OAAO,MAAMC,WAAW,GAAG;AAC1BP,EAAAA,OAD0B;AAE1BC,EAAAA,OAF0B;AAG1BE,EAAAA;AAH0B,CAApB;AAMP,OAAO,MAAMK,KAAK,GAAGV,gBAAgB,CAAEO,UAAF,EAAcE,WAAd,CAA9B;AACPR,QAAQ,CAAES,KAAF,CAAR;AACAF,MAAM,CAAEE,KAAF,CAAN,CAAgBC,wBAAhB,CAA0CL,gBAA1C;AACAE,MAAM,CAAEE,KAAF,CAAN,CAAgBE,sBAAhB,CAAwCR,cAAxC","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { createReduxStore, register } from '@wordpress/data';\n\n/**\n * Internal dependencies\n */\nimport reducer from './reducer';\nimport * as actions from './actions';\nimport * as privateActions from './private-actions';\nimport * as selectors from './selectors';\nimport * as privateSelectors from './private-selectors';\nimport { STORE_NAME } from './constants';\nimport { unlock } from '../experiments';\n\nexport const storeConfig = {\n\treducer,\n\tactions,\n\tselectors,\n};\n\nexport const store = createReduxStore( STORE_NAME, storeConfig );\nregister( store );\nunlock( store ).registerPrivateSelectors( privateSelectors );\nunlock( store ).registerPrivateActions( privateActions );\n"]}
+{"version":3,"sources":["@wordpress/edit-site/src/store/index.js"],"names":["createReduxStore","register","reducer","actions","privateActions","selectors","privateSelectors","STORE_NAME","unlock","storeConfig","store","registerPrivateSelectors","registerPrivateActions"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,gBAAT,EAA2BC,QAA3B,QAA2C,iBAA3C;AAEA;AACA;AACA;;AACA,OAAOC,OAAP,MAAoB,WAApB;AACA,OAAO,KAAKC,OAAZ,MAAyB,WAAzB;AACA,OAAO,KAAKC,cAAZ,MAAgC,mBAAhC;AACA,OAAO,KAAKC,SAAZ,MAA2B,aAA3B;AACA,OAAO,KAAKC,gBAAZ,MAAkC,qBAAlC;AACA,SAASC,UAAT,QAA2B,aAA3B;AACA,SAASC,MAAT,QAAuB,iBAAvB;AAEA,OAAO,MAAMC,WAAW,GAAG;AAC1BP,EAAAA,OAD0B;AAE1BC,EAAAA,OAF0B;AAG1BE,EAAAA;AAH0B,CAApB;AAMP,OAAO,MAAMK,KAAK,GAAGV,gBAAgB,CAAEO,UAAF,EAAcE,WAAd,CAA9B;AACPR,QAAQ,CAAES,KAAF,CAAR;AACAF,MAAM,CAAEE,KAAF,CAAN,CAAgBC,wBAAhB,CAA0CL,gBAA1C;AACAE,MAAM,CAAEE,KAAF,CAAN,CAAgBE,sBAAhB,CAAwCR,cAAxC","sourcesContent":["/**\n * WordPress dependencies\n */\nimport { createReduxStore, register } from '@wordpress/data';\n\n/**\n * Internal dependencies\n */\nimport reducer from './reducer';\nimport * as actions from './actions';\nimport * as privateActions from './private-actions';\nimport * as selectors from './selectors';\nimport * as privateSelectors from './private-selectors';\nimport { STORE_NAME } from './constants';\nimport { unlock } from '../private-apis';\n\nexport const storeConfig = {\n\treducer,\n\tactions,\n\tselectors,\n};\n\nexport const store = createReduxStore( STORE_NAME, storeConfig );\nregister( store );\nunlock( store ).registerPrivateSelectors( privateSelectors );\nunlock( store ).registerPrivateActions( privateActions );\n"]}

package/build-module/utils/get-is-list-page.js

@@ -1,16 +1,15 @@
 /**
  * Returns if the params match the list page route.
  *
- * @param {Object} params          The search params.
- * @param {string} params.postId   The post ID.
- * @param {string} params.postType The post type.
+ * @param {Object} params      The url params.
+ * @param {string} params.path The current path.
+ *
  * @return {boolean} Is list page or not.
  */
 export default function getIsListPage(_ref) {
   let {
-    postId,
-    postType
+    path
   } = _ref;
-  return !!(!postId && postType);
+  return path === '/templates/all' || path === '/template-parts/all';
 }
 //# sourceMappingURL=get-is-list-page.js.map

package/build-module/utils/get-is-list-page.js.map

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/edit-site/src/utils/get-is-list-page.js"],"names":["getIsListPage","postId","postType"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,SAASA,aAAT,OAA+C;AAAA,MAAvB;AAAEC,IAAAA,MAAF;AAAUC,IAAAA;AAAV,GAAuB;AAC7D,SAAO,CAAC,EAAI,CAAED,MAAF,IAAYC,QAAhB,CAAR;AACA","sourcesContent":["/**\n * Returns if the params match the list page route.\n *\n * @param {Object} params          The search params.\n * @param {string} params.postId   The post ID.\n * @param {string} params.postType The post type.\n * @return {boolean} Is list page or not.\n */\nexport default function getIsListPage( { postId, postType } ) {\n\treturn !! ( ! postId && postType );\n}\n"]}
+{"version":3,"sources":["@wordpress/edit-site/src/utils/get-is-list-page.js"],"names":["getIsListPage","path"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,eAAe,SAASA,aAAT,OAAmC;AAAA,MAAX;AAAEC,IAAAA;AAAF,GAAW;AACjD,SAAOA,IAAI,KAAK,gBAAT,IAA6BA,IAAI,KAAK,qBAA7C;AACA","sourcesContent":["/**\n * Returns if the params match the list page route.\n *\n * @param {Object} params      The url params.\n * @param {string} params.path The current path.\n *\n * @return {boolean} Is list page or not.\n */\nexport default function getIsListPage( { path } ) {\n\treturn path === '/templates/all' || path === '/template-parts/all';\n}\n"]}

package/build-style/style-rtl.css

@@ -1114,7 +1114,8 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
 }
 
 .edit-site-global-styles-screen-css-help-link {
-  padding-right: 16px;
+  display: block;
+  margin-top: 8px;
 }
 
 .edit-site-global-styles-screen-variations {
@@ -2145,23 +2146,23 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 
 .edit-site-layout__hub {
   position: fixed;
-  top: 24px;
-  right: 24px;
+  top: 0;
+  right: 0;
   width: calc(100vw - 48px);
-  height: 68px;
+  height: 60px;
   z-index: 3;
-  background: #000;
-  padding: 16px;
-  padding-right: 0;
-  border-radius: 8px;
-  box-shadow: 0 0.7px 1px rgba(0, 0, 0, 0.15), 0 2.7px 3.8px -0.2px rgba(0, 0, 0, 0.15), 0 5.5px 7.8px -0.3px rgba(0, 0, 0, 0.15), -0.1px 11.5px 16.4px -0.5px rgba(0, 0, 0, 0.15);
+}
+.edit-site-layout.is-full-canvas.is-edit-mode .edit-site-layout__hub {
+  width: auto;
+  padding-left: 0;
+}
+@media (min-width: 782px) {
+  .edit-site-layout__hub {
+    width: calc(360px - 48px);
+  }
 }
 .edit-site-layout.is-full-canvas .edit-site-layout__hub {
-  top: 0;
-  right: 0;
-  padding: 0;
   padding-left: 16px;
-  height: 60px;
   border-radius: 0;
   width: 100vw;
   box-shadow: none;
@@ -2172,15 +2173,6 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
     padding-left: 0;
   }
 }
-.edit-site-layout.is-full-canvas.is-edit-mode .edit-site-layout__hub {
-  width: auto;
-  padding-left: 0;
-}
-@media (min-width: 782px) {
-  .edit-site-layout__hub {
-    width: calc(360px - 48px);
-  }
-}
 
 .edit-site-layout__header {
   height: 60px;
@@ -2430,13 +2422,14 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 
 .edit-site-sidebar-navigation-screen__content {
   margin: 0 36px 16px 16px;
+  color: #949494;
 }
 
 .edit-site-sidebar-navigation-screen__title-icon {
   position: sticky;
   top: 0;
   background: #1e1e1e;
-  padding-top: 164px;
+  padding-top: 108px;
   box-shadow: 0 8px 16px #1e1e1e;
   margin-bottom: 8px;
   padding-bottom: 8px;
@@ -2454,14 +2447,10 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 .edit-site-sidebar-navigation-screen__back {
   color: #e0e0e0;
 }
-.edit-site-sidebar-navigation-screen__back:hover {
+.edit-site-sidebar-navigation-screen__back:hover, .edit-site-sidebar-navigation-screen__back:not([aria-disabled=true]):active {
   color: #fff;
 }
 
-.edit-site-sidebar-navigation-screen__icon-placeholder {
-  width: 36px;
-}
-
 .edit-site-sidebar-navigation-screen-templates__see-all {
   /* Overrides the margin that comes from the Item component */
   margin-top: 16px !important;
@@ -2479,11 +2468,6 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   gap: 8px;
 }
 
-.edit-site-site-hub__edit-button {
-  height: 32px;
-  color: #fff;
-}
-
 .edit-site-site-hub__post-type {
   opacity: 0.6;
 }
@@ -2492,10 +2476,7 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   height: 60px;
   width: 64px;
   flex-shrink: 0;
-}
-
-.edit-site-layout.is-edit-mode .edit-site-site-hub__view-mode-toggle-container {
-  width: 60px;
+  background: #1e1e1e;
 }
 
 .edit-site-site-hub__text-content {

package/build-style/style.css

@@ -1114,7 +1114,8 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
 }
 
 .edit-site-global-styles-screen-css-help-link {
-  padding-left: 16px;
+  display: block;
+  margin-top: 8px;
 }
 
 .edit-site-global-styles-screen-variations {
@@ -2145,23 +2146,23 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 
 .edit-site-layout__hub {
   position: fixed;
-  top: 24px;
-  left: 24px;
+  top: 0;
+  left: 0;
   width: calc(100vw - 48px);
-  height: 68px;
+  height: 60px;
   z-index: 3;
-  background: #000;
-  padding: 16px;
-  padding-left: 0;
-  border-radius: 8px;
-  box-shadow: 0 0.7px 1px rgba(0, 0, 0, 0.15), 0 2.7px 3.8px -0.2px rgba(0, 0, 0, 0.15), 0 5.5px 7.8px -0.3px rgba(0, 0, 0, 0.15), 0.1px 11.5px 16.4px -0.5px rgba(0, 0, 0, 0.15);
+}
+.edit-site-layout.is-full-canvas.is-edit-mode .edit-site-layout__hub {
+  width: auto;
+  padding-right: 0;
+}
+@media (min-width: 782px) {
+  .edit-site-layout__hub {
+    width: calc(360px - 48px);
+  }
 }
 .edit-site-layout.is-full-canvas .edit-site-layout__hub {
-  top: 0;
-  left: 0;
-  padding: 0;
   padding-right: 16px;
-  height: 60px;
   border-radius: 0;
   width: 100vw;
   box-shadow: none;
@@ -2172,15 +2173,6 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
     padding-right: 0;
   }
 }
-.edit-site-layout.is-full-canvas.is-edit-mode .edit-site-layout__hub {
-  width: auto;
-  padding-right: 0;
-}
-@media (min-width: 782px) {
-  .edit-site-layout__hub {
-    width: calc(360px - 48px);
-  }
-}
 
 .edit-site-layout__header {
   height: 60px;
@@ -2430,13 +2422,14 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 
 .edit-site-sidebar-navigation-screen__content {
   margin: 0 16px 16px 36px;
+  color: #949494;
 }
 
 .edit-site-sidebar-navigation-screen__title-icon {
   position: sticky;
   top: 0;
   background: #1e1e1e;
-  padding-top: 164px;
+  padding-top: 108px;
   box-shadow: 0 8px 16px #1e1e1e;
   margin-bottom: 8px;
   padding-bottom: 8px;
@@ -2454,14 +2447,10 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 .edit-site-sidebar-navigation-screen__back {
   color: #e0e0e0;
 }
-.edit-site-sidebar-navigation-screen__back:hover {
+.edit-site-sidebar-navigation-screen__back:hover, .edit-site-sidebar-navigation-screen__back:not([aria-disabled=true]):active {
   color: #fff;
 }
 
-.edit-site-sidebar-navigation-screen__icon-placeholder {
-  width: 36px;
-}
-
 .edit-site-sidebar-navigation-screen-templates__see-all {
   /* Overrides the margin that comes from the Item component */
   margin-top: 16px !important;
@@ -2479,11 +2468,6 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   gap: 8px;
 }
 
-.edit-site-site-hub__edit-button {
-  height: 32px;
-  color: #fff;
-}
-
 .edit-site-site-hub__post-type {
   opacity: 0.6;
 }
@@ -2492,10 +2476,7 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   height: 60px;
   width: 64px;
   flex-shrink: 0;
-}
-
-.edit-site-layout.is-edit-mode .edit-site-site-hub__view-mode-toggle-container {
-  width: 60px;
+  background: #1e1e1e;
 }
 
 .edit-site-site-hub__text-content {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.3.2",
+	"version": "5.3.3",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -29,33 +29,33 @@
 		"@babel/runtime": "^7.16.0",
 		"@wordpress/a11y": "^3.26.1",
 		"@wordpress/api-fetch": "^6.23.1",
-		"@wordpress/block-editor": "^11.3.2",
-		"@wordpress/block-library": "^8.3.2",
-		"@wordpress/blocks": "^12.3.1",
-		"@wordpress/components": "^23.3.1",
-		"@wordpress/compose": "^6.3.1",
-		"@wordpress/core-data": "^6.3.1",
-		"@wordpress/data": "^8.3.1",
+		"@wordpress/block-editor": "^11.3.3",
+		"@wordpress/block-library": "^8.3.3",
+		"@wordpress/blocks": "^12.3.2",
+		"@wordpress/components": "^23.3.2",
+		"@wordpress/compose": "^6.3.2",
+		"@wordpress/core-data": "^6.3.2",
+		"@wordpress/data": "^8.3.2",
 		"@wordpress/deprecated": "^3.26.1",
-		"@wordpress/editor": "^13.3.2",
+		"@wordpress/editor": "^13.3.3",
 		"@wordpress/element": "^5.3.1",
-		"@wordpress/experiments": "^0.8.1",
 		"@wordpress/hooks": "^3.26.1",
 		"@wordpress/html-entities": "^3.26.1",
 		"@wordpress/i18n": "^4.26.1",
 		"@wordpress/icons": "^9.17.1",
-		"@wordpress/interface": "^5.3.2",
-		"@wordpress/keyboard-shortcuts": "^4.3.1",
-		"@wordpress/keycodes": "^3.26.1",
+		"@wordpress/interface": "^5.3.3",
+		"@wordpress/keyboard-shortcuts": "^4.3.2",
+		"@wordpress/keycodes": "^3.26.2",
 		"@wordpress/media-utils": "^4.17.1",
-		"@wordpress/notices": "^3.26.1",
-		"@wordpress/plugins": "^5.3.1",
-		"@wordpress/preferences": "^3.3.1",
-		"@wordpress/reusable-blocks": "^4.3.2",
+		"@wordpress/notices": "^3.26.2",
+		"@wordpress/plugins": "^5.3.2",
+		"@wordpress/preferences": "^3.3.2",
+		"@wordpress/private-apis": "^0.8.1",
+		"@wordpress/reusable-blocks": "^4.3.3",
 		"@wordpress/style-engine": "^1.9.1",
 		"@wordpress/url": "^3.27.1",
-		"@wordpress/viewport": "^5.3.1",
-		"@wordpress/widgets": "^3.3.2",
+		"@wordpress/viewport": "^5.3.2",
+		"@wordpress/widgets": "^3.3.3",
 		"classnames": "^2.3.1",
 		"colord": "^2.9.2",
 		"downloadjs": "^1.4.7",
@@ -73,5 +73,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "3eb2c536278d5a17f698b9c378fe3db746a89622"
+	"gitHead": "1bf01c01a8238ce3a681ad1e517f86033818b78d"
 }

package/src/components/add-new-template/new-template-part.js

@@ -20,7 +20,7 @@ import {
 	getUniqueTemplatePartTitle,
 	getCleanTemplatePartSlug,
 } from '../../utils/template-part-create';
-import { unlock } from '../../experiments';
+import { unlock } from '../../private-apis';
 
 export default function NewTemplatePart( {
 	postType,
@@ -67,9 +67,12 @@ export default function NewTemplatePart( {
 			setCanvasMode( 'edit' );
 
 			// Navigate to the created template part editor.
-			history.push( {
-				postId: templatePart.id,
-				postType: templatePart.type,
+			window.queueMicrotask( () => {
+				history.push( {
+					postId: templatePart.id,
+					postType: 'wp_template_part',
+					path: '/template-parts/single',
+				} );
 			} );
 
 			// TODO: Add a success notice?

package/src/components/add-new-template/new-template.js

@@ -48,7 +48,7 @@ import AddCustomGenericTemplateModal from './add-custom-generic-template-modal';
 import TemplateActionsLoadingScreen from './template-actions-loading-screen';
 import { useHistory } from '../routes';
 import { store as editSiteStore } from '../../store';
-import { unlock } from '../../experiments';
+import { unlock } from '../../private-apis';
 
 const DEFAULT_TEMPLATE_SLUGS = [
 	'front-page',
@@ -102,7 +102,6 @@ export default function NewTemplate( {
 	const { setTemplate, setCanvasMode } = unlock(
 		useDispatch( editSiteStore )
 	);
-
 	async function createTemplate( template, isWPSuggestion = true ) {
 		if ( isCreatingTemplate ) {
 			return;
@@ -140,15 +139,18 @@ export default function NewTemplate( {
 
 			// Set template before navigating away to avoid initial stale value.
 			setTemplate( newTemplate.id, newTemplate.slug );
-
 			// Switch to edit mode.
 			setCanvasMode( 'edit' );
 
 			// Navigate to the created template editor.
-			history.push( {
-				postId: newTemplate.id,
-				postType: newTemplate.type,
+			window.queueMicrotask( () => {
+				history.push( {
+					postId: newTemplate.id,
+					postType: newTemplate.type,
+					path: '/templates/single',
+				} );
 			} );
+
 			createSuccessNotice(
 				sprintf(
 					// translators: %s: Title of the created template e.g: "Category".

package/src/components/block-editor/editor-canvas.js

@@ -13,7 +13,7 @@ import { useSelect, useDispatch } from '@wordpress/data';
 /**
  * Internal dependencies
  */
-import { unlock } from '../../experiments';
+import { unlock } from '../../private-apis';
 import { store as editSiteStore } from '../../store';
 
 function EditorCanvas( { enableResizing, settings, children, ...props } ) {

package/src/components/block-editor/index.js

@@ -17,7 +17,7 @@ import {
 	__unstableUseTypingObserver as useTypingObserver,
 	BlockEditorKeyboardShortcuts,
 	store as blockEditorStore,
-	experiments as blockEditorExperiments,
+	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
 import {
 	useMergeRefs,
@@ -37,9 +37,9 @@ import BackButton from './back-button';
 import ResizableEditor from './resizable-editor';
 import EditorCanvas from './editor-canvas';
 import StyleBook from '../style-book';
-import { unlock } from '../../experiments';
+import { unlock } from '../../private-apis';
 
-const { ExperimentalBlockEditorProvider } = unlock( blockEditorExperiments );
+const { ExperimentalBlockEditorProvider } = unlock( blockEditorPrivateApis );
 
 const LAYOUT = {
 	type: 'default',

package/src/components/editor/index.js

@@ -4,7 +4,7 @@
 import { useMemo } from '@wordpress/element';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { Notice } from '@wordpress/components';
-import { EntityProvider, store as coreStore } from '@wordpress/core-data';
+import { EntityProvider } from '@wordpress/core-data';
 import { store as preferencesStore } from '@wordpress/preferences';
 import {
 	BlockContextProvider,
@@ -17,7 +17,7 @@ import {
 	store as interfaceStore,
 } from '@wordpress/interface';
 import { EditorNotices, EditorSnackbars } from '@wordpress/editor';
-import { __ } from '@wordpress/i18n';
+import { __, sprintf } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
@@ -34,7 +34,8 @@ import { GlobalStylesRenderer } from '../global-styles-renderer';
 import { GlobalStylesProvider } from '../global-styles/global-styles-provider';
 import useTitle from '../routes/use-title';
 import CanvasSpinner from '../canvas-spinner';
-import { unlock } from '../../experiments';
+import { unlock } from '../../private-apis';
+import useEditedEntityRecord from '../use-edited-entity-record';
 
 const interfaceLabels = {
 	/* translators: accessibility text for the editor content landmark region. */
@@ -49,11 +50,15 @@ const interfaceLabels = {
 
 export default function Editor() {
 	const {
-		editedPostId,
-		editedPostType,
-		editedPost,
+		record: editedPost,
+		getTitle,
+		isLoaded: hasLoadedPost,
+	} = useEditedEntityRecord();
+
+	const { id: editedPostId, type: editedPostType } = editedPost;
+
+	const {
 		context,
-		hasLoadedPost,
 		editorMode,
 		canvasMode,
 		blockEditorMode,
@@ -63,36 +68,19 @@ export default function Editor() {
 		showIconLabels,
 	} = useSelect( ( select ) => {
 		const {
-			getEditedPostType,
-			getEditedPostId,
 			getEditedPostContext,
 			getEditorMode,
 			getCanvasMode,
 			isInserterOpened,
 			isListViewOpened,
 		} = unlock( select( editSiteStore ) );
-		const { hasFinishedResolution, getEntityRecord } = select( coreStore );
 		const { __unstableGetEditorMode } = select( blockEditorStore );
 		const { getActiveComplementaryArea } = select( interfaceStore );
-		const postType = getEditedPostType();
-		const postId = getEditedPostId();
 
 		// The currently selected entity to display.
 		// Typically template or template part in the site editor.
 		return {
-			editedPostId: postId,
-			editedPostType: postType,
-			editedPost: postId
-				? getEntityRecord( 'postType', postType, postId )
-				: null,
 			context: getEditedPostContext(),
-			hasLoadedPost: postId
-				? hasFinishedResolution( 'getEntityRecord', [
-						'postType',
-						postType,
-						postId,
-				  ] )
-				: false,
 			editorMode: getEditorMode(),
 			canvasMode: getCanvasMode(),
 			blockEditorMode: __unstableGetEditorMode(),
@@ -134,15 +122,28 @@ export default function Editor() {
 					} ),
 			],
 		} ),
-		[ context ]
+		[ context, setEditedPostContext ]
 	);
-	const isReady = editedPostType !== undefined && editedPostId !== undefined;
+
+	let title;
+	if ( hasLoadedPost ) {
+		const type =
+			editedPostType === 'wp_template'
+				? __( 'Template' )
+				: __( 'Template Part' );
+		title = sprintf(
+			// translators: A breadcrumb trail in browser tab. %1$s: title of template being edited, %2$s: type of template (Template or Template Part).
+			__( '%1$s ‹ %2$s ‹ Editor' ),
+			getTitle(),
+			type
+		);
+	}
 
 	// Only announce the title once the editor is ready to prevent "Replace"
 	// action in <URlQueryController> from double-announcing.
-	useTitle( isReady && __( 'Editor (beta)' ) );
+	useTitle( hasLoadedPost && title );
 
-	if ( ! isReady ) {
+	if ( ! hasLoadedPost ) {
 		return <CanvasSpinner />;
 	}
 

package/src/components/global-styles/border-panel.js

@@ -3,7 +3,7 @@
  */
 import {
 	__experimentalBorderRadiusControl as BorderRadiusControl,
-	experiments as blockEditorExperiments,
+	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
 import {
 	__experimentalBorderBoxControl as BorderBoxControl,
@@ -19,9 +19,9 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import { getSupportedGlobalStylesPanels, useColorsPerOrigin } from './hooks';
-import { unlock } from '../../experiments';
+import { unlock } from '../../private-apis';
 
-const { useGlobalSetting, useGlobalStyle } = unlock( blockEditorExperiments );
+const { useGlobalSetting, useGlobalStyle } = unlock( blockEditorPrivateApis );
 
 export function useHasBorderPanel( name ) {
 	const controls = [

package/src/components/global-styles/color-palette-panel.js

@@ -6,14 +6,14 @@ import {
 	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { experiments as blockEditorExperiments } from '@wordpress/block-editor';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
  */
-import { unlock } from '../../experiments';
+import { unlock } from '../../private-apis';
 
-const { useGlobalSetting } = unlock( blockEditorExperiments );
+const { useGlobalSetting } = unlock( blockEditorPrivateApis );
 
 export default function ColorPalettePanel( { name } ) {
 	const [ themeColors, setThemeColors ] = useGlobalSetting(

package/src/components/global-styles/custom-css.js

@@ -12,7 +12,7 @@ import {
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import {
-	experiments as blockEditorExperiments,
+	privateApis as blockEditorPrivateApis,
 	transformStyles,
 } from '@wordpress/block-editor';
 import { info } from '@wordpress/icons';
@@ -20,10 +20,10 @@ import { info } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
-import { unlock } from '../../experiments';
+import { unlock } from '../../private-apis';
 import Subtitle from './subtitle';
 
-const { useGlobalStyle } = unlock( blockEditorExperiments );
+const { useGlobalStyle } = unlock( blockEditorPrivateApis );
 function CustomCSSControl( { blockName } ) {
 	// If blockName is defined, we are customizing CSS at the block level:
 	// styles.blocks.blockName.css

package/src/components/global-styles/dimensions-panel.js

@@ -20,7 +20,7 @@ import {
 	__experimentalUseCustomSides as useCustomSides,
 	HeightControl,
 	__experimentalSpacingSizesControl as SpacingSizesControl,
-	experiments as blockEditorExperiments,
+	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
 import { Icon, positionCenter, stretchWide } from '@wordpress/icons';
 
@@ -28,9 +28,9 @@ import { Icon, positionCenter, stretchWide } from '@wordpress/icons';
  * Internal dependencies
  */
 import { getSupportedGlobalStylesPanels } from './hooks';
-import { unlock } from '../../experiments';
+import { unlock } from '../../private-apis';
 
-const { useGlobalSetting, useGlobalStyle } = unlock( blockEditorExperiments );
+const { useGlobalSetting, useGlobalStyle } = unlock( blockEditorPrivateApis );
 
 const AXIAL_SIDES = [ 'horizontal', 'vertical' ];