@wordpress/edit-site 6.42.0 → 6.43.1-next.v.202604091042.0

package/build-module/components/site-editor-routes/pages.mjs

@@ -1,6 +1,8 @@
 // packages/edit-site/src/components/site-editor-routes/pages.js
 import { privateApis as routerPrivateApis } from "@wordpress/router";
 import { __ } from "@wordpress/i18n";
+import { resolveSelect } from "@wordpress/data";
+import { store as coreStore } from "@wordpress/core-data";
 import { loadView } from "@wordpress/views";
 import Editor from "../editor/index.mjs";
 import SidebarNavigationScreen from "../sidebar-navigation-screen/index.mjs";
@@ -8,20 +10,25 @@ import SidebarNavigationScreenUnsupported from "../sidebar-navigation-screen-uns
 import DataViewsSidebarContent from "../sidebar-dataviews/index.mjs";
 import PostList from "../post-list/index.mjs";
 import { unlock } from "../../lock-unlock.mjs";
-import {
-  DEFAULT_VIEW,
-  getActiveViewOverridesForTab
-} from "../post-list/view-utils.mjs";
-import { jsx } from "react/jsx-runtime";
+import { isThemeDataLoaded } from "./utils.mjs";
+import { Fragment, jsx } from "react/jsx-runtime";
 var { useLocation } = unlock(routerPrivateApis);
 async function isListView(query) {
   const { activeView = "all" } = query;
+  const config = await unlock(resolveSelect(coreStore)).getViewConfig(
+    "postType",
+    "page"
+  );
+  const defaultView = config?.default_view;
+  const defaultLayouts = config?.default_layouts;
+  const viewEntry = config?.view_list?.find((v) => v.slug === activeView);
   const view = await loadView({
     kind: "postType",
     name: "page",
     slug: "default",
-    defaultView: DEFAULT_VIEW,
-    activeViewOverrides: getActiveViewOverridesForTab(activeView)
+    defaultView,
+    defaultLayouts,
+    activeViewOverrides: viewEntry?.view ?? {}
   });
   return view.type === "list";
 }
