@wordpress/edit-site 7.2.0 → 7.3.0

package/build-style/style.css

@@ -438,8 +438,8 @@
 
 .dataviews-filters__summary-operators-container .dataviews-filters__summary-operators-filter-select {
   width: 100%;
+  min-width: 0;
   white-space: nowrap;
-  overflow: hidden;
 }
 
 .dataviews-filters__summary-chip-container {
@@ -716,16 +716,10 @@
   font-size: 16px;
   /* Override core line-height. To be reviewed. */
   line-height: normal;
-  box-shadow: 0 0 0 transparent;
-  border-radius: 2px;
-  border: 1px solid #949494;
+  border: var(--wpds-border-width-xs, 1px) solid var(--wpds-color-stroke-interactive-neutral, #8d8d8d);
+  border-radius: var(--wpds-border-radius-sm, 2px);
 }
 
-@media not (prefers-reduced-motion) {
-  .dataviews-filters__search-widget-listitem .dataviews-filters__search-widget-listitem-multi-selection {
-    transition: box-shadow 0.1s linear;
-  }
-}
 @media (min-width: 600px) {
   .dataviews-filters__search-widget-listitem .dataviews-filters__search-widget-listitem-multi-selection {
     font-size: 13px;
@@ -733,10 +727,15 @@
     line-height: normal;
   }
 }
+.dataviews-filters__search-widget-listitem .dataviews-filters__search-widget-listitem-multi-selection:hover:not(:disabled, [aria-disabled=true], [type=checkbox]) {
+  border-color: var(--wpds-color-stroke-interactive-neutral-active, #6e6e6e);
+}
+
 .dataviews-filters__search-widget-listitem .dataviews-filters__search-widget-listitem-multi-selection:focus {
-  border-color: var(--wp-admin-theme-color);
-  box-shadow: 0 0 0 0.5px var(--wp-admin-theme-color);
-  outline: 2px solid transparent;
+  outline: var(--wpds-border-width-focus, var(--wp-admin-border-width-focus, 2px)) solid var(--focus-color, var(--wpds-color-stroke-focus, var(--wp-admin-theme-color, #3858e9)));
+  outline-offset: var(--wpds-border-width-focus, var(--wp-admin-border-width-focus, 2px));
+  border-color: var(--wpds-color-stroke-interactive-neutral, #8d8d8d);
+  box-shadow: none;
 }
 
 .dataviews-filters__search-widget-listitem .dataviews-filters__search-widget-listitem-multi-selection::-moz-placeholder {
@@ -851,16 +850,10 @@
   font-size: 16px;
   /* Override core line-height. To be reviewed. */
   line-height: normal;
-  box-shadow: 0 0 0 transparent;
-  border-radius: 2px;
-  border: 1px solid #949494;
+  border: var(--wpds-border-width-xs, 1px) solid var(--wpds-color-stroke-interactive-neutral, #8d8d8d);
+  border-radius: var(--wpds-border-radius-sm, 2px);
 }
 
-@media not (prefers-reduced-motion) {
-  .dataviews-filters__search-widget-filter-combobox__wrapper .dataviews-filters__search-widget-filter-combobox__input {
-    transition: box-shadow 0.1s linear;
-  }
-}
 @media (min-width: 600px) {
   .dataviews-filters__search-widget-filter-combobox__wrapper .dataviews-filters__search-widget-filter-combobox__input {
     font-size: 13px;
@@ -868,10 +861,15 @@
     line-height: normal;
   }
 }
+.dataviews-filters__search-widget-filter-combobox__wrapper .dataviews-filters__search-widget-filter-combobox__input:hover:not(:disabled, [aria-disabled=true], [type=checkbox]) {
+  border-color: var(--wpds-color-stroke-interactive-neutral-active, #6e6e6e);
+}
+
 .dataviews-filters__search-widget-filter-combobox__wrapper .dataviews-filters__search-widget-filter-combobox__input:focus {
-  border-color: var(--wp-admin-theme-color);
-  box-shadow: 0 0 0 0.5px var(--wp-admin-theme-color);
-  outline: 2px solid transparent;
+  outline: var(--wpds-border-width-focus, var(--wp-admin-border-width-focus, 2px)) solid var(--focus-color, var(--wpds-color-stroke-focus, var(--wp-admin-theme-color, #3858e9)));
+  outline-offset: var(--wpds-border-width-focus, var(--wp-admin-border-width-focus, 2px));
+  border-color: var(--wpds-color-stroke-interactive-neutral, #8d8d8d);
+  box-shadow: none;
 }
 
 .dataviews-filters__search-widget-filter-combobox__wrapper .dataviews-filters__search-widget-filter-combobox__input::-moz-placeholder {
@@ -900,7 +898,6 @@
 }
 .dataviews-filters__search-widget-filter-combobox__wrapper .dataviews-filters__search-widget-filter-combobox__input:focus {
   background: var(--wpds-color-background-surface-neutral-strong, #fff);
-  box-shadow: inset 0 0 0 var(--wpds-border-width-focus, var(--wp-admin-border-width-focus, 2px)) var(--wpds-color-stroke-focus, var(--wp-admin-theme-color, #3858e9));
 }
 
 .dataviews-filters__search-widget-filter-combobox__wrapper .dataviews-filters__search-widget-filter-combobox__input::-moz-placeholder {
@@ -1300,6 +1297,17 @@
   background: var(--wpds-color-background-surface-neutral, #fcfcfc);
 }
 
+.dataviews-view-grid.has-media-fit-contain .dataviews-view-grid__media,
+.dataviews-view-grid-infinite-scroll.has-media-fit-contain .dataviews-view-grid__media {
+  background-color: var(--wpds-color-background-surface-neutral, #fcfcfc);
+}
+
+.dataviews-view-grid.has-media-fit-contain .dataviews-view-grid__media img,
+.dataviews-view-grid-infinite-scroll.has-media-fit-contain .dataviews-view-grid__media img {
+  -o-object-fit: contain;
+  object-fit: contain;
+}
+
 .dataviews-view-grid .dataviews-view-grid__fields,
 .dataviews-view-grid-infinite-scroll .dataviews-view-grid__fields {
   position: relative;
@@ -1517,8 +1525,7 @@ div.dataviews-view-list {
 .dataviews-view-list div[role=article]:not(.is-selected):hover,
 .dataviews-view-list div[role=article]:not(.is-selected).is-hovered,
 .dataviews-view-list div[role=article]:not(.is-selected):focus-within {
-  color: var(--wpds-color-foreground-interactive-brand, var(--wp-admin-theme-color, #3858e9));
-  background-color: var(--wpds-color-background-interactive-brand-weak, rgba(0, 0, 0, 0));
+  background-color: var(--wpds-color-background-interactive-neutral-weak-active, #ededed);
 }
 
 .dataviews-view-list div[role=row]:not(.is-selected):hover .dataviews-title-field,
@@ -1531,7 +1538,7 @@ div.dataviews-view-list {
 .dataviews-view-list div[role=article]:not(.is-selected).is-hovered .dataviews-view-list__field,
 .dataviews-view-list div[role=article]:not(.is-selected):focus-within .dataviews-title-field,
 .dataviews-view-list div[role=article]:not(.is-selected):focus-within .dataviews-view-list__field {
-  color: var(--wpds-color-foreground-interactive-brand, var(--wp-admin-theme-color, #3858e9));
+  color: var(--wpds-color-foreground-interactive-neutral, #1e1e1e);
 }
 
 .dataviews-view-list div[role=row].is-selected .dataviews-view-list__item-wrapper,
@@ -1539,7 +1546,7 @@ div.dataviews-view-list {
 .dataviews-view-list div[role=article].is-selected .dataviews-view-list__item-wrapper,
 .dataviews-view-list div[role=article].is-selected:focus-within .dataviews-view-list__item-wrapper {
   background-color: var(--wpds-color-background-interactive-brand-weak-active, color-mix(in oklch, var(--wp-admin-theme-color, #3858e9) 12%, white));
-  color: var(--wpds-color-foreground-interactive-neutral, #1e1e1e);
+  color: var(--wpds-color-foreground-content-neutral, #1e1e1e);
 }
 
 .dataviews-view-list div[role=row].is-selected .dataviews-view-list__item-wrapper .dataviews-title-field,
@@ -1550,7 +1557,7 @@ div.dataviews-view-list {
 .dataviews-view-list div[role=article].is-selected .dataviews-view-list__item-wrapper .dataviews-view-list__field,
 .dataviews-view-list div[role=article].is-selected:focus-within .dataviews-view-list__item-wrapper .dataviews-title-field,
 .dataviews-view-list div[role=article].is-selected:focus-within .dataviews-view-list__item-wrapper .dataviews-view-list__field {
-  color: var(--wpds-color-foreground-interactive-neutral-active, #1e1e1e);
+  color: var(--wpds-color-foreground-content-neutral, #1e1e1e);
 }
 
 .dataviews-view-list .dataviews-view-list__item {
@@ -1626,7 +1633,7 @@ div.dataviews-view-list {
 }
 
 .dataviews-view-list .dataviews-view-list__field {
-  color: var(--wpds-color-foreground-interactive-neutral-weak, #707070);
+  color: var(--wpds-color-foreground-content-neutral-weak, #707070);
 }
 
 .dataviews-view-list .dataviews-view-list__fields {
@@ -1775,7 +1782,7 @@ div.dataviews-view-list {
   bottom: 0;
   left: 0;
   width: 1px;
-  background-color: var(--wpds-color-background-surface-neutral, #fcfcfc);
+  background-color: var(--wpds-color-stroke-surface-neutral-weak, #f0f0f0);
 }
 
 .dataviews-view-table td.dataviews-view-table__checkbox-column,
@@ -2108,6 +2115,7 @@ div.dataviews-view-list {
   min-height: 0;
   background-color: var(--wpds-color-background-surface-neutral-strong, #fff);
   border-radius: var(--wpds-border-radius-md, 4px);
+  overflow: hidden;
   position: relative;
 }
 
@@ -2130,6 +2138,15 @@ div.dataviews-view-list {
   pointer-events: none;
 }
 
+.dataviews-view-picker-grid.has-media-fit-contain .dataviews-view-picker-grid__media {
+  background-color: var(--wpds-color-background-surface-neutral, #fcfcfc);
+}
+
+.dataviews-view-picker-grid.has-media-fit-contain .dataviews-view-picker-grid__media img {
+  -o-object-fit: contain;
+  object-fit: contain;
+}
+
 .dataviews-view-picker-grid .dataviews-view-picker-grid__fields {
   position: relative;
   font-size: 12px;
@@ -2700,51 +2717,35 @@ div.dataviews-view-list {
   background-color: var(--wpds-color-background-interactive-neutral-strong-active, #1e1e1e);
 }
 
-.dataviews-validated-control:has(:is(input, select):invalid[data-validity-visible]) .components-input-control__backdrop {
-  --wp-components-color-accent: #cc1818;
-  border-color: #cc1818;
+.dataviews-validated-control__wrapper-with-error-delegate:has(input[type=radio]:invalid[data-validity-visible]), .dataviews-validated-control__wrapper-with-error-delegate:has(input:invalid[data-validity-visible]) .components-form-token-field__input-container:not(:has([aria-expanded=true])), .dataviews-validated-control .components-combobox-control__suggestions-container:has(input:invalid[data-validity-visible]):not(:has([aria-expanded=true])), .dataviews-validated-control:has(:is(input, select):invalid[data-validity-visible]) .components-input-control__backdrop {
+  --focus-color: #cc1818;
 }
 
-.dataviews-validated-control__indicator {
-  display: flex;
-  align-items: flex-start;
-  gap: 4px;
-  margin: 8px 0 0;
-  font-family: -apple-system, system-ui, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-  font-size: 12px;
-  line-height: 16px;
-  color: #757575;
-  animation: dataviews-validated-control__indicator-jump 0.2s cubic-bezier(0.68, -0.55, 0.27, 1.55);
+.dataviews-validated-control:has(:is(input, select):invalid[data-validity-visible]) .components-input-control__backdrop {
+  border-color: #cc1818;
 }
 
-.dataviews-validated-control__indicator.is-invalid {
-  color: #cc1818;
+.dataviews-validated-control .components-combobox-control__suggestions-container:has(input:invalid[data-validity-visible]):not(:has([aria-expanded=true])) {
+  border-color: #cc1818;
 }
 
-.dataviews-validated-control__indicator.is-valid {
-  color: color-mix(in srgb, #000 30%, #4ab866);
+.dataviews-validated-control__wrapper-with-error-delegate {
+  position: relative;
 }
 
-.dataviews-validated-control__indicator-icon {
-  flex-shrink: 0;
+.dataviews-validated-control__wrapper-with-error-delegate:has(input:invalid[data-validity-visible]) .components-form-token-field__input-container:not(:has([aria-expanded=true])) {
+  border-color: #cc1818;
 }
 
-.dataviews-validated-control__indicator-spinner {
-  margin: 2px;
-  width: 12px;
-  height: 12px;
+.dataviews-validated-control__error-delegate {
+  position: absolute;
+  top: 0;
+  height: 100%;
+  width: 100%;
+  opacity: 0;
+  pointer-events: none;
 }
 
-@keyframes dataviews-validated-control__indicator-jump {
-  0% {
-    transform: translateY(-4px);
-    opacity: 0;
-  }
-  100% {
-    transform: translateY(0);
-    opacity: 1;
-  }
-}
 .dataforms-layouts-panel__field-trigger {
   position: relative;
   color: inherit;
@@ -2809,6 +2810,12 @@ div.dataviews-view-list {
   border-radius: var(--wpds-border-radius-xs, 1px);
 }
 
+.dataforms-layouts-panel__field-trigger-icon::after {
+  content: "";
+  position: absolute;
+  inset: 0;
+}
+
 .dataforms-layouts-panel__field-trigger-icon:focus-visible {
   opacity: 1;
   outline: var(--wpds-border-width-focus, var(--wp-admin-border-width-focus, 2px)) solid var(--wpds-color-stroke-focus, var(--wp-admin-theme-color, #3858e9));
@@ -2844,9 +2851,7 @@ div.dataviews-view-list {
 }
 
 .dataforms-layouts-panel__field-label-error-content {
-  position: relative;
-  z-index: 1;
-  cursor: help;
+  pointer-events: none;
   color: var(--wpds-color-foreground-content-error-weak, #cc1818);
   display: inline-flex;
   flex-direction: row;
@@ -2868,6 +2873,10 @@ div.dataviews-view-list {
   font-weight: var(--wpds-typography-font-weight-emphasis, 600);
 }
 
+.dataforms-layouts-panel__field-control:has(a, button) {
+  z-index: 1;
+}
+
 .dataforms-layouts-panel__field-control > * {
   min-width: 0;
 }
@@ -2902,10 +2911,6 @@ div.dataviews-view-list {
   z-index: 159990;
 }
 
-.dataforms-layouts-panel__summary-button:empty {
-  min-width: 160px;
-}
-
 .dataforms-layouts-regular__field {
   width: 100%;
   min-height: var(--wpds-dimension-size-md, 32px);
@@ -3732,7 +3737,7 @@ fieldset.fields__media-edit .fields__media-edit-expanded:not(.is-empty) .fields_
   position: absolute;
   width: 100%;
   bottom: 0;
-  border-top: 1px solid #ddd;
+  border-top: 1px solid var(--wpds-color-stroke-surface-neutral, #dbdbdb);
   padding: 24px;
   background-color: #fff;
   box-sizing: border-box;
@@ -3776,9 +3781,13 @@ fieldset.fields__media-edit .fields__media-edit-expanded:not(.is-empty) .fields_
   margin-bottom: 0;
 }
 
+.font-library__font-demo {
+  position: relative;
+}
+
 .font-library__font-card {
   box-sizing: border-box;
-  border: 1px solid #ddd;
+  border: 1px solid var(--wpds-color-stroke-surface-neutral, #dbdbdb);
   width: 100%;
   height: auto !important;
   padding: 16px;
@@ -3807,6 +3816,23 @@ fieldset.fields__media-edit .fields__media-edit-expanded:not(.is-empty) .fields_
   width: auto;
 }
 
+@media not (prefers-reduced-motion) {
+  .font-library__font-card .font-library__font-variant_demo-image {
+    transition: opacity var(--wpds-motion-duration-lg, 300ms) var(--wpds-motion-easing-subtle, cubic-bezier(0.15, 0, 0.15, 1));
+  }
+}
+.font-library__font-card .font-library__font-variant_demo-image.is-loading {
+  position: absolute;
+  top: 0;
+  left: 0;
+  opacity: 0;
+}
+
+.font-library__font-card .font-library__font-variant-demo-skeleton {
+  height: 24px;
+  border-radius: var(--wpds-border-radius-sm, 2px);
+}
+
 .font-library__font-card .font-library__font-variant_demo-text {
   white-space: nowrap;
   flex-shrink: 0;
@@ -3820,7 +3846,7 @@ fieldset.fields__media-edit .fields__media-edit-expanded:not(.is-empty) .fields_
 .font-library-modal__tablist-container {
   position: sticky;
   top: 0;
-  border-bottom: 1px solid #ddd;
+  border-bottom: 1px solid var(--wpds-color-stroke-surface-neutral, #dbdbdb);
   background: #fff;
   z-index: 1;
 }
@@ -3960,7 +3986,7 @@ button.font-library__upload-area {
   left: 16px;
   top: 0;
   width: 0;
-  border: 0.5px solid #ddd;
+  border: 0.5px solid var(--wpds-color-stroke-surface-neutral, #dbdbdb);
 }
 
 .global-styles-ui-screen-revisions__revision-item:first-child::after {
@@ -4067,7 +4093,7 @@ button.font-library__upload-area {
   bottom: 0;
   background: #fff;
   padding: 12px;
-  border-top: 1px solid #ddd;
+  border-top: 1px solid var(--wpds-color-stroke-surface-neutral, #dbdbdb);
   box-sizing: border-box;
 }
 
@@ -4153,11 +4179,32 @@ button.font-library__upload-area {
   border-radius: 2px;
 }
 
-.global-styles-ui-block-types-search {
-  margin-bottom: 10px;
+.global-styles-ui-block-types-filter {
+  margin-bottom: 12px;
   padding: 0 16px;
 }
 
+.global-styles-ui-block-types-search {
+  flex-grow: 1;
+}
+
+.global-styles-ui-block-types-item-list .global-styles-ui-block-types-item__icon {
+  min-width: 24px;
+}
+
+.global-styles-ui-block-types-item-list__no-results {
+  padding-top: 16px;
+}
+
+.global-styles-ui-block-types-item__indicator {
+  background: var(--wp-admin-theme-color);
+  border-radius: 50%;
+  flex: none;
+  height: 6px;
+  margin-left: auto;
+  width: 6px;
+}
+
 .global-styles-ui-screen-typography__font-variants-count {
   color: #757575;
 }
@@ -4270,10 +4317,6 @@ button.font-library__upload-area {
   opacity: 0;
 }
 
-.global-styles-ui__shadow-editor__remove-button.global-styles-ui__shadow-editor__remove-button {
-  border: none;
-}
-
 .global-styles-ui__shadow-editor__dropdown-toggle:hover + .global-styles-ui__shadow-editor__remove-button, .global-styles-ui__shadow-editor__remove-button:focus, .global-styles-ui__shadow-editor__remove-button:hover {
   opacity: 1;
 }
@@ -4365,7 +4408,8 @@ button.font-library__upload-area {
 }
 
 .global-styles-ui-color-palette-panel,
-.global-styles-ui-gradient-palette-panel {
+.global-styles-ui-gradient-palette-panel,
+.global-styles-ui-duotone-palette-panel {
   padding: 16px;
 }
 
@@ -5597,9 +5641,10 @@ body.js.site-editor-php {
 @media (min-width: 782px) {
   body.js.site-editor-php:has(.editor-editor-interface.is-distraction-free) {
     --wp-admin--admin-bar--height: 0px;
+    --wp-editor-admin-bar-display: none;
   }
-  body.js.site-editor-php:has(.editor-editor-interface.is-distraction-free) #wpadminbar {
-    display: none;
+  body.js.site-editor-php #wpadminbar {
+    display: var(--wp-editor-admin-bar-display, block);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "7.2.0",
+	"version": "7.3.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -47,52 +47,52 @@
 	],
 	"dependencies": {
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "^4.53.0",
-		"@wordpress/admin-ui": "^2.8.0",
-		"@wordpress/api-fetch": "^7.53.0",
-		"@wordpress/base-styles": "^12.1.0",
-		"@wordpress/blob": "^4.53.0",
-		"@wordpress/block-editor": "^16.2.0",
-		"@wordpress/block-library": "^10.4.0",
-		"@wordpress/blocks": "^15.26.0",
-		"@wordpress/commands": "^1.53.0",
-		"@wordpress/components": "^39.0.0",
-		"@wordpress/compose": "^8.6.0",
-		"@wordpress/core-data": "^7.53.0",
-		"@wordpress/data": "^10.53.0",
-		"@wordpress/dataviews": "^18.0.0",
-		"@wordpress/date": "^5.53.0",
-		"@wordpress/deprecated": "^4.53.0",
-		"@wordpress/dom": "^4.53.0",
-		"@wordpress/editor": "^14.53.0",
-		"@wordpress/element": "^8.5.0",
-		"@wordpress/escape-html": "^3.53.0",
-		"@wordpress/fields": "^0.45.0",
-		"@wordpress/global-styles-engine": "^1.20.0",
-		"@wordpress/global-styles-ui": "^1.20.0",
-		"@wordpress/hooks": "^4.53.0",
-		"@wordpress/html-entities": "^4.53.0",
-		"@wordpress/i18n": "^6.26.0",
-		"@wordpress/icons": "^15.4.0",
-		"@wordpress/keyboard-shortcuts": "^5.53.0",
-		"@wordpress/keycodes": "^4.53.0",
-		"@wordpress/media-utils": "^5.53.0",
-		"@wordpress/notices": "^5.53.0",
-		"@wordpress/patterns": "^2.53.0",
-		"@wordpress/plugins": "^7.53.0",
-		"@wordpress/preferences": "^4.53.0",
-		"@wordpress/primitives": "^4.53.0",
-		"@wordpress/private-apis": "^1.53.0",
-		"@wordpress/reusable-blocks": "^5.53.0",
-		"@wordpress/router": "^1.53.0",
-		"@wordpress/style-engine": "^2.53.0",
-		"@wordpress/theme": "^1.2.0",
-		"@wordpress/ui": "^0.20.0",
-		"@wordpress/url": "^4.53.0",
-		"@wordpress/viewport": "^6.53.0",
-		"@wordpress/views": "^1.20.0",
-		"@wordpress/widgets": "^4.53.0",
-		"@wordpress/wordcount": "^4.53.0",
+		"@wordpress/a11y": "^4.54.0",
+		"@wordpress/admin-ui": "^2.9.0",
+		"@wordpress/api-fetch": "^7.54.0",
+		"@wordpress/base-styles": "^13.0.0",
+		"@wordpress/blob": "^4.54.0",
+		"@wordpress/block-editor": "^17.0.0",
+		"@wordpress/block-library": "^10.5.0",
+		"@wordpress/blocks": "^15.27.0",
+		"@wordpress/commands": "^1.54.0",
+		"@wordpress/components": "^40.0.0",
+		"@wordpress/compose": "^8.7.0",
+		"@wordpress/core-data": "^7.54.0",
+		"@wordpress/data": "^10.54.0",
+		"@wordpress/dataviews": "^18.1.0",
+		"@wordpress/date": "^5.54.0",
+		"@wordpress/deprecated": "^4.54.0",
+		"@wordpress/dom": "^4.54.0",
+		"@wordpress/editor": "^14.54.0",
+		"@wordpress/element": "^8.6.0",
+		"@wordpress/escape-html": "^3.54.0",
+		"@wordpress/fields": "^0.46.0",
+		"@wordpress/global-styles-engine": "^1.21.0",
+		"@wordpress/global-styles-ui": "^1.21.0",
+		"@wordpress/hooks": "^4.54.0",
+		"@wordpress/html-entities": "^4.54.0",
+		"@wordpress/i18n": "^6.27.0",
+		"@wordpress/icons": "^15.5.0",
+		"@wordpress/keyboard-shortcuts": "^5.54.0",
+		"@wordpress/keycodes": "^4.54.0",
+		"@wordpress/media-utils": "^5.54.0",
+		"@wordpress/notices": "^5.54.0",
+		"@wordpress/patterns": "^2.54.0",
+		"@wordpress/plugins": "^7.54.0",
+		"@wordpress/preferences": "^4.54.0",
+		"@wordpress/primitives": "^4.54.0",
+		"@wordpress/private-apis": "^1.54.0",
+		"@wordpress/reusable-blocks": "^5.54.0",
+		"@wordpress/router": "^1.54.0",
+		"@wordpress/style-engine": "^2.54.0",
+		"@wordpress/theme": "^2.0.0",
+		"@wordpress/ui": "^0.21.0",
+		"@wordpress/url": "^4.54.0",
+		"@wordpress/viewport": "^6.54.0",
+		"@wordpress/views": "^1.21.0",
+		"@wordpress/widgets": "^4.54.0",
+		"@wordpress/wordcount": "^4.54.0",
 		"change-case": "^4.1.2",
 		"clsx": "^2.1.1",
 		"colord": "^2.9.3",
@@ -106,5 +106,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "989764d42ff93e33684aaf0b96a5b7f3d9bbff52"
+	"gitHead": "5ef24f60261976bb198ad035db24bf81c1fb92b4"
 }

package/src/components/block-editor/use-navigate-to-entity-record.js

@@ -1,15 +1,14 @@
-import { useSelect, useRegistry } from '@wordpress/data';
+import { useRegistry } from '@wordpress/data';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { useCallback } from '@wordpress/element';
 import { addQueryArgs } from '@wordpress/url';
 import { store as coreStore } from '@wordpress/core-data';
 import { store as editorStore } from '@wordpress/editor';
 import { unlock } from '../../lock-unlock';
-import { DEFAULT_DEVICE_TYPE } from './use-viewport-sync';
+import { isValidViewport } from './viewport';
 
 const { useHistory, useLocation } = unlock( routerPrivateApis );
 
-const VALID_VIEWPORTS = [ 'desktop', 'tablet', 'mobile' ];
 /**
  * Hook to handle navigation to entity records.
  *
@@ -20,10 +19,6 @@ export default function useNavigateToEntityRecord() {
 	const location = useLocation();
 	const { query, path } = location;
 	const registry = useRegistry();
-	const currentDeviceType = useSelect(
-		( select ) => select( editorStore ).getDeviceType(),
-		[]
-	);
 
 	const onNavigateToEntityRecord = useCallback(
 		( params ) => {
@@ -49,37 +44,21 @@ export default function useNavigateToEntityRecord() {
 			// Store the selected block in the URL for restoration when navigating back.
 			if ( externalClientId ) {
 				urlUpdates.selectedBlock = externalClientId;
+				history.navigate( addQueryArgs( path, urlUpdates ), {
+					replace: true,
+				} );
 			}
 
-			// Save the current viewport for when we navigate back (e.g. from overlay editor).
-			// Omit viewport from URL when it's the default to keep URLs clean.
+			// The width an entity is asked to be edited at is where it opens,
+			// not something the entity being left carries away: a width set from
+			// the device preview is view state, and an entity that asks for none
+			// opens at the default.
 			const requestedViewport =
 				typeof params.viewport === 'string'
 					? params.viewport.toLowerCase()
 					: undefined;
 			const isValidRequestedViewport =
-				VALID_VIEWPORTS.includes( requestedViewport );
-
-			if ( isValidRequestedViewport ) {
-				const currentViewportLower = (
-					currentDeviceType || DEFAULT_DEVICE_TYPE
-				).toLowerCase();
-				if (
-					currentViewportLower === DEFAULT_DEVICE_TYPE.toLowerCase()
-				) {
-					delete urlUpdates.viewport;
-				} else {
-					urlUpdates.viewport = currentViewportLower;
-				}
-			}
-
-			const hasUpdatesToSave =
-				externalClientId || isValidRequestedViewport;
-			if ( hasUpdatesToSave ) {
-				history.navigate( addQueryArgs( path, urlUpdates ), {
-					replace: true,
-				} );
-			}
+				isValidViewport( requestedViewport );
 
 			// Navigate to the new entity record
 			const queryArgs = {
@@ -96,7 +75,7 @@ export default function useNavigateToEntityRecord() {
 
 			history.navigate( url );
 		},
-		[ history, path, query, registry, currentDeviceType ]
+		[ history, path, query, registry ]
 	);
 
 	return onNavigateToEntityRecord;

package/src/components/block-editor/use-site-editor-settings.js

@@ -91,7 +91,6 @@ export function useSpecificEditorSettings() {
 			__experimentalFeatures: globalSettings,
 			richEditingEnabled: true,
 			supportsTemplateMode: true,
-			focusMode: canvas !== 'view',
 			onNavigateToEntityRecord,
 			onNavigateToPreviousEntityRecord,
 			isPreviewMode: canvas === 'view',