@wordpress/edit-site 6.45.0 → 6.45.1-next.v.202605131032.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (36) hide show
  1. package/build/components/add-new-template/utils.cjs +11 -8
  2. package/build/components/add-new-template/utils.cjs.map +2 -2
  3. package/build/components/add-new-template-legacy/utils.cjs +12 -9
  4. package/build/components/add-new-template-legacy/utils.cjs.map +2 -2
  5. package/build/components/layout/hooks.cjs +35 -28
  6. package/build/components/layout/hooks.cjs.map +2 -2
  7. package/build/components/page-patterns/use-pattern-settings.cjs +4 -1
  8. package/build/components/page-patterns/use-pattern-settings.cjs.map +2 -2
  9. package/build/components/sidebar-identity/index.cjs +15 -7
  10. package/build/components/sidebar-identity/index.cjs.map +2 -2
  11. package/build/components/sidebar-navigation-screen-main/index.cjs +1 -1
  12. package/build/components/sidebar-navigation-screen-main/index.cjs.map +2 -2
  13. package/build-module/components/add-new-template/utils.mjs +11 -8
  14. package/build-module/components/add-new-template/utils.mjs.map +2 -2
  15. package/build-module/components/add-new-template-legacy/utils.mjs +12 -9
  16. package/build-module/components/add-new-template-legacy/utils.mjs.map +2 -2
  17. package/build-module/components/layout/hooks.mjs +36 -29
  18. package/build-module/components/layout/hooks.mjs.map +2 -2
  19. package/build-module/components/page-patterns/use-pattern-settings.mjs +4 -1
  20. package/build-module/components/page-patterns/use-pattern-settings.mjs.map +2 -2
  21. package/build-module/components/sidebar-identity/index.mjs +16 -8
  22. package/build-module/components/sidebar-identity/index.mjs.map +2 -2
  23. package/build-module/components/sidebar-navigation-screen-main/index.mjs +2 -2
  24. package/build-module/components/sidebar-navigation-screen-main/index.mjs.map +2 -2
  25. package/build-style/style-rtl.css +1 -13
  26. package/build-style/style.css +1 -13
  27. package/package.json +47 -47
  28. package/src/components/add-new-template/utils.js +12 -8
  29. package/src/components/add-new-template-legacy/utils.js +13 -9
  30. package/src/components/layout/hooks.js +63 -42
  31. package/src/components/layout/style.scss +3 -15
  32. package/src/components/page-patterns/use-pattern-settings.js +6 -1
  33. package/src/components/page-templates/style.scss +0 -6
  34. package/src/components/sidebar-identity/index.js +6 -2
  35. package/src/components/sidebar-navigation-screen/style.scss +2 -2
  36. package/src/components/sidebar-navigation-screen-main/index.js +2 -2
package/build-module/components/page-patterns/use-pattern-settings.mjs CHANGED
@@ -41,9 +41,12 @@ function usePatternSettings() {
41
41
  __experimentalFeatures,
42
42
  ...restStoredSettings
43
43
  } = storedSettings;
