@wordpress/edit-site 6.48.1 → 6.49.0

package/build-module/components/save-button/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/components/save-button/index.js"],
-  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { useSelect, useDispatch } from '@wordpress/data';\nimport { Button } from '@wordpress/components';\nimport { __, _n, sprintf } from '@wordpress/i18n';\nimport { store as coreStore } from '@wordpress/core-data';\nimport { displayShortcut } from '@wordpress/keycodes';\nimport { privateApis as routerPrivateApis } from '@wordpress/router';\nimport {\n\tuseEntitiesSavedStatesIsDirty,\n\tstore as editorStore,\n} from '@wordpress/editor';\n\n/**\n * Internal dependencies\n */\nimport { store as editSiteStore } from '../../store';\nimport {\n\tcurrentlyPreviewingTheme,\n\tisPreviewingTheme,\n} from '../../utils/is-previewing-theme';\nimport { unlock } from '../../lock-unlock';\n\nconst { useLocation } = unlock( routerPrivateApis );\n\nexport default function SaveButton( {\n\tclassName = 'edit-site-save-button__button',\n\tvariant = 'primary',\n\tshowTooltip = true,\n\tshowReviewMessage,\n\ticon,\n\tsize,\n\t__next40pxDefaultSize = false,\n} ) {\n\tconst { params } = useLocation();\n\tconst { setIsSaveViewOpened } = useDispatch( editSiteStore );\n\tconst { saveDirtyEntities } = unlock( useDispatch( editorStore ) );\n\tconst { dirtyEntityRecords } = useEntitiesSavedStatesIsDirty();\n\tconst { isSaving, isSaveViewOpen, previewingThemeName } = useSelect(\n\t\t( select ) => {\n\t\t\tconst { isSavingEntityRecord, isResolving } = select( coreStore );\n\t\t\tconst { isSaveViewOpened } = select( editSiteStore );\n\t\t\tconst isActivatingTheme = isResolving( 'activateTheme' );\n\t\t\tconst currentlyPreviewingThemeId = currentlyPreviewingTheme();\n\t\t\treturn {\n\t\t\t\tisSaving:\n\t\t\t\t\tdirtyEntityRecords.some( ( record ) =>\n\t\t\t\t\t\tisSavingEntityRecord(\n\t\t\t\t\t\t\trecord.kind,\n\t\t\t\t\t\t\trecord.name,\n\t\t\t\t\t\t\trecord.key\n\t\t\t\t\t\t)\n\t\t\t\t\t) || isActivatingTheme,\n\t\t\t\tisSaveViewOpen: isSaveViewOpened(),\n\t\t\t\t// Do not call `getTheme` with null, it will cause a request to\n\t\t\t\t// the server.\n\t\t\t\tpreviewingThemeName: currentlyPreviewingThemeId\n\t\t\t\t\t? select( coreStore ).getTheme( currentlyPreviewingThemeId )\n\t\t\t\t\t\t\t?.name?.rendered\n\t\t\t\t\t: undefined,\n\t\t\t};\n\t\t},\n\t\t[ dirtyEntityRecords ]\n\t);\n\tconst hasDirtyEntities = !! dirtyEntityRecords.length;\n\tlet isOnlyCurrentEntityDirty;\n\t// Check if the current entity is the only entity with changes.\n\t// We have some extra logic for `wp_global_styles` for now, that\n\t// is used in navigation sidebar.\n\tif ( dirtyEntityRecords.length === 1 ) {\n\t\tif ( params.postId ) {\n\t\t\tisOnlyCurrentEntityDirty =\n\t\t\t\t`${ dirtyEntityRecords[ 0 ].key }` === params.postId &&\n\t\t\t\tdirtyEntityRecords[ 0 ].name === params.postType;\n\t\t} else if ( params.path?.includes( 'wp_global_styles' ) ) {\n\t\t\tisOnlyCurrentEntityDirty =\n\t\t\t\tdirtyEntityRecords[ 0 ].name === 'globalStyles';\n\t\t}\n\t}\n\tconst disabled =\n\t\tisSaving || ( ! hasDirtyEntities && ! isPreviewingTheme() );\n\tconst getLabel = () => {\n\t\tif ( isPreviewingTheme() ) {\n\t\t\tif ( isSaving ) {\n\t\t\t\treturn sprintf(\n\t\t\t\t\t/* translators: %s: The name of theme to be activated. */\n\t\t\t\t\t__( 'Activating %s' ),\n\t\t\t\t\tpreviewingThemeName\n\t\t\t\t);\n\t\t\t} else if ( disabled ) {\n\t\t\t\treturn __( 'Saved' );\n\t\t\t} else if ( hasDirtyEntities ) {\n\t\t\t\treturn sprintf(\n\t\t\t\t\t/* translators: %s: The name of theme to be activated. */\n\t\t\t\t\t__( 'Activate %s & Save' ),\n\t\t\t\t\tpreviewingThemeName\n\t\t\t\t);\n\t\t\t}\n\t\t\treturn sprintf(\n\t\t\t\t/* translators: %s: The name of theme to be activated. */\n\t\t\t\t__( 'Activate %s' ),\n\t\t\t\tpreviewingThemeName\n\t\t\t);\n\t\t}\n\t\tif ( isSaving ) {\n\t\t\treturn __( 'Saving' );\n\t\t}\n\t\tif ( disabled ) {\n\t\t\treturn __( 'Saved' );\n\t\t}\n\t\tif ( ! isOnlyCurrentEntityDirty && showReviewMessage ) {\n\t\t\treturn sprintf(\n\t\t\t\t// translators: %d: number of unsaved changes (number).\n\t\t\t\t_n(\n\t\t\t\t\t'Review %d change\u2026',\n\t\t\t\t\t'Review %d changes\u2026',\n\t\t\t\t\tdirtyEntityRecords.length\n\t\t\t\t),\n\t\t\t\tdirtyEntityRecords.length\n\t\t\t);\n\t\t}\n\t\treturn __( 'Save' );\n\t};\n\tconst label = getLabel();\n\tconst onClick = isOnlyCurrentEntityDirty\n\t\t? () => saveDirtyEntities( { dirtyEntityRecords } )\n\t\t: () => setIsSaveViewOpened( true );\n\treturn (\n\t\t<Button\n\t\t\tvariant={ variant }\n\t\t\tclassName={ className }\n\t\t\taria-disabled={ disabled }\n\t\t\taria-expanded={ isSaveViewOpen }\n\t\t\tisBusy={ isSaving }\n\t\t\tonClick={ disabled ? undefined : onClick }\n\t\t\tlabel={ label }\n\t\t\t/*\n\t\t\t * We want the tooltip to show the keyboard shortcut only when the\n\t\t\t * button does something, i.e. when it's not disabled.\n\t\t\t */\n\t\t\tshortcut={ disabled ? undefined : displayShortcut.primary( 's' ) }\n\t\t\t/*\n\t\t\t * Displaying the keyboard shortcut conditionally makes the tooltip\n\t\t\t * itself show conditionally. This would trigger a full-rerendering\n\t\t\t * of the button that we want to avoid. By setting `showTooltip`,\n\t\t\t * the tooltip is always rendered even when there's no keyboard shortcut.\n\t\t\t */\n\t\t\tshowTooltip={ showTooltip }\n\t\t\ticon={ icon }\n\t\t\t__next40pxDefaultSize={ __next40pxDefaultSize }\n\t\t\tsize={ size }\n\t\t>\n\t\t\t{ label }\n\t\t</Button>\n\t);\n}\n"],
+  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { useSelect, useDispatch } from '@wordpress/data';\nimport { Button } from '@wordpress/components';\nimport { __, _n, sprintf } from '@wordpress/i18n';\nimport { store as coreStore } from '@wordpress/core-data';\nimport { displayShortcut } from '@wordpress/keycodes';\nimport { privateApis as routerPrivateApis } from '@wordpress/router';\nimport {\n\tuseEntitiesSavedStatesIsDirty,\n\tstore as editorStore,\n} from '@wordpress/editor';\n\n/**\n * Internal dependencies\n */\nimport { store as editSiteStore } from '../../store';\nimport {\n\tcurrentlyPreviewingTheme,\n\tisPreviewingTheme,\n} from '../../utils/is-previewing-theme';\nimport { unlock } from '../../lock-unlock';\n\nconst { useLocation } = unlock( routerPrivateApis );\n\nexport default function SaveButton( {\n\tclassName = 'edit-site-save-button__button',\n\tvariant = 'primary',\n\tshowTooltip = true,\n\tshowReviewMessage,\n\ticon,\n\tsize,\n\t__next40pxDefaultSize = false,\n} ) {\n\tconst { params } = useLocation();\n\tconst { setIsSaveViewOpened } = useDispatch( editSiteStore );\n\tconst { saveDirtyEntities } = unlock( useDispatch( editorStore ) );\n\tconst { dirtyEntityRecords } = useEntitiesSavedStatesIsDirty();\n\tconst { isSaving, isSaveViewOpen, previewingThemeName } = useSelect(\n\t\t( select ) => {\n\t\t\tconst { isSavingEntityRecord, isResolving } = select( coreStore );\n\t\t\tconst { isSaveViewOpened } = select( editSiteStore );\n\t\t\tconst isActivatingTheme = isResolving( 'activateTheme' );\n\t\t\tconst currentlyPreviewingThemeId = currentlyPreviewingTheme();\n\t\t\treturn {\n\t\t\t\tisSaving:\n\t\t\t\t\tdirtyEntityRecords.some( ( record ) =>\n\t\t\t\t\t\tisSavingEntityRecord(\n\t\t\t\t\t\t\trecord.kind,\n\t\t\t\t\t\t\trecord.name,\n\t\t\t\t\t\t\trecord.key\n\t\t\t\t\t\t)\n\t\t\t\t\t) || isActivatingTheme,\n\t\t\t\tisSaveViewOpen: isSaveViewOpened(),\n\t\t\t\t// Do not call `getTheme` with null, it will cause a request to\n\t\t\t\t// the server.\n\t\t\t\tpreviewingThemeName: currentlyPreviewingThemeId\n\t\t\t\t\t? select( coreStore ).getTheme( currentlyPreviewingThemeId )\n\t\t\t\t\t\t\t?.name?.rendered\n\t\t\t\t\t: undefined,\n\t\t\t};\n\t\t},\n\t\t[ dirtyEntityRecords ]\n\t);\n\tconst hasDirtyEntities = !! dirtyEntityRecords.length;\n\tlet isOnlyCurrentEntityDirty;\n\t// Check if the current entity is the only entity with changes.\n\t// We have some extra logic for `wp_global_styles` for now, that\n\t// is used in navigation sidebar.\n\tif ( dirtyEntityRecords.length === 1 ) {\n\t\tif ( params.postId ) {\n\t\t\tisOnlyCurrentEntityDirty =\n\t\t\t\t`${ dirtyEntityRecords[ 0 ].key }` === params.postId &&\n\t\t\t\tdirtyEntityRecords[ 0 ].name === params.postType;\n\t\t} else if ( params.path?.includes( 'wp_global_styles' ) ) {\n\t\t\tisOnlyCurrentEntityDirty =\n\t\t\t\tdirtyEntityRecords[ 0 ].name === 'globalStyles';\n\t\t}\n\t}\n\tconst disabled =\n\t\tisSaving || ( ! hasDirtyEntities && ! isPreviewingTheme() );\n\tconst getLabel = () => {\n\t\tif ( isPreviewingTheme() ) {\n\t\t\tif ( isSaving ) {\n\t\t\t\treturn sprintf(\n\t\t\t\t\t/* translators: %s: The name of theme to be activated. */\n\t\t\t\t\t__( 'Activating %s' ),\n\t\t\t\t\tpreviewingThemeName\n\t\t\t\t);\n\t\t\t} else if ( disabled ) {\n\t\t\t\treturn __( 'Saved' );\n\t\t\t} else if ( hasDirtyEntities ) {\n\t\t\t\treturn sprintf(\n\t\t\t\t\t/* translators: %s: The name of theme to be activated. */\n\t\t\t\t\t__( 'Activate %s & Save' ),\n\t\t\t\t\tpreviewingThemeName\n\t\t\t\t);\n\t\t\t}\n\t\t\treturn sprintf(\n\t\t\t\t/* translators: %s: The name of theme to be activated. */\n\t\t\t\t__( 'Activate %s' ),\n\t\t\t\tpreviewingThemeName\n\t\t\t);\n\t\t}\n\t\tif ( isSaving ) {\n\t\t\treturn __( 'Saving' );\n\t\t}\n\t\tif ( disabled ) {\n\t\t\treturn __( 'Saved' );\n\t\t}\n\t\tif ( ! isOnlyCurrentEntityDirty && showReviewMessage ) {\n\t\t\treturn sprintf(\n\t\t\t\t// translators: %d: number of unsaved changes (number).\n\t\t\t\t_n(\n\t\t\t\t\t'Review %d change…',\n\t\t\t\t\t'Review %d changes…',\n\t\t\t\t\tdirtyEntityRecords.length\n\t\t\t\t),\n\t\t\t\tdirtyEntityRecords.length\n\t\t\t);\n\t\t}\n\t\treturn __( 'Save' );\n\t};\n\tconst label = getLabel();\n\tconst onClick = isOnlyCurrentEntityDirty\n\t\t? () => saveDirtyEntities( { dirtyEntityRecords } )\n\t\t: () => setIsSaveViewOpened( true );\n\treturn (\n\t\t<Button\n\t\t\tvariant={ variant }\n\t\t\tclassName={ className }\n\t\t\taria-disabled={ disabled }\n\t\t\taria-expanded={ isSaveViewOpen }\n\t\t\tisBusy={ isSaving }\n\t\t\tonClick={ disabled ? undefined : onClick }\n\t\t\tlabel={ label }\n\t\t\t/*\n\t\t\t * We want the tooltip to show the keyboard shortcut only when the\n\t\t\t * button does something, i.e. when it's not disabled.\n\t\t\t */\n\t\t\tshortcut={ disabled ? undefined : displayShortcut.primary( 's' ) }\n\t\t\t/*\n\t\t\t * Displaying the keyboard shortcut conditionally makes the tooltip\n\t\t\t * itself show conditionally. This would trigger a full-rerendering\n\t\t\t * of the button that we want to avoid. By setting `showTooltip`,\n\t\t\t * the tooltip is always rendered even when there's no keyboard shortcut.\n\t\t\t */\n\t\t\tshowTooltip={ showTooltip }\n\t\t\ticon={ icon }\n\t\t\t__next40pxDefaultSize={ __next40pxDefaultSize }\n\t\t\tsize={ size }\n\t\t>\n\t\t\t{ label }\n\t\t</Button>\n\t);\n}\n"],
   "mappings": ";AAGA,SAAS,WAAW,mBAAmB;AACvC,SAAS,cAAc;AACvB,SAAS,IAAI,IAAI,eAAe;AAChC,SAAS,SAAS,iBAAiB;AACnC,SAAS,uBAAuB;AAChC,SAAS,eAAe,yBAAyB;AACjD;AAAA,EACC;AAAA,EACA,SAAS;AAAA,OACH;AAKP,SAAS,SAAS,qBAAqB;AACvC;AAAA,EACC;AAAA,EACA;AAAA,OACM;AACP,SAAS,cAAc;AA2GrB;AAzGF,IAAM,EAAE,YAAY,IAAI,OAAQ,iBAAkB;AAEnC,SAAR,WAA6B;AAAA,EACnC,YAAY;AAAA,EACZ,UAAU;AAAA,EACV,cAAc;AAAA,EACd;AAAA,EACA;AAAA,EACA;AAAA,EACA,wBAAwB;AACzB,GAAI;AACH,QAAM,EAAE,OAAO,IAAI,YAAY;AAC/B,QAAM,EAAE,oBAAoB,IAAI,YAAa,aAAc;AAC3D,QAAM,EAAE,kBAAkB,IAAI,OAAQ,YAAa,WAAY,CAAE;AACjE,QAAM,EAAE,mBAAmB,IAAI,8BAA8B;AAC7D,QAAM,EAAE,UAAU,gBAAgB,oBAAoB,IAAI;AAAA,IACzD,CAAE,WAAY;AACb,YAAM,EAAE,sBAAsB,YAAY,IAAI,OAAQ,SAAU;AAChE,YAAM,EAAE,iBAAiB,IAAI,OAAQ,aAAc;AACnD,YAAM,oBAAoB,YAAa,eAAgB;AACvD,YAAM,6BAA6B,yBAAyB;AAC5D,aAAO;AAAA,QACN,UACC,mBAAmB;AAAA,UAAM,CAAE,WAC1B;AAAA,YACC,OAAO;AAAA,YACP,OAAO;AAAA,YACP,OAAO;AAAA,UACR;AAAA,QACD,KAAK;AAAA,QACN,gBAAgB,iBAAiB;AAAA;AAAA;AAAA,QAGjC,qBAAqB,6BAClB,OAAQ,SAAU,EAAE,SAAU,0BAA2B,GACvD,MAAM,WACR;AAAA,MACJ;AAAA,IACD;AAAA,IACA,CAAE,kBAAmB;AAAA,EACtB;AACA,QAAM,mBAAmB,CAAC,CAAE,mBAAmB;AAC/C,MAAI;AAIJ,MAAK,mBAAmB,WAAW,GAAI;AACtC,QAAK,OAAO,QAAS;AACpB,iCACC,GAAI,mBAAoB,CAAE,EAAE,GAAI,OAAO,OAAO,UAC9C,mBAAoB,CAAE,EAAE,SAAS,OAAO;AAAA,IAC1C,WAAY,OAAO,MAAM,SAAU,kBAAmB,GAAI;AACzD,iCACC,mBAAoB,CAAE,EAAE,SAAS;AAAA,IACnC;AAAA,EACD;AACA,QAAM,WACL,YAAc,CAAE,oBAAoB,CAAE,kBAAkB;AACzD,QAAM,WAAW,MAAM;AACtB,QAAK,kBAAkB,GAAI;AAC1B,UAAK,UAAW;AACf,eAAO;AAAA;AAAA,UAEN,GAAI,eAAgB;AAAA,UACpB;AAAA,QACD;AAAA,MACD,WAAY,UAAW;AACtB,eAAO,GAAI,OAAQ;AAAA,MACpB,WAAY,kBAAmB;AAC9B,eAAO;AAAA;AAAA,UAEN,GAAI,oBAAqB;AAAA,UACzB;AAAA,QACD;AAAA,MACD;AACA,aAAO;AAAA;AAAA,QAEN,GAAI,aAAc;AAAA,QAClB;AAAA,MACD;AAAA,IACD;AACA,QAAK,UAAW;AACf,aAAO,GAAI,QAAS;AAAA,IACrB;AACA,QAAK,UAAW;AACf,aAAO,GAAI,OAAQ;AAAA,IACpB;AACA,QAAK,CAAE,4BAA4B,mBAAoB;AACtD,aAAO;AAAA;AAAA,QAEN;AAAA,UACC;AAAA,UACA;AAAA,UACA,mBAAmB;AAAA,QACpB;AAAA,QACA,mBAAmB;AAAA,MACpB;AAAA,IACD;AACA,WAAO,GAAI,MAAO;AAAA,EACnB;AACA,QAAM,QAAQ,SAAS;AACvB,QAAM,UAAU,2BACb,MAAM,kBAAmB,EAAE,mBAAmB,CAAE,IAChD,MAAM,oBAAqB,IAAK;AACnC,SACC;AAAA,IAAC;AAAA;AAAA,MACA;AAAA,MACA;AAAA,MACA,iBAAgB;AAAA,MAChB,iBAAgB;AAAA,MAChB,QAAS;AAAA,MACT,SAAU,WAAW,SAAY;AAAA,MACjC;AAAA,MAKA,UAAW,WAAW,SAAY,gBAAgB,QAAS,GAAI;AAAA,MAO/D;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MAEE;AAAA;AAAA,EACH;AAEF;",
   "names": []
 }

package/build-module/components/save-hub/index.mjs

@@ -1,6 +1,6 @@
 // packages/edit-site/src/components/save-hub/index.js
 import { useSelect } from "@wordpress/data";
-import { __experimentalHStack as HStack } from "@wordpress/components";
+import { Stack } from "@wordpress/ui";
 import { store as coreStore } from "@wordpress/core-data";
 import { check } from "@wordpress/icons";
 import SaveButton from "../save-button/index.mjs";
@@ -18,11 +18,11 @@ function SaveHub() {
       isDisabled: _isSaving || !dirtyEntityRecords.length && !isPreviewingTheme()
     };
   }, []);
-  return /* @__PURE__ */ jsx(HStack, { className: "edit-site-save-hub", alignment: "right", spacing: 4, children: /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx(Stack, { className: "edit-site-save-hub", gap: "lg", children: /* @__PURE__ */ jsx(
     SaveButton,
     {
       className: "edit-site-save-hub__button",
-      variant: isDisabled ? null : "primary",
+      variant: isDisabled && !isSaving ? null : "primary",
       showTooltip: false,
       icon: isDisabled && !isSaving ? check : null,
       showReviewMessage: true,

package/build-module/components/save-hub/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/components/save-hub/index.js"],
-  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { useSelect } from '@wordpress/data';\nimport { __experimentalHStack as HStack } from '@wordpress/components';\nimport { store as coreStore } from '@wordpress/core-data';\nimport { check } from '@wordpress/icons';\n\n/**\n * Internal dependencies\n */\nimport SaveButton from '../save-button';\nimport { isPreviewingTheme } from '../../utils/is-previewing-theme';\n\nexport default function SaveHub() {\n\tconst { isDisabled, isSaving } = useSelect( ( select ) => {\n\t\tconst { __experimentalGetDirtyEntityRecords, isSavingEntityRecord } =\n\t\t\tselect( coreStore );\n\t\tconst dirtyEntityRecords = __experimentalGetDirtyEntityRecords();\n\t\tconst _isSaving = dirtyEntityRecords.some( ( record ) =>\n\t\t\tisSavingEntityRecord( record.kind, record.name, record.key )\n\t\t);\n\t\treturn {\n\t\t\tisSaving: _isSaving,\n\t\t\tisDisabled:\n\t\t\t\t_isSaving ||\n\t\t\t\t( ! dirtyEntityRecords.length && ! isPreviewingTheme() ),\n\t\t};\n\t}, [] );\n\treturn (\n\t\t<HStack className=\"edit-site-save-hub\" alignment=\"right\" spacing={ 4 }>\n\t\t\t<SaveButton\n\t\t\t\tclassName=\"edit-site-save-hub__button\"\n\t\t\t\tvariant={ isDisabled ? null : 'primary' }\n\t\t\t\tshowTooltip={ false }\n\t\t\t\ticon={ isDisabled && ! isSaving ? check : null }\n\t\t\t\tshowReviewMessage\n\t\t\t\t__next40pxDefaultSize\n\t\t\t/>\n\t\t</HStack>\n\t);\n}\n"],
-  "mappings": ";AAGA,SAAS,iBAAiB;AAC1B,SAAS,wBAAwB,cAAc;AAC/C,SAAS,SAAS,iBAAiB;AACnC,SAAS,aAAa;AAKtB,OAAO,gBAAgB;AACvB,SAAS,yBAAyB;AAmB/B;AAjBY,SAAR,UAA2B;AACjC,QAAM,EAAE,YAAY,SAAS,IAAI,UAAW,CAAE,WAAY;AACzD,UAAM,EAAE,qCAAqC,qBAAqB,IACjE,OAAQ,SAAU;AACnB,UAAM,qBAAqB,oCAAoC;AAC/D,UAAM,YAAY,mBAAmB;AAAA,MAAM,CAAE,WAC5C,qBAAsB,OAAO,MAAM,OAAO,MAAM,OAAO,GAAI;AAAA,IAC5D;AACA,WAAO;AAAA,MACN,UAAU;AAAA,MACV,YACC,aACE,CAAE,mBAAmB,UAAU,CAAE,kBAAkB;AAAA,IACvD;AAAA,EACD,GAAG,CAAC,CAAE;AACN,SACC,oBAAC,UAAO,WAAU,sBAAqB,WAAU,SAAQ,SAAU,GAClE;AAAA,IAAC;AAAA;AAAA,MACA,WAAU;AAAA,MACV,SAAU,aAAa,OAAO;AAAA,MAC9B,aAAc;AAAA,MACd,MAAO,cAAc,CAAE,WAAW,QAAQ;AAAA,MAC1C,mBAAiB;AAAA,MACjB,uBAAqB;AAAA;AAAA,EACtB,GACD;AAEF;",
+  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { useSelect } from '@wordpress/data';\nimport { Stack } from '@wordpress/ui';\nimport { store as coreStore } from '@wordpress/core-data';\nimport { check } from '@wordpress/icons';\n\n/**\n * Internal dependencies\n */\nimport SaveButton from '../save-button';\nimport { isPreviewingTheme } from '../../utils/is-previewing-theme';\n\nexport default function SaveHub() {\n\tconst { isDisabled, isSaving } = useSelect( ( select ) => {\n\t\tconst { __experimentalGetDirtyEntityRecords, isSavingEntityRecord } =\n\t\t\tselect( coreStore );\n\t\tconst dirtyEntityRecords = __experimentalGetDirtyEntityRecords();\n\t\tconst _isSaving = dirtyEntityRecords.some( ( record ) =>\n\t\t\tisSavingEntityRecord( record.kind, record.name, record.key )\n\t\t);\n\t\treturn {\n\t\t\tisSaving: _isSaving,\n\t\t\tisDisabled:\n\t\t\t\t_isSaving ||\n\t\t\t\t( ! dirtyEntityRecords.length && ! isPreviewingTheme() ),\n\t\t};\n\t}, [] );\n\treturn (\n\t\t<Stack className=\"edit-site-save-hub\" gap=\"lg\">\n\t\t\t<SaveButton\n\t\t\t\tclassName=\"edit-site-save-hub__button\"\n\t\t\t\tvariant={ isDisabled && ! isSaving ? null : 'primary' }\n\t\t\t\tshowTooltip={ false }\n\t\t\t\ticon={ isDisabled && ! isSaving ? check : null }\n\t\t\t\tshowReviewMessage\n\t\t\t\t__next40pxDefaultSize\n\t\t\t/>\n\t\t</Stack>\n\t);\n}\n"],
+  "mappings": ";AAGA,SAAS,iBAAiB;AAC1B,SAAS,aAAa;AACtB,SAAS,SAAS,iBAAiB;AACnC,SAAS,aAAa;AAKtB,OAAO,gBAAgB;AACvB,SAAS,yBAAyB;AAmB/B;AAjBY,SAAR,UAA2B;AACjC,QAAM,EAAE,YAAY,SAAS,IAAI,UAAW,CAAE,WAAY;AACzD,UAAM,EAAE,qCAAqC,qBAAqB,IACjE,OAAQ,SAAU;AACnB,UAAM,qBAAqB,oCAAoC;AAC/D,UAAM,YAAY,mBAAmB;AAAA,MAAM,CAAE,WAC5C,qBAAsB,OAAO,MAAM,OAAO,MAAM,OAAO,GAAI;AAAA,IAC5D;AACA,WAAO;AAAA,MACN,UAAU;AAAA,MACV,YACC,aACE,CAAE,mBAAmB,UAAU,CAAE,kBAAkB;AAAA,IACvD;AAAA,EACD,GAAG,CAAC,CAAE;AACN,SACC,oBAAC,SAAM,WAAU,sBAAqB,KAAI,MACzC;AAAA,IAAC;AAAA;AAAA,MACA,WAAU;AAAA,MACV,SAAU,cAAc,CAAE,WAAW,OAAO;AAAA,MAC5C,aAAc;AAAA,MACd,MAAO,cAAc,CAAE,WAAW,QAAQ;AAAA,MAC1C,mBAAiB;AAAA,MACjB,uBAAqB;AAAA;AAAA,EACtB,GACD;AAEF;",
   "names": []
 }

package/build-module/components/sidebar-dataviews/index.mjs

@@ -16,6 +16,7 @@ import { unlock } from "../../lock-unlock.mjs";
 import SidebarNavigationItem from "../sidebar-navigation-item/index.mjs";
 import { Fragment, jsx } from "react/jsx-runtime";
 var { useLocation } = unlock(routerPrivateApis);
+var VIEW_CONFIG_FIELDS = ["view_list"];
 var SLUG_TO_ICON = {
   all: pages,
   published,
@@ -38,7 +39,8 @@ function DataViewsSidebarContent({
   } = useLocation();
   const { view_list: viewList } = useViewConfig({
     kind: "postType",
-    name: postType
+    name: postType,
+    fields: VIEW_CONFIG_FIELDS
   });
   if (!postType) {
     return null;

package/build-module/components/sidebar-dataviews/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/components/sidebar-dataviews/index.js"],
-  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { __experimentalItemGroup as ItemGroup } from '@wordpress/components';\nimport { privateApis as routerPrivateApis } from '@wordpress/router';\nimport {\n\ttrash,\n\tpages,\n\tdrafts,\n\tpublished,\n\tscheduled,\n\tpending,\n\tnotAllowed,\n} from '@wordpress/icons';\nimport { useViewConfig } from '@wordpress/views';\nimport { addQueryArgs } from '@wordpress/url';\n\n/**\n * Internal dependencies\n */\nimport { unlock } from '../../lock-unlock';\nimport SidebarNavigationItem from '../sidebar-navigation-item';\n\nconst { useLocation } = unlock( routerPrivateApis );\n\nconst SLUG_TO_ICON = {\n\tall: pages,\n\tpublished,\n\tfuture: scheduled,\n\tdrafts,\n\tpending,\n\tprivate: notAllowed,\n\ttrash,\n};\nconst defaultResolveIcon = ( view ) => {\n\treturn SLUG_TO_ICON[ view.slug ];\n};\n\nexport default function DataViewsSidebarContent( {\n\tpostType,\n\tresolveIcon = defaultResolveIcon,\n} ) {\n\tconst {\n\t\tpath,\n\t\tquery: { activeView = 'all' },\n\t} = useLocation();\n\tconst { view_list: viewList } = useViewConfig( {\n\t\tkind: 'postType',\n\t\tname: postType,\n\t} );\n\tif ( ! postType ) {\n\t\treturn null;\n\t}\n\n\treturn (\n\t\t<>\n\t\t\t<ItemGroup className=\"edit-site-sidebar-dataviews\">\n\t\t\t\t{ viewList?.map( ( view ) => {\n\t\t\t\t\tconst isActive = view.slug === activeView;\n\t\t\t\t\tconst slug = view.slug === 'all' ? undefined : view.slug;\n\t\t\t\t\tconst icon = resolveIcon( view );\n\t\t\t\t\treturn (\n\t\t\t\t\t\t<SidebarNavigationItem\n\t\t\t\t\t\t\tkey={ view.slug }\n\t\t\t\t\t\t\ticon={ icon }\n\t\t\t\t\t\t\tto={ addQueryArgs( path, {\n\t\t\t\t\t\t\t\tactiveView: slug,\n\t\t\t\t\t\t\t} ) }\n\t\t\t\t\t\t\taria-current={ isActive ? 'true' : undefined }\n\t\t\t\t\t\t>\n\t\t\t\t\t\t\t{ view.title }\n\t\t\t\t\t\t</SidebarNavigationItem>\n\t\t\t\t\t);\n\t\t\t\t} ) }\n\t\t\t</ItemGroup>\n\t\t</>\n\t);\n}\n"],
-  "mappings": ";AAGA,SAAS,2BAA2B,iBAAiB;AACrD,SAAS,eAAe,yBAAyB;AACjD;AAAA,EACC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACM;AACP,SAAS,qBAAqB;AAC9B,SAAS,oBAAoB;AAK7B,SAAS,cAAc;AACvB,OAAO,2BAA2B;AAkChC,mBAOI,WAPJ;AAhCF,IAAM,EAAE,YAAY,IAAI,OAAQ,iBAAkB;AAElD,IAAM,eAAe;AAAA,EACpB,KAAK;AAAA,EACL;AAAA,EACA,QAAQ;AAAA,EACR;AAAA,EACA;AAAA,EACA,SAAS;AAAA,EACT;AACD;AACA,IAAM,qBAAqB,CAAE,SAAU;AACtC,SAAO,aAAc,KAAK,IAAK;AAChC;AAEe,SAAR,wBAA0C;AAAA,EAChD;AAAA,EACA,cAAc;AACf,GAAI;AACH,QAAM;AAAA,IACL;AAAA,IACA,OAAO,EAAE,aAAa,MAAM;AAAA,EAC7B,IAAI,YAAY;AAChB,QAAM,EAAE,WAAW,SAAS,IAAI,cAAe;AAAA,IAC9C,MAAM;AAAA,IACN,MAAM;AAAA,EACP,CAAE;AACF,MAAK,CAAE,UAAW;AACjB,WAAO;AAAA,EACR;AAEA,SACC,gCACC,8BAAC,aAAU,WAAU,+BAClB,oBAAU,IAAK,CAAE,SAAU;AAC5B,UAAM,WAAW,KAAK,SAAS;AAC/B,UAAM,OAAO,KAAK,SAAS,QAAQ,SAAY,KAAK;AACpD,UAAM,OAAO,YAAa,IAAK;AAC/B,WACC;AAAA,MAAC;AAAA;AAAA,QAEA;AAAA,QACA,IAAK,aAAc,MAAM;AAAA,UACxB,YAAY;AAAA,QACb,CAAE;AAAA,QACF,gBAAe,WAAW,SAAS;AAAA,QAEjC,eAAK;AAAA;AAAA,MAPD,KAAK;AAAA,IAQZ;AAAA,EAEF,CAAE,GACH,GACD;AAEF;",
+  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { __experimentalItemGroup as ItemGroup } from '@wordpress/components';\nimport { privateApis as routerPrivateApis } from '@wordpress/router';\nimport {\n\ttrash,\n\tpages,\n\tdrafts,\n\tpublished,\n\tscheduled,\n\tpending,\n\tnotAllowed,\n} from '@wordpress/icons';\nimport { useViewConfig } from '@wordpress/views';\nimport { addQueryArgs } from '@wordpress/url';\n\n/**\n * Internal dependencies\n */\nimport { unlock } from '../../lock-unlock';\nimport SidebarNavigationItem from '../sidebar-navigation-item';\n\nconst { useLocation } = unlock( routerPrivateApis );\n\nconst VIEW_CONFIG_FIELDS = [ 'view_list' ];\n\nconst SLUG_TO_ICON = {\n\tall: pages,\n\tpublished,\n\tfuture: scheduled,\n\tdrafts,\n\tpending,\n\tprivate: notAllowed,\n\ttrash,\n};\nconst defaultResolveIcon = ( view ) => {\n\treturn SLUG_TO_ICON[ view.slug ];\n};\n\nexport default function DataViewsSidebarContent( {\n\tpostType,\n\tresolveIcon = defaultResolveIcon,\n} ) {\n\tconst {\n\t\tpath,\n\t\tquery: { activeView = 'all' },\n\t} = useLocation();\n\tconst { view_list: viewList } = useViewConfig( {\n\t\tkind: 'postType',\n\t\tname: postType,\n\t\tfields: VIEW_CONFIG_FIELDS,\n\t} );\n\tif ( ! postType ) {\n\t\treturn null;\n\t}\n\n\treturn (\n\t\t<>\n\t\t\t<ItemGroup className=\"edit-site-sidebar-dataviews\">\n\t\t\t\t{ viewList?.map( ( view ) => {\n\t\t\t\t\tconst isActive = view.slug === activeView;\n\t\t\t\t\tconst slug = view.slug === 'all' ? undefined : view.slug;\n\t\t\t\t\tconst icon = resolveIcon( view );\n\t\t\t\t\treturn (\n\t\t\t\t\t\t<SidebarNavigationItem\n\t\t\t\t\t\t\tkey={ view.slug }\n\t\t\t\t\t\t\ticon={ icon }\n\t\t\t\t\t\t\tto={ addQueryArgs( path, {\n\t\t\t\t\t\t\t\tactiveView: slug,\n\t\t\t\t\t\t\t} ) }\n\t\t\t\t\t\t\taria-current={ isActive ? 'true' : undefined }\n\t\t\t\t\t\t>\n\t\t\t\t\t\t\t{ view.title }\n\t\t\t\t\t\t</SidebarNavigationItem>\n\t\t\t\t\t);\n\t\t\t\t} ) }\n\t\t\t</ItemGroup>\n\t\t</>\n\t);\n}\n"],
+  "mappings": ";AAGA,SAAS,2BAA2B,iBAAiB;AACrD,SAAS,eAAe,yBAAyB;AACjD;AAAA,EACC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACM;AACP,SAAS,qBAAqB;AAC9B,SAAS,oBAAoB;AAK7B,SAAS,cAAc;AACvB,OAAO,2BAA2B;AAqChC,mBAOI,WAPJ;AAnCF,IAAM,EAAE,YAAY,IAAI,OAAQ,iBAAkB;AAElD,IAAM,qBAAqB,CAAE,WAAY;AAEzC,IAAM,eAAe;AAAA,EACpB,KAAK;AAAA,EACL;AAAA,EACA,QAAQ;AAAA,EACR;AAAA,EACA;AAAA,EACA,SAAS;AAAA,EACT;AACD;AACA,IAAM,qBAAqB,CAAE,SAAU;AACtC,SAAO,aAAc,KAAK,IAAK;AAChC;AAEe,SAAR,wBAA0C;AAAA,EAChD;AAAA,EACA,cAAc;AACf,GAAI;AACH,QAAM;AAAA,IACL;AAAA,IACA,OAAO,EAAE,aAAa,MAAM;AAAA,EAC7B,IAAI,YAAY;AAChB,QAAM,EAAE,WAAW,SAAS,IAAI,cAAe;AAAA,IAC9C,MAAM;AAAA,IACN,MAAM;AAAA,IACN,QAAQ;AAAA,EACT,CAAE;AACF,MAAK,CAAE,UAAW;AACjB,WAAO;AAAA,EACR;AAEA,SACC,gCACC,8BAAC,aAAU,WAAU,+BAClB,oBAAU,IAAK,CAAE,SAAU;AAC5B,UAAM,WAAW,KAAK,SAAS;AAC/B,UAAM,OAAO,KAAK,SAAS,QAAQ,SAAY,KAAK;AACpD,UAAM,OAAO,YAAa,IAAK;AAC/B,WACC;AAAA,MAAC;AAAA;AAAA,QAEA;AAAA,QACA,IAAK,aAAc,MAAM;AAAA,UACxB,YAAY;AAAA,QACb,CAAE;AAAA,QACF,gBAAe,WAAW,SAAS;AAAA,QAEjC,eAAK;AAAA;AAAA,MAPD,KAAK;AAAA,IAQZ;AAAA,EAEF,CAAE,GACH,GACD;AAEF;",
   "names": []
 }

package/build-module/components/sidebar-navigation-item/index.mjs

@@ -1,10 +1,7 @@
 // packages/edit-site/src/components/sidebar-navigation-item/index.js
 import clsx from "clsx";
-import {
-  __experimentalItem as Item,
-  __experimentalHStack as HStack,
-  FlexBlock
-} from "@wordpress/components";
+import { __experimentalItem as Item, FlexBlock } from "@wordpress/components";
+import { Stack } from "@wordpress/ui";
 import { isRTL } from "@wordpress/i18n";
 import { chevronRightSmall, chevronLeftSmall, Icon } from "@wordpress/icons";
 import { privateApis as routerPrivateApis } from "@wordpress/router";
@@ -12,8 +9,17 @@ import { useContext } from "@wordpress/element";
 import { unlock } from "../../lock-unlock.mjs";
 import { SidebarNavigationContext } from "../sidebar/index.mjs";
 import { jsx, jsxs } from "react/jsx-runtime";
-var { useHistory, useLink } = unlock(routerPrivateApis);
+var { useHistory, useLink, useLocation } = unlock(routerPrivateApis);
 function SidebarNavigationItem({
+  isHidden = false,
+  ...props
+}) {
+  if (isHidden) {
+    return null;
+  }
+  return /* @__PURE__ */ jsx(SidebarNavigationItemContent, { ...props });
+}
+function SidebarNavigationItemContent({
   className,
   icon,
   withChevron = false,
@@ -21,11 +27,15 @@ function SidebarNavigationItem({
   uid,
   to,
   onClick,
+  activeOnRouteName,
   children,
   ...props
 }) {
   const history = useHistory();
+  const linkProps = useLink(to);
+  const { name } = useLocation();
   const { navigate } = useContext(SidebarNavigationContext);
+  const isActive = activeOnRouteName && name === activeOnRouteName;
   function handleClick(e) {
     if (onClick) {
       onClick(e);
@@ -36,7 +46,6 @@ function SidebarNavigationItem({
       navigate("forward", `[id="${uid}"]`);
     }
   }
-  const linkProps = useLink(to);
   return /* @__PURE__ */ jsx(
     Item,
     {
@@ -48,8 +57,9 @@ function SidebarNavigationItem({
       id: uid,
       onClick: handleClick,
       href: to ? linkProps.href : void 0,
+      "aria-current": isActive ? true : void 0,
       ...props,
-      children: /* @__PURE__ */ jsxs(HStack, { justify: "flex-start", children: [
+      children: /* @__PURE__ */ jsxs(Stack, { direction: "row", align: "center", justify: "start", gap: "sm", children: [
         icon && /* @__PURE__ */ jsx(
           Icon,
           {

package/build-module/components/sidebar-navigation-item/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/components/sidebar-navigation-item/index.js"],
-  "sourcesContent": ["/**\n * External dependencies\n */\nimport clsx from 'clsx';\n\n/**\n * WordPress dependencies\n */\nimport {\n\t__experimentalItem as Item,\n\t__experimentalHStack as HStack,\n\tFlexBlock,\n} from '@wordpress/components';\nimport { isRTL } from '@wordpress/i18n';\nimport { chevronRightSmall, chevronLeftSmall, Icon } from '@wordpress/icons';\nimport { privateApis as routerPrivateApis } from '@wordpress/router';\nimport { useContext } from '@wordpress/element';\n\n/**\n * Internal dependencies\n */\nimport { unlock } from '../../lock-unlock';\nimport { SidebarNavigationContext } from '../sidebar';\n\nconst { useHistory, useLink } = unlock( routerPrivateApis );\n\nexport default function SidebarNavigationItem( {\n\tclassName,\n\ticon,\n\twithChevron = false,\n\tsuffix,\n\tuid,\n\tto,\n\tonClick,\n\tchildren,\n\t...props\n} ) {\n\tconst history = useHistory();\n\tconst { navigate } = useContext( SidebarNavigationContext );\n\t// If there is no custom click handler, create one that navigates to `params`.\n\tfunction handleClick( e ) {\n\t\tif ( onClick ) {\n\t\t\tonClick( e );\n\t\t\tnavigate( 'forward' );\n\t\t} else if ( to ) {\n\t\t\te.preventDefault();\n\t\t\thistory.navigate( to );\n\t\t\tnavigate( 'forward', `[id=\"${ uid }\"]` );\n\t\t}\n\t}\n\tconst linkProps = useLink( to );\n\n\treturn (\n\t\t<Item\n\t\t\tclassName={ clsx(\n\t\t\t\t'edit-site-sidebar-navigation-item',\n\t\t\t\t{ 'with-suffix': ! withChevron && suffix },\n\t\t\t\tclassName\n\t\t\t) }\n\t\t\tid={ uid }\n\t\t\tonClick={ handleClick }\n\t\t\thref={ to ? linkProps.href : undefined }\n\t\t\t{ ...props }\n\t\t>\n\t\t\t<HStack justify=\"flex-start\">\n\t\t\t\t{ icon && (\n\t\t\t\t\t<Icon\n\t\t\t\t\t\tstyle={ { fill: 'currentcolor' } }\n\t\t\t\t\t\ticon={ icon }\n\t\t\t\t\t\tsize={ 24 }\n\t\t\t\t\t/>\n\t\t\t\t) }\n\t\t\t\t<FlexBlock>{ children }</FlexBlock>\n\t\t\t\t{ withChevron && (\n\t\t\t\t\t<Icon\n\t\t\t\t\t\ticon={ isRTL() ? chevronLeftSmall : chevronRightSmall }\n\t\t\t\t\t\tclassName=\"edit-site-sidebar-navigation-item__drilldown-indicator\"\n\t\t\t\t\t\tsize={ 24 }\n\t\t\t\t\t/>\n\t\t\t\t) }\n\t\t\t\t{ ! withChevron && suffix }\n\t\t\t</HStack>\n\t\t</Item>\n\t);\n}\n"],
-  "mappings": ";AAGA,OAAO,UAAU;AAKjB;AAAA,EACC,sBAAsB;AAAA,EACtB,wBAAwB;AAAA,EACxB;AAAA,OACM;AACP,SAAS,aAAa;AACtB,SAAS,mBAAmB,kBAAkB,YAAY;AAC1D,SAAS,eAAe,yBAAyB;AACjD,SAAS,kBAAkB;AAK3B,SAAS,cAAc;AACvB,SAAS,gCAAgC;AA0CtC,SAEE,KAFF;AAxCH,IAAM,EAAE,YAAY,QAAQ,IAAI,OAAQ,iBAAkB;AAE3C,SAAR,sBAAwC;AAAA,EAC9C;AAAA,EACA;AAAA,EACA,cAAc;AAAA,EACd;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACJ,GAAI;AACH,QAAM,UAAU,WAAW;AAC3B,QAAM,EAAE,SAAS,IAAI,WAAY,wBAAyB;AAE1D,WAAS,YAAa,GAAI;AACzB,QAAK,SAAU;AACd,cAAS,CAAE;AACX,eAAU,SAAU;AAAA,IACrB,WAAY,IAAK;AAChB,QAAE,eAAe;AACjB,cAAQ,SAAU,EAAG;AACrB,eAAU,WAAW,QAAS,GAAI,IAAK;AAAA,IACxC;AAAA,EACD;AACA,QAAM,YAAY,QAAS,EAAG;AAE9B,SACC;AAAA,IAAC;AAAA;AAAA,MACA,WAAY;AAAA,QACX;AAAA,QACA,EAAE,eAAe,CAAE,eAAe,OAAO;AAAA,QACzC;AAAA,MACD;AAAA,MACA,IAAK;AAAA,MACL,SAAU;AAAA,MACV,MAAO,KAAK,UAAU,OAAO;AAAA,MAC3B,GAAG;AAAA,MAEL,+BAAC,UAAO,SAAQ,cACb;AAAA,gBACD;AAAA,UAAC;AAAA;AAAA,YACA,OAAQ,EAAE,MAAM,eAAe;AAAA,YAC/B;AAAA,YACA,MAAO;AAAA;AAAA,QACR;AAAA,QAED,oBAAC,aAAY,UAAU;AAAA,QACrB,eACD;AAAA,UAAC;AAAA;AAAA,YACA,MAAO,MAAM,IAAI,mBAAmB;AAAA,YACpC,WAAU;AAAA,YACV,MAAO;AAAA;AAAA,QACR;AAAA,QAEC,CAAE,eAAe;AAAA,SACpB;AAAA;AAAA,EACD;AAEF;",
+  "sourcesContent": ["/**\n * External dependencies\n */\nimport clsx from 'clsx';\n\n/**\n * WordPress dependencies\n */\nimport { __experimentalItem as Item, FlexBlock } from '@wordpress/components';\nimport { Stack } from '@wordpress/ui';\nimport { isRTL } from '@wordpress/i18n';\nimport { chevronRightSmall, chevronLeftSmall, Icon } from '@wordpress/icons';\nimport { privateApis as routerPrivateApis } from '@wordpress/router';\nimport { useContext } from '@wordpress/element';\n\n/**\n * Internal dependencies\n */\nimport { unlock } from '../../lock-unlock';\nimport { SidebarNavigationContext } from '../sidebar';\n\nconst { useHistory, useLink, useLocation } = unlock( routerPrivateApis );\n\nexport default function SidebarNavigationItem( {\n\tisHidden = false,\n\t...props\n} ) {\n\tif ( isHidden ) {\n\t\treturn null;\n\t}\n\n\treturn <SidebarNavigationItemContent { ...props } />;\n}\n\nfunction SidebarNavigationItemContent( {\n\tclassName,\n\ticon,\n\twithChevron = false,\n\tsuffix,\n\tuid,\n\tto,\n\tonClick,\n\tactiveOnRouteName,\n\tchildren,\n\t...props\n} ) {\n\tconst history = useHistory();\n\tconst linkProps = useLink( to );\n\tconst { name } = useLocation();\n\tconst { navigate } = useContext( SidebarNavigationContext );\n\n\tconst isActive = activeOnRouteName && name === activeOnRouteName;\n\t// If there is no custom click handler, create one that navigates to `params`.\n\tfunction handleClick( e ) {\n\t\tif ( onClick ) {\n\t\t\tonClick( e );\n\t\t\tnavigate( 'forward' );\n\t\t} else if ( to ) {\n\t\t\te.preventDefault();\n\t\t\thistory.navigate( to );\n\t\t\tnavigate( 'forward', `[id=\"${ uid }\"]` );\n\t\t}\n\t}\n\n\treturn (\n\t\t<Item\n\t\t\tclassName={ clsx(\n\t\t\t\t'edit-site-sidebar-navigation-item',\n\t\t\t\t{ 'with-suffix': ! withChevron && suffix },\n\t\t\t\tclassName\n\t\t\t) }\n\t\t\tid={ uid }\n\t\t\tonClick={ handleClick }\n\t\t\thref={ to ? linkProps.href : undefined }\n\t\t\taria-current={ isActive ? true : undefined }\n\t\t\t{ ...props }\n\t\t>\n\t\t\t<Stack direction=\"row\" align=\"center\" justify=\"start\" gap=\"sm\">\n\t\t\t\t{ icon && (\n\t\t\t\t\t<Icon\n\t\t\t\t\t\tstyle={ { fill: 'currentcolor' } }\n\t\t\t\t\t\ticon={ icon }\n\t\t\t\t\t\tsize={ 24 }\n\t\t\t\t\t/>\n\t\t\t\t) }\n\t\t\t\t<FlexBlock>{ children }</FlexBlock>\n\t\t\t\t{ withChevron && (\n\t\t\t\t\t<Icon\n\t\t\t\t\t\ticon={ isRTL() ? chevronLeftSmall : chevronRightSmall }\n\t\t\t\t\t\tclassName=\"edit-site-sidebar-navigation-item__drilldown-indicator\"\n\t\t\t\t\t\tsize={ 24 }\n\t\t\t\t\t/>\n\t\t\t\t) }\n\t\t\t\t{ ! withChevron && suffix }\n\t\t\t</Stack>\n\t\t</Item>\n\t);\n}\n"],
+  "mappings": ";AAGA,OAAO,UAAU;AAKjB,SAAS,sBAAsB,MAAM,iBAAiB;AACtD,SAAS,aAAa;AACtB,SAAS,aAAa;AACtB,SAAS,mBAAmB,kBAAkB,YAAY;AAC1D,SAAS,eAAe,yBAAyB;AACjD,SAAS,kBAAkB;AAK3B,SAAS,cAAc;AACvB,SAAS,gCAAgC;AAYjC,cA8CL,YA9CK;AAVR,IAAM,EAAE,YAAY,SAAS,YAAY,IAAI,OAAQ,iBAAkB;AAExD,SAAR,sBAAwC;AAAA,EAC9C,WAAW;AAAA,EACX,GAAG;AACJ,GAAI;AACH,MAAK,UAAW;AACf,WAAO;AAAA,EACR;AAEA,SAAO,oBAAC,gCAA+B,GAAG,OAAQ;AACnD;AAEA,SAAS,6BAA8B;AAAA,EACtC;AAAA,EACA;AAAA,EACA,cAAc;AAAA,EACd;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,GAAG;AACJ,GAAI;AACH,QAAM,UAAU,WAAW;AAC3B,QAAM,YAAY,QAAS,EAAG;AAC9B,QAAM,EAAE,KAAK,IAAI,YAAY;AAC7B,QAAM,EAAE,SAAS,IAAI,WAAY,wBAAyB;AAE1D,QAAM,WAAW,qBAAqB,SAAS;AAE/C,WAAS,YAAa,GAAI;AACzB,QAAK,SAAU;AACd,cAAS,CAAE;AACX,eAAU,SAAU;AAAA,IACrB,WAAY,IAAK;AAChB,QAAE,eAAe;AACjB,cAAQ,SAAU,EAAG;AACrB,eAAU,WAAW,QAAS,GAAI,IAAK;AAAA,IACxC;AAAA,EACD;AAEA,SACC;AAAA,IAAC;AAAA;AAAA,MACA,WAAY;AAAA,QACX;AAAA,QACA,EAAE,eAAe,CAAE,eAAe,OAAO;AAAA,QACzC;AAAA,MACD;AAAA,MACA,IAAK;AAAA,MACL,SAAU;AAAA,MACV,MAAO,KAAK,UAAU,OAAO;AAAA,MAC7B,gBAAe,WAAW,OAAO;AAAA,MAC/B,GAAG;AAAA,MAEL,+BAAC,SAAM,WAAU,OAAM,OAAM,UAAS,SAAQ,SAAQ,KAAI,MACvD;AAAA,gBACD;AAAA,UAAC;AAAA;AAAA,YACA,OAAQ,EAAE,MAAM,eAAe;AAAA,YAC/B;AAAA,YACA,MAAO;AAAA;AAAA,QACR;AAAA,QAED,oBAAC,aAAY,UAAU;AAAA,QACrB,eACD;AAAA,UAAC;AAAA;AAAA,YACA,MAAO,MAAM,IAAI,mBAAmB;AAAA,YACpC,WAAU;AAAA,YACV,MAAO;AAAA;AAAA,QACR;AAAA,QAEC,CAAE,eAAe;AAAA,SACpB;AAAA;AAAA,EACD;AAEF;",
   "names": []
 }

package/build-module/components/sidebar-navigation-screen-global-styles/index.mjs

@@ -6,25 +6,14 @@ import { store as preferencesStore } from "@wordpress/preferences";
 import { store as editorStore } from "@wordpress/editor";
 import { privateApis as routerPrivateApis } from "@wordpress/router";
 import { addQueryArgs } from "@wordpress/url";
+import { useGlobalStylesRevisions } from "@wordpress/global-styles-ui";
 import SidebarNavigationScreen from "../sidebar-navigation-screen/index.mjs";
 import { unlock } from "../../lock-unlock.mjs";
 import { store as editSiteStore } from "../../store/index.mjs";
-import SidebarNavigationItem from "../sidebar-navigation-item/index.mjs";
-import { useGlobalStylesRevisions } from "@wordpress/global-styles-ui";
 import SidebarNavigationScreenDetailsFooter from "../sidebar-navigation-screen-details-footer/index.mjs";
 import { MainSidebarNavigationContent } from "../sidebar-navigation-screen-main/index.mjs";
 import { Fragment, jsx } from "react/jsx-runtime";
 var { useLocation, useHistory } = unlock(routerPrivateApis);
-function SidebarNavigationItemGlobalStyles(props) {
-  const { name } = useLocation();
-  return /* @__PURE__ */ jsx(
-    SidebarNavigationItem,
-    {
-      ...props,
-      "aria-current": name === "styles"
-    }
-  );
-}
 function SidebarNavigationScreenGlobalStyles() {
   const history = useHistory();
   const { path } = useLocation();
@@ -58,7 +47,7 @@ function SidebarNavigationScreenGlobalStyles() {
       description: __(
         "Customize the appearance of your website using the block editor."
       ),
-      content: /* @__PURE__ */ jsx(MainSidebarNavigationContent, { activeItem: "styles-navigation-item" }),
+      content: /* @__PURE__ */ jsx(MainSidebarNavigationContent, {}),
       footer: shouldShowGlobalStylesFooter && /* @__PURE__ */ jsx(
         SidebarNavigationScreenDetailsFooter,
         {
@@ -71,7 +60,6 @@ function SidebarNavigationScreenGlobalStyles() {
   ) });
 }
 export {
-  SidebarNavigationItemGlobalStyles,
   SidebarNavigationScreenGlobalStyles as default
 };
 //# sourceMappingURL=index.mjs.map

package/build-module/components/sidebar-navigation-screen-global-styles/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/components/sidebar-navigation-screen-global-styles/index.js"],
-  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\nimport { useDispatch } from '@wordpress/data';\nimport { useCallback } from '@wordpress/element';\nimport { store as preferencesStore } from '@wordpress/preferences';\nimport { store as editorStore } from '@wordpress/editor';\nimport { privateApis as routerPrivateApis } from '@wordpress/router';\nimport { addQueryArgs } from '@wordpress/url';\n\n/**\n * Internal dependencies\n */\nimport SidebarNavigationScreen from '../sidebar-navigation-screen';\nimport { unlock } from '../../lock-unlock';\nimport { store as editSiteStore } from '../../store';\nimport SidebarNavigationItem from '../sidebar-navigation-item';\nimport { useGlobalStylesRevisions } from '@wordpress/global-styles-ui';\nimport SidebarNavigationScreenDetailsFooter from '../sidebar-navigation-screen-details-footer';\nimport { MainSidebarNavigationContent } from '../sidebar-navigation-screen-main';\n\nconst { useLocation, useHistory } = unlock( routerPrivateApis );\n\nexport function SidebarNavigationItemGlobalStyles( props ) {\n\tconst { name } = useLocation();\n\treturn (\n\t\t<SidebarNavigationItem\n\t\t\t{ ...props }\n\t\t\taria-current={ name === 'styles' }\n\t\t/>\n\t);\n}\n\nexport default function SidebarNavigationScreenGlobalStyles() {\n\tconst history = useHistory();\n\tconst { path } = useLocation();\n\tconst {\n\t\trevisions,\n\t\tisLoading: isLoadingRevisions,\n\t\trevisionsCount,\n\t} = useGlobalStylesRevisions();\n\tconst { openGeneralSidebar } = useDispatch( editSiteStore );\n\tconst { setStylesPath } = unlock( useDispatch( editorStore ) );\n\tconst { set: setPreference } = useDispatch( preferencesStore );\n\n\tconst openGlobalStyles = useCallback( async () => {\n\t\thistory.navigate( addQueryArgs( path, { canvas: 'edit' } ), {\n\t\t\ttransition: 'canvas-mode-edit-transition',\n\t\t} );\n\t\treturn Promise.all( [\n\t\t\tsetPreference( 'core', 'distractionFree', false ),\n\t\t\topenGeneralSidebar( 'edit-site/global-styles' ),\n\t\t] );\n\t}, [ path, history, openGeneralSidebar, setPreference ] );\n\n\tconst openRevisions = useCallback( async () => {\n\t\tawait openGlobalStyles();\n\t\t// Open the global styles revisions once the canvas mode is set to edit,\n\t\t// and the global styles sidebar is open. Set the path to revisions.\n\t\tsetStylesPath( '/revisions' );\n\t}, [ openGlobalStyles, setStylesPath ] );\n\n\t// If there are no revisions, do not render a footer.\n\tconst shouldShowGlobalStylesFooter =\n\t\t!! revisionsCount && ! isLoadingRevisions;\n\n\treturn (\n\t\t<>\n\t\t\t<SidebarNavigationScreen\n\t\t\t\ttitle={ __( 'Design' ) }\n\t\t\t\tisRoot\n\t\t\t\tdescription={ __(\n\t\t\t\t\t'Customize the appearance of your website using the block editor.'\n\t\t\t\t) }\n\t\t\t\tcontent={\n\t\t\t\t\t<MainSidebarNavigationContent activeItem=\"styles-navigation-item\" />\n\t\t\t\t}\n\t\t\t\tfooter={\n\t\t\t\t\tshouldShowGlobalStylesFooter && (\n\t\t\t\t\t\t<SidebarNavigationScreenDetailsFooter\n\t\t\t\t\t\t\trecord={ revisions?.[ 0 ] }\n\t\t\t\t\t\t\trevisionsCount={ revisionsCount }\n\t\t\t\t\t\t\tonClick={ openRevisions }\n\t\t\t\t\t\t/>\n\t\t\t\t\t)\n\t\t\t\t}\n\t\t\t/>\n\t\t</>\n\t);\n}\n"],
-  "mappings": ";AAGA,SAAS,UAAU;AACnB,SAAS,mBAAmB;AAC5B,SAAS,mBAAmB;AAC5B,SAAS,SAAS,wBAAwB;AAC1C,SAAS,SAAS,mBAAmB;AACrC,SAAS,eAAe,yBAAyB;AACjD,SAAS,oBAAoB;AAK7B,OAAO,6BAA6B;AACpC,SAAS,cAAc;AACvB,SAAS,SAAS,qBAAqB;AACvC,OAAO,2BAA2B;AAClC,SAAS,gCAAgC;AACzC,OAAO,0CAA0C;AACjD,SAAS,oCAAoC;AAO3C,SAyCA,UAzCA;AALF,IAAM,EAAE,aAAa,WAAW,IAAI,OAAQ,iBAAkB;AAEvD,SAAS,kCAAmC,OAAQ;AAC1D,QAAM,EAAE,KAAK,IAAI,YAAY;AAC7B,SACC;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MACL,gBAAe,SAAS;AAAA;AAAA,EACzB;AAEF;AAEe,SAAR,sCAAuD;AAC7D,QAAM,UAAU,WAAW;AAC3B,QAAM,EAAE,KAAK,IAAI,YAAY;AAC7B,QAAM;AAAA,IACL;AAAA,IACA,WAAW;AAAA,IACX;AAAA,EACD,IAAI,yBAAyB;AAC7B,QAAM,EAAE,mBAAmB,IAAI,YAAa,aAAc;AAC1D,QAAM,EAAE,cAAc,IAAI,OAAQ,YAAa,WAAY,CAAE;AAC7D,QAAM,EAAE,KAAK,cAAc,IAAI,YAAa,gBAAiB;AAE7D,QAAM,mBAAmB,YAAa,YAAY;AACjD,YAAQ,SAAU,aAAc,MAAM,EAAE,QAAQ,OAAO,CAAE,GAAG;AAAA,MAC3D,YAAY;AAAA,IACb,CAAE;AACF,WAAO,QAAQ,IAAK;AAAA,MACnB,cAAe,QAAQ,mBAAmB,KAAM;AAAA,MAChD,mBAAoB,yBAA0B;AAAA,IAC/C,CAAE;AAAA,EACH,GAAG,CAAE,MAAM,SAAS,oBAAoB,aAAc,CAAE;AAExD,QAAM,gBAAgB,YAAa,YAAY;AAC9C,UAAM,iBAAiB;AAGvB,kBAAe,YAAa;AAAA,EAC7B,GAAG,CAAE,kBAAkB,aAAc,CAAE;AAGvC,QAAM,+BACL,CAAC,CAAE,kBAAkB,CAAE;AAExB,SACC,gCACC;AAAA,IAAC;AAAA;AAAA,MACA,OAAQ,GAAI,QAAS;AAAA,MACrB,QAAM;AAAA,MACN,aAAc;AAAA,QACb;AAAA,MACD;AAAA,MACA,SACC,oBAAC,gCAA6B,YAAW,0BAAyB;AAAA,MAEnE,QACC,gCACC;AAAA,QAAC;AAAA;AAAA,UACA,QAAS,YAAa,CAAE;AAAA,UACxB;AAAA,UACA,SAAU;AAAA;AAAA,MACX;AAAA;AAAA,EAGH,GACD;AAEF;",
+  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\nimport { useDispatch } from '@wordpress/data';\nimport { useCallback } from '@wordpress/element';\nimport { store as preferencesStore } from '@wordpress/preferences';\nimport { store as editorStore } from '@wordpress/editor';\nimport { privateApis as routerPrivateApis } from '@wordpress/router';\nimport { addQueryArgs } from '@wordpress/url';\nimport { useGlobalStylesRevisions } from '@wordpress/global-styles-ui';\n\n/**\n * Internal dependencies\n */\nimport SidebarNavigationScreen from '../sidebar-navigation-screen';\nimport { unlock } from '../../lock-unlock';\nimport { store as editSiteStore } from '../../store';\nimport SidebarNavigationScreenDetailsFooter from '../sidebar-navigation-screen-details-footer';\nimport { MainSidebarNavigationContent } from '../sidebar-navigation-screen-main';\n\nconst { useLocation, useHistory } = unlock( routerPrivateApis );\n\nexport default function SidebarNavigationScreenGlobalStyles() {\n\tconst history = useHistory();\n\tconst { path } = useLocation();\n\tconst {\n\t\trevisions,\n\t\tisLoading: isLoadingRevisions,\n\t\trevisionsCount,\n\t} = useGlobalStylesRevisions();\n\tconst { openGeneralSidebar } = useDispatch( editSiteStore );\n\tconst { setStylesPath } = unlock( useDispatch( editorStore ) );\n\tconst { set: setPreference } = useDispatch( preferencesStore );\n\n\tconst openGlobalStyles = useCallback( async () => {\n\t\thistory.navigate( addQueryArgs( path, { canvas: 'edit' } ), {\n\t\t\ttransition: 'canvas-mode-edit-transition',\n\t\t} );\n\t\treturn Promise.all( [\n\t\t\tsetPreference( 'core', 'distractionFree', false ),\n\t\t\topenGeneralSidebar( 'edit-site/global-styles' ),\n\t\t] );\n\t}, [ path, history, openGeneralSidebar, setPreference ] );\n\n\tconst openRevisions = useCallback( async () => {\n\t\tawait openGlobalStyles();\n\t\t// Open the global styles revisions once the canvas mode is set to edit,\n\t\t// and the global styles sidebar is open. Set the path to revisions.\n\t\tsetStylesPath( '/revisions' );\n\t}, [ openGlobalStyles, setStylesPath ] );\n\n\t// If there are no revisions, do not render a footer.\n\tconst shouldShowGlobalStylesFooter =\n\t\t!! revisionsCount && ! isLoadingRevisions;\n\n\treturn (\n\t\t<>\n\t\t\t<SidebarNavigationScreen\n\t\t\t\ttitle={ __( 'Design' ) }\n\t\t\t\tisRoot\n\t\t\t\tdescription={ __(\n\t\t\t\t\t'Customize the appearance of your website using the block editor.'\n\t\t\t\t) }\n\t\t\t\tcontent={ <MainSidebarNavigationContent /> }\n\t\t\t\tfooter={\n\t\t\t\t\tshouldShowGlobalStylesFooter && (\n\t\t\t\t\t\t<SidebarNavigationScreenDetailsFooter\n\t\t\t\t\t\t\trecord={ revisions?.[ 0 ] }\n\t\t\t\t\t\t\trevisionsCount={ revisionsCount }\n\t\t\t\t\t\t\tonClick={ openRevisions }\n\t\t\t\t\t\t/>\n\t\t\t\t\t)\n\t\t\t\t}\n\t\t\t/>\n\t\t</>\n\t);\n}\n"],
+  "mappings": ";AAGA,SAAS,UAAU;AACnB,SAAS,mBAAmB;AAC5B,SAAS,mBAAmB;AAC5B,SAAS,SAAS,wBAAwB;AAC1C,SAAS,SAAS,mBAAmB;AACrC,SAAS,eAAe,yBAAyB;AACjD,SAAS,oBAAoB;AAC7B,SAAS,gCAAgC;AAKzC,OAAO,6BAA6B;AACpC,SAAS,cAAc;AACvB,SAAS,SAAS,qBAAqB;AACvC,OAAO,0CAA0C;AACjD,SAAS,oCAAoC;AAsC3C,mBAOY,WAPZ;AApCF,IAAM,EAAE,aAAa,WAAW,IAAI,OAAQ,iBAAkB;AAE/C,SAAR,sCAAuD;AAC7D,QAAM,UAAU,WAAW;AAC3B,QAAM,EAAE,KAAK,IAAI,YAAY;AAC7B,QAAM;AAAA,IACL;AAAA,IACA,WAAW;AAAA,IACX;AAAA,EACD,IAAI,yBAAyB;AAC7B,QAAM,EAAE,mBAAmB,IAAI,YAAa,aAAc;AAC1D,QAAM,EAAE,cAAc,IAAI,OAAQ,YAAa,WAAY,CAAE;AAC7D,QAAM,EAAE,KAAK,cAAc,IAAI,YAAa,gBAAiB;AAE7D,QAAM,mBAAmB,YAAa,YAAY;AACjD,YAAQ,SAAU,aAAc,MAAM,EAAE,QAAQ,OAAO,CAAE,GAAG;AAAA,MAC3D,YAAY;AAAA,IACb,CAAE;AACF,WAAO,QAAQ,IAAK;AAAA,MACnB,cAAe,QAAQ,mBAAmB,KAAM;AAAA,MAChD,mBAAoB,yBAA0B;AAAA,IAC/C,CAAE;AAAA,EACH,GAAG,CAAE,MAAM,SAAS,oBAAoB,aAAc,CAAE;AAExD,QAAM,gBAAgB,YAAa,YAAY;AAC9C,UAAM,iBAAiB;AAGvB,kBAAe,YAAa;AAAA,EAC7B,GAAG,CAAE,kBAAkB,aAAc,CAAE;AAGvC,QAAM,+BACL,CAAC,CAAE,kBAAkB,CAAE;AAExB,SACC,gCACC;AAAA,IAAC;AAAA;AAAA,MACA,OAAQ,GAAI,QAAS;AAAA,MACrB,QAAM;AAAA,MACN,aAAc;AAAA,QACb;AAAA,MACD;AAAA,MACA,SAAU,oBAAC,gCAA6B;AAAA,MACxC,QACC,gCACC;AAAA,QAAC;AAAA;AAAA,UACA,QAAS,YAAa,CAAE;AAAA,UACxB;AAAA,UACA,SAAU;AAAA;AAAA,MACX;AAAA;AAAA,EAGH,GACD;AAEF;",
   "names": []
 }

package/build-module/components/sidebar-navigation-screen-identity/index.mjs

@@ -1,22 +1,8 @@
 // packages/edit-site/src/components/sidebar-navigation-screen-identity/index.js
 import { __ } from "@wordpress/i18n";
-import { privateApis as routerPrivateApis } from "@wordpress/router";
 import SidebarNavigationScreen from "../sidebar-navigation-screen/index.mjs";
-import { unlock } from "../../lock-unlock.mjs";
-import SidebarNavigationItem from "../sidebar-navigation-item/index.mjs";
 import { MainSidebarNavigationContent } from "../sidebar-navigation-screen-main/index.mjs";
 import { jsx } from "react/jsx-runtime";
-var { useLocation } = unlock(routerPrivateApis);
-function SidebarNavigationItemIdentity(props) {
-  const { name } = useLocation();
-  return /* @__PURE__ */ jsx(
-    SidebarNavigationItem,
-    {
-      ...props,
-      "aria-current": name === "identity"
-    }
-  );
-}
 function SidebarNavigationScreenIdentity() {
   return /* @__PURE__ */ jsx(
     SidebarNavigationScreen,
@@ -31,7 +17,6 @@ function SidebarNavigationScreenIdentity() {
   );
 }
 export {
-  SidebarNavigationItemIdentity,
   SidebarNavigationScreenIdentity as default
 };
 //# sourceMappingURL=index.mjs.map

package/build-module/components/sidebar-navigation-screen-identity/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/components/sidebar-navigation-screen-identity/index.js"],
-  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\nimport { privateApis as routerPrivateApis } from '@wordpress/router';\n\n/**\n * Internal dependencies\n */\nimport SidebarNavigationScreen from '../sidebar-navigation-screen';\nimport { unlock } from '../../lock-unlock';\nimport SidebarNavigationItem from '../sidebar-navigation-item';\nimport { MainSidebarNavigationContent } from '../sidebar-navigation-screen-main';\n\nconst { useLocation } = unlock( routerPrivateApis );\n\nexport function SidebarNavigationItemIdentity( props ) {\n\tconst { name } = useLocation();\n\treturn (\n\t\t<SidebarNavigationItem\n\t\t\t{ ...props }\n\t\t\taria-current={ name === 'identity' }\n\t\t/>\n\t);\n}\n\nexport default function SidebarNavigationScreenIdentity() {\n\treturn (\n\t\t<SidebarNavigationScreen\n\t\t\tisRoot\n\t\t\ttitle={ __( 'Design' ) }\n\t\t\tdescription={ __(\n\t\t\t\t'Customize the appearance of your website using the block editor.'\n\t\t\t) }\n\t\t\tcontent={ <MainSidebarNavigationContent /> }\n\t\t/>\n\t);\n}\n"],
-  "mappings": ";AAGA,SAAS,UAAU;AACnB,SAAS,eAAe,yBAAyB;AAKjD,OAAO,6BAA6B;AACpC,SAAS,cAAc;AACvB,OAAO,2BAA2B;AAClC,SAAS,oCAAoC;AAO3C;AALF,IAAM,EAAE,YAAY,IAAI,OAAQ,iBAAkB;AAE3C,SAAS,8BAA+B,OAAQ;AACtD,QAAM,EAAE,KAAK,IAAI,YAAY;AAC7B,SACC;AAAA,IAAC;AAAA;AAAA,MACE,GAAG;AAAA,MACL,gBAAe,SAAS;AAAA;AAAA,EACzB;AAEF;AAEe,SAAR,kCAAmD;AACzD,SACC;AAAA,IAAC;AAAA;AAAA,MACA,QAAM;AAAA,MACN,OAAQ,GAAI,QAAS;AAAA,MACrB,aAAc;AAAA,QACb;AAAA,MACD;AAAA,MACA,SAAU,oBAAC,gCAA6B;AAAA;AAAA,EACzC;AAEF;",
+  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\n\n/**\n * Internal dependencies\n */\nimport SidebarNavigationScreen from '../sidebar-navigation-screen';\nimport { MainSidebarNavigationContent } from '../sidebar-navigation-screen-main';\n\nexport default function SidebarNavigationScreenIdentity() {\n\treturn (\n\t\t<SidebarNavigationScreen\n\t\t\tisRoot\n\t\t\ttitle={ __( 'Design' ) }\n\t\t\tdescription={ __(\n\t\t\t\t'Customize the appearance of your website using the block editor.'\n\t\t\t) }\n\t\t\tcontent={ <MainSidebarNavigationContent /> }\n\t\t/>\n\t);\n}\n"],
+  "mappings": ";AAGA,SAAS,UAAU;AAKnB,OAAO,6BAA6B;AACpC,SAAS,oCAAoC;AAUhC;AARE,SAAR,kCAAmD;AACzD,SACC;AAAA,IAAC;AAAA;AAAA,MACA,QAAM;AAAA,MACN,OAAQ,GAAI,QAAS;AAAA,MACrB,aAAc;AAAA,QACb;AAAA,MACD;AAAA,MACA,SAAU,oBAAC,gCAA6B;AAAA;AAAA,EACzC;AAEF;",
   "names": []
 }

package/build-module/components/sidebar-navigation-screen-main/index.mjs

@@ -13,71 +13,53 @@ import { useSelect } from "@wordpress/data";
 import { store as coreStore } from "@wordpress/core-data";
 import SidebarNavigationScreen from "../sidebar-navigation-screen/index.mjs";
 import SidebarNavigationItem from "../sidebar-navigation-item/index.mjs";
-import { SidebarNavigationItemGlobalStyles } from "../sidebar-navigation-screen-global-styles/index.mjs";
-import { SidebarNavigationItemIdentity } from "../sidebar-navigation-screen-identity/index.mjs";
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { jsx, jsxs } from "react/jsx-runtime";
 function MainSidebarNavigationContent({ isBlockBasedTheme = true }) {
   return /* @__PURE__ */ jsxs(ItemGroup, { className: "edit-site-sidebar-navigation-screen-main", children: [
-    isBlockBasedTheme && /* @__PURE__ */ jsxs(Fragment, { children: [
-      /* @__PURE__ */ jsx(
-        SidebarNavigationItemGlobalStyles,
-        {
-          to: "/styles",
-          uid: "global-styles-navigation-item",
-          icon: styles,
-          children: __("Styles")
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        SidebarNavigationItem,
-        {
-          uid: "navigation-navigation-item",
-          to: "/navigation",
-          withChevron: true,
-          icon: navigation,
-          children: __("Navigation")
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        SidebarNavigationItemIdentity,
-        {
-          to: "/identity",
-          uid: "identity-navigation-item",
-          icon: siteLogo,
-          children: _x("Identity", "site identity")
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        SidebarNavigationItem,
-        {
-          uid: "page-navigation-item",
-          to: "/page",
-          withChevron: true,
-          icon: page,
-          children: __("Pages")
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        SidebarNavigationItem,
-        {
-          uid: "template-navigation-item",
-          to: "/template",
-          withChevron: true,
-          icon: layout,
-          children: __("Templates")
-        }
-      )
-    ] }),
-    !isBlockBasedTheme && /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx(
       SidebarNavigationItem,
       {
-        uid: "stylebook-navigation-item",
-        to: "/stylebook",
-        withChevron: true,
+        to: "/identity",
+        uid: "identity-navigation-item",
+        icon: siteLogo,
+        activeOnRouteName: "identity",
+        isHidden: !isBlockBasedTheme,
+        children: _x("Identity", "site identity")
+      }
+    ),
+    /* @__PURE__ */ jsx(
+      SidebarNavigationItem,
+      {
+        to: isBlockBasedTheme ? "/styles" : "/stylebook",
+        uid: isBlockBasedTheme ? "global-styles-navigation-item" : "stylebook-navigation-item",
         icon: styles,
+        activeOnRouteName: isBlockBasedTheme ? "styles" : void 0,
+        withChevron: !isBlockBasedTheme,
         children: __("Styles")
       }
     ),
+    /* @__PURE__ */ jsx(
+      SidebarNavigationItem,
+      {
+        uid: "page-navigation-item",
+        to: "/page",
+        withChevron: true,
+        icon: page,
+        isHidden: !isBlockBasedTheme,
+        children: __("Pages")
+      }
+    ),
+    /* @__PURE__ */ jsx(
+      SidebarNavigationItem,
+      {
+        uid: "navigation-navigation-item",
+        to: "/navigation",
+        withChevron: true,
+        icon: navigation,
+        isHidden: !isBlockBasedTheme,
+        children: __("Navigation")
+      }
+    ),
     /* @__PURE__ */ jsx(
       SidebarNavigationItem,
       {
@@ -87,6 +69,17 @@ function MainSidebarNavigationContent({ isBlockBasedTheme = true }) {
         icon: symbol,
         children: __("Patterns")
       }
+    ),
+    /* @__PURE__ */ jsx(
+      SidebarNavigationItem,
+      {
+        uid: "template-navigation-item",
+        to: "/template",
+        withChevron: true,
+        icon: layout,
+        isHidden: !isBlockBasedTheme,
+        children: __("Templates")
+      }
     )
   ] });
 }

package/build-module/components/sidebar-navigation-screen-main/index.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/components/sidebar-navigation-screen-main/index.js"],
-  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { __experimentalItemGroup as ItemGroup } from '@wordpress/components';\nimport { __, _x } from '@wordpress/i18n';\nimport {\n\tlayout,\n\tsymbol,\n\tnavigation,\n\tstyles,\n\tpage,\n\tsiteLogo,\n} from '@wordpress/icons';\nimport { useSelect } from '@wordpress/data';\nimport { store as coreStore } from '@wordpress/core-data';\n\n/**\n * Internal dependencies\n */\nimport SidebarNavigationScreen from '../sidebar-navigation-screen';\nimport SidebarNavigationItem from '../sidebar-navigation-item';\nimport { SidebarNavigationItemGlobalStyles } from '../sidebar-navigation-screen-global-styles';\nimport { SidebarNavigationItemIdentity } from '../sidebar-navigation-screen-identity';\n\nexport function MainSidebarNavigationContent( { isBlockBasedTheme = true } ) {\n\treturn (\n\t\t<ItemGroup className=\"edit-site-sidebar-navigation-screen-main\">\n\t\t\t{ isBlockBasedTheme && (\n\t\t\t\t<>\n\t\t\t\t\t<SidebarNavigationItemGlobalStyles\n\t\t\t\t\t\tto=\"/styles\"\n\t\t\t\t\t\tuid=\"global-styles-navigation-item\"\n\t\t\t\t\t\ticon={ styles }\n\t\t\t\t\t>\n\t\t\t\t\t\t{ __( 'Styles' ) }\n\t\t\t\t\t</SidebarNavigationItemGlobalStyles>\n\t\t\t\t\t<SidebarNavigationItem\n\t\t\t\t\t\tuid=\"navigation-navigation-item\"\n\t\t\t\t\t\tto=\"/navigation\"\n\t\t\t\t\t\twithChevron\n\t\t\t\t\t\ticon={ navigation }\n\t\t\t\t\t>\n\t\t\t\t\t\t{ __( 'Navigation' ) }\n\t\t\t\t\t</SidebarNavigationItem>\n\t\t\t\t\t<SidebarNavigationItemIdentity\n\t\t\t\t\t\tto=\"/identity\"\n\t\t\t\t\t\tuid=\"identity-navigation-item\"\n\t\t\t\t\t\ticon={ siteLogo }\n\t\t\t\t\t>\n\t\t\t\t\t\t{ _x( 'Identity', 'site identity' ) }\n\t\t\t\t\t</SidebarNavigationItemIdentity>\n\t\t\t\t\t<SidebarNavigationItem\n\t\t\t\t\t\tuid=\"page-navigation-item\"\n\t\t\t\t\t\tto=\"/page\"\n\t\t\t\t\t\twithChevron\n\t\t\t\t\t\ticon={ page }\n\t\t\t\t\t>\n\t\t\t\t\t\t{ __( 'Pages' ) }\n\t\t\t\t\t</SidebarNavigationItem>\n\t\t\t\t\t<SidebarNavigationItem\n\t\t\t\t\t\tuid=\"template-navigation-item\"\n\t\t\t\t\t\tto=\"/template\"\n\t\t\t\t\t\twithChevron\n\t\t\t\t\t\ticon={ layout }\n\t\t\t\t\t>\n\t\t\t\t\t\t{ __( 'Templates' ) }\n\t\t\t\t\t</SidebarNavigationItem>\n\t\t\t\t</>\n\t\t\t) }\n\t\t\t{ ! isBlockBasedTheme && (\n\t\t\t\t<SidebarNavigationItem\n\t\t\t\t\tuid=\"stylebook-navigation-item\"\n\t\t\t\t\tto=\"/stylebook\"\n\t\t\t\t\twithChevron\n\t\t\t\t\ticon={ styles }\n\t\t\t\t>\n\t\t\t\t\t{ __( 'Styles' ) }\n\t\t\t\t</SidebarNavigationItem>\n\t\t\t) }\n\t\t\t<SidebarNavigationItem\n\t\t\t\tuid=\"patterns-navigation-item\"\n\t\t\t\tto=\"/pattern\"\n\t\t\t\twithChevron\n\t\t\t\ticon={ symbol }\n\t\t\t>\n\t\t\t\t{ __( 'Patterns' ) }\n\t\t\t</SidebarNavigationItem>\n\t\t</ItemGroup>\n\t);\n}\n\nexport default function SidebarNavigationScreenMain( { customDescription } ) {\n\tconst isBlockBasedTheme = useSelect(\n\t\t( select ) => select( coreStore ).getCurrentTheme()?.is_block_theme,\n\t\t[]\n\t);\n\n\tlet description;\n\tif ( customDescription ) {\n\t\tdescription = customDescription;\n\t} else if ( isBlockBasedTheme ) {\n\t\tdescription = __(\n\t\t\t'Customize the appearance of your website using the block editor.'\n\t\t);\n\t} else {\n\t\tdescription = __(\n\t\t\t'Explore block styles and patterns to refine your site.'\n\t\t);\n\t}\n\n\treturn (\n\t\t<SidebarNavigationScreen\n\t\t\tisRoot\n\t\t\ttitle={ __( 'Design' ) }\n\t\t\tdescription={ description }\n\t\t\tcontent={\n\t\t\t\t<MainSidebarNavigationContent\n\t\t\t\t\tisBlockBasedTheme={ isBlockBasedTheme }\n\t\t\t\t/>\n\t\t\t}\n\t\t/>\n\t);\n}\n"],
-  "mappings": ";AAGA,SAAS,2BAA2B,iBAAiB;AACrD,SAAS,IAAI,UAAU;AACvB;AAAA,EACC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACM;AACP,SAAS,iBAAiB;AAC1B,SAAS,SAAS,iBAAiB;AAKnC,OAAO,6BAA6B;AACpC,OAAO,2BAA2B;AAClC,SAAS,yCAAyC;AAClD,SAAS,qCAAqC;AAM1C,mBACC,KADD;AAJG,SAAS,6BAA8B,EAAE,oBAAoB,KAAK,GAAI;AAC5E,SACC,qBAAC,aAAU,WAAU,4CAClB;AAAA,yBACD,iCACC;AAAA;AAAA,QAAC;AAAA;AAAA,UACA,IAAG;AAAA,UACH,KAAI;AAAA,UACJ,MAAO;AAAA,UAEL,aAAI,QAAS;AAAA;AAAA,MAChB;AAAA,MACA;AAAA,QAAC;AAAA;AAAA,UACA,KAAI;AAAA,UACJ,IAAG;AAAA,UACH,aAAW;AAAA,UACX,MAAO;AAAA,UAEL,aAAI,YAAa;AAAA;AAAA,MACpB;AAAA,MACA;AAAA,QAAC;AAAA;AAAA,UACA,IAAG;AAAA,UACH,KAAI;AAAA,UACJ,MAAO;AAAA,UAEL,aAAI,YAAY,eAAgB;AAAA;AAAA,MACnC;AAAA,MACA;AAAA,QAAC;AAAA;AAAA,UACA,KAAI;AAAA,UACJ,IAAG;AAAA,UACH,aAAW;AAAA,UACX,MAAO;AAAA,UAEL,aAAI,OAAQ;AAAA;AAAA,MACf;AAAA,MACA;AAAA,QAAC;AAAA;AAAA,UACA,KAAI;AAAA,UACJ,IAAG;AAAA,UACH,aAAW;AAAA,UACX,MAAO;AAAA,UAEL,aAAI,WAAY;AAAA;AAAA,MACnB;AAAA,OACD;AAAA,IAEC,CAAE,qBACH;AAAA,MAAC;AAAA;AAAA,QACA,KAAI;AAAA,QACJ,IAAG;AAAA,QACH,aAAW;AAAA,QACX,MAAO;AAAA,QAEL,aAAI,QAAS;AAAA;AAAA,IAChB;AAAA,IAED;AAAA,MAAC;AAAA;AAAA,QACA,KAAI;AAAA,QACJ,IAAG;AAAA,QACH,aAAW;AAAA,QACX,MAAO;AAAA,QAEL,aAAI,UAAW;AAAA;AAAA,IAClB;AAAA,KACD;AAEF;AAEe,SAAR,4BAA8C,EAAE,kBAAkB,GAAI;AAC5E,QAAM,oBAAoB;AAAA,IACzB,CAAE,WAAY,OAAQ,SAAU,EAAE,gBAAgB,GAAG;AAAA,IACrD,CAAC;AAAA,EACF;AAEA,MAAI;AACJ,MAAK,mBAAoB;AACxB,kBAAc;AAAA,EACf,WAAY,mBAAoB;AAC/B,kBAAc;AAAA,MACb;AAAA,IACD;AAAA,EACD,OAAO;AACN,kBAAc;AAAA,MACb;AAAA,IACD;AAAA,EACD;AAEA,SACC;AAAA,IAAC;AAAA;AAAA,MACA,QAAM;AAAA,MACN,OAAQ,GAAI,QAAS;AAAA,MACrB;AAAA,MACA,SACC;AAAA,QAAC;AAAA;AAAA,UACA;AAAA;AAAA,MACD;AAAA;AAAA,EAEF;AAEF;",
+  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { __experimentalItemGroup as ItemGroup } from '@wordpress/components';\nimport { __, _x } from '@wordpress/i18n';\nimport {\n\tlayout,\n\tsymbol,\n\tnavigation,\n\tstyles,\n\tpage,\n\tsiteLogo,\n} from '@wordpress/icons';\nimport { useSelect } from '@wordpress/data';\nimport { store as coreStore } from '@wordpress/core-data';\n\n/**\n * Internal dependencies\n */\nimport SidebarNavigationScreen from '../sidebar-navigation-screen';\nimport SidebarNavigationItem from '../sidebar-navigation-item';\n\nexport function MainSidebarNavigationContent( { isBlockBasedTheme = true } ) {\n\treturn (\n\t\t<ItemGroup className=\"edit-site-sidebar-navigation-screen-main\">\n\t\t\t<SidebarNavigationItem\n\t\t\t\tto=\"/identity\"\n\t\t\t\tuid=\"identity-navigation-item\"\n\t\t\t\ticon={ siteLogo }\n\t\t\t\tactiveOnRouteName=\"identity\"\n\t\t\t\tisHidden={ ! isBlockBasedTheme }\n\t\t\t>\n\t\t\t\t{ _x( 'Identity', 'site identity' ) }\n\t\t\t</SidebarNavigationItem>\n\t\t\t<SidebarNavigationItem\n\t\t\t\tto={ isBlockBasedTheme ? '/styles' : '/stylebook' }\n\t\t\t\tuid={\n\t\t\t\t\tisBlockBasedTheme\n\t\t\t\t\t\t? 'global-styles-navigation-item'\n\t\t\t\t\t\t: 'stylebook-navigation-item'\n\t\t\t\t}\n\t\t\t\ticon={ styles }\n\t\t\t\tactiveOnRouteName={ isBlockBasedTheme ? 'styles' : undefined }\n\t\t\t\twithChevron={ ! isBlockBasedTheme }\n\t\t\t>\n\t\t\t\t{ __( 'Styles' ) }\n\t\t\t</SidebarNavigationItem>\n\t\t\t<SidebarNavigationItem\n\t\t\t\tuid=\"page-navigation-item\"\n\t\t\t\tto=\"/page\"\n\t\t\t\twithChevron\n\t\t\t\ticon={ page }\n\t\t\t\tisHidden={ ! isBlockBasedTheme }\n\t\t\t>\n\t\t\t\t{ __( 'Pages' ) }\n\t\t\t</SidebarNavigationItem>\n\t\t\t<SidebarNavigationItem\n\t\t\t\tuid=\"navigation-navigation-item\"\n\t\t\t\tto=\"/navigation\"\n\t\t\t\twithChevron\n\t\t\t\ticon={ navigation }\n\t\t\t\tisHidden={ ! isBlockBasedTheme }\n\t\t\t>\n\t\t\t\t{ __( 'Navigation' ) }\n\t\t\t</SidebarNavigationItem>\n\t\t\t<SidebarNavigationItem\n\t\t\t\tuid=\"patterns-navigation-item\"\n\t\t\t\tto=\"/pattern\"\n\t\t\t\twithChevron\n\t\t\t\ticon={ symbol }\n\t\t\t>\n\t\t\t\t{ __( 'Patterns' ) }\n\t\t\t</SidebarNavigationItem>\n\t\t\t<SidebarNavigationItem\n\t\t\t\tuid=\"template-navigation-item\"\n\t\t\t\tto=\"/template\"\n\t\t\t\twithChevron\n\t\t\t\ticon={ layout }\n\t\t\t\tisHidden={ ! isBlockBasedTheme }\n\t\t\t>\n\t\t\t\t{ __( 'Templates' ) }\n\t\t\t</SidebarNavigationItem>\n\t\t</ItemGroup>\n\t);\n}\n\nexport default function SidebarNavigationScreenMain( { customDescription } ) {\n\tconst isBlockBasedTheme = useSelect(\n\t\t( select ) => select( coreStore ).getCurrentTheme()?.is_block_theme,\n\t\t[]\n\t);\n\n\tlet description;\n\tif ( customDescription ) {\n\t\tdescription = customDescription;\n\t} else if ( isBlockBasedTheme ) {\n\t\tdescription = __(\n\t\t\t'Customize the appearance of your website using the block editor.'\n\t\t);\n\t} else {\n\t\tdescription = __(\n\t\t\t'Explore block styles and patterns to refine your site.'\n\t\t);\n\t}\n\n\treturn (\n\t\t<SidebarNavigationScreen\n\t\t\tisRoot\n\t\t\ttitle={ __( 'Design' ) }\n\t\t\tdescription={ description }\n\t\t\tcontent={\n\t\t\t\t<MainSidebarNavigationContent\n\t\t\t\t\tisBlockBasedTheme={ isBlockBasedTheme }\n\t\t\t\t/>\n\t\t\t}\n\t\t/>\n\t);\n}\n"],
+  "mappings": ";AAGA,SAAS,2BAA2B,iBAAiB;AACrD,SAAS,IAAI,UAAU;AACvB;AAAA,EACC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACM;AACP,SAAS,iBAAiB;AAC1B,SAAS,SAAS,iBAAiB;AAKnC,OAAO,6BAA6B;AACpC,OAAO,2BAA2B;AAIhC,SACC,KADD;AAFK,SAAS,6BAA8B,EAAE,oBAAoB,KAAK,GAAI;AAC5E,SACC,qBAAC,aAAU,WAAU,4CACpB;AAAA;AAAA,MAAC;AAAA;AAAA,QACA,IAAG;AAAA,QACH,KAAI;AAAA,QACJ,MAAO;AAAA,QACP,mBAAkB;AAAA,QAClB,UAAW,CAAE;AAAA,QAEX,aAAI,YAAY,eAAgB;AAAA;AAAA,IACnC;AAAA,IACA;AAAA,MAAC;AAAA;AAAA,QACA,IAAK,oBAAoB,YAAY;AAAA,QACrC,KACC,oBACG,kCACA;AAAA,QAEJ,MAAO;AAAA,QACP,mBAAoB,oBAAoB,WAAW;AAAA,QACnD,aAAc,CAAE;AAAA,QAEd,aAAI,QAAS;AAAA;AAAA,IAChB;AAAA,IACA;AAAA,MAAC;AAAA;AAAA,QACA,KAAI;AAAA,QACJ,IAAG;AAAA,QACH,aAAW;AAAA,QACX,MAAO;AAAA,QACP,UAAW,CAAE;AAAA,QAEX,aAAI,OAAQ;AAAA;AAAA,IACf;AAAA,IACA;AAAA,MAAC;AAAA;AAAA,QACA,KAAI;AAAA,QACJ,IAAG;AAAA,QACH,aAAW;AAAA,QACX,MAAO;AAAA,QACP,UAAW,CAAE;AAAA,QAEX,aAAI,YAAa;AAAA;AAAA,IACpB;AAAA,IACA;AAAA,MAAC;AAAA;AAAA,QACA,KAAI;AAAA,QACJ,IAAG;AAAA,QACH,aAAW;AAAA,QACX,MAAO;AAAA,QAEL,aAAI,UAAW;AAAA;AAAA,IAClB;AAAA,IACA;AAAA,MAAC;AAAA;AAAA,QACA,KAAI;AAAA,QACJ,IAAG;AAAA,QACH,aAAW;AAAA,QACX,MAAO;AAAA,QACP,UAAW,CAAE;AAAA,QAEX,aAAI,WAAY;AAAA;AAAA,IACnB;AAAA,KACD;AAEF;AAEe,SAAR,4BAA8C,EAAE,kBAAkB,GAAI;AAC5E,QAAM,oBAAoB;AAAA,IACzB,CAAE,WAAY,OAAQ,SAAU,EAAE,gBAAgB,GAAG;AAAA,IACrD,CAAC;AAAA,EACF;AAEA,MAAI;AACJ,MAAK,mBAAoB;AACxB,kBAAc;AAAA,EACf,WAAY,mBAAoB;AAC/B,kBAAc;AAAA,MACb;AAAA,IACD;AAAA,EACD,OAAO;AACN,kBAAc;AAAA,MACb;AAAA,IACD;AAAA,EACD;AAEA,SACC;AAAA,IAAC;AAAA;AAAA,MACA,QAAM;AAAA,MACN,OAAQ,GAAI,QAAS;AAAA,MACrB;AAAA,MACA,SACC;AAAA,QAAC;AAAA;AAAA,UACA;AAAA;AAAA,MACD;AAAA;AAAA,EAEF;AAEF;",
   "names": []
 }

package/build-module/components/sidebar-navigation-screen-navigation-menu/rename-modal.mjs

@@ -25,7 +25,6 @@ function RenameModal({ menuTitle, onClose, onSave }) {
         /* @__PURE__ */ jsx(
           TextControl,
           {
-            __next40pxDefaultSize: true,
             value: editedMenuTitle,
             placeholder: __("Navigation title"),
             onChange: setEditedMenuTitle,

package/build-module/components/sidebar-navigation-screen-navigation-menu/rename-modal.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/components/sidebar-navigation-screen-navigation-menu/rename-modal.js"],
-  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport {\n\t__experimentalHStack as HStack,\n\t__experimentalVStack as VStack,\n\tButton,\n\tTextControl,\n\tModal,\n} from '@wordpress/components';\nimport { __ } from '@wordpress/i18n';\nimport { useState } from '@wordpress/element';\n\nconst notEmptyString = ( testString ) => testString?.trim()?.length > 0;\n\nexport default function RenameModal( { menuTitle, onClose, onSave } ) {\n\tconst [ editedMenuTitle, setEditedMenuTitle ] = useState( menuTitle );\n\n\tconst titleHasChanged = editedMenuTitle !== menuTitle;\n\n\tconst isEditedMenuTitleValid =\n\t\ttitleHasChanged && notEmptyString( editedMenuTitle );\n\n\treturn (\n\t\t<Modal\n\t\t\ttitle={ __( 'Rename' ) }\n\t\t\tonRequestClose={ onClose }\n\t\t\tfocusOnMount=\"firstContentElement\"\n\t\t\tsize=\"small\"\n\t\t>\n\t\t\t<form className=\"sidebar-navigation__rename-modal-form\">\n\t\t\t\t<VStack spacing=\"3\">\n\t\t\t\t\t<TextControl\n\t\t\t\t\t\t__next40pxDefaultSize\n\t\t\t\t\t\tvalue={ editedMenuTitle }\n\t\t\t\t\t\tplaceholder={ __( 'Navigation title' ) }\n\t\t\t\t\t\tonChange={ setEditedMenuTitle }\n\t\t\t\t\t\tlabel={ __( 'Name' ) }\n\t\t\t\t\t/>\n\t\t\t\t\t<HStack justify=\"right\">\n\t\t\t\t\t\t<Button\n\t\t\t\t\t\t\t__next40pxDefaultSize\n\t\t\t\t\t\t\tvariant=\"tertiary\"\n\t\t\t\t\t\t\tonClick={ onClose }\n\t\t\t\t\t\t>\n\t\t\t\t\t\t\t{ __( 'Cancel' ) }\n\t\t\t\t\t\t</Button>\n\n\t\t\t\t\t\t<Button\n\t\t\t\t\t\t\t__next40pxDefaultSize\n\t\t\t\t\t\t\taccessibleWhenDisabled\n\t\t\t\t\t\t\tdisabled={ ! isEditedMenuTitleValid }\n\t\t\t\t\t\t\tvariant=\"primary\"\n\t\t\t\t\t\t\ttype=\"submit\"\n\t\t\t\t\t\t\tonClick={ ( e ) => {\n\t\t\t\t\t\t\t\te.preventDefault();\n\n\t\t\t\t\t\t\t\tif ( ! isEditedMenuTitleValid ) {\n\t\t\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\tonSave( { title: editedMenuTitle } );\n\n\t\t\t\t\t\t\t\t// Immediate close avoids ability to hit save multiple times.\n\t\t\t\t\t\t\t\tonClose();\n\t\t\t\t\t\t\t} }\n\t\t\t\t\t\t>\n\t\t\t\t\t\t\t{ __( 'Save' ) }\n\t\t\t\t\t\t</Button>\n\t\t\t\t\t</HStack>\n\t\t\t\t</VStack>\n\t\t\t</form>\n\t\t</Modal>\n\t);\n}\n"],
-  "mappings": ";AAGA;AAAA,EACC,wBAAwB;AAAA,EACxB,wBAAwB;AAAA,EACxB;AAAA,EACA;AAAA,EACA;AAAA,OACM;AACP,SAAS,UAAU;AACnB,SAAS,gBAAgB;AAqBpB,cAOA,YAPA;AAnBL,IAAM,iBAAiB,CAAE,eAAgB,YAAY,KAAK,GAAG,SAAS;AAEvD,SAAR,YAA8B,EAAE,WAAW,SAAS,OAAO,GAAI;AACrE,QAAM,CAAE,iBAAiB,kBAAmB,IAAI,SAAU,SAAU;AAEpE,QAAM,kBAAkB,oBAAoB;AAE5C,QAAM,yBACL,mBAAmB,eAAgB,eAAgB;AAEpD,SACC;AAAA,IAAC;AAAA;AAAA,MACA,OAAQ,GAAI,QAAS;AAAA,MACrB,gBAAiB;AAAA,MACjB,cAAa;AAAA,MACb,MAAK;AAAA,MAEL,8BAAC,UAAK,WAAU,yCACf,+BAAC,UAAO,SAAQ,KACf;AAAA;AAAA,UAAC;AAAA;AAAA,YACA,uBAAqB;AAAA,YACrB,OAAQ;AAAA,YACR,aAAc,GAAI,kBAAmB;AAAA,YACrC,UAAW;AAAA,YACX,OAAQ,GAAI,MAAO;AAAA;AAAA,QACpB;AAAA,QACA,qBAAC,UAAO,SAAQ,SACf;AAAA;AAAA,YAAC;AAAA;AAAA,cACA,uBAAqB;AAAA,cACrB,SAAQ;AAAA,cACR,SAAU;AAAA,cAER,aAAI,QAAS;AAAA;AAAA,UAChB;AAAA,UAEA;AAAA,YAAC;AAAA;AAAA,cACA,uBAAqB;AAAA,cACrB,wBAAsB;AAAA,cACtB,UAAW,CAAE;AAAA,cACb,SAAQ;AAAA,cACR,MAAK;AAAA,cACL,SAAU,CAAE,MAAO;AAClB,kBAAE,eAAe;AAEjB,oBAAK,CAAE,wBAAyB;AAC/B;AAAA,gBACD;AACA,uBAAQ,EAAE,OAAO,gBAAgB,CAAE;AAGnC,wBAAQ;AAAA,cACT;AAAA,cAEE,aAAI,MAAO;AAAA;AAAA,UACd;AAAA,WACD;AAAA,SACD,GACD;AAAA;AAAA,EACD;AAEF;",
+  "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport {\n\t__experimentalHStack as HStack,\n\t__experimentalVStack as VStack,\n\tButton,\n\tTextControl,\n\tModal,\n} from '@wordpress/components';\nimport { __ } from '@wordpress/i18n';\nimport { useState } from '@wordpress/element';\n\nconst notEmptyString = ( testString ) => testString?.trim()?.length > 0;\n\nexport default function RenameModal( { menuTitle, onClose, onSave } ) {\n\tconst [ editedMenuTitle, setEditedMenuTitle ] = useState( menuTitle );\n\n\tconst titleHasChanged = editedMenuTitle !== menuTitle;\n\n\tconst isEditedMenuTitleValid =\n\t\ttitleHasChanged && notEmptyString( editedMenuTitle );\n\n\treturn (\n\t\t<Modal\n\t\t\ttitle={ __( 'Rename' ) }\n\t\t\tonRequestClose={ onClose }\n\t\t\tfocusOnMount=\"firstContentElement\"\n\t\t\tsize=\"small\"\n\t\t>\n\t\t\t<form className=\"sidebar-navigation__rename-modal-form\">\n\t\t\t\t<VStack spacing=\"3\">\n\t\t\t\t\t<TextControl\n\t\t\t\t\t\tvalue={ editedMenuTitle }\n\t\t\t\t\t\tplaceholder={ __( 'Navigation title' ) }\n\t\t\t\t\t\tonChange={ setEditedMenuTitle }\n\t\t\t\t\t\tlabel={ __( 'Name' ) }\n\t\t\t\t\t/>\n\t\t\t\t\t<HStack justify=\"right\">\n\t\t\t\t\t\t<Button\n\t\t\t\t\t\t\t__next40pxDefaultSize\n\t\t\t\t\t\t\tvariant=\"tertiary\"\n\t\t\t\t\t\t\tonClick={ onClose }\n\t\t\t\t\t\t>\n\t\t\t\t\t\t\t{ __( 'Cancel' ) }\n\t\t\t\t\t\t</Button>\n\n\t\t\t\t\t\t<Button\n\t\t\t\t\t\t\t__next40pxDefaultSize\n\t\t\t\t\t\t\taccessibleWhenDisabled\n\t\t\t\t\t\t\tdisabled={ ! isEditedMenuTitleValid }\n\t\t\t\t\t\t\tvariant=\"primary\"\n\t\t\t\t\t\t\ttype=\"submit\"\n\t\t\t\t\t\t\tonClick={ ( e ) => {\n\t\t\t\t\t\t\t\te.preventDefault();\n\n\t\t\t\t\t\t\t\tif ( ! isEditedMenuTitleValid ) {\n\t\t\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\tonSave( { title: editedMenuTitle } );\n\n\t\t\t\t\t\t\t\t// Immediate close avoids ability to hit save multiple times.\n\t\t\t\t\t\t\t\tonClose();\n\t\t\t\t\t\t\t} }\n\t\t\t\t\t\t>\n\t\t\t\t\t\t\t{ __( 'Save' ) }\n\t\t\t\t\t\t</Button>\n\t\t\t\t\t</HStack>\n\t\t\t\t</VStack>\n\t\t\t</form>\n\t\t</Modal>\n\t);\n}\n"],
+  "mappings": ";AAGA;AAAA,EACC,wBAAwB;AAAA,EACxB,wBAAwB;AAAA,EACxB;AAAA,EACA;AAAA,EACA;AAAA,OACM;AACP,SAAS,UAAU;AACnB,SAAS,gBAAgB;AAqBpB,cAMA,YANA;AAnBL,IAAM,iBAAiB,CAAE,eAAgB,YAAY,KAAK,GAAG,SAAS;AAEvD,SAAR,YAA8B,EAAE,WAAW,SAAS,OAAO,GAAI;AACrE,QAAM,CAAE,iBAAiB,kBAAmB,IAAI,SAAU,SAAU;AAEpE,QAAM,kBAAkB,oBAAoB;AAE5C,QAAM,yBACL,mBAAmB,eAAgB,eAAgB;AAEpD,SACC;AAAA,IAAC;AAAA;AAAA,MACA,OAAQ,GAAI,QAAS;AAAA,MACrB,gBAAiB;AAAA,MACjB,cAAa;AAAA,MACb,MAAK;AAAA,MAEL,8BAAC,UAAK,WAAU,yCACf,+BAAC,UAAO,SAAQ,KACf;AAAA;AAAA,UAAC;AAAA;AAAA,YACA,OAAQ;AAAA,YACR,aAAc,GAAI,kBAAmB;AAAA,YACrC,UAAW;AAAA,YACX,OAAQ,GAAI,MAAO;AAAA;AAAA,QACpB;AAAA,QACA,qBAAC,UAAO,SAAQ,SACf;AAAA;AAAA,YAAC;AAAA;AAAA,cACA,uBAAqB;AAAA,cACrB,SAAQ;AAAA,cACR,SAAU;AAAA,cAER,aAAI,QAAS;AAAA;AAAA,UAChB;AAAA,UAEA;AAAA,YAAC;AAAA;AAAA,cACA,uBAAqB;AAAA,cACrB,wBAAsB;AAAA,cACtB,UAAW,CAAE;AAAA,cACb,SAAQ;AAAA,cACR,MAAK;AAAA,cACL,SAAU,CAAE,MAAO;AAClB,kBAAE,eAAe;AAEjB,oBAAK,CAAE,wBAAyB;AAC/B;AAAA,gBACD;AACA,uBAAQ,EAAE,OAAO,gBAAgB,CAAE;AAGnC,wBAAQ;AAAA,cACT;AAAA,cAEE,aAAI,MAAO;AAAA;AAAA,UACd;AAAA,WACD;AAAA,SACD,GACD;AAAA;AAAA,EACD;AAEF;",
   "names": []
 }

package/build-module/components/sidebar-navigation-screen-patterns/index.mjs

@@ -21,6 +21,7 @@ import usePatternCategories from "./use-pattern-categories.mjs";
 import useTemplatePartAreas from "./use-template-part-areas.mjs";
 import { unlock } from "../../lock-unlock.mjs";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+var VIEW_CONFIG_FIELDS = ["view_list"];
 var { useLocation } = unlock(routerPrivateApis);
 function CategoriesGroup({
   templatePartViews,
@@ -67,11 +68,13 @@ function SidebarNavigationScreenPatterns({ backPath }) {
   const currentCategory = categoryId || (postType === PATTERN_TYPES.user ? PATTERN_DEFAULT_CATEGORY : TEMPLATE_PART_ALL_AREAS_CATEGORY);
   const { view_list: templatePartViews } = useViewConfig({
     kind: "postType",
-    name: TEMPLATE_PART_POST_TYPE
+    name: TEMPLATE_PART_POST_TYPE,
+    fields: VIEW_CONFIG_FIELDS
   });
   const { view_list: patternViews } = useViewConfig({
     kind: "postType",
-    name: PATTERN_TYPES.user
+    name: PATTERN_TYPES.user,
+    fields: VIEW_CONFIG_FIELDS
   });
   const { templatePartAreas, isLoading, hasTemplateParts } = useTemplatePartAreas();
   const templatePartCounts = useMemo(() => {
@@ -104,7 +107,7 @@ function SidebarNavigationScreenPatterns({ backPath }) {
       isRoot: !backPath,
       backPath,
       content: /* @__PURE__ */ jsxs(Fragment, { children: [
-        isLoading && __("Loading items\u2026"),
+        isLoading && __("Loading items…"),
         !isLoading && /* @__PURE__ */ jsxs(Fragment, { children: [
           !hasTemplateParts && !hasPatterns && /* @__PURE__ */ jsx(ItemGroup, { className: "edit-site-sidebar-navigation-screen-patterns__group", children: /* @__PURE__ */ jsx(Item, { children: __("No items found") }) }),
           /* @__PURE__ */ jsx(