@wordpress/edit-site 5.0.0 → 5.2.0

package/build-style/style.css

@@ -58,15 +58,15 @@
 * @param {string} hex - the hexadecimal value to convert
 * @return {string} comma separated rgb values
 */
-/**
- * Breakpoint mixins
- */
 /**
  * Long content fade mixin
  *
  * Creates a fading overlay to signify that the content is longer
  * than the space allows.
  */
+/**
+ * Breakpoint mixins
+ */
 /**
  * Focus styles.
  */
@@ -320,11 +320,6 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   overflow: auto;
   z-index: 20;
 }
-.interface-interface-skeleton__content .interface-navigable-region__stacker {
-  flex-grow: 1;
-  display: flex;
-  flex-direction: column;
-}
 
 .interface-interface-skeleton__secondary-sidebar,
 .interface-interface-skeleton__sidebar {
@@ -359,9 +354,6 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   }
 }
 
-.interface-interface-skeleton__secondary-sidebar .interface-navigable-region__stacker {
-  height: 100%;
-}
 @media (min-width: 782px) {
   .interface-interface-skeleton__secondary-sidebar {
     border-right: 1px solid #e0e0e0;
@@ -509,6 +501,9 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   box-shadow: none;
   font-weight: 500;
 }
+.interface-preferences__tabs .components-tab-panel__tabs .components-tab-panel__tabs-item.is-active::after {
+  content: none;
+}
 .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);
 }
@@ -617,16 +612,49 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   bottom: 0;
   padding: 0;
   margin: auto 0;
-  width: 4px;
-  height: 100px;
+  width: 12px;
   -webkit-appearance: none;
           appearance: none;
   cursor: ew-resize;
   outline: none;
-  background: #949494;
+  background: none;
   border-radius: 2px;
   border: 0;
 }
+.resizable-editor__drag-handle.is-variation-default {
+  height: 100px;
+}
+.resizable-editor__drag-handle.is-variation-separator {
+  height: 100%;
+}
+.resizable-editor__drag-handle.is-variation-separator::after {
+  width: 1px;
+  border-radius: 0;
+  background: #2f2f2f;
+  left: auto;
+  right: 50%;
+  transition: all ease 0.2s;
+  transition-delay: 0.1s;
+}
+@media (prefers-reduced-motion: reduce) {
+  .resizable-editor__drag-handle.is-variation-separator::after {
+    transition-duration: 0s;
+    transition-delay: 0s;
+    animation-duration: 1ms;
+    animation-delay: 0s;
+  }
+}
+.resizable-editor__drag-handle::after {
+  position: absolute;
+  top: 0;
+  left: 4px;
+  right: 0;
+  bottom: 0;
+  content: "";
+  width: 4px;
+  background: #949494;
+  border-radius: 2px;
+}
 .resizable-editor__drag-handle.is-left {
   left: -16px;
 }
@@ -634,9 +662,16 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   right: -16px;
 }
 .resizable-editor__drag-handle:hover, .resizable-editor__drag-handle:active {
+  opacity: 1;
+}
+.resizable-editor__drag-handle:hover.is-variation-default::after, .resizable-editor__drag-handle:active.is-variation-default::after {
   background: #ccc;
 }
-.resizable-editor__drag-handle:focus {
+.resizable-editor__drag-handle:hover.is-variation-separator::after, .resizable-editor__drag-handle:active.is-variation-separator::after {
+  width: 2px;
+  background: var(--wp-admin-theme-color);
+}
+.resizable-editor__drag-handle:focus::after {
   box-shadow: 0 0 0 1px #2f2f2f, 0 0 0 calc(var(--wp-admin-border-width-focus) + 1px) var(--wp-admin-theme-color);
 }
 
@@ -875,6 +910,14 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   overflow-y: scroll;
 }
 