@@ -35,8 +42,10 @@ var pagesRoute = {
   path: "/page",
   areas: {
     sidebar({ siteData }) {
-      const isBlockTheme = siteData.currentTheme?.is_block_theme;
-      return isBlockTheme ? /* @__PURE__ */ jsx(
+      if (!isThemeDataLoaded(siteData)) {
+        return null;
+      }
+      return siteData.currentTheme.is_block_theme ? /* @__PURE__ */ jsx(
         SidebarNavigationScreen,
         {
           title: __("Pages"),
@@ -58,8 +67,10 @@ var pagesRoute = {
       return isList ? /* @__PURE__ */ jsx(Editor, {}) : void 0;
     },
     mobile({ siteData }) {
-      const isBlockTheme = siteData.currentTheme?.is_block_theme;
-      return isBlockTheme ? /* @__PURE__ */ jsx(MobilePagesView, {}) : /* @__PURE__ */ jsx(SidebarNavigationScreenUnsupported, {});
+      if (!isThemeDataLoaded(siteData)) {
+        return /* @__PURE__ */ jsx(Fragment, {});
+      }
+      return siteData.currentTheme.is_block_theme ? /* @__PURE__ */ jsx(MobilePagesView, {}) : /* @__PURE__ */ jsx(SidebarNavigationScreenUnsupported, {});
     }
   },
   widths: {

package/build-module/components/site-editor-routes/pages.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/components/site-editor-routes/pages.js"],
-  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { privateApis as routerPrivateApis } from '@wordpress/router';\nimport { __ } from '@wordpress/i18n';\nimport { loadView } from '@wordpress/views';\n\n/**\n * Internal dependencies\n */\nimport Editor from '../editor';\nimport SidebarNavigationScreen from '../sidebar-navigation-screen';\nimport SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';\nimport DataViewsSidebarContent from '../sidebar-dataviews';\nimport PostList from '../post-list';\nimport { unlock } from '../../lock-unlock';\nimport {\n\tDEFAULT_VIEW,\n\tgetActiveViewOverridesForTab,\n} from '../post-list/view-utils';\n\nconst { useLocation } = unlock( routerPrivateApis );\n\nasync function isListView( query ) {\n\tconst { activeView = 'all' } = query;\n\tconst view = await loadView( {\n\t\tkind: 'postType',\n\t\tname: 'page',\n\t\tslug: 'default',\n\t\tdefaultView: DEFAULT_VIEW,\n\t\tactiveViewOverrides: getActiveViewOverridesForTab( activeView ),\n\t} );\n\treturn view.type === 'list';\n}\n\nfunction MobilePagesView() {\n\tconst { query = {} } = useLocation();\n\tconst { canvas = 'view' } = query;\n\n\treturn canvas === 'edit' ? <Editor /> : <PostList postType=\"page\" />;\n}\n\nexport const pagesRoute = {\n\tname: 'pages',\n\tpath: '/page',\n\tareas: {\n\t\tsidebar( { siteData } ) {\n\t\t\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\t\t\treturn isBlockTheme ? (\n\t\t\t\t<SidebarNavigationScreen\n\t\t\t\t\ttitle={ __( 'Pages' ) }\n\t\t\t\t\tbackPath=\"/\"\n\t\t\t\t\tcontent={ <DataViewsSidebarContent postType=\"page\" /> }\n\t\t\t\t/>\n\t\t\t) : (\n\t\t\t\t<SidebarNavigationScreenUnsupported />\n\t\t\t);\n\t\t},\n\t\tcontent( { siteData } ) {\n\t\t\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\t\t\treturn isBlockTheme ? <PostList postType=\"page\" /> : undefined;\n\t\t},\n\t\tasync preview( { query, siteData } ) {\n\t\t\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\t\t\tif ( ! isBlockTheme ) {\n\t\t\t\treturn undefined;\n\t\t\t}\n\t\t\tconst isList = await isListView( query );\n\t\t\treturn isList ? <Editor /> : undefined;\n\t\t},\n\t\tmobile( { siteData } ) {\n\t\t\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\t\t\treturn isBlockTheme ? (\n\t\t\t\t<MobilePagesView />\n\t\t\t) : (\n\t\t\t\t<SidebarNavigationScreenUnsupported />\n\t\t\t);\n\t\t},\n\t},\n\twidths: {\n\t\tasync content( { query } ) {\n\t\t\tconst isList = await isListView( query );\n\t\t\treturn isList ? 380 : undefined;\n\t\t},\n\t},\n};\n"],
-  "mappings": ";AAGA,SAAS,eAAe,yBAAyB;AACjD,SAAS,UAAU;AACnB,SAAS,gBAAgB;AAKzB,OAAO,YAAY;AACnB,OAAO,6BAA6B;AACpC,OAAO,wCAAwC;AAC/C,OAAO,6BAA6B;AACpC,OAAO,cAAc;AACrB,SAAS,cAAc;AACvB;AAAA,EACC;AAAA,EACA;AAAA,OACM;AAoBqB;AAlB5B,IAAM,EAAE,YAAY,IAAI,OAAQ,iBAAkB;AAElD,eAAe,WAAY,OAAQ;AAClC,QAAM,EAAE,aAAa,MAAM,IAAI;AAC/B,QAAM,OAAO,MAAM,SAAU;AAAA,IAC5B,MAAM;AAAA,IACN,MAAM;AAAA,IACN,MAAM;AAAA,IACN,aAAa;AAAA,IACb,qBAAqB,6BAA8B,UAAW;AAAA,EAC/D,CAAE;AACF,SAAO,KAAK,SAAS;AACtB;AAEA,SAAS,kBAAkB;AAC1B,QAAM,EAAE,QAAQ,CAAC,EAAE,IAAI,YAAY;AACnC,QAAM,EAAE,SAAS,OAAO,IAAI;AAE5B,SAAO,WAAW,SAAS,oBAAC,UAAO,IAAK,oBAAC,YAAS,UAAS,QAAO;AACnE;AAEO,IAAM,aAAa;AAAA,EACzB,MAAM;AAAA,EACN,MAAM;AAAA,EACN,OAAO;AAAA,IACN,QAAS,EAAE,SAAS,GAAI;AACvB,YAAM,eAAe,SAAS,cAAc;AAC5C,aAAO,eACN;AAAA,QAAC;AAAA;AAAA,UACA,OAAQ,GAAI,OAAQ;AAAA,UACpB,UAAS;AAAA,UACT,SAAU,oBAAC,2BAAwB,UAAS,QAAO;AAAA;AAAA,MACpD,IAEA,oBAAC,sCAAmC;AAAA,IAEtC;AAAA,IACA,QAAS,EAAE,SAAS,GAAI;AACvB,YAAM,eAAe,SAAS,cAAc;AAC5C,aAAO,eAAe,oBAAC,YAAS,UAAS,QAAO,IAAK;AAAA,IACtD;AAAA,IACA,MAAM,QAAS,EAAE,OAAO,SAAS,GAAI;AACpC,YAAM,eAAe,SAAS,cAAc;AAC5C,UAAK,CAAE,cAAe;AACrB,eAAO;AAAA,MACR;AACA,YAAM,SAAS,MAAM,WAAY,KAAM;AACvC,aAAO,SAAS,oBAAC,UAAO,IAAK;AAAA,IAC9B;AAAA,IACA,OAAQ,EAAE,SAAS,GAAI;AACtB,YAAM,eAAe,SAAS,cAAc;AAC5C,aAAO,eACN,oBAAC,mBAAgB,IAEjB,oBAAC,sCAAmC;AAAA,IAEtC;AAAA,EACD;AAAA,EACA,QAAQ;AAAA,IACP,MAAM,QAAS,EAAE,MAAM,GAAI;AAC1B,YAAM,SAAS,MAAM,WAAY,KAAM;AACvC,aAAO,SAAS,MAAM;AAAA,IACvB;AAAA,EACD;AACD;",
+  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { privateApis as routerPrivateApis } from '@wordpress/router';\nimport { __ } from '@wordpress/i18n';\nimport { resolveSelect } from '@wordpress/data';\nimport { store as coreStore } from '@wordpress/core-data';\nimport { loadView } from '@wordpress/views';\n\n/**\n * Internal dependencies\n */\nimport Editor from '../editor';\nimport SidebarNavigationScreen from '../sidebar-navigation-screen';\nimport SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';\nimport DataViewsSidebarContent from '../sidebar-dataviews';\nimport PostList from '../post-list';\nimport { unlock } from '../../lock-unlock';\nimport { isThemeDataLoaded } from './utils';\n\nconst { useLocation } = unlock( routerPrivateApis );\n\nasync function isListView( query ) {\n\tconst { activeView = 'all' } = query;\n\tconst config = await unlock( resolveSelect( coreStore ) ).getViewConfig(\n\t\t'postType',\n\t\t'page'\n\t);\n\tconst defaultView = config?.default_view;\n\tconst defaultLayouts = config?.default_layouts;\n\tconst viewEntry = config?.view_list?.find( ( v ) => v.slug === activeView );\n\tconst view = await loadView( {\n\t\tkind: 'postType',\n\t\tname: 'page',\n\t\tslug: 'default',\n\t\tdefaultView,\n\t\tdefaultLayouts,\n\t\tactiveViewOverrides: viewEntry?.view ?? {},\n\t} );\n\treturn view.type === 'list';\n}\n\nfunction MobilePagesView() {\n\tconst { query = {} } = useLocation();\n\tconst { canvas = 'view' } = query;\n\n\treturn canvas === 'edit' ? <Editor /> : <PostList postType=\"page\" />;\n}\n\nexport const pagesRoute = {\n\tname: 'pages',\n\tpath: '/page',\n\tareas: {\n\t\tsidebar( { siteData } ) {\n\t\t\tif ( ! isThemeDataLoaded( siteData ) ) {\n\t\t\t\treturn null;\n\t\t\t}\n\t\t\treturn siteData.currentTheme.is_block_theme ? (\n\t\t\t\t<SidebarNavigationScreen\n\t\t\t\t\ttitle={ __( 'Pages' ) }\n\t\t\t\t\tbackPath=\"/\"\n\t\t\t\t\tcontent={ <DataViewsSidebarContent postType=\"page\" /> }\n\t\t\t\t/>\n\t\t\t) : (\n\t\t\t\t<SidebarNavigationScreenUnsupported />\n\t\t\t);\n\t\t},\n\t\tcontent( { siteData } ) {\n\t\t\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\t\t\treturn isBlockTheme ? <PostList postType=\"page\" /> : undefined;\n\t\t},\n\t\tasync preview( { query, siteData } ) {\n\t\t\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\t\t\tif ( ! isBlockTheme ) {\n\t\t\t\treturn undefined;\n\t\t\t}\n\t\t\tconst isList = await isListView( query );\n\t\t\treturn isList ? <Editor /> : undefined;\n\t\t},\n\t\tmobile( { siteData } ) {\n\t\t\tif ( ! isThemeDataLoaded( siteData ) ) {\n\t\t\t\treturn <></>;\n\t\t\t}\n\t\t\treturn siteData.currentTheme.is_block_theme ? (\n\t\t\t\t<MobilePagesView />\n\t\t\t) : (\n\t\t\t\t<SidebarNavigationScreenUnsupported />\n\t\t\t);\n\t\t},\n\t},\n\twidths: {\n\t\tasync content( { query } ) {\n\t\t\tconst isList = await isListView( query );\n\t\t\treturn isList ? 380 : undefined;\n\t\t},\n\t},\n};\n"],
+  "mappings": ";AAGA,SAAS,eAAe,yBAAyB;AACjD,SAAS,UAAU;AACnB,SAAS,qBAAqB;AAC9B,SAAS,SAAS,iBAAiB;AACnC,SAAS,gBAAgB;AAKzB,OAAO,YAAY;AACnB,OAAO,6BAA6B;AACpC,OAAO,wCAAwC;AAC/C,OAAO,6BAA6B;AACpC,OAAO,cAAc;AACrB,SAAS,cAAc;AACvB,SAAS,yBAAyB;AA4BN,SAmCjB,UAnCiB;AA1B5B,IAAM,EAAE,YAAY,IAAI,OAAQ,iBAAkB;AAElD,eAAe,WAAY,OAAQ;AAClC,QAAM,EAAE,aAAa,MAAM,IAAI;AAC/B,QAAM,SAAS,MAAM,OAAQ,cAAe,SAAU,CAAE,EAAE;AAAA,IACzD;AAAA,IACA;AAAA,EACD;AACA,QAAM,cAAc,QAAQ;AAC5B,QAAM,iBAAiB,QAAQ;AAC/B,QAAM,YAAY,QAAQ,WAAW,KAAM,CAAE,MAAO,EAAE,SAAS,UAAW;AAC1E,QAAM,OAAO,MAAM,SAAU;AAAA,IAC5B,MAAM;AAAA,IACN,MAAM;AAAA,IACN,MAAM;AAAA,IACN;AAAA,IACA;AAAA,IACA,qBAAqB,WAAW,QAAQ,CAAC;AAAA,EAC1C,CAAE;AACF,SAAO,KAAK,SAAS;AACtB;AAEA,SAAS,kBAAkB;AAC1B,QAAM,EAAE,QAAQ,CAAC,EAAE,IAAI,YAAY;AACnC,QAAM,EAAE,SAAS,OAAO,IAAI;AAE5B,SAAO,WAAW,SAAS,oBAAC,UAAO,IAAK,oBAAC,YAAS,UAAS,QAAO;AACnE;AAEO,IAAM,aAAa;AAAA,EACzB,MAAM;AAAA,EACN,MAAM;AAAA,EACN,OAAO;AAAA,IACN,QAAS,EAAE,SAAS,GAAI;AACvB,UAAK,CAAE,kBAAmB,QAAS,GAAI;AACtC,eAAO;AAAA,MACR;AACA,aAAO,SAAS,aAAa,iBAC5B;AAAA,QAAC;AAAA;AAAA,UACA,OAAQ,GAAI,OAAQ;AAAA,UACpB,UAAS;AAAA,UACT,SAAU,oBAAC,2BAAwB,UAAS,QAAO;AAAA;AAAA,MACpD,IAEA,oBAAC,sCAAmC;AAAA,IAEtC;AAAA,IACA,QAAS,EAAE,SAAS,GAAI;AACvB,YAAM,eAAe,SAAS,cAAc;AAC5C,aAAO,eAAe,oBAAC,YAAS,UAAS,QAAO,IAAK;AAAA,IACtD;AAAA,IACA,MAAM,QAAS,EAAE,OAAO,SAAS,GAAI;AACpC,YAAM,eAAe,SAAS,cAAc;AAC5C,UAAK,CAAE,cAAe;AACrB,eAAO;AAAA,MACR;AACA,YAAM,SAAS,MAAM,WAAY,KAAM;AACvC,aAAO,SAAS,oBAAC,UAAO,IAAK;AAAA,IAC9B;AAAA,IACA,OAAQ,EAAE,SAAS,GAAI;AACtB,UAAK,CAAE,kBAAmB,QAAS,GAAI;AACtC,eAAO,gCAAE;AAAA,MACV;AACA,aAAO,SAAS,aAAa,iBAC5B,oBAAC,mBAAgB,IAEjB,oBAAC,sCAAmC;AAAA,IAEtC;AAAA,EACD;AAAA,EACA,QAAQ;AAAA,IACP,MAAM,QAAS,EAAE,MAAM,GAAI;AAC1B,YAAM,SAAS,MAAM,WAAY,KAAM;AACvC,aAAO,SAAS,MAAM;AAAA,IACvB;AAAA,EACD;AACD;",
   "names": []
 }

package/build-module/components/site-editor-routes/stylebook.mjs

@@ -4,7 +4,7 @@ import { privateApis as editorPrivateApis } from "@wordpress/editor";
 import SidebarNavigationScreen from "../sidebar-navigation-screen/index.mjs";
 import SidebarNavigationScreenUnsupported from "../sidebar-navigation-screen-unsupported/index.mjs";
 import { unlock } from "../../lock-unlock.mjs";
-import { isClassicThemeWithStyleBookSupport } from "./utils.mjs";
+import { isClassicThemeWithStyleBookSupport, isThemeDataLoaded } from "./utils.mjs";
 import { jsx } from "react/jsx-runtime";
 var { StyleBookPreview } = unlock(editorPrivateApis);
 var stylebookRoute = {
@@ -12,6 +12,9 @@ var stylebookRoute = {
   path: "/stylebook",
   areas: {
     sidebar({ siteData }) {
+      if (!isThemeDataLoaded(siteData)) {
+        return null;
+      }
       return isClassicThemeWithStyleBookSupport(siteData) ? /* @__PURE__ */ jsx(
         SidebarNavigationScreen,
         {
@@ -24,10 +27,22 @@ var stylebookRoute = {
       ) : /* @__PURE__ */ jsx(SidebarNavigationScreenUnsupported, {});
     },
     preview({ siteData }) {
-      return isClassicThemeWithStyleBookSupport(siteData) ? /* @__PURE__ */ jsx(StyleBookPreview, { isStatic: true }) : void 0;
+      return isClassicThemeWithStyleBookSupport(siteData) ? /* @__PURE__ */ jsx(
+        StyleBookPreview,
+        {
+          isStatic: true,
+          settings: siteData.editorSettings
+        }
+      ) : void 0;
     },
     mobile({ siteData }) {
-      return isClassicThemeWithStyleBookSupport(siteData) ? /* @__PURE__ */ jsx(StyleBookPreview, { isStatic: true }) : void 0;
+      return isClassicThemeWithStyleBookSupport(siteData) ? /* @__PURE__ */ jsx(
+        StyleBookPreview,
+        {
+          isStatic: true,
+          settings: siteData.editorSettings
+        }
+      ) : void 0;
     }
   }
 };

package/build-module/components/site-editor-routes/stylebook.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/components/site-editor-routes/stylebook.js"],
-  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\nimport { privateApis as editorPrivateApis } from '@wordpress/editor';\n\n/**\n * Internal dependencies\n */\nimport SidebarNavigationScreen from '../sidebar-navigation-screen';\nimport SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';\nimport { unlock } from '../../lock-unlock';\nimport { isClassicThemeWithStyleBookSupport } from './utils';\n\nconst { StyleBookPreview } = unlock( editorPrivateApis );\n\nexport const stylebookRoute = {\n\tname: 'stylebook',\n\tpath: '/stylebook',\n\tareas: {\n\t\tsidebar( { siteData } ) {\n\t\t\treturn isClassicThemeWithStyleBookSupport( siteData ) ? (\n\t\t\t\t<SidebarNavigationScreen\n\t\t\t\t\ttitle={ __( 'Styles' ) }\n\t\t\t\t\tbackPath=\"/\"\n\t\t\t\t\tdescription={ __(\n\t\t\t\t\t\t`Preview your website's visual identity: colors, typography, and blocks.`\n\t\t\t\t\t) }\n\t\t\t\t/>\n\t\t\t) : (\n\t\t\t\t<SidebarNavigationScreenUnsupported />\n\t\t\t);\n\t\t},\n\t\tpreview( { siteData } ) {\n\t\t\treturn isClassicThemeWithStyleBookSupport( siteData ) ? (\n\t\t\t\t<StyleBookPreview isStatic />\n\t\t\t) : undefined;\n\t\t},\n\t\tmobile( { siteData } ) {\n\t\t\treturn isClassicThemeWithStyleBookSupport( siteData ) ? (\n\t\t\t\t<StyleBookPreview isStatic />\n\t\t\t) : undefined;\n\t\t},\n\t},\n};\n"],
-  "mappings": ";AAGA,SAAS,UAAU;AACnB,SAAS,eAAe,yBAAyB;AAKjD,OAAO,6BAA6B;AACpC,OAAO,wCAAwC;AAC/C,SAAS,cAAc;AACvB,SAAS,0CAA0C;AAU/C;AARJ,IAAM,EAAE,iBAAiB,IAAI,OAAQ,iBAAkB;AAEhD,IAAM,iBAAiB;AAAA,EAC7B,MAAM;AAAA,EACN,MAAM;AAAA,EACN,OAAO;AAAA,IACN,QAAS,EAAE,SAAS,GAAI;AACvB,aAAO,mCAAoC,QAAS,IACnD;AAAA,QAAC;AAAA;AAAA,UACA,OAAQ,GAAI,QAAS;AAAA,UACrB,UAAS;AAAA,UACT,aAAc;AAAA,YACb;AAAA,UACD;AAAA;AAAA,MACD,IAEA,oBAAC,sCAAmC;AAAA,IAEtC;AAAA,IACA,QAAS,EAAE,SAAS,GAAI;AACvB,aAAO,mCAAoC,QAAS,IACnD,oBAAC,oBAAiB,UAAQ,MAAC,IACxB;AAAA,IACL;AAAA,IACA,OAAQ,EAAE,SAAS,GAAI;AACtB,aAAO,mCAAoC,QAAS,IACnD,oBAAC,oBAAiB,UAAQ,MAAC,IACxB;AAAA,IACL;AAAA,EACD;AACD;",
+  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\nimport { privateApis as editorPrivateApis } from '@wordpress/editor';\n\n/**\n * Internal dependencies\n */\nimport SidebarNavigationScreen from '../sidebar-navigation-screen';\nimport SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';\nimport { unlock } from '../../lock-unlock';\nimport { isClassicThemeWithStyleBookSupport, isThemeDataLoaded } from './utils';\n\nconst { StyleBookPreview } = unlock( editorPrivateApis );\n\nexport const stylebookRoute = {\n\tname: 'stylebook',\n\tpath: '/stylebook',\n\tareas: {\n\t\tsidebar( { siteData } ) {\n\t\t\tif ( ! isThemeDataLoaded( siteData ) ) {\n\t\t\t\treturn null;\n\t\t\t}\n\t\t\treturn isClassicThemeWithStyleBookSupport( siteData ) ? (\n\t\t\t\t<SidebarNavigationScreen\n\t\t\t\t\ttitle={ __( 'Styles' ) }\n\t\t\t\t\tbackPath=\"/\"\n\t\t\t\t\tdescription={ __(\n\t\t\t\t\t\t`Preview your website's visual identity: colors, typography, and blocks.`\n\t\t\t\t\t) }\n\t\t\t\t/>\n\t\t\t) : (\n\t\t\t\t<SidebarNavigationScreenUnsupported />\n\t\t\t);\n\t\t},\n\t\tpreview( { siteData } ) {\n\t\t\treturn isClassicThemeWithStyleBookSupport( siteData ) ? (\n\t\t\t\t<StyleBookPreview\n\t\t\t\t\tisStatic\n\t\t\t\t\tsettings={ siteData.editorSettings }\n\t\t\t\t/>\n\t\t\t) : undefined;\n\t\t},\n\t\tmobile( { siteData } ) {\n\t\t\treturn isClassicThemeWithStyleBookSupport( siteData ) ? (\n\t\t\t\t<StyleBookPreview\n\t\t\t\t\tisStatic\n\t\t\t\t\tsettings={ siteData.editorSettings }\n\t\t\t\t/>\n\t\t\t) : undefined;\n\t\t},\n\t},\n};\n"],
+  "mappings": ";AAGA,SAAS,UAAU;AACnB,SAAS,eAAe,yBAAyB;AAKjD,OAAO,6BAA6B;AACpC,OAAO,wCAAwC;AAC/C,SAAS,cAAc;AACvB,SAAS,oCAAoC,yBAAyB;AAalE;AAXJ,IAAM,EAAE,iBAAiB,IAAI,OAAQ,iBAAkB;AAEhD,IAAM,iBAAiB;AAAA,EAC7B,MAAM;AAAA,EACN,MAAM;AAAA,EACN,OAAO;AAAA,IACN,QAAS,EAAE,SAAS,GAAI;AACvB,UAAK,CAAE,kBAAmB,QAAS,GAAI;AACtC,eAAO;AAAA,MACR;AACA,aAAO,mCAAoC,QAAS,IACnD;AAAA,QAAC;AAAA;AAAA,UACA,OAAQ,GAAI,QAAS;AAAA,UACrB,UAAS;AAAA,UACT,aAAc;AAAA,YACb;AAAA,UACD;AAAA;AAAA,MACD,IAEA,oBAAC,sCAAmC;AAAA,IAEtC;AAAA,IACA,QAAS,EAAE,SAAS,GAAI;AACvB,aAAO,mCAAoC,QAAS,IACnD;AAAA,QAAC;AAAA;AAAA,UACA,UAAQ;AAAA,UACR,UAAW,SAAS;AAAA;AAAA,MACrB,IACG;AAAA,IACL;AAAA,IACA,OAAQ,EAAE,SAAS,GAAI;AACtB,aAAO,mCAAoC,QAAS,IACnD;AAAA,QAAC;AAAA;AAAA,UACA,UAAQ;AAAA,UACR,UAAW,SAAS;AAAA;AAAA,MACrB,IACG;AAAA,IACL;AAAA,EACD;AACD;",
   "names": []
 }

package/build-module/components/site-editor-routes/template-item.mjs

@@ -2,19 +2,26 @@
 import Editor from "../editor/index.mjs";
 import SidebarNavigationScreenTemplatesBrowse from "../sidebar-navigation-screen-templates-browse/index.mjs";
 import SidebarNavigationScreenUnsupported from "../sidebar-navigation-screen-unsupported/index.mjs";
-import { jsx } from "react/jsx-runtime";
+import { isThemeDataLoaded } from "./utils.mjs";
+import { Fragment, jsx } from "react/jsx-runtime";
 var areas = {
   sidebar({ siteData }) {
-    const isBlockTheme = siteData.currentTheme?.is_block_theme;
-    return isBlockTheme ? /* @__PURE__ */ jsx(SidebarNavigationScreenTemplatesBrowse, { backPath: "/" }) : /* @__PURE__ */ jsx(SidebarNavigationScreenUnsupported, {});
+    if (!isThemeDataLoaded(siteData)) {
+      return null;
+    }
+    return siteData.currentTheme.is_block_theme ? /* @__PURE__ */ jsx(SidebarNavigationScreenTemplatesBrowse, { backPath: "/" }) : /* @__PURE__ */ jsx(SidebarNavigationScreenUnsupported, {});
   },
   mobile({ siteData }) {
-    const isBlockTheme = siteData.currentTheme?.is_block_theme;
-    return isBlockTheme ? /* @__PURE__ */ jsx(Editor, {}) : /* @__PURE__ */ jsx(SidebarNavigationScreenUnsupported, {});
+    if (!isThemeDataLoaded(siteData)) {
+      return /* @__PURE__ */ jsx(Fragment, {});
+    }
+    return siteData.currentTheme.is_block_theme ? /* @__PURE__ */ jsx(Editor, {}) : /* @__PURE__ */ jsx(SidebarNavigationScreenUnsupported, {});
   },
   preview({ siteData }) {
-    const isBlockTheme = siteData.currentTheme?.is_block_theme;
-    return isBlockTheme ? /* @__PURE__ */ jsx(Editor, {}) : /* @__PURE__ */ jsx(SidebarNavigationScreenUnsupported, {});
+    if (!isThemeDataLoaded(siteData)) {
+      return null;
+    }
+    return siteData.currentTheme.is_block_theme ? /* @__PURE__ */ jsx(Editor, {}) : /* @__PURE__ */ jsx(SidebarNavigationScreenUnsupported, {});
   }
 };
 var templateItemRoute = {

package/build-module/components/site-editor-routes/template-item.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/components/site-editor-routes/template-item.js"],
-  "sourcesContent": ["/**\n * Internal dependencies\n */\nimport Editor from '../editor';\nimport SidebarNavigationScreenTemplatesBrowse from '../sidebar-navigation-screen-templates-browse';\nimport SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';\n\nconst areas = {\n\tsidebar( { siteData } ) {\n\t\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\t\treturn isBlockTheme ? (\n\t\t\t<SidebarNavigationScreenTemplatesBrowse backPath=\"/\" />\n\t\t) : (\n\t\t\t<SidebarNavigationScreenUnsupported />\n\t\t);\n\t},\n\tmobile( { siteData } ) {\n\t\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\t\treturn isBlockTheme ? (\n\t\t\t<Editor />\n\t\t) : (\n\t\t\t<SidebarNavigationScreenUnsupported />\n\t\t);\n\t},\n\tpreview( { siteData } ) {\n\t\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\t\treturn isBlockTheme ? (\n\t\t\t<Editor />\n\t\t) : (\n\t\t\t<SidebarNavigationScreenUnsupported />\n\t\t);\n\t},\n};\n\nexport const templateItemRoute = {\n\tname: 'template-item',\n\tpath: '/wp_template/*postId',\n\tareas,\n};\n"],
-  "mappings": ";AAGA,OAAO,YAAY;AACnB,OAAO,4CAA4C;AACnD,OAAO,wCAAwC;AAM5C;AAJH,IAAM,QAAQ;AAAA,EACb,QAAS,EAAE,SAAS,GAAI;AACvB,UAAM,eAAe,SAAS,cAAc;AAC5C,WAAO,eACN,oBAAC,0CAAuC,UAAS,KAAI,IAErD,oBAAC,sCAAmC;AAAA,EAEtC;AAAA,EACA,OAAQ,EAAE,SAAS,GAAI;AACtB,UAAM,eAAe,SAAS,cAAc;AAC5C,WAAO,eACN,oBAAC,UAAO,IAER,oBAAC,sCAAmC;AAAA,EAEtC;AAAA,EACA,QAAS,EAAE,SAAS,GAAI;AACvB,UAAM,eAAe,SAAS,cAAc;AAC5C,WAAO,eACN,oBAAC,UAAO,IAER,oBAAC,sCAAmC;AAAA,EAEtC;AACD;AAEO,IAAM,oBAAoB;AAAA,EAChC,MAAM;AAAA,EACN,MAAM;AAAA,EACN;AACD;",
+  "sourcesContent": ["/**\n * Internal dependencies\n */\nimport Editor from '../editor';\nimport SidebarNavigationScreenTemplatesBrowse from '../sidebar-navigation-screen-templates-browse';\nimport SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';\nimport { isThemeDataLoaded } from './utils';\n\nconst areas = {\n\tsidebar( { siteData } ) {\n\t\tif ( ! isThemeDataLoaded( siteData ) ) {\n\t\t\treturn null;\n\t\t}\n\t\treturn siteData.currentTheme.is_block_theme ? (\n\t\t\t<SidebarNavigationScreenTemplatesBrowse backPath=\"/\" />\n\t\t) : (\n\t\t\t<SidebarNavigationScreenUnsupported />\n\t\t);\n\t},\n\tmobile( { siteData } ) {\n\t\tif ( ! isThemeDataLoaded( siteData ) ) {\n\t\t\treturn <></>;\n\t\t}\n\t\treturn siteData.currentTheme.is_block_theme ? (\n\t\t\t<Editor />\n\t\t) : (\n\t\t\t<SidebarNavigationScreenUnsupported />\n\t\t);\n\t},\n\tpreview( { siteData } ) {\n\t\tif ( ! isThemeDataLoaded( siteData ) ) {\n\t\t\treturn null;\n\t\t}\n\t\treturn siteData.currentTheme.is_block_theme ? (\n\t\t\t<Editor />\n\t\t) : (\n\t\t\t<SidebarNavigationScreenUnsupported />\n\t\t);\n\t},\n};\n\nexport const templateItemRoute = {\n\tname: 'template-item',\n\tpath: '/wp_template/*postId',\n\tareas,\n};\n"],
+  "mappings": ";AAGA,OAAO,YAAY;AACnB,OAAO,4CAA4C;AACnD,OAAO,wCAAwC;AAC/C,SAAS,yBAAyB;AAQ/B,SAOO,UAPP;AANH,IAAM,QAAQ;AAAA,EACb,QAAS,EAAE,SAAS,GAAI;AACvB,QAAK,CAAE,kBAAmB,QAAS,GAAI;AACtC,aAAO;AAAA,IACR;AACA,WAAO,SAAS,aAAa,iBAC5B,oBAAC,0CAAuC,UAAS,KAAI,IAErD,oBAAC,sCAAmC;AAAA,EAEtC;AAAA,EACA,OAAQ,EAAE,SAAS,GAAI;AACtB,QAAK,CAAE,kBAAmB,QAAS,GAAI;AACtC,aAAO,gCAAE;AAAA,IACV;AACA,WAAO,SAAS,aAAa,iBAC5B,oBAAC,UAAO,IAER,oBAAC,sCAAmC;AAAA,EAEtC;AAAA,EACA,QAAS,EAAE,SAAS,GAAI;AACvB,QAAK,CAAE,kBAAmB,QAAS,GAAI;AACtC,aAAO;AAAA,IACR;AACA,WAAO,SAAS,aAAa,iBAC5B,oBAAC,UAAO,IAER,oBAAC,sCAAmC;AAAA,EAEtC;AACD;AAEO,IAAM,oBAAoB;AAAA,EAChC,MAAM;AAAA,EACN,MAAM;AAAA,EACN;AACD;",
   "names": []
 }

package/build-module/components/site-editor-routes/templates.mjs

@@ -1,23 +1,29 @@
 // packages/edit-site/src/components/site-editor-routes/templates.js
+import { resolveSelect } from "@wordpress/data";
+import { store as coreStore } from "@wordpress/core-data";
 import { loadView } from "@wordpress/views";
 import Editor from "../editor/index.mjs";
 import SidebarNavigationScreenTemplatesBrowse from "../sidebar-navigation-screen-templates-browse/index.mjs";
 import SidebarNavigationScreenUnsupported from "../sidebar-navigation-screen-unsupported/index.mjs";
 import PageTemplates from "../page-templates/index.mjs";
 import PageTemplatesLegacy from "../page-templates/index-legacy.mjs";
-import {
-  DEFAULT_VIEW,
-  getActiveViewOverridesForTab
-} from "../page-templates/view-utils.mjs";
-import { jsx } from "react/jsx-runtime";
+import { unlock } from "../../lock-unlock.mjs";
+import { isThemeDataLoaded } from "./utils.mjs";
+import { Fragment, jsx } from "react/jsx-runtime";
 async function isTemplateListView(query) {
   const { activeView = "active" } = query;
+  const config = await unlock(resolveSelect(coreStore)).getViewConfig(
+    "postType",
+    "wp_template"
+  );
+  const defaultView = config?.default_view;
+  const activeViewOverrides = config?.view_list?.find((v) => v.slug === activeView)?.view ?? {};
   const view = await loadView({
     kind: "postType",
     name: "wp_template",
     slug: "default",
-    defaultView: DEFAULT_VIEW,
-    activeViewOverrides: getActiveViewOverridesForTab(activeView)
+    defaultView,
+    activeViewOverrides
   });
   return view.type === "list";
 }
@@ -26,8 +32,10 @@ var templatesRoute = {
   path: "/template",
   areas: {
     sidebar({ siteData }) {
-      const isBlockTheme = siteData.currentTheme?.is_block_theme;
-      return isBlockTheme ? /* @__PURE__ */ jsx(SidebarNavigationScreenTemplatesBrowse, { backPath: "/" }) : /* @__PURE__ */ jsx(SidebarNavigationScreenUnsupported, {});
+      if (!isThemeDataLoaded(siteData)) {
+        return null;
+      }
+      return siteData.currentTheme.is_block_theme ? /* @__PURE__ */ jsx(SidebarNavigationScreenTemplatesBrowse, { backPath: "/" }) : /* @__PURE__ */ jsx(SidebarNavigationScreenUnsupported, {});
     },
     content({ siteData }) {
       const isBlockTheme = siteData.currentTheme?.is_block_theme;
@@ -45,8 +53,10 @@ var templatesRoute = {
       return isListView ? /* @__PURE__ */ jsx(Editor, {}) : void 0;
     },
     mobile({ siteData }) {
-      const isBlockTheme = siteData.currentTheme?.is_block_theme;
-      if (!isBlockTheme) {
+      if (!isThemeDataLoaded(siteData)) {
+        return /* @__PURE__ */ jsx(Fragment, {});
+      }
+      if (!siteData.currentTheme.is_block_theme) {
         return /* @__PURE__ */ jsx(SidebarNavigationScreenUnsupported, {});
       }
       const isTemplateActivateEnabled = typeof window !== "undefined" && window.__experimentalTemplateActivate;

package/build-module/components/site-editor-routes/templates.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/components/site-editor-routes/templates.js"],
-  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { loadView } from '@wordpress/views';\n\n/**\n * Internal dependencies\n */\nimport Editor from '../editor';\nimport SidebarNavigationScreenTemplatesBrowse from '../sidebar-navigation-screen-templates-browse';\nimport SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';\nimport PageTemplates from '../page-templates';\nimport PageTemplatesLegacy from '../page-templates/index-legacy';\nimport {\n\tDEFAULT_VIEW,\n\tgetActiveViewOverridesForTab,\n} from '../page-templates/view-utils';\n\nasync function isTemplateListView( query ) {\n\tconst { activeView = 'active' } = query;\n\tconst view = await loadView( {\n\t\tkind: 'postType',\n\t\tname: 'wp_template',\n\t\tslug: 'default',\n\t\tdefaultView: DEFAULT_VIEW,\n\t\tactiveViewOverrides: getActiveViewOverridesForTab( activeView ),\n\t} );\n\treturn view.type === 'list';\n}\n\nexport const templatesRoute = {\n\tname: 'templates',\n\tpath: '/template',\n\tareas: {\n\t\tsidebar( { siteData } ) {\n\t\t\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\t\t\treturn isBlockTheme ? (\n\t\t\t\t<SidebarNavigationScreenTemplatesBrowse backPath=\"/\" />\n\t\t\t) : (\n\t\t\t\t<SidebarNavigationScreenUnsupported />\n\t\t\t);\n\t\t},\n\t\tcontent( { siteData } ) {\n\t\t\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\t\t\tif ( ! isBlockTheme ) {\n\t\t\t\treturn undefined;\n\t\t\t}\n\t\t\t// Use the new template activation system if experiment is enabled,\n\t\t\t// otherwise use the legacy simple template list.\n\t\t\treturn window?.__experimentalTemplateActivate ? (\n\t\t\t\t<PageTemplates />\n\t\t\t) : (\n\t\t\t\t<PageTemplatesLegacy />\n\t\t\t);\n\t\t},\n\t\tasync preview( { query, siteData } ) {\n\t\t\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\t\t\tif ( ! isBlockTheme ) {\n\t\t\t\treturn undefined;\n\t\t\t}\n\t\t\tconst isListView = await isTemplateListView( query );\n\t\t\treturn isListView ? <Editor /> : undefined;\n\t\t},\n\t\tmobile( { siteData } ) {\n\t\t\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\t\t\tif ( ! isBlockTheme ) {\n\t\t\t\treturn <SidebarNavigationScreenUnsupported />;\n\t\t\t}\n\t\t\t// Check if the template activation experiment is enabled.\n\t\t\tconst isTemplateActivateEnabled =\n\t\t\t\ttypeof window !== 'undefined' &&\n\t\t\t\twindow.__experimentalTemplateActivate;\n\t\t\t// Use the new template activation system if experiment is enabled,\n\t\t\t// otherwise use the legacy simple template list.\n\t\t\treturn isTemplateActivateEnabled ? (\n\t\t\t\t<PageTemplates />\n\t\t\t) : (\n\t\t\t\t<PageTemplatesLegacy />\n\t\t\t);\n\t\t},\n\t},\n\twidths: {\n\t\tasync content( { query } ) {\n\t\t\tconst isListView = await isTemplateListView( query );\n\t\t\treturn isListView ? 380 : undefined;\n\t\t},\n\t},\n};\n"],
-  "mappings": ";AAGA,SAAS,gBAAgB;AAKzB,OAAO,YAAY;AACnB,OAAO,4CAA4C;AACnD,OAAO,wCAAwC;AAC/C,OAAO,mBAAmB;AAC1B,OAAO,yBAAyB;AAChC;AAAA,EACC;AAAA,EACA;AAAA,OACM;AAqBH;AAnBJ,eAAe,mBAAoB,OAAQ;AAC1C,QAAM,EAAE,aAAa,SAAS,IAAI;AAClC,QAAM,OAAO,MAAM,SAAU;AAAA,IAC5B,MAAM;AAAA,IACN,MAAM;AAAA,IACN,MAAM;AAAA,IACN,aAAa;AAAA,IACb,qBAAqB,6BAA8B,UAAW;AAAA,EAC/D,CAAE;AACF,SAAO,KAAK,SAAS;AACtB;AAEO,IAAM,iBAAiB;AAAA,EAC7B,MAAM;AAAA,EACN,MAAM;AAAA,EACN,OAAO;AAAA,IACN,QAAS,EAAE,SAAS,GAAI;AACvB,YAAM,eAAe,SAAS,cAAc;AAC5C,aAAO,eACN,oBAAC,0CAAuC,UAAS,KAAI,IAErD,oBAAC,sCAAmC;AAAA,IAEtC;AAAA,IACA,QAAS,EAAE,SAAS,GAAI;AACvB,YAAM,eAAe,SAAS,cAAc;AAC5C,UAAK,CAAE,cAAe;AACrB,eAAO;AAAA,MACR;AAGA,aAAO,QAAQ,iCACd,oBAAC,iBAAc,IAEf,oBAAC,uBAAoB;AAAA,IAEvB;AAAA,IACA,MAAM,QAAS,EAAE,OAAO,SAAS,GAAI;AACpC,YAAM,eAAe,SAAS,cAAc;AAC5C,UAAK,CAAE,cAAe;AACrB,eAAO;AAAA,MACR;AACA,YAAM,aAAa,MAAM,mBAAoB,KAAM;AACnD,aAAO,aAAa,oBAAC,UAAO,IAAK;AAAA,IAClC;AAAA,IACA,OAAQ,EAAE,SAAS,GAAI;AACtB,YAAM,eAAe,SAAS,cAAc;AAC5C,UAAK,CAAE,cAAe;AACrB,eAAO,oBAAC,sCAAmC;AAAA,MAC5C;AAEA,YAAM,4BACL,OAAO,WAAW,eAClB,OAAO;AAGR,aAAO,4BACN,oBAAC,iBAAc,IAEf,oBAAC,uBAAoB;AAAA,IAEvB;AAAA,EACD;AAAA,EACA,QAAQ;AAAA,IACP,MAAM,QAAS,EAAE,MAAM,GAAI;AAC1B,YAAM,aAAa,MAAM,mBAAoB,KAAM;AACnD,aAAO,aAAa,MAAM;AAAA,IAC3B;AAAA,EACD;AACD;",
+  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { resolveSelect } from '@wordpress/data';\nimport { store as coreStore } from '@wordpress/core-data';\nimport { loadView } from '@wordpress/views';\n\n/**\n * Internal dependencies\n */\nimport Editor from '../editor';\nimport SidebarNavigationScreenTemplatesBrowse from '../sidebar-navigation-screen-templates-browse';\nimport SidebarNavigationScreenUnsupported from '../sidebar-navigation-screen-unsupported';\nimport PageTemplates from '../page-templates';\nimport PageTemplatesLegacy from '../page-templates/index-legacy';\nimport { unlock } from '../../lock-unlock';\nimport { isThemeDataLoaded } from './utils';\n\nasync function isTemplateListView( query ) {\n\tconst { activeView = 'active' } = query;\n\tconst config = await unlock( resolveSelect( coreStore ) ).getViewConfig(\n\t\t'postType',\n\t\t'wp_template'\n\t);\n\tconst defaultView = config?.default_view;\n\tconst activeViewOverrides =\n\t\tconfig?.view_list?.find( ( v ) => v.slug === activeView )?.view ?? {};\n\tconst view = await loadView( {\n\t\tkind: 'postType',\n\t\tname: 'wp_template',\n\t\tslug: 'default',\n\t\tdefaultView,\n\t\tactiveViewOverrides,\n\t} );\n\treturn view.type === 'list';\n}\n\nexport const templatesRoute = {\n\tname: 'templates',\n\tpath: '/template',\n\tareas: {\n\t\tsidebar( { siteData } ) {\n\t\t\tif ( ! isThemeDataLoaded( siteData ) ) {\n\t\t\t\treturn null;\n\t\t\t}\n\t\t\treturn siteData.currentTheme.is_block_theme ? (\n\t\t\t\t<SidebarNavigationScreenTemplatesBrowse backPath=\"/\" />\n\t\t\t) : (\n\t\t\t\t<SidebarNavigationScreenUnsupported />\n\t\t\t);\n\t\t},\n\t\tcontent( { siteData } ) {\n\t\t\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\t\t\tif ( ! isBlockTheme ) {\n\t\t\t\treturn undefined;\n\t\t\t}\n\t\t\t// Use the new template activation system if experiment is enabled,\n\t\t\t// otherwise use the legacy simple template list.\n\t\t\treturn window?.__experimentalTemplateActivate ? (\n\t\t\t\t<PageTemplates />\n\t\t\t) : (\n\t\t\t\t<PageTemplatesLegacy />\n\t\t\t);\n\t\t},\n\t\tasync preview( { query, siteData } ) {\n\t\t\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\t\t\tif ( ! isBlockTheme ) {\n\t\t\t\treturn undefined;\n\t\t\t}\n\t\t\tconst isListView = await isTemplateListView( query );\n\t\t\treturn isListView ? <Editor /> : undefined;\n\t\t},\n\t\tmobile( { siteData } ) {\n\t\t\tif ( ! isThemeDataLoaded( siteData ) ) {\n\t\t\t\treturn <></>;\n\t\t\t}\n\t\t\tif ( ! siteData.currentTheme.is_block_theme ) {\n\t\t\t\treturn <SidebarNavigationScreenUnsupported />;\n\t\t\t}\n\t\t\t// Check if the template activation experiment is enabled.\n\t\t\tconst isTemplateActivateEnabled =\n\t\t\t\ttypeof window !== 'undefined' &&\n\t\t\t\twindow.__experimentalTemplateActivate;\n\t\t\t// Use the new template activation system if experiment is enabled,\n\t\t\t// otherwise use the legacy simple template list.\n\t\t\treturn isTemplateActivateEnabled ? (\n\t\t\t\t<PageTemplates />\n\t\t\t) : (\n\t\t\t\t<PageTemplatesLegacy />\n\t\t\t);\n\t\t},\n\t},\n\twidths: {\n\t\tasync content( { query } ) {\n\t\t\tconst isListView = await isTemplateListView( query );\n\t\t\treturn isListView ? 380 : undefined;\n\t\t},\n\t},\n};\n"],
+  "mappings": ";AAGA,SAAS,qBAAqB;AAC9B,SAAS,SAAS,iBAAiB;AACnC,SAAS,gBAAgB;AAKzB,OAAO,YAAY;AACnB,OAAO,4CAA4C;AACnD,OAAO,wCAAwC;AAC/C,OAAO,mBAAmB;AAC1B,OAAO,yBAAyB;AAChC,SAAS,cAAc;AACvB,SAAS,yBAAyB;AA8B9B,SA4BO,UA5BP;AA5BJ,eAAe,mBAAoB,OAAQ;AAC1C,QAAM,EAAE,aAAa,SAAS,IAAI;AAClC,QAAM,SAAS,MAAM,OAAQ,cAAe,SAAU,CAAE,EAAE;AAAA,IACzD;AAAA,IACA;AAAA,EACD;AACA,QAAM,cAAc,QAAQ;AAC5B,QAAM,sBACL,QAAQ,WAAW,KAAM,CAAE,MAAO,EAAE,SAAS,UAAW,GAAG,QAAQ,CAAC;AACrE,QAAM,OAAO,MAAM,SAAU;AAAA,IAC5B,MAAM;AAAA,IACN,MAAM;AAAA,IACN,MAAM;AAAA,IACN;AAAA,IACA;AAAA,EACD,CAAE;AACF,SAAO,KAAK,SAAS;AACtB;AAEO,IAAM,iBAAiB;AAAA,EAC7B,MAAM;AAAA,EACN,MAAM;AAAA,EACN,OAAO;AAAA,IACN,QAAS,EAAE,SAAS,GAAI;AACvB,UAAK,CAAE,kBAAmB,QAAS,GAAI;AACtC,eAAO;AAAA,MACR;AACA,aAAO,SAAS,aAAa,iBAC5B,oBAAC,0CAAuC,UAAS,KAAI,IAErD,oBAAC,sCAAmC;AAAA,IAEtC;AAAA,IACA,QAAS,EAAE,SAAS,GAAI;AACvB,YAAM,eAAe,SAAS,cAAc;AAC5C,UAAK,CAAE,cAAe;AACrB,eAAO;AAAA,MACR;AAGA,aAAO,QAAQ,iCACd,oBAAC,iBAAc,IAEf,oBAAC,uBAAoB;AAAA,IAEvB;AAAA,IACA,MAAM,QAAS,EAAE,OAAO,SAAS,GAAI;AACpC,YAAM,eAAe,SAAS,cAAc;AAC5C,UAAK,CAAE,cAAe;AACrB,eAAO;AAAA,MACR;AACA,YAAM,aAAa,MAAM,mBAAoB,KAAM;AACnD,aAAO,aAAa,oBAAC,UAAO,IAAK;AAAA,IAClC;AAAA,IACA,OAAQ,EAAE,SAAS,GAAI;AACtB,UAAK,CAAE,kBAAmB,QAAS,GAAI;AACtC,eAAO,gCAAE;AAAA,MACV;AACA,UAAK,CAAE,SAAS,aAAa,gBAAiB;AAC7C,eAAO,oBAAC,sCAAmC;AAAA,MAC5C;AAEA,YAAM,4BACL,OAAO,WAAW,eAClB,OAAO;AAGR,aAAO,4BACN,oBAAC,iBAAc,IAEf,oBAAC,uBAAoB;AAAA,IAEvB;AAAA,EACD;AAAA,EACA,QAAQ;AAAA,IACP,MAAM,QAAS,EAAE,MAAM,GAAI;AAC1B,YAAM,aAAa,MAAM,mBAAoB,KAAM;AACnD,aAAO,aAAa,MAAM;AAAA,IAC3B;AAAA,EACD;AACD;",
   "names": []
 }

package/build-module/components/site-editor-routes/utils.mjs

@@ -1,4 +1,7 @@
 // packages/edit-site/src/components/site-editor-routes/utils.js
+function isThemeDataLoaded(siteData) {
+  return siteData.currentTheme !== void 0 && siteData.currentTheme !== null;
+}
 function isClassicThemeWithStyleBookSupport(siteData) {
   const isBlockTheme = siteData.currentTheme?.is_block_theme;
   const supportsEditorStyles = siteData.currentTheme?.theme_supports["editor-styles"];
@@ -6,6 +9,7 @@ function isClassicThemeWithStyleBookSupport(siteData) {
   return !isBlockTheme && (supportsEditorStyles || hasThemeJson);
 }
 export {
-  isClassicThemeWithStyleBookSupport
+  isClassicThemeWithStyleBookSupport,
+  isThemeDataLoaded
 };
 //# sourceMappingURL=utils.mjs.map

package/build-module/components/site-editor-routes/utils.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/components/site-editor-routes/utils.js"],
-  "sourcesContent": ["/**\n * Check if the classic theme supports the stylebook.\n *\n * @param {Object} siteData - The site data provided by the site editor route area resolvers.\n * @return {boolean} True if the stylebook is supported, false otherwise.\n */\nexport function isClassicThemeWithStyleBookSupport( siteData ) {\n\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\tconst supportsEditorStyles =\n\t\tsiteData.currentTheme?.theme_supports[ 'editor-styles' ];\n\t// This is a temp solution until the has_theme_json value is available for the current theme.\n\tconst hasThemeJson = siteData.editorSettings?.supportsLayout;\n\treturn ! isBlockTheme && ( supportsEditorStyles || hasThemeJson );\n}\n"],
-  "mappings": ";AAMO,SAAS,mCAAoC,UAAW;AAC9D,QAAM,eAAe,SAAS,cAAc;AAC5C,QAAM,uBACL,SAAS,cAAc,eAAgB,eAAgB;AAExD,QAAM,eAAe,SAAS,gBAAgB;AAC9C,SAAO,CAAE,iBAAkB,wBAAwB;AACpD;",
+  "sourcesContent": ["/**\n * Check if the current theme data has been loaded from the REST API.\n *\n * @param {Object} siteData - The site data provided by the site editor route area resolvers.\n * @return {boolean} True if the theme data is available, false otherwise.\n */\nexport function isThemeDataLoaded( siteData ) {\n\treturn (\n\t\tsiteData.currentTheme !== undefined && siteData.currentTheme !== null\n\t);\n}\n\n/**\n * Check if the classic theme supports the stylebook.\n *\n * @param {Object} siteData - The site data provided by the site editor route area resolvers.\n * @return {boolean} True if the stylebook is supported, false otherwise.\n */\nexport function isClassicThemeWithStyleBookSupport( siteData ) {\n\tconst isBlockTheme = siteData.currentTheme?.is_block_theme;\n\tconst supportsEditorStyles =\n\t\tsiteData.currentTheme?.theme_supports[ 'editor-styles' ];\n\t// This is a temp solution until the has_theme_json value is available for the current theme.\n\tconst hasThemeJson = siteData.editorSettings?.supportsLayout;\n\treturn ! isBlockTheme && ( supportsEditorStyles || hasThemeJson );\n}\n"],
+  "mappings": ";AAMO,SAAS,kBAAmB,UAAW;AAC7C,SACC,SAAS,iBAAiB,UAAa,SAAS,iBAAiB;AAEnE;AAQO,SAAS,mCAAoC,UAAW;AAC9D,QAAM,eAAe,SAAS,cAAc;AAC5C,QAAM,uBACL,SAAS,cAAc,eAAgB,eAAgB;AAExD,QAAM,eAAe,SAAS,gBAAgB;AAC9C,SAAO,CAAE,iBAAkB,wBAAwB;AACpD;",
   "names": []
 }

package/build-style/style-rtl.css

@@ -464,13 +464,11 @@
   border-radius: 2px;
 }
 
-/**
- * When DataViews are placed within cards, apply a consistent top padding.
- */
-.components-card__body:has(> .dataviews-wrapper),
-.components-card__body:has(> .dataviews-picker-wrapper) {
-  padding: 8px 0 0;
-  overflow: hidden;
+.dataviews__view-actions--infinite-scroll {
+  position: sticky;
+  top: 0;
+  z-index: 2;
+  background-color: #fff;
 }
 
 .dataviews-bulk-actions-footer__item-count {
@@ -1304,45 +1302,55 @@
   outline: 2px solid transparent;
 }
 
-.dataviews-view-grid .dataviews-view-grid__card {
+.dataviews-view-grid .dataviews-view-grid__card,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__card {
   height: 100%;
   justify-content: flex-start;
   position: relative;
 }
 
-.dataviews-view-grid .dataviews-view-grid__card .dataviews-view-grid__title {
+.dataviews-view-grid .dataviews-view-grid__card .dataviews-view-grid__title,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__card .dataviews-view-grid__title {
   padding: 8px 0 4px;
 }
 
-.dataviews-view-grid .dataviews-view-grid__card .dataviews-view-grid__title-field {
+.dataviews-view-grid .dataviews-view-grid__card .dataviews-view-grid__title-field,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__card .dataviews-view-grid__title-field {
   min-height: 24px;
   overflow: hidden;
   align-content: center;
   text-align: start;
 }
 
-.dataviews-view-grid .dataviews-view-grid__card .dataviews-view-grid__title-field--clickable {
+.dataviews-view-grid .dataviews-view-grid__card .dataviews-view-grid__title-field--clickable,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__card .dataviews-view-grid__title-field--clickable {
   width: fit-content;
 }
 
-.dataviews-view-grid .dataviews-view-grid__card.is-selected .dataviews-view-grid__fields .dataviews-view-grid__field .dataviews-view-grid__field-value {
+.dataviews-view-grid .dataviews-view-grid__card.is-selected .dataviews-view-grid__fields .dataviews-view-grid__field .dataviews-view-grid__field-value,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__card.is-selected .dataviews-view-grid__fields .dataviews-view-grid__field .dataviews-view-grid__field-value {
   color: #1e1e1e;
 }
 
 .dataviews-view-grid .dataviews-view-grid__card.is-selected .dataviews-view-grid__media::after,
-.dataviews-view-grid .dataviews-view-grid__card .dataviews-view-grid__media:focus::after {
+.dataviews-view-grid .dataviews-view-grid__card .dataviews-view-grid__media:focus::after,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__card.is-selected .dataviews-view-grid__media::after,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__card .dataviews-view-grid__media:focus::after {
   background-color: rgba(var(--wp-admin-theme-color--rgb), 0.08);
 }
 
-.dataviews-view-grid .dataviews-view-grid__card.is-selected .dataviews-view-grid__media::after {
+.dataviews-view-grid .dataviews-view-grid__card.is-selected .dataviews-view-grid__media::after,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__card.is-selected .dataviews-view-grid__media::after {
   box-shadow: inset 0 0 0 1px var(--wp-admin-theme-color);
 }
 
-.dataviews-view-grid .dataviews-view-grid__card .dataviews-view-grid__media:focus::after {
+.dataviews-view-grid .dataviews-view-grid__card .dataviews-view-grid__media:focus::after,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__card .dataviews-view-grid__media:focus::after {
   box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
 }
 
-.dataviews-view-grid .dataviews-view-grid__media {
+.dataviews-view-grid .dataviews-view-grid__media,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__media {
   width: 100%;
   aspect-ratio: 1/1;
   background-color: #fff;
@@ -1351,17 +1359,20 @@
   position: relative;
 }
 
-.dataviews-view-grid .dataviews-view-grid__media.dataviews-view-grid__media--placeholder {
+.dataviews-view-grid .dataviews-view-grid__media.dataviews-view-grid__media--placeholder,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__media.dataviews-view-grid__media--placeholder {
   aspect-ratio: 3/1;
 }
 
-.dataviews-view-grid .dataviews-view-grid__media img {
+.dataviews-view-grid .dataviews-view-grid__media img,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__media img {
   object-fit: cover;
   width: 100%;
   height: 100%;
 }
 
-.dataviews-view-grid .dataviews-view-grid__media::after {
+.dataviews-view-grid .dataviews-view-grid__media::after,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__media::after {
   content: "";
   position: absolute;
   top: 0;
@@ -1373,7 +1384,8 @@
   pointer-events: none;
 }
 
-.dataviews-view-grid .dataviews-view-grid__media .dataviews-view-grid__media-placeholder {
+.dataviews-view-grid .dataviews-view-grid__media .dataviews-view-grid__media-placeholder,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__media .dataviews-view-grid__media-placeholder {
   width: 100%;
   height: 100%;
   display: block;
@@ -1382,28 +1394,33 @@
   background: #f0f0f0;
 }
 
-.dataviews-view-grid .dataviews-view-grid__fields {
+.dataviews-view-grid .dataviews-view-grid__fields,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__fields {
   position: relative;
   font-size: 12px;
   line-height: 16px;
 }
 
-.dataviews-view-grid .dataviews-view-grid__fields:not(:empty) {
+.dataviews-view-grid .dataviews-view-grid__fields:not(:empty),
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__fields:not(:empty) {
   padding: 0 0 12px;
 }
 
-.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field-value:not(:empty) {
+.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field-value:not(:empty),
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__fields .dataviews-view-grid__field-value:not(:empty) {
   min-height: 24px;
   line-height: 20px;
   padding-top: 2px;
 }
 
-.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field {
+.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__fields .dataviews-view-grid__field {
   min-height: 24px;
   align-items: center;
 }
 
-.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field .dataviews-view-grid__field-name {
+.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field .dataviews-view-grid__field-name,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__fields .dataviews-view-grid__field .dataviews-view-grid__field-name {
   width: 35%;
   color: #757575;
   overflow: hidden;
@@ -1411,28 +1428,33 @@
   white-space: nowrap;
 }
 
-.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field .dataviews-view-grid__field-value {
+.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field .dataviews-view-grid__field-value,
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__fields .dataviews-view-grid__field .dataviews-view-grid__field-value {
   width: 65%;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
 
-.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field:not(:has(.dataviews-view-grid__field-value:not(:empty))) {
+.dataviews-view-grid .dataviews-view-grid__fields .dataviews-view-grid__field:not(:has(.dataviews-view-grid__field-value:not(:empty))),
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__fields .dataviews-view-grid__field:not(:has(.dataviews-view-grid__field-value:not(:empty))) {
   display: none;
 }
 
-.dataviews-view-grid .dataviews-view-grid__badge-fields:not(:empty) {
+.dataviews-view-grid .dataviews-view-grid__badge-fields:not(:empty),
+.dataviews-view-grid-infinite-scroll .dataviews-view-grid__badge-fields:not(:empty) {
   padding-bottom: 12px;
 }
 
-.dataviews-view-grid.is-refreshing {
+.dataviews-view-grid.is-refreshing,
+.dataviews-view-grid-infinite-scroll.is-refreshing {
   opacity: 0.5;
   pointer-events: none;
 }
 
 @media not (prefers-reduced-motion) {
-  .dataviews-view-grid.is-refreshing {
+  .dataviews-view-grid.is-refreshing,
+  .dataviews-view-grid-infinite-scroll.is-refreshing {
     opacity: 1;
     animation: dataviews-pulse 1s ease-in-out infinite;
   }
@@ -2308,7 +2330,7 @@ div.dataviews-view-list {
 
 .dataviews-view-activity {
   margin: 0 0 auto;
-  padding: 8px 24px;
+  padding: 0 24px;
 }
 
 .dataviews-view-activity .dataviews-view-activity__group-header {
@@ -2405,7 +2427,7 @@ div.dataviews-view-list {
 }
 
 .dataviews-view-activity .dataviews-view-activity__item.is-compact .dataviews-view-activity__item-type {
-  width: 8px;
+  width: 12px;
 }
 
 .dataviews-view-activity .dataviews-view-activity__item.is-compact .dataviews-view-activity__item-type::before {
@@ -2755,17 +2777,18 @@ div.dataviews-view-list {
   align-items: center;
 }
 
-.dataforms-layouts-card__field-header-label {
-  font-family: -apple-system, "system-ui", "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
-  font-weight: 499;
-  font-size: 15px;
-  line-height: 20px;
-}
-
 .dataforms-layouts-card__field {
   width: 100%;
 }
 
+.dataforms-layouts-card__field-header-content {
+  min-height: 24px;
+}
+
+.dataforms-layouts-card__field-header-content-description {
+  display: contents;
+}
+
 .dataforms-layouts-card__field-description {
   color: #757575;
   display: block;
@@ -3002,6 +3025,11 @@ fieldset.fields__media-edit .components-base-control__label {
   color: #1e1e1e;
 }
 
+fieldset.fields__media-edit .fields__media-edit-description {
+  font-size: 12px;
+  line-height: 1.5;
+}
+
 fieldset.fields__media-edit {
   /* stylelint-disable-next-line property-no-unknown -- '@container' not globally permitted */
   container-type: inline-size;
@@ -3858,6 +3886,7 @@ button.font-library__upload-area {
   background: #fff;
   padding: 12px;
   border-top: 1px solid #ddd;
+  box-sizing: border-box;
 }
 
 .global-styles-ui-variations_item {
@@ -5216,18 +5245,6 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   margin-left: -16px;
 }
 
-.edit-site-sidebar-dataviews-dataview-item {
-  border-radius: 2px;
-}
-.edit-site-sidebar-dataviews-dataview-item:hover, .edit-site-sidebar-dataviews-dataview-item:focus, .edit-site-sidebar-dataviews-dataview-item[aria-current] {
-  color: #e0e0e0;
-}
-.edit-site-sidebar-dataviews-dataview-item.is-selected {
-  background: #2f2f2f;
-  font-weight: 499;
-  color: #fff;
-}
-
 .edit-site-site-hub {
   display: flex;
   align-items: center;