@wordpress/edit-site 5.19.2 → 5.20.0

package/build-style/style-rtl.css

@@ -97,7 +97,7 @@
   --wp-block-synced-color: #7a00df;
   --wp-block-synced-color--rgb: 122, 0, 223;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   :root {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -841,8 +841,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   padding: 0;
   margin: auto 0;
   width: 12px;
-  -webkit-appearance: none;
-          appearance: none;
+  appearance: none;
   cursor: ew-resize;
   outline: none;
   background: none;
@@ -1129,6 +1128,44 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   color: rgba(30, 30, 30, 0.62);
 }
 
+.dataviews-wrapper {
+  width: 100%;
+  padding: 32px;
+}
+
+.dataviews-list-view {
+  width: 100%;
+  text-indent: 0;
+  border-color: inherit;
+  border-collapse: collapse;
+  position: relative;
+}
+.dataviews-list-view a {
+  text-decoration: none;
+}
+.dataviews-list-view th {
+  text-align: right;
+  font-weight: normal;
+  padding: 0 16px 16px;
+  color: #757575;
+}
+.dataviews-list-view td,
+.dataviews-list-view th {
+  padding: 12px;
+}
+.dataviews-list-view td:last-child,
+.dataviews-list-view th:last-child {
+  text-align: left;
+}
+.dataviews-list-view tr {
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.dataviews__per-page-control-prefix {
+  color: #757575;
+  text-wrap: nowrap;
+}
+
 .edit-site-global-styles-preview {
   display: flex;
   align-items: center;
@@ -1859,7 +1896,8 @@ body.is-fullscreen-mode .edit-site-list-header {
 .edit-site-list-added-by__avatar img {
   width: 32px;
   height: 32px;
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
   opacity: 0;
   transition: opacity 0.1s linear;
 }
@@ -2476,6 +2514,25 @@ h3.edit-site-template-card__template-areas-title {
   margin: 0 0 8px;
 }
 
+.edit-site-template-panel__replace-template-modal {
+  z-index: 1000001;
+}
+
+.edit-site-template-panel__replace-template-modal__content {
+  column-count: 2;
+  column-gap: 24px;
+}
+@media (min-width: 782px) {
+  .edit-site-template-panel__replace-template-modal__content {
+    column-count: 3;
+  }
+}
+@media (min-width: 1280px) {
+  .edit-site-template-panel__replace-template-modal__content {
+    column-count: 4;
+  }
+}
+
 .edit-site-editor__interface-skeleton {
   opacity: 1;
   transition: opacity 0.1s ease-out;
@@ -2705,7 +2762,8 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 .edit-site-welcome-guide__image > img {
   display: block;
   max-width: 100%;
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
 }
 .edit-site-welcome-guide__heading {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
@@ -3269,7 +3327,6 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 .edit-site-sidebar-navigation-screen__title {
   flex-grow: 1;
   padding: 6px 0 0 0;
-  overflow: hidden;
   overflow-wrap: break-word;
 }
 
@@ -3381,10 +3438,12 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   color: #949494;
 }
 .edit-site-sidebar-navigation-screen-page__featured-image img {
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
   height: 100%;
   width: 100%;
-  object-position: 50% 50%;
+  -o-object-position: 50% 50%;
+     object-position: 50% 50%;
 }
 
 .edit-site-sidebar-navigation-screen-page__featured-image-description {
@@ -3692,7 +3751,8 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   width: 100%;
   height: auto;
   border-radius: 4px;
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
   background: #333;
 }
 .edit-site-layout.is-full-canvas.is-edit-mode .edit-site-site-icon__image {
@@ -3887,11 +3947,22 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
   align-items: center;
   display: flex;
   justify-content: center;
-  height: 100px;
+  height: 250px;
   width: 100%;
   background-color: #f0f0f0;
 }
 
+.font-library-modal__local-fonts {
+  margin: 0 auto;
+  width: 80%;
+}
+.font-library-modal__local-fonts .font-library-modal__upload-area__text {
+  color: #6e6e6e;
+}
+.font-library-modal__local-fonts .font-library-modal__upload-area__notice {
+  margin: 0;
+}
+
 .font-library-modal__font-name {
   font-weight: bold;
 }
@@ -3930,6 +4001,10 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
   max-width: 350px;
 }
 
+.font-library-modal__font-collection__notice {
+  margin: 0;
+}
+
 body.js #wpadminbar {
   display: none;
 }
@@ -4041,7 +4116,7 @@ body.admin-color-light {
   --wp-admin-theme-color-darker-20--rgb: 0, 97, 135;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-light {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4056,7 +4131,7 @@ body.admin-color-modern {
   --wp-admin-theme-color-darker-20--rgb: 24, 58, 214;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-modern {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4071,7 +4146,7 @@ body.admin-color-blue {
   --wp-admin-theme-color-darker-20--rgb: 6, 64, 84;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-blue {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4086,7 +4161,7 @@ body.admin-color-coffee {
   --wp-admin-theme-color-darker-20--rgb: 43, 39, 36;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-coffee {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4101,7 +4176,7 @@ body.admin-color-ectoplasm {
   --wp-admin-theme-color-darker-20--rgb: 58, 44, 77;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-ectoplasm {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4116,7 +4191,7 @@ body.admin-color-midnight {
   --wp-admin-theme-color-darker-20--rgb: 208, 44, 33;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-midnight {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4131,7 +4206,7 @@ body.admin-color-ocean {
   --wp-admin-theme-color-darker-20--rgb: 76, 96, 102;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-ocean {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4146,7 +4221,7 @@ body.admin-color-sunrise {
   --wp-admin-theme-color-darker-20--rgb: 195, 105, 34;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-sunrise {
     --wp-admin-border-width-focus: 1.5px;
   }

package/build-style/style.css

@@ -97,7 +97,7 @@
   --wp-block-synced-color: #7a00df;
   --wp-block-synced-color--rgb: 122, 0, 223;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   :root {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -841,8 +841,7 @@ body.is-fullscreen-mode .interface-interface-skeleton {
   padding: 0;
   margin: auto 0;
   width: 12px;
-  -webkit-appearance: none;
-          appearance: none;
+  appearance: none;
   cursor: ew-resize;
   outline: none;
   background: none;
@@ -1129,6 +1128,44 @@ textarea.edit-site-code-editor-text-area.edit-site-code-editor-text-area:-ms-inp
   color: rgba(30, 30, 30, 0.62);
 }
 
+.dataviews-wrapper {
+  width: 100%;
+  padding: 32px;
+}
+
+.dataviews-list-view {
+  width: 100%;
+  text-indent: 0;
+  border-color: inherit;
+  border-collapse: collapse;
+  position: relative;
+}
+.dataviews-list-view a {
+  text-decoration: none;
+}
+.dataviews-list-view th {
+  text-align: left;
+  font-weight: normal;
+  padding: 0 16px 16px;
+  color: #757575;
+}
+.dataviews-list-view td,
+.dataviews-list-view th {
+  padding: 12px;
+}
+.dataviews-list-view td:last-child,
+.dataviews-list-view th:last-child {
+  text-align: right;
+}
+.dataviews-list-view tr {
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.dataviews__per-page-control-prefix {
+  color: #757575;
+  text-wrap: nowrap;
+}
+
 .edit-site-global-styles-preview {
   display: flex;
   align-items: center;
@@ -1860,7 +1897,8 @@ body.is-fullscreen-mode .edit-site-list-header {
 .edit-site-list-added-by__avatar img {
   width: 32px;
   height: 32px;
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
   opacity: 0;
   transition: opacity 0.1s linear;
 }
@@ -2477,6 +2515,25 @@ h3.edit-site-template-card__template-areas-title {
   margin: 0 0 8px;
 }
 
+.edit-site-template-panel__replace-template-modal {
+  z-index: 1000001;
+}
+
+.edit-site-template-panel__replace-template-modal__content {
+  column-count: 2;
+  column-gap: 24px;
+}
+@media (min-width: 782px) {
+  .edit-site-template-panel__replace-template-modal__content {
+    column-count: 3;
+  }
+}
+@media (min-width: 1280px) {
+  .edit-site-template-panel__replace-template-modal__content {
+    column-count: 4;
+  }
+}
+
 .edit-site-editor__interface-skeleton {
   opacity: 1;
   transition: opacity 0.1s ease-out;
@@ -2706,7 +2763,8 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 .edit-site-welcome-guide__image > img {
   display: block;
   max-width: 100%;
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
 }
 .edit-site-welcome-guide__heading {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
@@ -3270,7 +3328,6 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
 .edit-site-sidebar-navigation-screen__title {
   flex-grow: 1;
   padding: 6px 0 0 0;
-  overflow: hidden;
   overflow-wrap: break-word;
 }
 
@@ -3382,10 +3439,12 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   color: #949494;
 }
 .edit-site-sidebar-navigation-screen-page__featured-image img {
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
   height: 100%;
   width: 100%;
-  object-position: 50% 50%;
+  -o-object-position: 50% 50%;
+     object-position: 50% 50%;
 }
 
 .edit-site-sidebar-navigation-screen-page__featured-image-description {
@@ -3693,7 +3752,8 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar {
   width: 100%;
   height: auto;
   border-radius: 4px;
-  object-fit: cover;
+  -o-object-fit: cover;
+     object-fit: cover;
   background: #333;
 }
 .edit-site-layout.is-full-canvas.is-edit-mode .edit-site-site-icon__image {
@@ -3888,11 +3948,22 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
   align-items: center;
   display: flex;
   justify-content: center;
-  height: 100px;
+  height: 250px;
   width: 100%;
   background-color: #f0f0f0;
 }
 
+.font-library-modal__local-fonts {
+  margin: 0 auto;
+  width: 80%;
+}
+.font-library-modal__local-fonts .font-library-modal__upload-area__text {
+  color: #6e6e6e;
+}
+.font-library-modal__local-fonts .font-library-modal__upload-area__notice {
+  margin: 0;
+}
+
 .font-library-modal__font-name {
   font-weight: bold;
 }
@@ -3931,6 +4002,10 @@ body:has(.edit-site-resizable-frame__inner.is-resizing) {
   max-width: 350px;
 }
 
+.font-library-modal__font-collection__notice {
+  margin: 0;
+}
+
 body.js #wpadminbar {
   display: none;
 }
@@ -4042,7 +4117,7 @@ body.admin-color-light {
   --wp-admin-theme-color-darker-20--rgb: 0, 97, 135;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-light {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4057,7 +4132,7 @@ body.admin-color-modern {
   --wp-admin-theme-color-darker-20--rgb: 24, 58, 214;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-modern {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4072,7 +4147,7 @@ body.admin-color-blue {
   --wp-admin-theme-color-darker-20--rgb: 6, 64, 84;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-blue {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4087,7 +4162,7 @@ body.admin-color-coffee {
   --wp-admin-theme-color-darker-20--rgb: 43, 39, 36;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-coffee {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4102,7 +4177,7 @@ body.admin-color-ectoplasm {
   --wp-admin-theme-color-darker-20--rgb: 58, 44, 77;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-ectoplasm {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4117,7 +4192,7 @@ body.admin-color-midnight {
   --wp-admin-theme-color-darker-20--rgb: 208, 44, 33;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-midnight {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4132,7 +4207,7 @@ body.admin-color-ocean {
   --wp-admin-theme-color-darker-20--rgb: 76, 96, 102;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-ocean {
     --wp-admin-border-width-focus: 1.5px;
   }
@@ -4147,7 +4222,7 @@ body.admin-color-sunrise {
   --wp-admin-theme-color-darker-20--rgb: 195, 105, 34;
   --wp-admin-border-width-focus: 2px;
 }
-@media (min-resolution: 192dpi) {
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   body.admin-color-sunrise {
     --wp-admin-border-width-focus: 1.5px;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.19.2",
+	"version": "5.20.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -27,44 +27,45 @@
 	"react-native": "src/index",
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
-		"@wordpress/a11y": "^3.42.2",
-		"@wordpress/api-fetch": "^6.39.2",
-		"@wordpress/block-editor": "^12.10.2",
-		"@wordpress/block-library": "^8.19.2",
-		"@wordpress/blocks": "^12.19.2",
-		"@wordpress/commands": "^0.13.2",
-		"@wordpress/components": "^25.8.2",
-		"@wordpress/compose": "^6.19.2",
-		"@wordpress/core-commands": "^0.11.2",
-		"@wordpress/core-data": "^6.19.2",
-		"@wordpress/data": "^9.12.2",
-		"@wordpress/date": "^4.42.2",
-		"@wordpress/deprecated": "^3.42.2",
-		"@wordpress/dom": "^3.42.2",
-		"@wordpress/editor": "^13.19.2",
-		"@wordpress/element": "^5.19.2",
-		"@wordpress/escape-html": "^2.42.2",
-		"@wordpress/hooks": "^3.42.2",
-		"@wordpress/html-entities": "^3.42.2",
-		"@wordpress/i18n": "^4.42.2",
-		"@wordpress/icons": "^9.33.2",
-		"@wordpress/interface": "^5.19.2",
-		"@wordpress/keyboard-shortcuts": "^4.19.2",
-		"@wordpress/keycodes": "^3.42.2",
-		"@wordpress/media-utils": "^4.33.2",
-		"@wordpress/notices": "^4.10.2",
-		"@wordpress/patterns": "^1.3.2",
-		"@wordpress/plugins": "^6.10.2",
-		"@wordpress/preferences": "^3.19.2",
-		"@wordpress/primitives": "^3.40.2",
-		"@wordpress/private-apis": "^0.24.2",
-		"@wordpress/reusable-blocks": "^4.19.2",
-		"@wordpress/router": "^0.11.2",
-		"@wordpress/style-engine": "^1.25.2",
-		"@wordpress/url": "^3.43.2",
-		"@wordpress/viewport": "^5.19.2",
-		"@wordpress/widgets": "^3.19.2",
-		"@wordpress/wordcount": "^3.42.2",
+		"@tanstack/react-table": "^8.10.3",
+		"@wordpress/a11y": "^3.43.0",
+		"@wordpress/api-fetch": "^6.40.0",
+		"@wordpress/block-editor": "^12.11.0",
+		"@wordpress/block-library": "^8.20.0",
+		"@wordpress/blocks": "^12.20.0",
+		"@wordpress/commands": "^0.14.0",
+		"@wordpress/components": "^25.9.0",
+		"@wordpress/compose": "^6.20.0",
+		"@wordpress/core-commands": "^0.12.0",
+		"@wordpress/core-data": "^6.20.0",
+		"@wordpress/data": "^9.13.0",
+		"@wordpress/date": "^4.43.0",
+		"@wordpress/deprecated": "^3.43.0",
+		"@wordpress/dom": "^3.43.0",
+		"@wordpress/editor": "^13.20.0",
+		"@wordpress/element": "^5.20.0",
+		"@wordpress/escape-html": "^2.43.0",
+		"@wordpress/hooks": "^3.43.0",
+		"@wordpress/html-entities": "^3.43.0",
+		"@wordpress/i18n": "^4.43.0",
+		"@wordpress/icons": "^9.34.0",
+		"@wordpress/interface": "^5.20.0",
+		"@wordpress/keyboard-shortcuts": "^4.20.0",
+		"@wordpress/keycodes": "^3.43.0",
+		"@wordpress/media-utils": "^4.34.0",
+		"@wordpress/notices": "^4.11.0",
+		"@wordpress/patterns": "^1.4.0",
+		"@wordpress/plugins": "^6.11.0",
+		"@wordpress/preferences": "^3.20.0",
+		"@wordpress/primitives": "^3.41.0",
+		"@wordpress/private-apis": "^0.25.0",
+		"@wordpress/reusable-blocks": "^4.20.0",
+		"@wordpress/router": "^0.12.0",
+		"@wordpress/style-engine": "^1.26.0",
+		"@wordpress/url": "^3.44.0",
+		"@wordpress/viewport": "^5.20.0",
+		"@wordpress/widgets": "^3.20.0",
+		"@wordpress/wordcount": "^3.43.0",
 		"change-case": "^4.1.2",
 		"classnames": "^2.3.1",
 		"colord": "^2.9.2",
@@ -84,5 +85,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "5d2e3d07cc97af8090fc32c1e5d5013a2967e752"
+	"gitHead": "9b8e598c5418d38fe72197c24ef1d3dd6c712151"
 }

package/src/components/add-new-pattern/index.js

@@ -4,13 +4,14 @@
 import { DropdownMenu } from '@wordpress/components';
 import { useState, useRef } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
-import { plus, symbol, symbolFilled } from '@wordpress/icons';
+import { plus, symbol, symbolFilled, upload } from '@wordpress/icons';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import {
 	privateApis as editPatternsPrivateApis,
 	store as patternsStore,
 } from '@wordpress/patterns';
+import { store as coreStore } from '@wordpress/core-data';
 import { store as noticesStore } from '@wordpress/notices';
 
 /**
@@ -19,7 +20,6 @@ import { store as noticesStore } from '@wordpress/notices';
 import CreateTemplatePartModal from '../create-template-part-modal';
 import SidebarButton from '../sidebar-button';
 import { unlock } from '../../lock-unlock';
-import { store as editSiteStore } from '../../store';
 import {
 	PATTERN_TYPES,
 	PATTERN_DEFAULT_CATEGORY,
@@ -36,9 +36,8 @@ export default function AddNewPattern() {
 	const [ showPatternModal, setShowPatternModal ] = useState( false );
 	const [ showTemplatePartModal, setShowTemplatePartModal ] =
 		useState( false );
-	const isTemplatePartsMode = useSelect( ( select ) => {
-		const settings = select( editSiteStore ).getSettings();
-		return !! settings.supportsTemplatePartsMode;
+	const isBlockBasedTheme = useSelect( ( select ) => {
+		return select( coreStore ).getCurrentTheme()?.is_block_theme;
 	}, [] );
 	const { createPatternFromFile } = unlock( useDispatch( patternsStore ) );
 	const { createSuccessNotice, createErrorNotice } =
@@ -52,7 +51,7 @@ export default function AddNewPattern() {
 		history.push( {
 			postId: pattern.id,
 			postType: PATTERN_TYPES.user,
-			categoryType: PATTERN_TYPES.user,
+			categoryType: PATTERN_TYPES.theme,
 			categoryId,
 			canvas: 'edit',
 		} );
@@ -82,9 +81,7 @@ export default function AddNewPattern() {
 		},
 	];
 
-	// Remove condition when command palette issues are resolved.
-	// See: https://github.com/WordPress/gutenberg/issues/52154.
-	if ( ! isTemplatePartsMode ) {
+	if ( isBlockBasedTheme ) {
 		controls.push( {
 			icon: symbolFilled,
 			onClick: () => setShowTemplatePartModal( true ),
@@ -93,7 +90,7 @@ export default function AddNewPattern() {
 	}
 
 	controls.push( {
-		icon: symbol,
+		icon: upload,
 		onClick: () => {
 			patternUploadInputRef.current.click();
 		},

package/src/components/block-editor/block-editor-provider/default-block-editor-provider.js

@@ -27,8 +27,8 @@ const noop = () => {};
  * mimic the look and feel of the post editor and
  * allow editing of the page content only.
  *
- * @param {Object}    props
- * @param {WPElement} props.children
+ * @param {Object}  props
+ * @param {Element} props.children
  */
 export default function DefaultBlockEditorProvider( { children } ) {
 	const settings = useSiteEditorSettings();
@@ -51,13 +51,18 @@ export default function DefaultBlockEditorProvider( { children } ) {
 		'postType',
 		templateType
 	);
-	const pageContentBlock = usePageContentBlocks( blocks, isTemplateHidden );
+	const pageContentBlocks = usePageContentBlocks( {
+		blocks,
+		isPageContentFocused: isTemplateHidden,
+		wrapPageContent: true,
+	} );
+
 	return (
 		<ExperimentalBlockEditorProvider
 			settings={ settings }
 			value={
-				isTemplateHidden && pageContentBlock.length
-					? pageContentBlock
+				isTemplateHidden && pageContentBlocks.length
+					? pageContentBlocks
 					: blocks
 			}
 			onInput={ isTemplateHidden ? noop : onInput }