@wordpress/edit-site 5.3.6 → 5.3.8

package/build-module/utils/history.js

@@ -6,17 +6,23 @@ import { createBrowserHistory } from 'history';
  * WordPress dependencies
  */
 
-import { addQueryArgs } from '@wordpress/url';
+import { addQueryArgs, getQueryArgs, removeQueryArgs } from '@wordpress/url';
 const history = createBrowserHistory();
 const originalHistoryPush = history.push;
 const originalHistoryReplace = history.replace;
 
 function push(params, state) {
-  return originalHistoryPush.call(history, addQueryArgs(window.location.href, params), state);
+  const currentArgs = getQueryArgs(window.location.href);
+  const currentUrlWithoutArgs = removeQueryArgs(window.location.href, ...Object.keys(currentArgs));
+  const newUrl = addQueryArgs(currentUrlWithoutArgs, params);
+  return originalHistoryPush.call(history, newUrl, state);
 }
 
 function replace(params, state) {
-  return originalHistoryReplace.call(history, addQueryArgs(window.location.href, params), state);
+  const currentArgs = getQueryArgs(window.location.href);
+  const currentUrlWithoutArgs = removeQueryArgs(window.location.href, ...Object.keys(currentArgs));
+  const newUrl = addQueryArgs(currentUrlWithoutArgs, params);
+  return originalHistoryReplace.call(history, newUrl, state);
 }
 
 history.push = push;

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