+.edit-site-global-styles-screen-variations {
+  margin-top: 16px;
+  border-top: 1px solid #ddd;
+}
+.edit-site-global-styles-screen-variations > * {
+  margin: 24px 16px;
+}
+
 .edit-site-header-edit-mode {
   height: 60px;
   align-items: center;
@@ -885,6 +928,7 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   width: 100%;
   justify-content: space-between;
   border-bottom: 1px solid #e0e0e0;
+  padding-left: 60px;
 }
 .edit-site-header-edit-mode .edit-site-header-edit-mode__start {
   display: flex;
@@ -1154,8 +1198,6 @@ body.is-fullscreen-mode .edit-site-list-header {
 .edit-site .edit-site-list .interface-interface-skeleton__content {
   background: #fff;
   padding: 16px;
-}
-.edit-site .edit-site-list .interface-interface-skeleton__content .interface-navigable-region__stacker {
   align-items: center;
 }
 @media (min-width: 782px) {
@@ -1163,9 +1205,6 @@ body.is-fullscreen-mode .edit-site-list-header {
     padding: 72px;
   }
 }
-.edit-site .edit-site-list .interface-interface-skeleton__content > .interface-navigable-region__stacker {
-  height: auto;
-}
 
 .edit-site-list-table {
   min-width: 100%;
@@ -1224,7 +1263,7 @@ body.is-fullscreen-mode .edit-site-list-header {
 
 @media (min-width: 782px) {
   .edit-site-list.is-navigation-open .components-snackbar-list {
-    margin-left: 300px;
+    margin-left: 360px;
   }
 }
 
@@ -1619,6 +1658,9 @@ body.is-fullscreen-mode .edit-site-list-header {
 .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;
@@ -2016,134 +2058,125 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 }
 
 .edit-site-layout {
-  min-height: 100%;
+  height: 100%;
   background: #1e1e1e;
   color: #fff;
   display: flex;
   flex-direction: column;
 }
-@media (min-width: 600px) {
-  .edit-site-layout {
-    display: grid;
-    grid-template-columns: 320px 1fr;
-    grid-template-rows: auto 1fr;
-    grid-template-areas: "header canvas" "sidebar canvas";
+
+.edit-site-layout__hub {
+  position: fixed;
+  top: 24px;
+  left: 24px;
+  width: calc(100vw - 48px);
+  height: 68px;
+  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 .edit-site-layout__hub {
+  top: 0;
+  left: 0;
+  padding: 0;
+  padding-right: 16px;
+  height: 60px;
+  border-radius: 0;
+  width: 100vw;
+  box-shadow: none;
+}
+@media (min-width: 782px) {
+  .edit-site-layout.is-full-canvas .edit-site-layout__hub {
+    width: auto;
+    padding-right: 0;
   }
-  .edit-site-layout.is-full-canvas {
-    grid-template-areas: "header header" "canvas canvas";
+}
+.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 {
-  grid-area: header;
   height: 60px;
   display: flex;
+  z-index: 2;
 }
-
-.edit-site-layout__logo {
-  align-items: center;
-  height: 60px;
-  display: flex;
-  justify-content: space-between;
-}
-.edit-site-layout__logo .components-button {
-  color: currentColor;
+.edit-site-layout:not(.is-full-canvas) .edit-site-layout__header {
+  position: fixed;
+  width: 100vw;
 }
 
-.edit-site-layout__edit-button {
-  background: #2f2f2f;
-  /* Overrides the color for all states of the button */
-  color: inherit !important;
+.edit-site-layout__content {
+  flex-grow: 1;
+  display: flex;
+  gap: 24px;
+  overflow: hidden;
 }
 
 .edit-site-layout__sidebar {
-  grid-area: sidebar;
   z-index: 1;
+  width: 100vw;
+}
+@media (min-width: 782px) {
+  .edit-site-layout__sidebar {
+    width: 360px;
+  }
+}
+.edit-site-layout.is-full-canvas .edit-site-layout__sidebar {
+  position: fixed !important;
+  height: 100vh;
+  left: 0;
+  top: 0;
+}
+.edit-site-layout__sidebar .resizable-editor__drag-handle.is-right {
+  right: -6px;
+}
+.edit-site-layout__sidebar > div {
   overflow-y: auto;
-  max-height: calc(100vh - 60px);
+  min-height: 100%;
   visibility: hidden;
   scrollbar-color: #757575 #1e1e1e;
   scrollbar-width: thin;
   scrollbar-gutter: stable;
 }
-.edit-site-layout__sidebar::-webkit-scrollbar {
+.edit-site-layout__sidebar > div::-webkit-scrollbar {
   width: 12px;
   height: 12px;
 }
-.edit-site-layout__sidebar::-webkit-scrollbar-track {
+.edit-site-layout__sidebar > div::-webkit-scrollbar-track {
   background-color: #1e1e1e;
 }
-.edit-site-layout__sidebar::-webkit-scrollbar-thumb {
+.edit-site-layout__sidebar > div::-webkit-scrollbar-thumb {
   background-color: #757575;
   border-radius: 8px;
   border: 3px solid transparent;
   background-clip: padding-box;
 }
-.edit-site-layout__sidebar:hover, .edit-site-layout__sidebar:focus, .edit-site-layout__sidebar > * {
+.edit-site-layout__sidebar > div:hover, .edit-site-layout__sidebar > div:focus, .edit-site-layout__sidebar > div > * {
   visibility: visible;
 }
-.edit-site-layout.is-full-canvas .edit-site-layout__sidebar {
-  display: none;
-}
-@media (min-width: 600px) {
-  .edit-site-layout.is-full-canvas .edit-site-layout__sidebar {
-    display: block;
-    grid-area: header;
-    position: absolute;
-    top: 60px;
-  }
-}
-
-.edit-site-layout__editor-header {
-  flex-grow: 1;
-}
-.edit-site-layout:not(.is-full-canvas) .edit-site-layout__editor-header {
-  position: fixed;
-  left: 60px;
-  right: 0;
-}
 
 .edit-site-layout__canvas-container {
-  grid-area: canvas;
   position: relative;
   flex-grow: 1;
   z-index: 2;
 }
-
-@media (min-width: 600px) {
-  .edit-site-layout__header {
-    -ms-grid-row: 1;
-    -ms-grid-column: 1;
-  }
-  .edit-site-layout.is-full-canvas > .edit-site-layout__header {
-    -ms-grid-row: 1;
-    -ms-grid-column: 1;
-    -ms-grid-column-span: 2;
-  }
-  .edit-site-layout__sidebar {
-    -ms-grid-row: 2;
-    -ms-grid-column: 1;
-  }
-  .edit-site-layout.is-full-canvas .edit-site-layout__sidebar {
-    -ms-grid-row: 1;
-    -ms-grid-column: 1;
-  }
-  .edit-site-layout.is-full-canvas > .edit-site-layout__sidebar {
-    -ms-grid-row: 1;
-    -ms-grid-column: 1;
-    -ms-grid-column-span: 2;
-  }
-  .edit-site-layout__canvas-container {
-    -ms-grid-row: 1;
-    -ms-grid-row-span: 2;
-    -ms-grid-column: 2;
-  }
-  .edit-site-layout.is-full-canvas > .edit-site-layout__canvas-container {
-    -ms-grid-row: 2;
-    -ms-grid-row-span: 1;
-    -ms-grid-column: 1;
-    -ms-grid-column-span: 2;
-  }
+.edit-site-layout__canvas-container.is-resizing::after {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  content: "";
+  z-index: 100;
 }
 
 .edit-site-layout__canvas {
@@ -2152,13 +2185,13 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   left: 0;
   bottom: 0;
   width: 100%;
-  box-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.8), 0 8px 10px -6px rgba(0, 0, 0, 0.8);
 }
 .edit-site-layout__canvas > div {
   color: #1e1e1e;
   background: #fff;
+  box-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.8), 0 8px 10px -6px rgba(0, 0, 0, 0.8);
 }
-@media (min-width: 600px) {
+@media (min-width: 782px) {
   .edit-site-layout__canvas {
     top: 24px;
     bottom: 24px;
@@ -2175,6 +2208,8 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   top: 0;
   bottom: 0;
   width: 100%;
+}
+.edit-site-layout.is-full-canvas .edit-site-layout__canvas > div {
   border-radius: 0;
 }
 
@@ -2185,11 +2220,14 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 
 .edit-site-layout__view-mode-toggle.components-button {
   position: relative;
-  background: #1e1e1e;
   color: #fff;
-  height: calc(100% + 1px);
-  border-radius: 0;
-  margin-bottom: -1px;
+  height: 100%;
+  width: 100%;
+  border-radius: 2px;
+  padding: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .edit-site-layout__view-mode-toggle.components-button:hover, .edit-site-layout__view-mode-toggle.components-button:active {
   color: #fff;
@@ -2207,7 +2245,7 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   bottom: 9px;
   left: 9px;
   border-radius: 4px;
-  box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) #1e1e1e;
+  box-shadow: none;
 }
 @media (prefers-reduced-motion: reduce) {
   .edit-site-layout__view-mode-toggle.components-button::before {
@@ -2215,19 +2253,12 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
     transition-delay: 0s;
   }
 }
-.edit-site-layout__view-mode-toggle.components-button:hover::before {
-  box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) #757575;
-}
-.edit-site-layout__view-mode-toggle.components-button.has-icon:hover::before {
-  box-shadow: none;
-}
 .edit-site-layout__view-mode-toggle.components-button:focus::before {
   box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) rgba(255, 255, 255, 0.1), inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
 }
 .edit-site-layout__view-mode-toggle.components-button .edit-site-layout__view-mode-toggle-icon {
+  display: flex;
   border-radius: 2px;
-  -o-object-fit: cover;
-     object-fit: cover;
 }
 
 .edit-site-sidebar__content.edit-site-sidebar__content {
@@ -2261,16 +2292,14 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 }
 
 .edit-site-sidebar-navigation-screen__content {
-  margin: 0 16px 0 36px;
-  flex-grow: 1;
-  overflow-y: auto;
+  margin: 0 16px 16px 36px;
 }
 
 .edit-site-sidebar-navigation-screen__title-icon {
   position: sticky;
   top: 0;
   background: #1e1e1e;
-  padding-top: 64px;
+  padding-top: 164px;
   box-shadow: 0 8px 16px #1e1e1e;
   margin-bottom: 8px;
   padding-bottom: 8px;
@@ -2304,6 +2333,37 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   color: inherit !important;
 }
 
+.edit-site-site-hub {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+}
+
+.edit-site-site-hub__edit-button {
+  height: 32px;
+}
+
+.edit-site-site-hub__post-type {
+  opacity: 0.6;
+}
+
+.edit-site-site-hub__view-mode-toggle-container {
+  height: 60px;
+  width: 60px;
+  flex-shrink: 0;
+}
+
+.edit-site-site-hub__text-content {
+  overflow: hidden;
+}
+
+.edit-site-site-hub__title {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
 .edit-site-site-icon__icon {
   fill: currentColor;
 }
@@ -2389,6 +2449,11 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   width: 100%;
 }
 
+.edit-site-push-changes-to-global-styles-control .components-button {
+  justify-content: center;
+  width: 100%;
+}
+
 html #wpadminbar {
   display: none;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.0.0",
+	"version": "5.2.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -27,33 +27,34 @@
 	"react-native": "src/index",
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^3.23.0",
-		"@wordpress/api-fetch": "^6.20.0",
-		"@wordpress/block-editor": "^11.0.0",
-		"@wordpress/block-library": "^8.0.0",
-		"@wordpress/blocks": "^12.0.0",
-		"@wordpress/components": "^23.0.0",
-		"@wordpress/compose": "^6.0.0",
-		"@wordpress/core-data": "^6.0.0",
-		"@wordpress/data": "^8.0.0",
-		"@wordpress/deprecated": "^3.23.0",
-		"@wordpress/editor": "^13.0.0",
-		"@wordpress/element": "^5.0.0",
-		"@wordpress/hooks": "^3.23.0",
-		"@wordpress/html-entities": "^3.23.0",
-		"@wordpress/i18n": "^4.23.0",
-		"@wordpress/icons": "^9.14.0",
-		"@wordpress/interface": "^5.0.0",
-		"@wordpress/keyboard-shortcuts": "^4.0.0",
-		"@wordpress/keycodes": "^3.23.0",
-		"@wordpress/media-utils": "^4.14.0",
-		"@wordpress/notices": "^3.23.0",
-		"@wordpress/plugins": "^5.0.0",
-		"@wordpress/preferences": "^3.0.0",
-		"@wordpress/reusable-blocks": "^4.0.0",
-		"@wordpress/style-engine": "^1.6.0",
-		"@wordpress/url": "^3.24.0",
-		"@wordpress/viewport": "^5.0.0",
+		"@wordpress/a11y": "^3.25.0",
+		"@wordpress/api-fetch": "^6.22.0",
+		"@wordpress/block-editor": "^11.2.0",
+		"@wordpress/block-library": "^8.2.0",
+		"@wordpress/blocks": "^12.2.0",
+		"@wordpress/components": "^23.2.0",
+		"@wordpress/compose": "^6.2.0",
+		"@wordpress/core-data": "^6.2.0",
+		"@wordpress/data": "^8.2.0",
+		"@wordpress/deprecated": "^3.25.0",
+		"@wordpress/editor": "^13.2.0",
+		"@wordpress/element": "^5.2.0",
+		"@wordpress/hooks": "^3.25.0",
+		"@wordpress/html-entities": "^3.25.0",
+		"@wordpress/i18n": "^4.25.0",
+		"@wordpress/icons": "^9.16.0",
+		"@wordpress/interface": "^5.2.0",
+		"@wordpress/keyboard-shortcuts": "^4.2.0",
+		"@wordpress/keycodes": "^3.25.0",
+		"@wordpress/media-utils": "^4.16.0",
+		"@wordpress/notices": "^3.25.0",
+		"@wordpress/plugins": "^5.2.0",
+		"@wordpress/preferences": "^3.2.0",
+		"@wordpress/reusable-blocks": "^4.2.0",
+		"@wordpress/style-engine": "^1.8.0",
+		"@wordpress/url": "^3.26.0",
+		"@wordpress/viewport": "^5.2.0",
+		"@wordpress/widgets": "^3.2.0",
 		"classnames": "^2.3.1",
 		"colord": "^2.9.2",
 		"downloadjs": "^1.4.7",
@@ -70,5 +71,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "1eb65aabe6738097f4c062e78f69ae8f05879848"
+	"gitHead": "204c880ff65295768e9695dfee6c7a9fee1fdd05"
 }

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

@@ -20,6 +20,7 @@ import { plus } from '@wordpress/icons';
 import { useHistory } from '../routes';
 import { store as editSiteStore } from '../../store';
 import CreateTemplatePartModal from '../create-template-part-modal';
+import { useExistingTemplateParts } from './utils';
 
 export default function NewTemplatePart( {
 	postType,
@@ -31,6 +32,7 @@ export default function NewTemplatePart( {
 	const { createErrorNotice } = useDispatch( noticesStore );
 	const { saveEntityRecord } = useDispatch( coreStore );
 	const { __unstableSetCanvasMode } = useDispatch( editSiteStore );
+	const existingTemplateParts = useExistingTemplateParts();
 
 	async function createTemplatePart( { title, area } ) {
 		if ( ! title ) {
@@ -40,6 +42,26 @@ export default function NewTemplatePart( {
 			return;
 		}
 
+		const uniqueTitle = () => {
+			const lowercaseTitle = title.toLowerCase();
+			const existingTitles = existingTemplateParts.map(
+				( templatePart ) => templatePart.title.rendered.toLowerCase()
+			);
+
+			if ( ! existingTitles.includes( lowercaseTitle ) ) {
+				return title;
+			}
+
+			let suffix = 2;
+			while (
+				existingTitles.includes( `${ lowercaseTitle } ${ suffix }` )
+			) {
+				suffix++;
+			}
+
+			return `${ title } ${ suffix }`;
+		};
+
 		try {
 			// Currently template parts only allow latin chars.
 			// Fallback slug will receive suffix by default.
@@ -52,7 +74,7 @@ export default function NewTemplatePart( {
 				'wp_template_part',
 				{
 					slug: cleanSlug,
-					title,
+					title: uniqueTitle(),
 					content: '',
 					area,
 				},

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

@@ -52,6 +52,20 @@ export const useExistingTemplates = () => {
 	);
 };
 
+export const useExistingTemplateParts = () => {
+	return useSelect(
+		( select ) =>
+			select( coreStore ).getEntityRecords(
+				'postType',
+				'wp_template_part',
+				{
+					per_page: -1,
+				}
+			),
+		[]
+	);
+};
+
 export const useDefaultTemplateTypes = () => {
 	return useSelect(
 		( select ) =>

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

@@ -53,7 +53,6 @@ function EditorCanvas( { enableResizing, settings, children, ...props } ) {
 					) }
 				</>
 			}
-			assets={ settings.__unstableResolvedAssets }
 			ref={ mouseMoveTypingRef }
 			name="editor-canvas"
 			className="edit-site-visual-editor__editor-canvas"