44
+ const nonGlobalStyles = (styles ?? []).filter(
45
+ (style) => !style.isGlobalStyles
46
+ );
44
47
  return {
45
48
  ...restStoredSettings,
46
- styles: globalStyles,
49
+ styles: [...nonGlobalStyles, ...globalStyles],
47
50
  __experimentalFeatures: globalSettings,
48
51
  [globalStylesDataKey]: mergedConfig.styles ?? {},
49
52
  __experimentalBlockPatterns: blockPatterns,
package/build-module/components/page-patterns/use-pattern-settings.mjs.map CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/components/page-patterns/use-pattern-settings.js"],
4
- "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { store as coreStore } from '@wordpress/core-data';\nimport { useSelect } from '@wordpress/data';\nimport { useMemo } from '@wordpress/element';\nimport { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';\nimport { privateApis as editorPrivateApis } from '@wordpress/editor';\nimport { generateGlobalStyles } from '@wordpress/global-styles-engine';\n\n/**\n * Internal dependencies\n */\nimport { unlock } from '../../lock-unlock';\nimport { store as editSiteStore } from '../../store';\nimport { filterOutDuplicatesByName } from './utils';\n\nconst { useGlobalStyles } = unlock( editorPrivateApis );\nconst { globalStylesDataKey } = unlock( blockEditorPrivateApis );\n\nexport default function usePatternSettings() {\n\t/*\n\t * Generate global styles directly because block previews use a separate\n\t * ExperimentalBlockEditorProvider and can't access GlobalStylesRenderer's output.\n\t * Reading config from useGlobalStyles and generating CSS directly keeps us in sync.\n\t * See: https://github.com/WordPress/gutenberg/issues/73350\n\t */\n\tconst { merged: mergedConfig } = useGlobalStyles();\n\n\tconst storedSettings = useSelect( ( select ) => {\n\t\tconst { getSettings } = unlock( select( editSiteStore ) );\n\t\treturn getSettings();\n\t}, [] );\n\n\tconst settingsBlockPatterns =\n\t\tstoredSettings.__experimentalAdditionalBlockPatterns ?? // WP 6.0\n\t\tstoredSettings.__experimentalBlockPatterns; // WP 5.9\n\n\tconst restBlockPatterns = useSelect(\n\t\t( select ) => select( coreStore ).getBlockPatterns(),\n\t\t[]\n\t);\n\n\tconst blockPatterns = useMemo(\n\t\t() =>\n\t\t\t[\n\t\t\t\t...( settingsBlockPatterns || [] ),\n\t\t\t\t...( restBlockPatterns || [] ),\n\t\t\t].filter( filterOutDuplicatesByName ),\n\t\t[ settingsBlockPatterns, restBlockPatterns ]\n\t);\n\n\tconst [ globalStyles, globalSettings ] = useMemo( () => {\n\t\treturn generateGlobalStyles( mergedConfig, [], {\n\t\t\tdisableRootPadding: false,\n\t\t} );\n\t}, [ mergedConfig ] );\n\n\tconst settings = useMemo( () => {\n\t\tconst {\n\t\t\t__experimentalAdditionalBlockPatterns,\n\t\t\tstyles,\n\t\t\t__experimentalFeatures,\n\t\t\t...restStoredSettings\n\t\t} = storedSettings;\n\n\t\treturn {\n\t\t\t...restStoredSettings,\n\t\t\tstyles: globalStyles,\n\t\t\t__experimentalFeatures: globalSettings,\n\t\t\t[ globalStylesDataKey ]: mergedConfig.styles ?? {},\n\t\t\t__experimentalBlockPatterns: blockPatterns,\n\t\t\tisPreviewMode: true,\n\t\t};\n\t}, [\n\t\tstoredSettings,\n\t\tblockPatterns,\n\t\tglobalStyles,\n\t\tglobalSettings,\n\t\tmergedConfig,\n\t] );\n\n\treturn settings;\n}\n"],
5
- "mappings": ";AAGA,SAAS,SAAS,iBAAiB;AACnC,SAAS,iBAAiB;AAC1B,SAAS,eAAe;AACxB,SAAS,eAAe,8BAA8B;AACtD,SAAS,eAAe,yBAAyB;AACjD,SAAS,4BAA4B;AAKrC,SAAS,cAAc;AACvB,SAAS,SAAS,qBAAqB;AACvC,SAAS,iCAAiC;AAE1C,IAAM,EAAE,gBAAgB,IAAI,OAAQ,iBAAkB;AACtD,IAAM,EAAE,oBAAoB,IAAI,OAAQ,sBAAuB;AAEhD,SAAR,qBAAsC;AAO5C,QAAM,EAAE,QAAQ,aAAa,IAAI,gBAAgB;AAEjD,QAAM,iBAAiB,UAAW,CAAE,WAAY;AAC/C,UAAM,EAAE,YAAY,IAAI,OAAQ,OAAQ,aAAc,CAAE;AACxD,WAAO,YAAY;AAAA,EACpB,GAAG,CAAC,CAAE;AAEN,QAAM,wBACL,eAAe;AAAA,EACf,eAAe;AAEhB,QAAM,oBAAoB;AAAA,IACzB,CAAE,WAAY,OAAQ,SAAU,EAAE,iBAAiB;AAAA,IACnD,CAAC;AAAA,EACF;AAEA,QAAM,gBAAgB;AAAA,IACrB,MACC;AAAA,MACC,GAAK,yBAAyB,CAAC;AAAA,MAC/B,GAAK,qBAAqB,CAAC;AAAA,IAC5B,EAAE,OAAQ,yBAA0B;AAAA,IACrC,CAAE,uBAAuB,iBAAkB;AAAA,EAC5C;AAEA,QAAM,CAAE,cAAc,cAAe,IAAI,QAAS,MAAM;AACvD,WAAO,qBAAsB,cAAc,CAAC,GAAG;AAAA,MAC9C,oBAAoB;AAAA,IACrB,CAAE;AAAA,EACH,GAAG,CAAE,YAAa,CAAE;AAEpB,QAAM,WAAW,QAAS,MAAM;AAC/B,UAAM;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA,GAAG;AAAA,IACJ,IAAI;AAEJ,WAAO;AAAA,MACN,GAAG;AAAA,MACH,QAAQ;AAAA,MACR,wBAAwB;AAAA,MACxB,CAAE,mBAAoB,GAAG,aAAa,UAAU,CAAC;AAAA,MACjD,6BAA6B;AAAA,MAC7B,eAAe;AAAA,IAChB;AAAA,EACD,GAAG;AAAA,IACF;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACD,CAAE;AAEF,SAAO;AACR;",
4
+ "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { store as coreStore } from '@wordpress/core-data';\nimport { useSelect } from '@wordpress/data';\nimport { useMemo } from '@wordpress/element';\nimport { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';\nimport { privateApis as editorPrivateApis } from '@wordpress/editor';\nimport { generateGlobalStyles } from '@wordpress/global-styles-engine';\n\n/**\n * Internal dependencies\n */\nimport { unlock } from '../../lock-unlock';\nimport { store as editSiteStore } from '../../store';\nimport { filterOutDuplicatesByName } from './utils';\n\nconst { useGlobalStyles } = unlock( editorPrivateApis );\nconst { globalStylesDataKey } = unlock( blockEditorPrivateApis );\n\nexport default function usePatternSettings() {\n\t/*\n\t * Generate global styles directly because block previews use a separate\n\t * ExperimentalBlockEditorProvider and can't access GlobalStylesRenderer's output.\n\t * Reading config from useGlobalStyles and generating CSS directly keeps us in sync.\n\t * See: https://github.com/WordPress/gutenberg/issues/73350\n\t */\n\tconst { merged: mergedConfig } = useGlobalStyles();\n\n\tconst storedSettings = useSelect( ( select ) => {\n\t\tconst { getSettings } = unlock( select( editSiteStore ) );\n\t\treturn getSettings();\n\t}, [] );\n\n\tconst settingsBlockPatterns =\n\t\tstoredSettings.__experimentalAdditionalBlockPatterns ?? // WP 6.0\n\t\tstoredSettings.__experimentalBlockPatterns; // WP 5.9\n\n\tconst restBlockPatterns = useSelect(\n\t\t( select ) => select( coreStore ).getBlockPatterns(),\n\t\t[]\n\t);\n\n\tconst blockPatterns = useMemo(\n\t\t() =>\n\t\t\t[\n\t\t\t\t...( settingsBlockPatterns || [] ),\n\t\t\t\t...( restBlockPatterns || [] ),\n\t\t\t].filter( filterOutDuplicatesByName ),\n\t\t[ settingsBlockPatterns, restBlockPatterns ]\n\t);\n\n\tconst [ globalStyles, globalSettings ] = useMemo( () => {\n\t\treturn generateGlobalStyles( mergedConfig, [], {\n\t\t\tdisableRootPadding: false,\n\t\t} );\n\t}, [ mergedConfig ] );\n\n\tconst settings = useMemo( () => {\n\t\tconst {\n\t\t\t__experimentalAdditionalBlockPatterns,\n\t\t\tstyles,\n\t\t\t__experimentalFeatures,\n\t\t\t...restStoredSettings\n\t\t} = storedSettings;\n\n\t\t// Preserve non-global styles from settings.styles (e.g., editor styles from add_editor_style)\n\t\tconst nonGlobalStyles = ( styles ?? [] ).filter(\n\t\t\t( style ) => ! style.isGlobalStyles\n\t\t);\n\n\t\treturn {\n\t\t\t...restStoredSettings,\n\t\t\tstyles: [ ...nonGlobalStyles, ...globalStyles ],\n\t\t\t__experimentalFeatures: globalSettings,\n\t\t\t[ globalStylesDataKey ]: mergedConfig.styles ?? {},\n\t\t\t__experimentalBlockPatterns: blockPatterns,\n\t\t\tisPreviewMode: true,\n\t\t};\n\t}, [\n\t\tstoredSettings,\n\t\tblockPatterns,\n\t\tglobalStyles,\n\t\tglobalSettings,\n\t\tmergedConfig,\n\t] );\n\n\treturn settings;\n}\n"],
5
+ "mappings": ";AAGA,SAAS,SAAS,iBAAiB;AACnC,SAAS,iBAAiB;AAC1B,SAAS,eAAe;AACxB,SAAS,eAAe,8BAA8B;AACtD,SAAS,eAAe,yBAAyB;AACjD,SAAS,4BAA4B;AAKrC,SAAS,cAAc;AACvB,SAAS,SAAS,qBAAqB;AACvC,SAAS,iCAAiC;AAE1C,IAAM,EAAE,gBAAgB,IAAI,OAAQ,iBAAkB;AACtD,IAAM,EAAE,oBAAoB,IAAI,OAAQ,sBAAuB;AAEhD,SAAR,qBAAsC;AAO5C,QAAM,EAAE,QAAQ,aAAa,IAAI,gBAAgB;AAEjD,QAAM,iBAAiB,UAAW,CAAE,WAAY;AAC/C,UAAM,EAAE,YAAY,IAAI,OAAQ,OAAQ,aAAc,CAAE;AACxD,WAAO,YAAY;AAAA,EACpB,GAAG,CAAC,CAAE;AAEN,QAAM,wBACL,eAAe;AAAA,EACf,eAAe;AAEhB,QAAM,oBAAoB;AAAA,IACzB,CAAE,WAAY,OAAQ,SAAU,EAAE,iBAAiB;AAAA,IACnD,CAAC;AAAA,EACF;AAEA,QAAM,gBAAgB;AAAA,IACrB,MACC;AAAA,MACC,GAAK,yBAAyB,CAAC;AAAA,MAC/B,GAAK,qBAAqB,CAAC;AAAA,IAC5B,EAAE,OAAQ,yBAA0B;AAAA,IACrC,CAAE,uBAAuB,iBAAkB;AAAA,EAC5C;AAEA,QAAM,CAAE,cAAc,cAAe,IAAI,QAAS,MAAM;AACvD,WAAO,qBAAsB,cAAc,CAAC,GAAG;AAAA,MAC9C,oBAAoB;AAAA,IACrB,CAAE;AAAA,EACH,GAAG,CAAE,YAAa,CAAE;AAEpB,QAAM,WAAW,QAAS,MAAM;AAC/B,UAAM;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA,GAAG;AAAA,IACJ,IAAI;AAGJ,UAAM,mBAAoB,UAAU,CAAC,GAAI;AAAA,MACxC,CAAE,UAAW,CAAE,MAAM;AAAA,IACtB;AAEA,WAAO;AAAA,MACN,GAAG;AAAA,MACH,QAAQ,CAAE,GAAG,iBAAiB,GAAG,YAAa;AAAA,MAC9C,wBAAwB;AAAA,MACxB,CAAE,mBAAoB,GAAG,aAAa,UAAU,CAAC;AAAA,MACjD,6BAA6B;AAAA,MAC7B,eAAe;AAAA,IAChB;AAAA,EACD,GAAG;AAAA,IACF;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACD,CAAE;AAEF,SAAO;AACR;",
6
6
  "names": []
