@wordpress/edit-site 5.0.0 → 5.1.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;
@@ -885,6 +877,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 +1147,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 +1154,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 +1212,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;
   }
 }
 
@@ -2016,51 +2004,72 @@ 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;
+  overflow: hidden;
 }
 
 .edit-site-layout__sidebar {
-  grid-area: sidebar;
   z-index: 1;
   overflow-y: auto;
-  max-height: calc(100vh - 60px);
+  width: 100vw;
   visibility: hidden;
   scrollbar-color: #757575 #1e1e1e;
   scrollbar-width: thin;
@@ -2082,70 +2091,24 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 .edit-site-layout__sidebar:hover, .edit-site-layout__sidebar:focus, .edit-site-layout__sidebar > * {
   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;
+@media (min-width: 782px) {
+  .edit-site-layout__sidebar {
+    width: 360px;
   }
 }
-
-.edit-site-layout__editor-header {
-  flex-grow: 1;
-}
-.edit-site-layout:not(.is-full-canvas) .edit-site-layout__editor-header {
+.edit-site-layout.is-full-canvas .edit-site-layout__sidebar {
   position: fixed;
-  left: 60px;
-  right: 0;
+  height: 100vh;
+  left: 0;
+  top: 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 {
   position: absolute;
   top: 0;
@@ -2158,7 +2121,7 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   color: #1e1e1e;
   background: #fff;
 }
-@media (min-width: 600px) {
+@media (min-width: 782px) {
   .edit-site-layout__canvas {
     top: 24px;
     bottom: 24px;
@@ -2185,11 +2148,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 +2173,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 +2181,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 +2220,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 +2261,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 +2377,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.1.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.24.0",
+		"@wordpress/api-fetch": "^6.21.0",
+		"@wordpress/block-editor": "^11.1.0",
+		"@wordpress/block-library": "^8.1.0",
+		"@wordpress/blocks": "^12.1.0",
+		"@wordpress/components": "^23.1.0",
+		"@wordpress/compose": "^6.1.0",
+		"@wordpress/core-data": "^6.1.0",
+		"@wordpress/data": "^8.1.0",
+		"@wordpress/deprecated": "^3.24.0",
+		"@wordpress/editor": "^13.1.0",
+		"@wordpress/element": "^5.1.0",
+		"@wordpress/hooks": "^3.24.0",
+		"@wordpress/html-entities": "^3.24.0",
+		"@wordpress/i18n": "^4.24.0",
+		"@wordpress/icons": "^9.15.0",
+		"@wordpress/interface": "^5.1.0",
+		"@wordpress/keyboard-shortcuts": "^4.1.0",
+		"@wordpress/keycodes": "^3.24.0",
+		"@wordpress/media-utils": "^4.15.0",
+		"@wordpress/notices": "^3.24.0",
+		"@wordpress/plugins": "^5.1.0",
+		"@wordpress/preferences": "^3.1.0",
+		"@wordpress/reusable-blocks": "^4.1.0",
+		"@wordpress/style-engine": "^1.7.0",
+		"@wordpress/url": "^3.25.0",
+		"@wordpress/viewport": "^5.1.0",
+		"@wordpress/widgets": "^3.1.0",
 		"classnames": "^2.3.1",
 		"colord": "^2.9.2",
 		"downloadjs": "^1.4.7",
@@ -70,5 +71,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "1eb65aabe6738097f4c062e78f69ae8f05879848"
+	"gitHead": "200bee7b06b15f6fa655e25b6ab69cbd6b49a357"
 }

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

@@ -153,6 +153,8 @@ export default function BlockEditor( { setIsInserterOpen } ) {
 		// Disable resizing in mobile viewport.
 		! isMobileViewport;
 	const isViewMode = canvasMode === 'view';
+	const showBlockAppender =
+		( isTemplatePart && hasBlocks ) || isViewMode ? false : undefined;
 
 	// eslint-disable-next-line @wordpress/data-no-store-string-literals
 	const { enableComplementaryArea } = useDispatch( 'core/interface' );
@@ -243,11 +245,7 @@ export default function BlockEditor( { setIsInserterOpen } ) {
 									<BlockList
 										className="edit-site-block-editor__block-list wp-site-blocks"
 										__experimentalLayout={ LAYOUT }
-										renderAppender={
-											isTemplatePart && hasBlocks
-												? false
-												: undefined
-										}
+										renderAppender={ showBlockAppender }
 									/>
 								</EditorCanvas>
 							</ResizableEditor>

package/src/components/editor/index.js

@@ -22,7 +22,6 @@ import {
 	EntitiesSavedStates,
 } from '@wordpress/editor';
 import { __ } from '@wordpress/i18n';
-import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
 
 /**
  * Internal dependencies
@@ -64,8 +63,6 @@ export default function Editor() {
 		isInserterOpen,
 		isListViewOpen,
 		isSaveViewOpen,
-		previousShortcut,
-		nextShortcut,
 		showIconLabels,
 	} = useSelect( ( select ) => {
 		const {
@@ -80,9 +77,6 @@ export default function Editor() {
 		} = select( editSiteStore );
 		const { hasFinishedResolution, getEntityRecord } = select( coreStore );
 		const { __unstableGetEditorMode } = select( blockEditorStore );
-		const { getAllShortcutKeyCombinations } = select(
-			keyboardShortcutsStore
-		);
 		const { getActiveComplementaryArea } = select( interfaceStore );
 		const postType = getEditedPostType();
 		const postId = getEditedPostId();
@@ -112,12 +106,6 @@ export default function Editor() {
 			isRightSidebarOpen: getActiveComplementaryArea(
 				editSiteStore.name
 			),
-			previousShortcut: getAllShortcutKeyCombinations(
-				'core/edit-site/previous-region'
-			),
-			nextShortcut: getAllShortcutKeyCombinations(
-				'core/edit-site/next-region'
-			),
 			showIconLabels: select( preferencesStore ).get(
 				'core/edit-site',
 				'showIconLabels'
@@ -178,6 +166,7 @@ export default function Editor() {
 						<BlockContextProvider value={ blockContext }>
 							<SidebarComplementaryAreaFills />
 							<InterfaceSkeleton
+								enableRegionNavigation={ false }
 								className={
 									showIconLabels && 'show-icon-labels'
 								}
@@ -258,10 +247,6 @@ export default function Editor() {
 										/>
 									)
 								}
-								shortcuts={ {
-									previous: previousShortcut,
-									next: nextShortcut,
-								} }
 								labels={ {
 									...interfaceLabels,
 									secondarySidebar: secondarySidebarLabel,

package/src/components/global-styles/block-preview-panel.js

@@ -4,25 +4,40 @@
 import { BlockPreview } from '@wordpress/block-editor';
 import { getBlockType, getBlockFromExample } from '@wordpress/blocks';
 import { useResizeObserver } from '@wordpress/compose';
+import { __experimentalSpacer as Spacer } from '@wordpress/components';
 
 const BlockPreviewPanel = ( { name } ) => {
-	const blockExample = getBlockType( name )?.example;
 	const [
 		containerResizeListener,
 		{ width: containerWidth, height: containerHeight },
 	] = useResizeObserver();
+	const blockExample = getBlockType( name )?.example;
+	const blocks = blockExample && getBlockFromExample( name, blockExample );
 	const viewportWidth = blockExample?.viewportWidth || containerWidth;
+	const minHeight = containerHeight;
 
 	return ! blockExample ? null : (
-		<div className="edit-site-global-styles__block-preview-panel">
-			{ containerResizeListener }
+		<Spacer marginX={ 4 } marginBottom={ 4 }>
+			<div className="edit-site-global-styles__block-preview-panel">
+				{ containerResizeListener }
 
-			<BlockPreview
-				viewportWidth={ viewportWidth }
-				__experimentalMinHeight={ containerHeight }
-				blocks={ getBlockFromExample( name, blockExample ) }
-			/>
-		</div>
+				<BlockPreview
+					blocks={ blocks }
+					viewportWidth={ viewportWidth }
+					__experimentalMinHeight={ minHeight }
+					__experimentalStyles={ [
+						{
+							css: `
+								body{
+									min-height:${ minHeight }px;
+									display:flex;align-items:center;justify-content:center;
+								}
+							`,
+						},
+					] }
+				/>
+			</div>
+		</Spacer>
 	);
 };
 

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

@@ -184,7 +184,6 @@ export default function BorderPanel( { name } ) {
 						popoverOffset={ 40 }
 						popoverPlacement="left-start"
 						value={ border }
-						__experimentalHasMultipleOrigins={ true }
 						__experimentalIsRenderedInSidebar={ true }
 						size={ '__unstable-large' }
 					/>

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

@@ -42,6 +42,7 @@ function CustomCSSControl() {
 	return (
 		<>
 			<TextareaControl
+				__nextHasNoMarginBottom
 				value={
 					customCSS?.replace( ignoreThemeCustomCSS, '' ) ||
 					themeCustomCSS

package/src/components/global-styles/global-styles-provider.js

@@ -94,7 +94,7 @@ function useGlobalStylesUserConfig() {
 	}, [ settings, styles ] );
 
 	const setConfig = useCallback(
-		( callback ) => {
+		( callback, options = {} ) => {
 			const record = getEditedEntityRecord(
 				'root',
 				'globalStyles',
@@ -105,10 +105,16 @@ function useGlobalStylesUserConfig() {
 				settings: record?.settings ?? {},
 			};
 			const updatedConfig = callback( currentConfig );
-			editEntityRecord( 'root', 'globalStyles', globalStylesId, {
-				styles: cleanEmptyObject( updatedConfig.styles ) || {},
-				settings: cleanEmptyObject( updatedConfig.settings ) || {},
-			} );
+			editEntityRecord(
+				'root',
+				'globalStyles',
+				globalStylesId,
+				{
+					styles: cleanEmptyObject( updatedConfig.styles ) || {},
+					settings: cleanEmptyObject( updatedConfig.settings ) || {},
+				},
+				options
+			);
 		},
 		[ globalStylesId ]
 	);

package/src/components/global-styles/screen-background-color.js

@@ -96,7 +96,6 @@ function ScreenBackgroundColor( { name } ) {
 				gradients={ gradientsPerOrigin }
 				disableCustomColors={ ! areCustomSolidsEnabled }
 				disableCustomGradients={ ! areCustomGradientsEnabled }
-				__experimentalHasMultipleOrigins
 				showTitle={ false }
 				enableAlpha
 				__experimentalIsRenderedInSidebar

package/src/components/global-styles/screen-block.js

@@ -2,7 +2,6 @@
  * WordPress dependencies
  */
 import { getBlockType } from '@wordpress/blocks';
-import { __experimentalSpacer as Spacer } from '@wordpress/components';
 
 /**
  * Internal dependencies
@@ -17,9 +16,7 @@ function ScreenBlock( { name } ) {
 	return (
 		<>
 			<ScreenHeader title={ blockType.title } />
-			<Spacer paddingX={ 4 }>
-				<BlockPreviewPanel name={ name } />
-			</Spacer>
+			<BlockPreviewPanel name={ name } />
 			<ContextMenu
 				parentMenu={ '/blocks/' + encodeURIComponent( name ) }
 				name={ name }

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

@@ -8,6 +8,7 @@ import { __ } from '@wordpress/i18n';
  */
 import ScreenHeader from './header';
 import BorderPanel, { useHasBorderPanel } from './border-panel';
+import BlockPreviewPanel from './block-preview-panel';
 
 function ScreenBorder( { name } ) {
 	const hasBorderPanel = useHasBorderPanel( name );
@@ -15,6 +16,7 @@ function ScreenBorder( { name } ) {
 	return (
 		<>
 			<ScreenHeader title={ __( 'Border' ) } />
+			<BlockPreviewPanel name={ name } />
 			{ hasBorderPanel && <BorderPanel name={ name } /> }
 		</>
 	);