@@ -1 +1 @@
-{"version":3,"sources":["@wordpress/edit-site/src/utils/history.js"],"names":["createBrowserHistory","addQueryArgs","history","originalHistoryPush","push","originalHistoryReplace","replace","params","state","call","window","location","href"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,oBAAT,QAAqC,SAArC;AAEA;AACA;AACA;;AACA,SAASC,YAAT,QAA6B,gBAA7B;AAEA,MAAMC,OAAO,GAAGF,oBAAoB,EAApC;AAEA,MAAMG,mBAAmB,GAAGD,OAAO,CAACE,IAApC;AACA,MAAMC,sBAAsB,GAAGH,OAAO,CAACI,OAAvC;;AAEA,SAASF,IAAT,CAAeG,MAAf,EAAuBC,KAAvB,EAA+B;AAC9B,SAAOL,mBAAmB,CAACM,IAApB,CACNP,OADM,EAEND,YAAY,CAAES,MAAM,CAACC,QAAP,CAAgBC,IAAlB,EAAwBL,MAAxB,CAFN,EAGNC,KAHM,CAAP;AAKA;;AAED,SAASF,OAAT,CAAkBC,MAAlB,EAA0BC,KAA1B,EAAkC;AACjC,SAAOH,sBAAsB,CAACI,IAAvB,CACNP,OADM,EAEND,YAAY,CAAES,MAAM,CAACC,QAAP,CAAgBC,IAAlB,EAAwBL,MAAxB,CAFN,EAGNC,KAHM,CAAP;AAKA;;AAEDN,OAAO,CAACE,IAAR,GAAeA,IAAf;AACAF,OAAO,CAACI,OAAR,GAAkBA,OAAlB;AAEA,eAAeJ,OAAf","sourcesContent":["/**\n * External dependencies\n */\nimport { createBrowserHistory } from 'history';\n\n/**\n * WordPress dependencies\n */\nimport { addQueryArgs } from '@wordpress/url';\n\nconst history = createBrowserHistory();\n\nconst originalHistoryPush = history.push;\nconst originalHistoryReplace = history.replace;\n\nfunction push( params, state ) {\n\treturn originalHistoryPush.call(\n\t\thistory,\n\t\taddQueryArgs( window.location.href, params ),\n\t\tstate\n\t);\n}\n\nfunction replace( params, state ) {\n\treturn originalHistoryReplace.call(\n\t\thistory,\n\t\taddQueryArgs( window.location.href, params ),\n\t\tstate\n\t);\n}\n\nhistory.push = push;\nhistory.replace = replace;\n\nexport default history;\n"]}
+{"version":3,"sources":["@wordpress/edit-site/src/utils/history.js"],"names":["createBrowserHistory","addQueryArgs","getQueryArgs","removeQueryArgs","history","originalHistoryPush","push","originalHistoryReplace","replace","params","state","currentArgs","window","location","href","currentUrlWithoutArgs","Object","keys","newUrl","call"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,oBAAT,QAAqC,SAArC;AAEA;AACA;AACA;;AACA,SAASC,YAAT,EAAuBC,YAAvB,EAAqCC,eAArC,QAA4D,gBAA5D;AAEA,MAAMC,OAAO,GAAGJ,oBAAoB,EAApC;AAEA,MAAMK,mBAAmB,GAAGD,OAAO,CAACE,IAApC;AACA,MAAMC,sBAAsB,GAAGH,OAAO,CAACI,OAAvC;;AAEA,SAASF,IAAT,CAAeG,MAAf,EAAuBC,KAAvB,EAA+B;AAC9B,QAAMC,WAAW,GAAGT,YAAY,CAAEU,MAAM,CAACC,QAAP,CAAgBC,IAAlB,CAAhC;AACA,QAAMC,qBAAqB,GAAGZ,eAAe,CAC5CS,MAAM,CAACC,QAAP,CAAgBC,IAD4B,EAE5C,GAAGE,MAAM,CAACC,IAAP,CAAaN,WAAb,CAFyC,CAA7C;AAIA,QAAMO,MAAM,GAAGjB,YAAY,CAAEc,qBAAF,EAAyBN,MAAzB,CAA3B;AACA,SAAOJ,mBAAmB,CAACc,IAApB,CAA0Bf,OAA1B,EAAmCc,MAAnC,EAA2CR,KAA3C,CAAP;AACA;;AAED,SAASF,OAAT,CAAkBC,MAAlB,EAA0BC,KAA1B,EAAkC;AACjC,QAAMC,WAAW,GAAGT,YAAY,CAAEU,MAAM,CAACC,QAAP,CAAgBC,IAAlB,CAAhC;AACA,QAAMC,qBAAqB,GAAGZ,eAAe,CAC5CS,MAAM,CAACC,QAAP,CAAgBC,IAD4B,EAE5C,GAAGE,MAAM,CAACC,IAAP,CAAaN,WAAb,CAFyC,CAA7C;AAIA,QAAMO,MAAM,GAAGjB,YAAY,CAAEc,qBAAF,EAAyBN,MAAzB,CAA3B;AACA,SAAOF,sBAAsB,CAACY,IAAvB,CAA6Bf,OAA7B,EAAsCc,MAAtC,EAA8CR,KAA9C,CAAP;AACA;;AAEDN,OAAO,CAACE,IAAR,GAAeA,IAAf;AACAF,OAAO,CAACI,OAAR,GAAkBA,OAAlB;AAEA,eAAeJ,OAAf","sourcesContent":["/**\n * External dependencies\n */\nimport { createBrowserHistory } from 'history';\n\n/**\n * WordPress dependencies\n */\nimport { addQueryArgs, getQueryArgs, removeQueryArgs } from '@wordpress/url';\n\nconst history = createBrowserHistory();\n\nconst originalHistoryPush = history.push;\nconst originalHistoryReplace = history.replace;\n\nfunction push( params, state ) {\n\tconst currentArgs = getQueryArgs( window.location.href );\n\tconst currentUrlWithoutArgs = removeQueryArgs(\n\t\twindow.location.href,\n\t\t...Object.keys( currentArgs )\n\t);\n\tconst newUrl = addQueryArgs( currentUrlWithoutArgs, params );\n\treturn originalHistoryPush.call( history, newUrl, state );\n}\n\nfunction replace( params, state ) {\n\tconst currentArgs = getQueryArgs( window.location.href );\n\tconst currentUrlWithoutArgs = removeQueryArgs(\n\t\twindow.location.href,\n\t\t...Object.keys( currentArgs )\n\t);\n\tconst newUrl = addQueryArgs( currentUrlWithoutArgs, params );\n\treturn originalHistoryReplace.call( history, newUrl, state );\n}\n\nhistory.push = push;\nhistory.replace = replace;\n\nexport default history;\n"]}

package/build-style/style-rtl.css

@@ -568,10 +568,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: right;
+}
 
 .edit-site-custom-template-modal__contents > .components-button {
   padding: 24px;
@@ -1567,46 +1576,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 +2149,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 +2299,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 +2322,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 +2351,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 +2373,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 +2390,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 +2408,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;
@@ -2477,7 +2458,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;
 }
@@ -2492,16 +2473,61 @@ 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 .offcanvas-editor-list-view-leaf {
+
+.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 .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-sidebar-navigation-screen-navigation-menus__content .popover-slot .wp-block-navigation-submenu {
+  display: none;
+}
 
 .edit-site-site-icon__icon {
   fill: currentColor;
@@ -2541,53 +2567,12 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   bottom: 0;
   right: 0;
   overflow: auto;
-  padding: 32px;
+  padding: 0;
   position: absolute;
   left: 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: right;
-  text-transform: uppercase;
-}
-.edit-site-style-book.is-wide .edit-site-style-book__example-title {
-  text-align: left;
-  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/build-style/style.css

@@ -568,10 +568,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;
@@ -1567,46 +1576,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 +2149,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 +2299,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 +2322,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 +2351,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 +2373,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 +2390,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 +2408,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;
@@ -2477,7 +2458,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;
 }
@@ -2492,16 +2473,61 @@ 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 .offcanvas-editor-list-view-leaf {
+
+.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 .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-sidebar-navigation-screen-navigation-menus__content .popover-slot .wp-block-navigation-submenu {
+  display: none;
+}
 
 .edit-site-site-icon__icon {
   fill: currentColor;
@@ -2541,53 +2567,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%;