7
7
  }
package/build-module/components/sidebar-identity/index.mjs CHANGED
@@ -1,6 +1,6 @@
1
1
  // packages/edit-site/src/components/sidebar-identity/index.js
2
2
  import { Page } from "@wordpress/admin-ui";
3
- import { __ } from "@wordpress/i18n";
3
+ import { __, _x } from "@wordpress/i18n";
4
4
  import { useSelect, useDispatch } from "@wordpress/data";
5
5
  import { store as coreStore } from "@wordpress/core-data";
6
6
  import { DataForm } from "@wordpress/dataviews";
@@ -66,15 +66,23 @@ function SidebarIdentity() {
66
66
  const onChange = (edits) => {
67
67
  editEntityRecord("root", "site", void 0, edits);
68
68
  };
69
- return /* @__PURE__ */ jsx(Page, { title: __("Identity"), headingLevel: 2, hasPadding: true, children: /* @__PURE__ */ jsx(
70
- DataForm,
69
+ return /* @__PURE__ */ jsx(
70
+ Page,
71
71
  {
72
- data,
73
- fields,
74
- form,
75
- onChange
72
+ title: _x("Identity", "site identity"),
73
+ headingLevel: 2,
74
+ hasPadding: true,
75
+ children: /* @__PURE__ */ jsx(
76
+ DataForm,
77
+ {
78
+ data,
79
+ fields,
80
+ form,
81
+ onChange
82
+ }
83
+ )
76
84
  }
77
- ) });
85
+ );
78
86
  }
