@wordpress/edit-site 5.5.0 → 5.6.0

package/build-style/style.css

@@ -524,6 +524,10 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 }
 .interface-preferences__tabs .components-tab-panel__tabs .components-tab-panel__tabs-item:focus:not(:disabled) {
   box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+  outline: 2px solid transparent;
+}
+.interface-preferences__tabs .components-tab-panel__tabs .components-tab-panel__tabs-item:focus-visible::before {
+  content: none;
 }
 .interface-preferences__tabs .components-tab-panel__tab-content {
   padding-left: 24px;
@@ -568,10 +572,19 @@ body.is-fullscreen-mode .interface-interface-skeleton {
 }
 
 @media (min-width: 600px) {
-  .edit-site-new-template-dropdown .edit-site-new-template-dropdown__popover {
+  .edit-site-new-template-dropdown .edit-site-new-template-dropdown__menu-groups {
     min-width: 300px;
   }
 }
+.edit-site-new-template-dropdown__menu-item-tooltip.components-tooltip .components-popover__content {
+  max-width: 320px;
+  padding: 8px 12px;
+  border-radius: 2px;
+  white-space: pre-wrap;
+  min-width: 0;
+  width: auto;
+  text-align: left;
+}
 
 .edit-site-custom-template-modal__contents > .components-button {
   padding: 24px;
@@ -1167,6 +1180,16 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   width: 24px;
 }
 
+.edit-site-global-styles-screen-root.edit-site-global-styles-screen-root,
+.edit-site-global-styles-screen-style-variations.edit-site-global-styles-screen-style-variations {
+  background: unset;
+  color: inherit;
+}
+
+.edit-site-global-styles-sidebar__panel .block-editor-block-icon svg {
+  fill: currentColor;
+}
+
 .edit-site-header-edit-mode {
   height: 60px;
   align-items: center;
@@ -1571,46 +1594,6 @@ body.is-fullscreen-mode .edit-site-list-header {
   color: #757575;
 }
 
-@keyframes loadingpulse {
-  0% {
-    opacity: 1;
-  }
-  50% {
-    opacity: 0.5;
-  }
-  100% {
-    opacity: 1;
-  }
-}
-.edit-site-navigation-inspector .block-editor-list-view-leaf .block-editor-list-view-block-contents {
-  white-space: normal;
-}
-.edit-site-navigation-inspector .block-editor-list-view-block__title {
-  margin-top: 3px;
-}
-.edit-site-navigation-inspector .block-editor-list-view-block__menu-cell {
-  padding-right: 0;
-}
-.edit-site-navigation-inspector .edit-site-navigation-inspector__select-menu {
-  margin-bottom: 8px;
-}
-
-.edit-site-navigation-inspector__placeholder {
-  padding: 8px;
-  margin: 8px;
-  background-color: #f0f0f0;
-  animation: loadingpulse 1s linear infinite;
-  animation-delay: 0.5s;
-}
-.edit-site-navigation-inspector__placeholder.is-child {
-  margin-left: 24px;
-  width: 50%;
-}
-
-.edit-site-navigation-inspector__empty-msg {
-  padding: 0 8px;
-}
-
 .edit-site-sidebar-edit-mode {
   width: 280px;
 }
@@ -2253,9 +2236,9 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 }
 
 .edit-site-layout__content {
+  height: 100%;
   flex-grow: 1;
   display: flex;
-  overflow: hidden;
 }
 
 .edit-site-layout__sidebar {
@@ -2403,6 +2386,20 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   }
 }
 
+.edit-site-save-hub {
+  color: #949494;
+}
+
+.edit-site-save-hub__button {
+  color: inherit;
+}
+.edit-site-save-hub__button[aria-disabled=true] {
+  opacity: 1;
+}
+.edit-site-save-hub__button[aria-disabled=true]:hover {
+  color: inherit;
+}
+
 @media (min-width: 600px) {
   .edit-site-save-panel__modal {
     width: 600px;
@@ -2412,25 +2409,27 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 .edit-site-sidebar__content {
   flex-grow: 1;
   overflow-y: auto;
+}
+.edit-site-sidebar__content .components-navigator-screen {
   visibility: hidden;
   scrollbar-color: #757575 #1e1e1e;
   scrollbar-width: thin;
   scrollbar-gutter: stable;
 }
-.edit-site-sidebar__content::-webkit-scrollbar {
+.edit-site-sidebar__content .components-navigator-screen::-webkit-scrollbar {
   width: 12px;
   height: 12px;
 }
-.edit-site-sidebar__content::-webkit-scrollbar-track {
+.edit-site-sidebar__content .components-navigator-screen::-webkit-scrollbar-track {
   background-color: #1e1e1e;
 }
-.edit-site-sidebar__content::-webkit-scrollbar-thumb {
+.edit-site-sidebar__content .components-navigator-screen::-webkit-scrollbar-thumb {
   background-color: #757575;
   border-radius: 8px;
   border: 3px solid transparent;
   background-clip: padding-box;
 }
-.edit-site-sidebar__content:hover, .edit-site-sidebar__content:focus, .edit-site-sidebar__content > * {
+.edit-site-sidebar__content .components-navigator-screen:hover, .edit-site-sidebar__content .components-navigator-screen:focus, .edit-site-sidebar__content .components-navigator-screen > * {
   visibility: visible;
 }
 
@@ -2439,8 +2438,6 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   flex-shrink: 0;
   margin: 0 24px;
   padding: 24px 0;
-  display: flex;
-  justify-content: flex-end;
 }
 
 .edit-site-sidebar__content.edit-site-sidebar__content {
@@ -2463,40 +2460,24 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-components-color-accent, var(--wp-admin-theme-color, #007cba));
   outline: 3px solid transparent;
 }
-.edit-site-sidebar-button:hover, .edit-site-sidebar-button:focus-visible, .edit-site-sidebar-button:focus, .edit-site-sidebar-button:not([aria-disabled=true]):active {
+.edit-site-sidebar-button:hover, .edit-site-sidebar-button:focus-visible, .edit-site-sidebar-button:focus, .edit-site-sidebar-button:not([aria-disabled=true]):active, .edit-site-sidebar-button[aria-expanded=true] {
   color: #fff;
 }
 
 .edit-site-sidebar-navigation-item.components-item {
   color: #949494;
-  border-width: 1.5px;
+  margin: 0 4px;
 }
 .edit-site-sidebar-navigation-item.components-item:hover, .edit-site-sidebar-navigation-item.components-item:focus, .edit-site-sidebar-navigation-item.components-item[aria-current] {
   color: #fff;
   background: #2f2f2f;
-  border-width: 1.5px;
 }
 .edit-site-sidebar-navigation-item.components-item[aria-current] {
   background: var(--wp-admin-theme-color);
 }
 
-.edit-site-sidebar-navigation-screen__content .edit-site-navigation-inspector .components-button {
-  color: #949494;
-}
-.edit-site-sidebar-navigation-screen__content .edit-site-navigation-inspector .components-button:hover, .edit-site-sidebar-navigation-screen__content .edit-site-navigation-inspector .components-button:focus, .edit-site-sidebar-navigation-screen__content .edit-site-navigation-inspector .components-button[aria-current] {
-  color: #fff;
-}
-
-.edit-site-sidebar-navigation-screen__content .edit-site-navigation-inspector .offcanvas-editor-list-view-leaf:hover, .edit-site-sidebar-navigation-screen__content .edit-site-navigation-inspector .offcanvas-editor-list-view-leaf:focus, .edit-site-sidebar-navigation-screen__content .edit-site-navigation-inspector .offcanvas-editor-list-view-leaf[aria-current] {
-  background: #2f2f2f;
-}
-.edit-site-sidebar-navigation-screen__content .edit-site-navigation-inspector .offcanvas-editor-list-view-leaf .block-editor-list-view-block__menu {
-  margin-left: -8px;
-}
-
 .edit-site-sidebar-navigation-screen__content .block-editor-list-view-block-select-button {
   cursor: grab;
-  width: calc(100% - 2px);
   padding: 8px;
 }
 
@@ -2512,6 +2493,18 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   color: #949494;
 }
 
+.edit-site-sidebar-navigation-screen__page-link {
+  color: #949494;
+  margin-left: 16px;
+  display: inline-block;
+}
+.edit-site-sidebar-navigation-screen__page-link:hover, .edit-site-sidebar-navigation-screen__page-link:focus {
+  color: #fff;
+}
+.edit-site-sidebar-navigation-screen__page-link .components-external-link__icon {
+  margin-left: 4px;
+}
+
 .edit-site-sidebar-navigation-screen__title-icon {
   position: sticky;
   top: 0;
@@ -2532,6 +2525,28 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   margin: 0;
 }
 
+.edit-site-sidebar-navigation-screen-template__added-by-description {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 24px;
+}
+.edit-site-sidebar-navigation-screen-template__added-by-description-author {
+  display: inline-flex;
+  align-items: center;
+}
+.edit-site-sidebar-navigation-screen-template__added-by-description-author img {
+  border-radius: 12px;
+}
+.edit-site-sidebar-navigation-screen-template__added-by-description-author svg {
+  fill: #949494;
+}
+.edit-site-sidebar-navigation-screen-template__added-by-description-author-icon {
+  width: 24px;
+  height: 24px;
+  margin-right: 8px;
+}
+
 .edit-site-sidebar-navigation-screen-templates__see-all {
   /* Overrides the margin that comes from the Item component */
   margin-top: 16px !important;
@@ -2550,7 +2565,7 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 
 .edit-site-site-hub__view-mode-toggle-container {
   height: 60px;
-  width: 64px;
+  width: 60px;
   flex-shrink: 0;
   background: #1e1e1e;
 }
@@ -2565,12 +2580,95 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   overflow: hidden;
 }
 
-.edit-site-sidebar-navigation-screen-navigation-menus .offcanvas-editor-list-view-leaf {
+.edit-site-site-hub__site-title {
+  margin-left: 4px;
+}
+
+.edit-site-sidebar-navigation-screen__description {
+  margin: 0 0 32px 16px;
+}
+
+.edit-site-sidebar-navigation-screen-navigation-menus__placeholder {
+  padding: 8px;
+  margin: 8px;
+  background-color: #f0f0f0;
+  animation: loadingpulse 1s linear infinite;
+  animation-delay: 0.5s;
+}
+
+@keyframes loadingpulse {
+  0% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0.5;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf {
   max-width: calc(100% - 4px);
+  border-radius: 2px;
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf:hover, .edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf:focus, .edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf[aria-current] {
+  background: #2f2f2f;
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf .block-editor-list-view-block__menu {
+  margin-left: -8px;
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf.is-selected > td {
+  background: transparent;
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf.is-selected .block-editor-list-view-block-contents {
+  color: inherit;
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf.is-selected:not(:hover) .block-editor-list-view-block__menu {
+  opacity: 0;
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf.is-selected:hover, .edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf.is-selected:focus {
+  color: #fff;
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf.is-selected:hover .block-editor-list-view-block__menu-cell, .edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf.is-selected:focus .block-editor-list-view-block__menu-cell {
+  opacity: 1;
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf.is-selected .block-editor-list-view-block__menu {
+  opacity: 1;
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf.is-selected .block-editor-list-view-block__menu:focus {
+  box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf .block-editor-list-view-block-contents:focus::after {
+  box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf.is-branch-selected:not(.is-selected):not(.is-synced-branch) {
+  background: transparent;
 }
-.edit-site-sidebar-navigation-screen-navigation-menus .block-editor-list-view-leaf .block-editor-list-view-block__contents-cell {
+.edit-site-sidebar-navigation-screen-navigation-menus__content .offcanvas-editor-list-view-leaf.is-branch-selected:not(.is-selected):not(.is-synced-branch):hover {
+  background: #2f2f2f;
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .block-editor-list-view-leaf .block-editor-list-view-block__contents-cell {
   width: 100%;
 }
+.edit-site-sidebar-navigation-screen-navigation-menus__content .block-editor-list-view-leaf .block-editor-list-view-block-contents {
+  white-space: normal;
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .block-editor-list-view-block__title {
+  margin-top: 3px;
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .block-editor-list-view-block__menu-cell {
+  padding-right: 0;
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .components-button {
+  color: #949494;
+}
+.edit-site-sidebar-navigation-screen-navigation-menus__content .components-button:hover, .edit-site-sidebar-navigation-screen-navigation-menus__content .components-button:focus, .edit-site-sidebar-navigation-screen-navigation-menus__content .components-button[aria-current] {
+  color: #fff;
+}
+
+.edit-site-sidebar-navigation-screen-navigation-menus__content .popover-slot .wp-block-navigation-submenu {
+  display: none;
+}
 
 .edit-site-site-icon__icon {
   fill: currentColor;
@@ -2610,53 +2708,12 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   bottom: 0;
   left: 0;
   overflow: auto;
-  padding: 32px;
+  padding: 0;
   position: absolute;
   right: 0;
   top: 48px;
 }
 
-.edit-site-style-book__examples {
-  max-width: 900px;
-  margin: 0 auto;
-}
-
-.edit-site-style-book__example {
-  background: none;
-  border-radius: 2px;
-  border: none;
-  color: inherit;
-  cursor: pointer;
-  display: flex;
-  flex-direction: column;
-  gap: 40px;
-  margin-bottom: 40px;
-  padding: 16px;
-  width: 100%;
-}
-.edit-site-style-book__example.is-selected {
-  box-shadow: 0 0 0 1px var(--wp-admin-theme-color);
-}
-.edit-site-style-book.is-wide .edit-site-style-book__example {
-  flex-direction: row;
-}
-
-.edit-site-style-book__example-title {
-  font-size: 11px;
-  font-weight: 500;
-  margin: 0;
-  text-align: left;
-  text-transform: uppercase;
-}
-.edit-site-style-book.is-wide .edit-site-style-book__example-title {
-  text-align: right;
-  width: 120px;
-}
-
-.edit-site-style-book__example-preview {
-  width: 100%;
-}
-
 .edit-site-push-changes-to-global-styles-control .components-button {
   justify-content: center;
   width: 100%;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.5.0",
+	"version": "5.6.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -27,35 +27,35 @@
 	"react-native": "src/index",
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^3.28.0",
-		"@wordpress/api-fetch": "^6.25.0",
-		"@wordpress/block-editor": "^11.5.0",
-		"@wordpress/block-library": "^8.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/deprecated": "^3.28.0",
-		"@wordpress/editor": "^13.5.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/interface": "^5.5.0",
-		"@wordpress/keyboard-shortcuts": "^4.5.0",
-		"@wordpress/keycodes": "^3.28.0",
-		"@wordpress/media-utils": "^4.19.0",
-		"@wordpress/notices": "^3.28.0",
-		"@wordpress/plugins": "^5.5.0",
-		"@wordpress/preferences": "^3.5.0",
-		"@wordpress/private-apis": "^0.10.0",
-		"@wordpress/reusable-blocks": "^4.5.0",
-		"@wordpress/style-engine": "^1.11.0",
-		"@wordpress/url": "^3.29.0",
-		"@wordpress/viewport": "^5.5.0",
-		"@wordpress/widgets": "^3.5.0",
+		"@wordpress/a11y": "^3.29.0",
+		"@wordpress/api-fetch": "^6.26.0",
+		"@wordpress/block-editor": "^11.6.0",
+		"@wordpress/block-library": "^8.6.0",
+		"@wordpress/blocks": "^12.6.0",
+		"@wordpress/components": "^23.6.0",
+		"@wordpress/compose": "^6.6.0",
+		"@wordpress/core-data": "^6.6.0",
+		"@wordpress/data": "^8.6.0",
+		"@wordpress/deprecated": "^3.29.0",
+		"@wordpress/editor": "^13.6.0",
+		"@wordpress/element": "^5.6.0",
+		"@wordpress/hooks": "^3.29.0",
+		"@wordpress/html-entities": "^3.29.0",
+		"@wordpress/i18n": "^4.29.0",
+		"@wordpress/icons": "^9.20.0",
+		"@wordpress/interface": "^5.6.0",
+		"@wordpress/keyboard-shortcuts": "^4.6.0",
+		"@wordpress/keycodes": "^3.29.0",
+		"@wordpress/media-utils": "^4.20.0",
+		"@wordpress/notices": "^3.29.0",
+		"@wordpress/plugins": "^5.6.0",
+		"@wordpress/preferences": "^3.6.0",
+		"@wordpress/private-apis": "^0.11.0",
+		"@wordpress/reusable-blocks": "^4.6.0",
+		"@wordpress/style-engine": "^1.12.0",
+		"@wordpress/url": "^3.30.0",
+		"@wordpress/viewport": "^5.6.0",
+		"@wordpress/widgets": "^3.6.0",
 		"classnames": "^2.3.1",
 		"colord": "^2.9.2",
 		"downloadjs": "^1.4.7",
@@ -73,5 +73,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "d5e03a74b79e3ca84afda24375474a103a063ee4"
+	"gitHead": "9534a7b3bbf07c1d40b94fdb7a3d091f297bfb06"
 }

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

@@ -5,7 +5,8 @@ import {
 	DropdownMenu,
 	MenuGroup,
 	MenuItem,
-	NavigableMenu,
+	Tooltip,
+	VisuallyHidden,
 } from '@wordpress/components';
 import { useState } from '@wordpress/element';
 import { useDispatch } from '@wordpress/data';
@@ -164,6 +165,11 @@ export default function NewTemplate( {
 	if ( ! missingTemplates.length ) {
 		return null;
 	}
+
+	const customTemplateDescription = __(
+		'A custom template can be manually applied to any post or page.'
+	);
+
 	return (
 		<>
 			<DropdownMenu
@@ -181,7 +187,7 @@ export default function NewTemplate( {
 						{ isCreatingTemplate && (
 							<TemplateActionsLoadingScreen />
 						) }
-						<NavigableMenu className="edit-site-new-template-dropdown__popover">
+						<div className="edit-site-new-template-dropdown__menu-groups">
 							<MenuGroup label={ postType.labels.add_new_item }>
 								{ missingTemplates.map( ( template ) => {
 									const {
@@ -192,44 +198,63 @@ export default function NewTemplate( {
 										icon,
 									} = template;
 									return (
-										<MenuItem
-											icon={
-												icon ||
-												TEMPLATE_ICONS[ slug ] ||
-												post
-											}
-											iconPosition="left"
-											info={ description }
+										<Tooltip
 											key={ slug }
-											onClick={ () =>
-												onClick
-													? onClick( template )
-													: createTemplate( template )
-											}
+											position="top right"
+											text={ description }
+											className="edit-site-new-template-dropdown__menu-item-tooltip"
 										>
-											{ title }
-										</MenuItem>
+											<MenuItem
+												icon={
+													icon ||
+													TEMPLATE_ICONS[ slug ] ||
+													post
+												}
+												iconPosition="left"
+												onClick={ () =>
+													onClick
+														? onClick( template )
+														: createTemplate(
+																template
+														  )
+												}
+											>
+												{ title }
+												{ /* TODO: This probably won't be needed if the <Tooltip> component is accessible.
+												 * @see https://github.com/WordPress/gutenberg/issues/48222 */ }
+												<VisuallyHidden>
+													{ description }
+												</VisuallyHidden>
+											</MenuItem>
+										</Tooltip>
 									);
 								} ) }
 							</MenuGroup>
 							<MenuGroup>
-								<MenuItem
-									icon={ customGenericTemplateIcon }
-									iconPosition="left"
-									info={ __(
-										'Custom templates can be applied to any post or page.'
-									) }
-									key="custom-template"
-									onClick={ () =>
-										setShowCustomGenericTemplateModal(
-											true
-										)
-									}
+								<Tooltip
+									position="top right"
+									text={ customTemplateDescription }
+									className="edit-site-new-template-dropdown__menu-item-tooltip"
 								>
-									{ __( 'Custom template' ) }
-								</MenuItem>
+									<MenuItem
+										icon={ customGenericTemplateIcon }
+										iconPosition="left"
+										onClick={ () =>
+											setShowCustomGenericTemplateModal(
+												true
+											)
+										}
+									>
+										{ __( 'Custom template' ) }
+										{ /* TODO: This probably won't be needed if the <Tooltip> component is accessible.
+										 * @see https://github.com/WordPress/gutenberg/issues/48222 */ }
+										<VisuallyHidden>
+											{ customTemplateDescription }
+										</VisuallyHidden>
+									</MenuItem>
+								</Tooltip>
 							</MenuGroup>
-						</NavigableMenu>
+						</div>
 					</>
 				) }
 			</DropdownMenu>

package/src/components/add-new-template/style.scss

@@ -1,9 +1,20 @@
 .edit-site-new-template-dropdown {
-	.edit-site-new-template-dropdown__popover {
+	.edit-site-new-template-dropdown__menu-groups {
 		@include break-small() {
 			min-width: 300px;
 		}
 	}
+
+	// The specificity is needed to override the default tooltip styles.
+	&__menu-item-tooltip.components-tooltip .components-popover__content {
+		max-width: 320px;
+		padding: $grid-unit-10 $grid-unit-15;
+		border-radius: 2px;
+		white-space: pre-wrap;
+		min-width: 0;
+		width: auto;
+		text-align: left;
+	}
 }
 
 .edit-site-custom-template-modal {

package/src/components/app/index.js

@@ -14,6 +14,7 @@ import { PluginArea } from '@wordpress/plugins';
  */
 import { Routes } from '../routes';
 import Layout from '../layout';
+import { GlobalStylesProvider } from '../global-styles/global-styles-provider';
 
 export default function App() {
 	const { createErrorNotice } = useDispatch( noticesStore );
@@ -33,12 +34,14 @@ export default function App() {
 	return (
 		<ShortcutProvider style={ { height: '100%' } }>
 			<SlotFillProvider>
-				<Popover.Slot />
-				<UnsavedChangesWarning />
-				<Routes>
-					<Layout />
-					<PluginArea onError={ onPluginAreaError } />
-				</Routes>
+				<GlobalStylesProvider>
+					<Popover.Slot />
+					<UnsavedChangesWarning />
+					<Routes>
+						<Layout />
+						<PluginArea onError={ onPluginAreaError } />
+					</Routes>
+				</GlobalStylesProvider>
 			</SlotFillProvider>
 		</ShortcutProvider>
 	);

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

@@ -44,7 +44,8 @@ function EditorCanvas( { enableResizing, settings, children, ...props } ) {
 						// Forming a "block formatting context" to prevent margin collapsing.
 						// @see https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Block_formatting_context
 						`.is-root-container { display: flow-root; }
-							body { position: relative; }`
+							body { position: relative;
+							${ canvasMode === 'view' ? 'cursor: pointer;' : '' }}}`
 					}</style>
 					{ enableResizing && (
 						<style>