@wordpress/edit-site 5.3.6 → 5.3.7

package/build-style/style-rtl.css

@@ -1567,46 +1567,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-left: 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-right: 24px;
-  width: 50%;
-}
-
-.edit-site-navigation-inspector__empty-msg {
-  padding: 0 8px;
-}
-
 .edit-site-sidebar-edit-mode {
   width: 280px;
 }
@@ -2180,9 +2140,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 {
@@ -2330,6 +2290,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;
@@ -2339,25 +2313,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;
 }
 
@@ -2366,8 +2342,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 {
@@ -2390,7 +2364,7 @@ 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;
 }
 
@@ -2407,20 +2381,6 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   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-right: -8px;
-}
-
 .edit-site-sidebar-navigation-screen__content .block-editor-list-view-block-select-button {
   cursor: grab;
   width: calc(100% - 2px);
@@ -2439,6 +2399,18 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   color: #949494;
 }
 
+.edit-site-sidebar-navigation-screen__page-link {
+  color: #949494;
+  margin-right: 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-right: 4px;
+}
+
 .edit-site-sidebar-navigation-screen__title-icon {
   position: sticky;
   top: 0;
@@ -2492,16 +2464,57 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   overflow: hidden;
 }
 
-.edit-site-sidebar-navigation-screen-navigation-menus .block-editor-list-view-block__menu-edit,
-.edit-site-sidebar-navigation-screen-navigation-menus .edit-site-navigation-inspector__select-menu {
-  display: none;
+.edit-site-sidebar-navigation-screen__description {
+  margin: 0 16px 32px 0;
+}
+
+.edit-site-sidebar-navigation-screen-navigation-menus__placeholder {
+  padding: 8px;
+  margin: 8px;
+  background-color: #f0f0f0;
+  animation: loadingpulse 1s linear infinite;
+  animation-delay: 0.5s;
 }
-.edit-site-sidebar-navigation-screen-navigation-menus .offcanvas-editor-list-view-leaf {
+
+@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 .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 .block-editor-list-view-block__menu {
+  margin-right: -8px;
+}
+.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-left: 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-site-icon__icon {
   fill: currentColor;

package/build-style/style.css

@@ -1567,46 +1567,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;
 }
@@ -2180,9 +2140,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 {
@@ -2330,6 +2290,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;
@@ -2339,25 +2313,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;
 }
 
@@ -2366,8 +2342,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 {
@@ -2390,7 +2364,7 @@ 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;
 }
 
@@ -2407,20 +2381,6 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   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);
@@ -2439,6 +2399,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;
@@ -2492,16 +2464,57 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   overflow: hidden;
 }
 
-.edit-site-sidebar-navigation-screen-navigation-menus .block-editor-list-view-block__menu-edit,
-.edit-site-sidebar-navigation-screen-navigation-menus .edit-site-navigation-inspector__select-menu {
-  display: none;
+.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;
 }