79
87
  export {
80
88
  SidebarIdentity as default
package/build-module/components/sidebar-identity/index.mjs.map CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/components/sidebar-identity/index.js"],
4
- "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { Page } from '@wordpress/admin-ui';\nimport { __ } from '@wordpress/i18n';\nimport { useSelect, useDispatch } from '@wordpress/data';\nimport { store as coreStore } from '@wordpress/core-data';\nimport { DataForm } from '@wordpress/dataviews';\nimport { MediaEdit } from '@wordpress/fields';\n\nconst fields = [\n\t{\n\t\tid: 'title',\n\t\ttype: 'text',\n\t\tlabel: __( 'Site Title' ),\n\t\tdescription: __(\n\t\t\t\"Displays in your site's layout via the Site Title block.\"\n\t\t),\n\t},\n\t{\n\t\tid: 'description',\n\t\ttype: 'text',\n\t\tlabel: __( 'Site Tagline' ),\n\t\tdescription: __(\n\t\t\t\"In a few words, explain what this site is about. Displays in your site's layout via the Site Tagline block.\"\n\t\t),\n\t},\n\t{\n\t\tid: 'site_logo',\n\t\ttype: 'media',\n\t\tlabel: __( 'Site Logo' ),\n\t\tdescription: __(\n\t\t\t\"Displays in your site's layout via the Site Logo block.\"\n\t\t),\n\t\tplaceholder: __( 'Choose logo' ),\n\t\tEdit: MediaEdit,\n\t\tsetValue: ( { value } ) => ( {\n\t\t\tsite_logo: value ?? 0,\n\t\t} ),\n\t},\n\t{\n\t\tid: 'site_icon',\n\t\ttype: 'media',\n\t\tlabel: __( 'Site Icon' ),\n\t\tdescription: __(\n\t\t\t'Shown in browser tabs, bookmarks, and mobile apps. It should be square and at least 512 by 512 pixels.'\n\t\t),\n\t\tplaceholder: __( 'Choose icon' ),\n\t\tEdit: MediaEdit,\n\t\tsetValue: ( { value } ) => ( {\n\t\t\tsite_icon: value ?? 0,\n\t\t} ),\n\t},\n];\n\nconst form = {\n\tlayout: {\n\t\ttype: 'regular',\n\t\tlabelPosition: 'top',\n\t},\n\tfields: [ 'title', 'description', 'site_logo', 'site_icon' ],\n};\n\nexport default function SidebarIdentity() {\n\tconst data = useSelect(\n\t\t( select ) =>\n\t\t\tselect( coreStore ).getEditedEntityRecord( 'root', 'site' ),\n\t\t[]\n\t);\n\tconst { editEntityRecord } = useDispatch( coreStore );\n\n\tconst onChange = ( edits ) => {\n\t\teditEntityRecord( 'root', 'site', undefined, edits );\n\t};\n\n\treturn (\n\t\t<Page title={ __( 'Identity' ) } headingLevel={ 2 } hasPadding>\n\t\t\t<DataForm\n\t\t\t\tdata={ data }\n\t\t\t\tfields={ fields }\n\t\t\t\tform={ form }\n\t\t\t\tonChange={ onChange }\n\t\t\t/>\n\t\t</Page>\n\t);\n}\n"],
5
- "mappings": ";AAGA,SAAS,YAAY;AACrB,SAAS,UAAU;AACnB,SAAS,WAAW,mBAAmB;AACvC,SAAS,SAAS,iBAAiB;AACnC,SAAS,gBAAgB;AACzB,SAAS,iBAAiB;AAqEvB;AAnEH,IAAM,SAAS;AAAA,EACd;AAAA,IACC,IAAI;AAAA,IACJ,MAAM;AAAA,IACN,OAAO,GAAI,YAAa;AAAA,IACxB,aAAa;AAAA,MACZ;AAAA,IACD;AAAA,EACD;AAAA,EACA;AAAA,IACC,IAAI;AAAA,IACJ,MAAM;AAAA,IACN,OAAO,GAAI,cAAe;AAAA,IAC1B,aAAa;AAAA,MACZ;AAAA,IACD;AAAA,EACD;AAAA,EACA;AAAA,IACC,IAAI;AAAA,IACJ,MAAM;AAAA,IACN,OAAO,GAAI,WAAY;AAAA,IACvB,aAAa;AAAA,MACZ;AAAA,IACD;AAAA,IACA,aAAa,GAAI,aAAc;AAAA,IAC/B,MAAM;AAAA,IACN,UAAU,CAAE,EAAE,MAAM,OAAS;AAAA,MAC5B,WAAW,SAAS;AAAA,IACrB;AAAA,EACD;AAAA,EACA;AAAA,IACC,IAAI;AAAA,IACJ,MAAM;AAAA,IACN,OAAO,GAAI,WAAY;AAAA,IACvB,aAAa;AAAA,MACZ;AAAA,IACD;AAAA,IACA,aAAa,GAAI,aAAc;AAAA,IAC/B,MAAM;AAAA,IACN,UAAU,CAAE,EAAE,MAAM,OAAS;AAAA,MAC5B,WAAW,SAAS;AAAA,IACrB;AAAA,EACD;AACD;AAEA,IAAM,OAAO;AAAA,EACZ,QAAQ;AAAA,IACP,MAAM;AAAA,IACN,eAAe;AAAA,EAChB;AAAA,EACA,QAAQ,CAAE,SAAS,eAAe,aAAa,WAAY;AAC5D;AAEe,SAAR,kBAAmC;AACzC,QAAM,OAAO;AAAA,IACZ,CAAE,WACD,OAAQ,SAAU,EAAE,sBAAuB,QAAQ,MAAO;AAAA,IAC3D,CAAC;AAAA,EACF;AACA,QAAM,EAAE,iBAAiB,IAAI,YAAa,SAAU;AAEpD,QAAM,WAAW,CAAE,UAAW;AAC7B,qBAAkB,QAAQ,QAAQ,QAAW,KAAM;AAAA,EACpD;AAEA,SACC,oBAAC,QAAK,OAAQ,GAAI,UAAW,GAAI,cAAe,GAAI,YAAU,MAC7D;AAAA,IAAC;AAAA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA;AAAA,EACD,GACD;AAEF;",
4
+ "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { Page } from '@wordpress/admin-ui';\nimport { __, _x } from '@wordpress/i18n';\nimport { useSelect, useDispatch } from '@wordpress/data';\nimport { store as coreStore } from '@wordpress/core-data';\nimport { DataForm } from '@wordpress/dataviews';\nimport { MediaEdit } from '@wordpress/fields';\n\nconst fields = [\n\t{\n\t\tid: 'title',\n\t\ttype: 'text',\n\t\tlabel: __( 'Site Title' ),\n\t\tdescription: __(\n\t\t\t\"Displays in your site's layout via the Site Title block.\"\n\t\t),\n\t},\n\t{\n\t\tid: 'description',\n\t\ttype: 'text',\n\t\tlabel: __( 'Site Tagline' ),\n\t\tdescription: __(\n\t\t\t\"In a few words, explain what this site is about. Displays in your site's layout via the Site Tagline block.\"\n\t\t),\n\t},\n\t{\n\t\tid: 'site_logo',\n\t\ttype: 'media',\n\t\tlabel: __( 'Site Logo' ),\n\t\tdescription: __(\n\t\t\t\"Displays in your site's layout via the Site Logo block.\"\n\t\t),\n\t\tplaceholder: __( 'Choose logo' ),\n\t\tEdit: MediaEdit,\n\t\tsetValue: ( { value } ) => ( {\n\t\t\tsite_logo: value ?? 0,\n\t\t} ),\n\t},\n\t{\n\t\tid: 'site_icon',\n\t\ttype: 'media',\n\t\tlabel: __( 'Site Icon' ),\n\t\tdescription: __(\n\t\t\t'Shown in browser tabs, bookmarks, and mobile apps. It should be square and at least 512 by 512 pixels.'\n\t\t),\n\t\tplaceholder: __( 'Choose icon' ),\n\t\tEdit: MediaEdit,\n\t\tsetValue: ( { value } ) => ( {\n\t\t\tsite_icon: value ?? 0,\n\t\t} ),\n\t},\n];\n\nconst form = {\n\tlayout: {\n\t\ttype: 'regular',\n\t\tlabelPosition: 'top',\n\t},\n\tfields: [ 'title', 'description', 'site_logo', 'site_icon' ],\n};\n\nexport default function SidebarIdentity() {\n\tconst data = useSelect(\n\t\t( select ) =>\n\t\t\tselect( coreStore ).getEditedEntityRecord( 'root', 'site' ),\n\t\t[]\n\t);\n\tconst { editEntityRecord } = useDispatch( coreStore );\n\n\tconst onChange = ( edits ) => {\n\t\teditEntityRecord( 'root', 'site', undefined, edits );\n\t};\n\n\treturn (\n\t\t<Page\n\t\t\ttitle={ _x( 'Identity', 'site identity' ) }\n\t\t\theadingLevel={ 2 }\n\t\t\thasPadding\n\t\t>\n\t\t\t<DataForm\n\t\t\t\tdata={ data }\n\t\t\t\tfields={ fields }\n\t\t\t\tform={ form }\n\t\t\t\tonChange={ onChange }\n\t\t\t/>\n\t\t</Page>\n\t);\n}\n"],
5
+ "mappings": ";AAGA,SAAS,YAAY;AACrB,SAAS,IAAI,UAAU;AACvB,SAAS,WAAW,mBAAmB;AACvC,SAAS,SAAS,iBAAiB;AACnC,SAAS,gBAAgB;AACzB,SAAS,iBAAiB;AAyEvB;AAvEH,IAAM,SAAS;AAAA,EACd;AAAA,IACC,IAAI;AAAA,IACJ,MAAM;AAAA,IACN,OAAO,GAAI,YAAa;AAAA,IACxB,aAAa;AAAA,MACZ;AAAA,IACD;AAAA,EACD;AAAA,EACA;AAAA,IACC,IAAI;AAAA,IACJ,MAAM;AAAA,IACN,OAAO,GAAI,cAAe;AAAA,IAC1B,aAAa;AAAA,MACZ;AAAA,IACD;AAAA,EACD;AAAA,EACA;AAAA,IACC,IAAI;AAAA,IACJ,MAAM;AAAA,IACN,OAAO,GAAI,WAAY;AAAA,IACvB,aAAa;AAAA,MACZ;AAAA,IACD;AAAA,IACA,aAAa,GAAI,aAAc;AAAA,IAC/B,MAAM;AAAA,IACN,UAAU,CAAE,EAAE,MAAM,OAAS;AAAA,MAC5B,WAAW,SAAS;AAAA,IACrB;AAAA,EACD;AAAA,EACA;AAAA,IACC,IAAI;AAAA,IACJ,MAAM;AAAA,IACN,OAAO,GAAI,WAAY;AAAA,IACvB,aAAa;AAAA,MACZ;AAAA,IACD;AAAA,IACA,aAAa,GAAI,aAAc;AAAA,IAC/B,MAAM;AAAA,IACN,UAAU,CAAE,EAAE,MAAM,OAAS;AAAA,MAC5B,WAAW,SAAS;AAAA,IACrB;AAAA,EACD;AACD;AAEA,IAAM,OAAO;AAAA,EACZ,QAAQ;AAAA,IACP,MAAM;AAAA,IACN,eAAe;AAAA,EAChB;AAAA,EACA,QAAQ,CAAE,SAAS,eAAe,aAAa,WAAY;AAC5D;AAEe,SAAR,kBAAmC;AACzC,QAAM,OAAO;AAAA,IACZ,CAAE,WACD,OAAQ,SAAU,EAAE,sBAAuB,QAAQ,MAAO;AAAA,IAC3D,CAAC;AAAA,EACF;AACA,QAAM,EAAE,iBAAiB,IAAI,YAAa,SAAU;AAEpD,QAAM,WAAW,CAAE,UAAW;AAC7B,qBAAkB,QAAQ,QAAQ,QAAW,KAAM;AAAA,EACpD;AAEA,SACC;AAAA,IAAC;AAAA;AAAA,MACA,OAAQ,GAAI,YAAY,eAAgB;AAAA,MACxC,cAAe;AAAA,MACf,YAAU;AAAA,MAEV;AAAA,QAAC;AAAA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA;AAAA,MACD;AAAA;AAAA,EACD;AAEF;",
6
6
  "names": []
7
7
  }
package/build-module/components/sidebar-navigation-screen-main/index.mjs CHANGED
@@ -1,6 +1,6 @@
1
1
  // packages/edit-site/src/components/sidebar-navigation-screen-main/index.js
2
2
  import { __experimentalItemGroup as ItemGroup } from "@wordpress/components";
3
- import { __ } from "@wordpress/i18n";
3
+ import { __, _x } from "@wordpress/i18n";
4
4
  import {
5
5
  layout,
6
6
  symbol,
@@ -44,7 +44,7 @@ function MainSidebarNavigationContent({ isBlockBasedTheme = true }) {
44
44
  to: "/identity",
45
45
  uid: "identity-navigation-item",
46
46
  icon: siteLogo,
47
- children: __("Identity")
47
+ children: _x("Identity", "site identity")
48
48
  }
49
49
  ),
50
50
  /* @__PURE__ */ jsx(
package/build-module/components/sidebar-navigation-screen-main/index.mjs.map CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../src/components/sidebar-navigation-screen-main/index.js"],
4
- "sourcesContent": ["/**\n * WordPress dependencies\n */\nimport { __experimentalItemGroup as ItemGroup } from '@wordpress/components';\nimport { __ } 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{ __( '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"],
5
- "mappings": ";AAGA,SAAS,2BAA2B,iBAAiB;AACrD,SAAS,UAAU;AACnB;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,UAAW;AAAA;AAAA,MAClB;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;",
4
+ "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"],
5
+ "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;",
6
6
  "names": []
7
7
  }