-.edit-site-sidebar-navigation-screen-navigation-menus .offcanvas-editor-list-view-leaf {
+
+@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 .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 .block-editor-list-view-block__menu {
+  margin-left: -8px;
+}
+.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-site-icon__icon {
   fill: currentColor;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.3.6",
+	"version": "5.3.7",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -29,15 +29,15 @@
 		"@babel/runtime": "^7.16.0",
 		"@wordpress/a11y": "^3.26.1",
 		"@wordpress/api-fetch": "^6.23.1",
-		"@wordpress/block-editor": "^11.3.6",
-		"@wordpress/block-library": "^8.3.6",
+		"@wordpress/block-editor": "^11.3.7",
+		"@wordpress/block-library": "^8.3.7",
 		"@wordpress/blocks": "^12.3.3",
 		"@wordpress/components": "^23.3.5",
 		"@wordpress/compose": "^6.3.3",
 		"@wordpress/core-data": "^6.3.3",
 		"@wordpress/data": "^8.3.3",
 		"@wordpress/deprecated": "^3.26.1",
-		"@wordpress/editor": "^13.3.6",
+		"@wordpress/editor": "^13.3.7",
 		"@wordpress/element": "^5.3.2",
 		"@wordpress/hooks": "^3.26.1",
 		"@wordpress/html-entities": "^3.26.1",
@@ -51,11 +51,11 @@
 		"@wordpress/plugins": "^5.3.3",
 		"@wordpress/preferences": "^3.3.5",
 		"@wordpress/private-apis": "^0.8.1",
-		"@wordpress/reusable-blocks": "^4.3.6",
+		"@wordpress/reusable-blocks": "^4.3.7",
 		"@wordpress/style-engine": "^1.9.1",
 		"@wordpress/url": "^3.27.1",
 		"@wordpress/viewport": "^5.3.3",
-		"@wordpress/widgets": "^3.3.6",
+		"@wordpress/widgets": "^3.3.7",
 		"classnames": "^2.3.1",
 		"colord": "^2.9.2",
 		"downloadjs": "^1.4.7",
@@ -73,5 +73,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "35f10c183655e9196d4ea12b8fa499a8ecbb7b6a"
+	"gitHead": "d14fea64bd9ad9d2d86047936974dbed39a5b5b3"
 }

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

@@ -43,7 +43,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>

package/src/components/layout/index.js

@@ -277,6 +277,20 @@ export default function Layout() {
 							{ canvasResizer }
 							{ !! canvasSize.width && (
 								<motion.div
+									whileHover={
+										isEditorPage && canvasMode === 'view'
+											? {
+													scale: 1.01,
+													transition: {
+														duration:
+															disableMotion ||
+															isResizing
+																? 0
+																: 0.2,
+													},
+											  }
+											: {}
+									}
 									initial={ false }
 									layout="position"
 									className="edit-site-layout__canvas"

package/src/components/layout/style.scss

@@ -49,11 +49,9 @@
 }
 
 .edit-site-layout__content {
+	height: 100%;
 	flex-grow: 1;
 	display: flex;
-
-	// Hide scrollbars during the edit/view animation.
-	overflow: hidden;
 }
 
 .edit-site-layout__sidebar {

package/src/components/list/index.js

@@ -19,8 +19,10 @@ import useTitle from '../routes/use-title';
 
 export default function List() {
 	const {
-		params: { postType: templateType },
+		params: { path },
 	} = useLocation();
+	const templateType =
+		path === '/wp_template/all' ? 'wp_template' : 'wp_template_part';
 
 	useRegisterShortcuts();
 

package/src/components/routes/link.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { addQueryArgs } from '@wordpress/url';
+import { addQueryArgs, getQueryArgs, removeQueryArgs } from '@wordpress/url';
 
 /**
  * Internal dependencies
@@ -21,8 +21,15 @@ export function useLink( params = {}, state, shouldReplace = false ) {
 		}
 	}
 
+	const currentArgs = getQueryArgs( window.location.href );
+	const currentUrlWithoutArgs = removeQueryArgs(
+		window.location.href,
+		...Object.keys( currentArgs )
+	);
+	const newUrl = addQueryArgs( currentUrlWithoutArgs, params );
+
 	return {
-		href: addQueryArgs( window.location.href, params ),
+		href: newUrl,
 		onClick,
 	};
 }

package/src/components/save-button/index.js

@@ -12,7 +12,7 @@ import { displayShortcut } from '@wordpress/keycodes';
  */
 import { store as editSiteStore } from '../../store';
 
-export default function SaveButton( { showTooltip = true } ) {
+export default function SaveButton() {
 	const { isDirty, isSaving, isSaveViewOpen } = useSelect( ( select ) => {
 		const { __experimentalGetDirtyEntityRecords, isSavingEntityRecord } =
 			select( coreStore );
@@ -52,7 +52,7 @@ export default function SaveButton( { showTooltip = true } ) {
 			 * of the button that we want to avoid. By setting `showTooltip`,
 			 & the tooltip is always rendered even when there's no keyboard shortcut.
 			 */
-			showTooltip={ showTooltip }
+			showTooltip
 		>
 			{ label }
 		</Button>

package/src/components/save-hub/index.js

@@ -0,0 +1,78 @@
+/**
+ * WordPress dependencies
+ */
+import { useSelect, useDispatch } from '@wordpress/data';
+import { Button, __experimentalHStack as HStack } from '@wordpress/components';
+import { sprintf, __, _n } from '@wordpress/i18n';
+import { store as coreStore } from '@wordpress/core-data';
+import { displayShortcut } from '@wordpress/keycodes';
+import { check } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import { store as editSiteStore } from '../../store';
+
+export default function SaveButton() {
+	const { countUnsavedChanges, isDirty, isSaving, isSaveViewOpen } =
+		useSelect( ( select ) => {
+			const {
+				__experimentalGetDirtyEntityRecords,
+				isSavingEntityRecord,
+			} = select( coreStore );
+			const dirtyEntityRecords = __experimentalGetDirtyEntityRecords();
+			const { isSaveViewOpened } = select( editSiteStore );
+			return {
+				isDirty: dirtyEntityRecords.length > 0,
+				isSaving: dirtyEntityRecords.some( ( record ) =>
+					isSavingEntityRecord( record.kind, record.name, record.key )
+				),
+				isSaveViewOpen: isSaveViewOpened(),
+				countUnsavedChanges: dirtyEntityRecords.length,
+			};
+		}, [] );
+	const { setIsSaveViewOpened } = useDispatch( editSiteStore );
+
+	const disabled = ! isDirty || isSaving;
+
+	const label = disabled ? __( 'Saved' ) : __( 'Save' );
+
+	return (
+		<HStack className="edit-site-save-hub" alignment="right" spacing={ 4 }>
+			{ isDirty && (
+				<span>
+					{ sprintf(
+						// translators: %d: number of unsaved changes (number).
+						_n(
+							'%d unsaved change',
+							'%d unsaved changes',
+							countUnsavedChanges
+						),
+						countUnsavedChanges
+					) }
+				</span>
+			) }
+			<Button
+				className="edit-site-save-hub__button"
+				variant={ disabled ? undefined : 'primary' }
+				aria-disabled={ disabled }
+				aria-expanded={ isSaveViewOpen }
+				isBusy={ isSaving }
+				onClick={
+					disabled ? undefined : () => setIsSaveViewOpened( true )
+				}
+				label={ label }
+				/*
+				 * We want the tooltip to show the keyboard shortcut only when the
+				 * button does something, i.e. when it's not disabled.
+				 */
+				shortcut={
+					disabled ? undefined : displayShortcut.primary( 's' )
+				}
+				icon={ disabled ? check : undefined }
+			>
+				{ label }
+			</Button>
+		</HStack>
+	);
+}