package/build-style/style-rtl.css CHANGED
@@ -3858,6 +3858,7 @@ button.font-library__upload-area {
3858
3858
 
3859
3859
  .global-styles-ui-header {
3860
3860
  margin-bottom: 0 !important;
3861
+ line-height: 1.9 !important;
3861
3862
  }
3862
3863
 
3863
3864
  .global-styles-ui-subtitle {
@@ -4356,10 +4357,6 @@ button.font-library__upload-area {
4356
4357
  text-wrap: pretty;
4357
4358
  }
4358
4359
 
4359
- .edit-site-page-templates .dataviews-pagination {
4360
- z-index: 2;
4361
- }
4362
-
4363
4360
  .edit-site-list__rename-modal {
4364
4361
  z-index: 1000001;
4365
4362
  }
@@ -4567,15 +4564,6 @@ button.font-library__upload-area {
4567
4564
  z-index: 2;
4568
4565
  overflow: visible;
4569
4566
  }
4570
- .edit-site-layout__canvas-container.is-resizing::after {
4571
- position: absolute;
4572
- top: 0;
4573
- right: 0;
4574
- left: 0;
4575
- bottom: 0;
4576
- content: "";
4577
- z-index: 100;
4578
- }
4579
4567
 
4580
4568
  .edit-site-layout__canvas {
4581
4569
  position: absolute;
package/build-style/style.css CHANGED
@@ -3858,6 +3858,7 @@ button.font-library__upload-area {
3858
3858
 
3859
3859
  .global-styles-ui-header {
3860
3860
  margin-bottom: 0 !important;
3861
+ line-height: 1.9 !important;
3861
3862
  }
3862
3863
 
3863
3864
  .global-styles-ui-subtitle {
@@ -4359,10 +4360,6 @@ button.font-library__upload-area {
4359
4360
  text-wrap: pretty;
4360
4361
  }
4361
4362
 
4362
- .edit-site-page-templates .dataviews-pagination {
4363
- z-index: 2;
4364
- }
4365
-
4366
4363
  .edit-site-list__rename-modal {
4367
4364
  z-index: 1000001;
4368
4365
  }
@@ -4570,15 +4567,6 @@ button.font-library__upload-area {
4570
4567
  z-index: 2;
4571
4568
  overflow: visible;
4572
4569
  }
4573
- .edit-site-layout__canvas-container.is-resizing::after {
4574
- position: absolute;
4575
- top: 0;
4576
- left: 0;
4577
- right: 0;
4578
- bottom: 0;
4579
- content: "";
4580
- z-index: 100;
4581
- }
4582
4570
 
4583
4571
  .edit-site-layout__canvas {
4584
4572
  position: absolute;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@wordpress/edit-site",
3
- "version": "6.45.0",
3
+ "version": "6.45.1-next.v.202605131032.0+f6d6e7149",
4
4
  "description": "Edit Site Page module for WordPress.",
5
5
  "author": "The WordPress Contributors",
6
6
  "license": "GPL-2.0-or-later",
@@ -48,51 +48,51 @@
48
48
  ],
49
49
  "dependencies": {
50
50
  "@react-spring/web": "^9.4.5",
51
- "@wordpress/a11y": "^4.45.0",
52
- "@wordpress/admin-ui": "^2.0.0",
53
- "@wordpress/api-fetch": "^7.45.0",
54
- "@wordpress/base-styles": "^7.0.0",
55
- "@wordpress/blob": "^4.45.0",
56
- "@wordpress/block-editor": "^15.18.0",
57
- "@wordpress/block-library": "^9.45.0",
58
- "@wordpress/blocks": "^15.18.0",
59
- "@wordpress/commands": "^1.45.0",
60
- "@wordpress/components": "^33.0.0",
61
- "@wordpress/compose": "^7.45.0",
62
- "@wordpress/core-data": "^7.45.0",
63
- "@wordpress/data": "^10.45.0",
64
- "@wordpress/dataviews": "^14.2.0",
65
- "@wordpress/date": "^5.45.0",
66
- "@wordpress/deprecated": "^4.45.0",
67
- "@wordpress/dom": "^4.45.0",
68
- "@wordpress/editor": "^14.45.0",
69
- "@wordpress/element": "^6.45.0",
70
- "@wordpress/escape-html": "^3.45.0",
71
- "@wordpress/fields": "^0.37.0",
72
- "@wordpress/global-styles-engine": "^1.12.0",
73
- "@wordpress/global-styles-ui": "^1.12.0",
74
- "@wordpress/hooks": "^4.45.0",
75
- "@wordpress/html-entities": "^4.45.0",
76
- "@wordpress/i18n": "^6.18.0",
77
- "@wordpress/icons": "^13.0.0",
78
- "@wordpress/keyboard-shortcuts": "^5.45.0",
79
- "@wordpress/keycodes": "^4.45.0",
80
- "@wordpress/media-utils": "^5.45.0",
81
- "@wordpress/notices": "^5.45.0",
82
- "@wordpress/patterns": "^2.45.0",
83
- "@wordpress/plugins": "^7.45.0",
84
- "@wordpress/preferences": "^4.45.0",
85
- "@wordpress/primitives": "^4.45.0",
86
- "@wordpress/private-apis": "^1.45.0",
87
- "@wordpress/reusable-blocks": "^5.45.0",
88
- "@wordpress/router": "^1.45.0",
89
- "@wordpress/style-engine": "^2.45.0",
90
- "@wordpress/ui": "^0.12.0",
91
- "@wordpress/url": "^4.45.0",
92
- "@wordpress/viewport": "^6.45.0",
93
- "@wordpress/views": "^1.12.0",
94
- "@wordpress/widgets": "^4.45.0",
95
- "@wordpress/wordcount": "^4.45.0",
51
+ "@wordpress/a11y": "^4.45.1-next.v.202605131032.0+f6d6e7149",
52
+ "@wordpress/admin-ui": "^2.0.2-next.v.202605131032.0+f6d6e7149",
53
+ "@wordpress/api-fetch": "^7.45.1-next.v.202605131032.0+f6d6e7149",
54
+ "@wordpress/base-styles": "^8.0.1-next.v.202605131032.0+f6d6e7149",
55
+ "@wordpress/blob": "^4.45.1-next.v.202605131032.0+f6d6e7149",
56
+ "@wordpress/block-editor": "^15.19.1-next.v.202605131032.0+f6d6e7149",
57
+ "@wordpress/block-library": "^9.45.1-next.v.202605131032.0+f6d6e7149",
58
+ "@wordpress/blocks": "^15.18.1-next.v.202605131032.0+f6d6e7149",
59
+ "@wordpress/commands": "^1.45.1-next.v.202605131032.0+f6d6e7149",
60
+ "@wordpress/components": "^33.1.1-next.v.202605131032.0+f6d6e7149",
61
+ "@wordpress/compose": "^7.45.1-next.v.202605131032.0+f6d6e7149",
62
+ "@wordpress/core-data": "^7.45.1-next.v.202605131032.0+f6d6e7149",
63
+ "@wordpress/data": "^10.45.1-next.v.202605131032.0+f6d6e7149",
64
+ "@wordpress/dataviews": "^14.2.1-next.v.202605131032.0+f6d6e7149",
65
+ "@wordpress/date": "^5.45.1-next.v.202605131032.0+f6d6e7149",
66
+ "@wordpress/deprecated": "^4.45.1-next.v.202605131032.0+f6d6e7149",
67
+ "@wordpress/dom": "^4.45.1-next.v.202605131032.0+f6d6e7149",
68
+ "@wordpress/editor": "^14.45.2-next.v.202605131032.0+f6d6e7149",
69
+ "@wordpress/element": "^6.45.1-next.v.202605131032.0+f6d6e7149",
70
+ "@wordpress/escape-html": "^3.45.1-next.v.202605131032.0+f6d6e7149",
71
+ "@wordpress/fields": "^0.37.1-next.v.202605131032.0+f6d6e7149",
72
+ "@wordpress/global-styles-engine": "^1.12.1-next.v.202605131032.0+f6d6e7149",
73
+ "@wordpress/global-styles-ui": "^1.12.1-next.v.202605131032.0+f6d6e7149",
74
+ "@wordpress/hooks": "^4.45.1-next.v.202605131032.0+f6d6e7149",
75
+ "@wordpress/html-entities": "^4.45.1-next.v.202605131032.0+f6d6e7149",
76
+ "@wordpress/i18n": "^6.18.1-next.v.202605131032.0+f6d6e7149",
77
+ "@wordpress/icons": "^13.0.1-next.v.202605131032.0+f6d6e7149",
78
+ "@wordpress/keyboard-shortcuts": "^5.45.1-next.v.202605131032.0+f6d6e7149",
79
+ "@wordpress/keycodes": "^4.45.1-next.v.202605131032.0+f6d6e7149",
80
+ "@wordpress/media-utils": "^5.45.1-next.v.202605131032.0+f6d6e7149",
81
+ "@wordpress/notices": "^5.45.1-next.v.202605131032.0+f6d6e7149",
82
+ "@wordpress/patterns": "^2.45.1-next.v.202605131032.0+f6d6e7149",
83
+ "@wordpress/plugins": "^7.45.1-next.v.202605131032.0+f6d6e7149",
84
+ "@wordpress/preferences": "^4.45.1-next.v.202605131032.0+f6d6e7149",
85
+ "@wordpress/primitives": "^4.45.1-next.v.202605131032.0+f6d6e7149",
86
+ "@wordpress/private-apis": "^1.45.1-next.v.202605131032.0+f6d6e7149",
87
+ "@wordpress/reusable-blocks": "^5.45.1-next.v.202605131032.0+f6d6e7149",
88
+ "@wordpress/router": "^1.45.1-next.v.202605131032.0+f6d6e7149",
89
+ "@wordpress/style-engine": "^2.45.1-next.v.202605131032.0+f6d6e7149",
90
+ "@wordpress/ui": "^0.13.1-next.v.202605131032.0+f6d6e7149",
91
+ "@wordpress/url": "^4.45.1-next.v.202605131032.0+f6d6e7149",
92
+ "@wordpress/viewport": "^6.45.1-next.v.202605131032.0+f6d6e7149",
93
+ "@wordpress/views": "^1.12.1-next.v.202605131032.0+f6d6e7149",
94
+ "@wordpress/widgets": "^4.45.1-next.v.202605131032.0+f6d6e7149",
95
+ "@wordpress/wordcount": "^4.45.1-next.v.202605131032.0+f6d6e7149",
96
96
  "change-case": "^4.1.2",
97
97
  "clsx": "^2.1.1",
98
98
  "colord": "^2.9.2",
@@ -107,5 +107,5 @@
107
107
  "publishConfig": {
108
108
  "access": "public"
109
109
  },
110
- "gitHead": "8c229eaed0e88c9827e2da3d73a78f9ddd77714b"
110
+ "gitHead": "0e198c7ac7ca634e73ded9220ce048c0302174dd"
111
111
  }
package/src/components/add-new-template/utils.js CHANGED
@@ -621,14 +621,18 @@ const useEntitiesInfo = (
621
621
  ( select ) => {
622
622
  return Object.keys( templatePrefixes || {} ).reduce(
623
623
  ( accumulator, slug ) => {
624
- accumulator[ slug ] = !! select(
625
- coreStore
626
- ).getEntityRecords( entityName, slug, {
627
- per_page: 1,
628
- _fields: 'id',
629
- context: 'view',
630
- ...additionalQueryParameters[ slug ],
631
- } )?.length;
624
+ const records = select( coreStore ).getEntityRecords(
625
+ entityName,
626
+ slug,
627
+ {
628
+ per_page: 1,
629
+ _fields: 'id',
630
+ context: 'view',
631
+ ...additionalQueryParameters[ slug ],
632
+ }
633
+ );
634
+ accumulator[ slug ] =
635
+ records === null || records.length > 0;
632
636
  return accumulator;
633
637
  },
634
638
  {}
package/src/components/add-new-template-legacy/utils.js CHANGED
@@ -719,15 +719,19 @@ const useEntitiesInfo = (
719
719
  recordsToExcludePerEntity?.[ slug ]?.map(
720
720
  ( { id } ) => id
721
721
  ) || [];
722
- accumulator[ slug ] = !! select(
723
- coreStore
724
- ).getEntityRecords( entityName, slug, {
725
- per_page: 1,
726
- _fields: 'id',
727
- context: 'view',
728
- exclude: existingEntitiesIds,
729
- ...additionalQueryParameters[ slug ],
730
- } )?.length;
722
+ const records = select( coreStore ).getEntityRecords(
723
+ entityName,
724
+ slug,
725
+ {
726
+ per_page: 1,
727
+ _fields: 'id',
728
+ context: 'view',
729
+ exclude: existingEntitiesIds,
730
+ ...additionalQueryParameters[ slug ],
731
+ }
732
+ );
733
+ accumulator[ slug ] =
734
+ records === null || records.length > 0;
731
735
  return accumulator;
732
736
  },
733
737
  {}
package/src/components/layout/hooks.js CHANGED
@@ -2,61 +2,82 @@
2
2
  * WordPress dependencies
3
3
  */
4
4
  import { useEffect, useState } from '@wordpress/element';
5
- import { useSelect } from '@wordpress/data';
5
+ import { select, subscribe } from '@wordpress/data';
6
6
  import { store as coreStore } from '@wordpress/core-data';
7
7
 
8
8
  const MAX_LOADING_TIME = 10000; // 10 seconds
9
+ const MAX_PAUSE_TIME = 100;
9
10
 
10
- export function useIsSiteEditorLoading() {
11
- const [ loaded, setLoaded ] = useState( false );
12
- const inLoadingPause = useSelect(
13
- ( select ) => {
14
- const hasResolvingSelectors =
15
- select( coreStore ).hasResolvingSelectors();
16
- return ! loaded && ! hasResolvingSelectors;
17
- },
18
- [ loaded ]
19
- );
11
+ /**
12
+ * Waits until the site editor has finished its initial loading.
13
+ *
14
+ * Resolves when there's a pause in resolving selectors (no active requests
15
+ * for at least MAX_PAUSE_TIME ms), or after MAX_LOADING_TIME as a fallback
16
+ * to prevent failed requests from blocking the editor indefinitely.
17
+ *
18
+ * @return {Promise<void>} Resolves when loading is considered complete.
19
+ */
20
+ function waitWhileSiteEditorLoading() {
21
+ let pauseTimeout;
22
+
23
+ const { promise, resolve } = Promise.withResolvers();
24
+
25
+ function finish() {
26
+ unsubscribe();
27
+ clearTimeout( pauseTimeout );
28
+ clearTimeout( maxTimeout );
29
+ resolve();
30
+ }
20
31
 
21
32
  /*
22
- * If the maximum expected loading time has passed, we're marking the
23
- * editor as loaded, in order to prevent any failed requests from blocking
33
+ * If the maximum expected loading time has passed, we consider the
34
+ * editor loaded, in order to prevent any failed requests from blocking
24
35
  * the editor canvas from appearing.
25
36
  */
26
- useEffect( () => {
27
- let timeout;
37
+ const maxTimeout = setTimeout( finish, MAX_LOADING_TIME );
28
38
 
29
- if ( ! loaded ) {
30
- timeout = setTimeout( () => {
31
- setLoaded( true );
32
- }, MAX_LOADING_TIME );
39
+ function checkResolving() {
40
+ const isResolving = select( coreStore ).hasResolvingSelectors();
41
+
42
+ if ( isResolving ) {
43
+ clearTimeout( pauseTimeout );
44
+ pauseTimeout = undefined;
45
+ return;
33
46
  }
34
47
 
35
- return () => {
36
- clearTimeout( timeout );
37
- };
38
- }, [ loaded ] );
48
+ /*
49
+ * We're using an arbitrary 100ms timeout here to catch brief
50
+ * moments without any resolving selectors that would result in
51
+ * displaying brief flickers of loading state and loaded state.
52
+ *
53
+ * It's worth experimenting with different values, since this also
54
+ * adds 100ms of artificial delay after loading has finished.
55
+ */
56
+ if ( ! pauseTimeout ) {
57
+ pauseTimeout = setTimeout( finish, MAX_PAUSE_TIME );
58
+ }
59
+ }
60
+
61
+ const unsubscribe = subscribe( checkResolving, coreStore );
62
+ checkResolving();
63
+
64
+ function cancel() {
65
+ unsubscribe();
66
+ clearTimeout( pauseTimeout );
67
+ clearTimeout( maxTimeout );
68
+ }
69
+
70
+ return [ promise, cancel ];
71
+ }
72
+
73
+ export function useIsSiteEditorLoading() {
74
+ const [ loaded, setLoaded ] = useState( false );
39
75
 
40
76
  useEffect( () => {
41
- if ( inLoadingPause ) {
42
- /*
43
- * We're using an arbitrary 100ms timeout here to catch brief
44
- * moments without any resolving selectors that would result in
45
- * displaying brief flickers of loading state and loaded state.
46
- *
47
- * It's worth experimenting with different values, since this also
48
- * adds 100ms of artificial delay after loading has finished.
49
- */
50
- const ARTIFICIAL_DELAY = 100;
51
- const timeout = setTimeout( () => {
52
- setLoaded( true );
53
- }, ARTIFICIAL_DELAY );
54
-
55
- return () => {
56
- clearTimeout( timeout );
57
- };
58
- }
59
- }, [ inLoadingPause ] );
77
+ const [ promise, cancel ] = waitWhileSiteEditorLoading();
78
+ promise.then( () => setLoaded( true ) );
79
+ return cancel;
80
+ }, [] );
60
81
 
61
82
  return ! loaded;
62
83
  }
package/src/components/layout/style.scss CHANGED
@@ -23,7 +23,7 @@
23
23
  }
24
24
 
25
25
  .edit-site-layout__sidebar-region {
26
- z-index: z-index(".edit-site-layout__sidebar");
26
+ z-index: 1;
27
27
  width: 100vw;
28
28
  flex-shrink: 0;
29
29
 
@@ -60,7 +60,7 @@
60
60
  .edit-site-layout__mobile {
61
61
  position: relative;
62
62
  width: 100%;
63
- z-index: z-index(".edit-site-layout__canvas-container");
63
+ z-index: 2;
64
64
  display: flex;
65
65
  flex-direction: column;
66
66
 
@@ -84,21 +84,9 @@
84
84
  .edit-site-layout__canvas-container {
85
85
  position: relative;
86
86
  flex-grow: 1;
87
- z-index: z-index(".edit-site-layout__canvas-container");
87
+ z-index: 2;
88
88
  // When animating the frame size can exceed its container size.
89
89
  overflow: visible;
90
-
91
- &.is-resizing::after {
92
- // This covers the whole content which ensures mouse up triggers
93
- // even if the content is "inert".
94
- position: absolute;
95
- top: 0;
96
- left: 0;
97
- right: 0;
98
- bottom: 0;
99
- content: "";
100
- z-index: z-index(".edit-site-layout__canvas-container.is-resizing::after");
101
- }
102
90
  }
103
91
 
104
92
  .edit-site-layout__canvas {
package/src/components/page-patterns/use-pattern-settings.js CHANGED
@@ -64,9 +64,14 @@ export default function usePatternSettings() {
64
64
  ...restStoredSettings
65
65
  } = storedSettings;
66
66
 
67
+ // Preserve non-global styles from settings.styles (e.g., editor styles from add_editor_style)
68
+ const nonGlobalStyles = ( styles ?? [] ).filter(
69
+ ( style ) => ! style.isGlobalStyles
70
+ );
71
+
67
72
  return {
68
73
  ...restStoredSettings,
69
- styles: globalStyles,
74
+ styles: [ ...nonGlobalStyles, ...globalStyles ],
70
75
  __experimentalFeatures: globalSettings,
71
76
  [ globalStylesDataKey ]: mergedConfig.styles ?? {},
72
77
  __experimentalBlockPatterns: blockPatterns,
package/src/components/page-templates/style.scss CHANGED
@@ -32,12 +32,6 @@
32
32
  }
33
33
  }
34
34
 
35
- .edit-site-page-templates {
36
- .dataviews-pagination {
37
- z-index: z-index(".edit-site-templates__dataviews-list-pagination");
38
- }
39
- }
40
-
41
35
  .edit-site-list__rename-modal {
42
36
  // The rename dropdown popover is open at the same time as the rename modal. The latter has to be higher.
43
37
  z-index: z-index(".edit-site-list__rename-modal");
package/src/components/sidebar-identity/index.js CHANGED
@@ -2,7 +2,7 @@
2
2
  * WordPress dependencies
3
3
  */
4
4
  import { Page } from '@wordpress/admin-ui';
5
- import { __ } from '@wordpress/i18n';
5
+ import { __, _x } from '@wordpress/i18n';
6
6
  import { useSelect, useDispatch } from '@wordpress/data';
7
7
  import { store as coreStore } from '@wordpress/core-data';
8
8
  import { DataForm } from '@wordpress/dataviews';
@@ -74,7 +74,11 @@ export default function SidebarIdentity() {
74
74
  };
75
75
 
76
76
  return (
77
- <Page title={ __( 'Identity' ) } headingLevel={ 2 } hasPadding>
77
+ <Page
78
+ title={ _x( 'Identity', 'site identity' ) }
79
+ headingLevel={ 2 }
80
+ hasPadding
81
+ >
78
82
  <DataForm
79
83
  data={ data }
80
84
  fields={ fields }
package/src/components/sidebar-navigation-screen/style.scss CHANGED
@@ -1,7 +1,6 @@
1
1
  @use "@wordpress/base-styles/colors" as *;
2
2
  @use "@wordpress/base-styles/mixins" as *;
3
3
  @use "@wordpress/base-styles/variables" as *;
4
- @use "@wordpress/base-styles/z-index" as *;
5
4
 
6
5
  .edit-site-sidebar-navigation-screen {
7
6
  display: flex;
@@ -39,7 +38,8 @@
39
38
  padding-top: $grid-unit-60;
40
39
  margin-bottom: $grid-unit-10;
41
40
  padding-bottom: $grid-unit-10;
42
- z-index: z-index(".edit-site-sidebar-navigation-screen__title-icon");
41
+ // Title needs to appear above other UI in the section content.
42
+ z-index: 1;
43
43
  }
44
44
 
45
45
  .edit-site-sidebar-navigation-screen__title {