@wordpress/edit-site 6.8.4 → 6.8.5

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

@@ -7,7 +7,7 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
 /**
  * Internal dependencies
  */
-import { useDefaultViewsWithItemCounts } from './default-views';
+import { useDefaultViews } from './default-views';
 import { unlock } from '../../lock-unlock';
 import DataViewItem from './dataview-item';
 import CustomDataViewsList from './custom-dataviews-list';
@@ -25,7 +25,7 @@ export default function DataViewsSidebarContent() {
       isCustom = 'false'
     }
   } = useLocation();
-  const defaultViews = useDefaultViewsWithItemCounts({
+  const defaultViews = useDefaultViews({
     postType
   });
   if (!postType) {
@@ -39,9 +39,6 @@ export default function DataViewsSidebarContent() {
           slug: dataview.slug,
           title: dataview.title,
           icon: dataview.icon,
-          navigationItemSuffix: /*#__PURE__*/_jsx("span", {
-            children: dataview.count
-          }),
           type: dataview.view.type,
           isActive: !isCustomBoolean && dataview.slug === activeView,
           isCustom: false

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

@@ -1 +1 @@
-{"version":3,"names":["__experimentalItemGroup","ItemGroup","privateApis","routerPrivateApis","useDefaultViewsWithItemCounts","unlock","DataViewItem","CustomDataViewsList","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","useLocation","DataViewsSidebarContent","params","postType","activeView","isCustom","defaultViews","isCustomBoolean","children","map","dataview","slug","title","icon","navigationItemSuffix","count","type","view","isActive","window","__experimentalCustomViews"],"sources":["@wordpress/edit-site/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';\n\n/**\n * Internal dependencies\n */\nimport { useDefaultViewsWithItemCounts } from './default-views';\nimport { unlock } from '../../lock-unlock';\nimport DataViewItem from './dataview-item';\nimport CustomDataViewsList from './custom-dataviews-list';\n\nconst { useLocation } = unlock( routerPrivateApis );\n\nexport default function DataViewsSidebarContent() {\n\tconst {\n\t\tparams: { postType, activeView = 'all', isCustom = 'false' },\n\t} = useLocation();\n\n\tconst defaultViews = useDefaultViewsWithItemCounts( { postType } );\n\n\tif ( ! postType ) {\n\t\treturn null;\n\t}\n\tconst isCustomBoolean = isCustom === 'true';\n\n\treturn (\n\t\t<>\n\t\t\t<ItemGroup>\n\t\t\t\t{ defaultViews.map( ( dataview ) => {\n\t\t\t\t\treturn (\n\t\t\t\t\t\t<DataViewItem\n\t\t\t\t\t\t\tkey={ dataview.slug }\n\t\t\t\t\t\t\tslug={ dataview.slug }\n\t\t\t\t\t\t\ttitle={ dataview.title }\n\t\t\t\t\t\t\ticon={ dataview.icon }\n\t\t\t\t\t\t\tnavigationItemSuffix={\n\t\t\t\t\t\t\t\t<span>{ dataview.count }</span>\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\ttype={ dataview.view.type }\n\t\t\t\t\t\t\tisActive={\n\t\t\t\t\t\t\t\t! isCustomBoolean &&\n\t\t\t\t\t\t\t\tdataview.slug === activeView\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tisCustom={ false }\n\t\t\t\t\t\t/>\n\t\t\t\t\t);\n\t\t\t\t} ) }\n\t\t\t</ItemGroup>\n\t\t\t{ window?.__experimentalCustomViews && (\n\t\t\t\t<CustomDataViewsList\n\t\t\t\t\tactiveView={ activeView }\n\t\t\t\t\ttype={ postType }\n\t\t\t\t\tisCustom\n\t\t\t\t/>\n\t\t\t) }\n\t\t</>\n\t);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,uBAAuB,IAAIC,SAAS,QAAQ,uBAAuB;AAC5E,SAASC,WAAW,IAAIC,iBAAiB,QAAQ,mBAAmB;;AAEpE;AACA;AACA;AACA,SAASC,6BAA6B,QAAQ,iBAAiB;AAC/D,SAASC,MAAM,QAAQ,mBAAmB;AAC1C,OAAOC,YAAY,MAAM,iBAAiB;AAC1C,OAAOC,mBAAmB,MAAM,yBAAyB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAAA,SAAAC,QAAA,IAAAC,SAAA;AAAA,SAAAC,IAAA,IAAAC,KAAA;AAE1D,MAAM;EAAEC;AAAY,CAAC,GAAGT,MAAM,CAAEF,iBAAkB,CAAC;AAEnD,eAAe,SAASY,uBAAuBA,CAAA,EAAG;EACjD,MAAM;IACLC,MAAM,EAAE;MAAEC,QAAQ;MAAEC,UAAU,GAAG,KAAK;MAAEC,QAAQ,GAAG;IAAQ;EAC5D,CAAC,GAAGL,WAAW,CAAC,CAAC;EAEjB,MAAMM,YAAY,GAAGhB,6BAA6B,CAAE;IAAEa;EAAS,CAAE,CAAC;EAElE,IAAK,CAAEA,QAAQ,EAAG;IACjB,OAAO,IAAI;EACZ;EACA,MAAMI,eAAe,GAAGF,QAAQ,KAAK,MAAM;EAE3C,oBACCN,KAAA,CAAAF,SAAA;IAAAW,QAAA,gBACCb,IAAA,CAACR,SAAS;MAAAqB,QAAA,EACPF,YAAY,CAACG,GAAG,CAAIC,QAAQ,IAAM;QACnC,oBACCf,IAAA,CAACH,YAAY;UAEZmB,IAAI,EAAGD,QAAQ,CAACC,IAAM;UACtBC,KAAK,EAAGF,QAAQ,CAACE,KAAO;UACxBC,IAAI,EAAGH,QAAQ,CAACG,IAAM;UACtBC,oBAAoB,eACnBnB,IAAA;YAAAa,QAAA,EAAQE,QAAQ,CAACK;UAAK,CAAQ,CAC9B;UACDC,IAAI,EAAGN,QAAQ,CAACO,IAAI,CAACD,IAAM;UAC3BE,QAAQ,EACP,CAAEX,eAAe,IACjBG,QAAQ,CAACC,IAAI,KAAKP,UAClB;UACDC,QAAQ,EAAG;QAAO,GAZZK,QAAQ,CAACC,IAaf,CAAC;MAEJ,CAAE;IAAC,CACO,CAAC,EACVQ,MAAM,EAAEC,yBAAyB,iBAClCzB,IAAA,CAACF,mBAAmB;MACnBW,UAAU,EAAGA,UAAY;MACzBY,IAAI,EAAGb,QAAU;MACjBE,QAAQ;IAAA,CACR,CACD;EAAA,CACA,CAAC;AAEL","ignoreList":[]}
+{"version":3,"names":["__experimentalItemGroup","ItemGroup","privateApis","routerPrivateApis","useDefaultViews","unlock","DataViewItem","CustomDataViewsList","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","useLocation","DataViewsSidebarContent","params","postType","activeView","isCustom","defaultViews","isCustomBoolean","children","map","dataview","slug","title","icon","type","view","isActive","window","__experimentalCustomViews"],"sources":["@wordpress/edit-site/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';\n\n/**\n * Internal dependencies\n */\nimport { useDefaultViews } from './default-views';\nimport { unlock } from '../../lock-unlock';\nimport DataViewItem from './dataview-item';\nimport CustomDataViewsList from './custom-dataviews-list';\n\nconst { useLocation } = unlock( routerPrivateApis );\n\nexport default function DataViewsSidebarContent() {\n\tconst {\n\t\tparams: { postType, activeView = 'all', isCustom = 'false' },\n\t} = useLocation();\n\tconst defaultViews = useDefaultViews( { postType } );\n\tif ( ! postType ) {\n\t\treturn null;\n\t}\n\tconst isCustomBoolean = isCustom === 'true';\n\n\treturn (\n\t\t<>\n\t\t\t<ItemGroup>\n\t\t\t\t{ defaultViews.map( ( dataview ) => {\n\t\t\t\t\treturn (\n\t\t\t\t\t\t<DataViewItem\n\t\t\t\t\t\t\tkey={ dataview.slug }\n\t\t\t\t\t\t\tslug={ dataview.slug }\n\t\t\t\t\t\t\ttitle={ dataview.title }\n\t\t\t\t\t\t\ticon={ dataview.icon }\n\t\t\t\t\t\t\ttype={ dataview.view.type }\n\t\t\t\t\t\t\tisActive={\n\t\t\t\t\t\t\t\t! isCustomBoolean &&\n\t\t\t\t\t\t\t\tdataview.slug === activeView\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tisCustom={ false }\n\t\t\t\t\t\t/>\n\t\t\t\t\t);\n\t\t\t\t} ) }\n\t\t\t</ItemGroup>\n\t\t\t{ window?.__experimentalCustomViews && (\n\t\t\t\t<CustomDataViewsList\n\t\t\t\t\tactiveView={ activeView }\n\t\t\t\t\ttype={ postType }\n\t\t\t\t\tisCustom\n\t\t\t\t/>\n\t\t\t) }\n\t\t</>\n\t);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA,SAASA,uBAAuB,IAAIC,SAAS,QAAQ,uBAAuB;AAC5E,SAASC,WAAW,IAAIC,iBAAiB,QAAQ,mBAAmB;;AAEpE;AACA;AACA;AACA,SAASC,eAAe,QAAQ,iBAAiB;AACjD,SAASC,MAAM,QAAQ,mBAAmB;AAC1C,OAAOC,YAAY,MAAM,iBAAiB;AAC1C,OAAOC,mBAAmB,MAAM,yBAAyB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAAA,SAAAC,QAAA,IAAAC,SAAA;AAAA,SAAAC,IAAA,IAAAC,KAAA;AAE1D,MAAM;EAAEC;AAAY,CAAC,GAAGT,MAAM,CAAEF,iBAAkB,CAAC;AAEnD,eAAe,SAASY,uBAAuBA,CAAA,EAAG;EACjD,MAAM;IACLC,MAAM,EAAE;MAAEC,QAAQ;MAAEC,UAAU,GAAG,KAAK;MAAEC,QAAQ,GAAG;IAAQ;EAC5D,CAAC,GAAGL,WAAW,CAAC,CAAC;EACjB,MAAMM,YAAY,GAAGhB,eAAe,CAAE;IAAEa;EAAS,CAAE,CAAC;EACpD,IAAK,CAAEA,QAAQ,EAAG;IACjB,OAAO,IAAI;EACZ;EACA,MAAMI,eAAe,GAAGF,QAAQ,KAAK,MAAM;EAE3C,oBACCN,KAAA,CAAAF,SAAA;IAAAW,QAAA,gBACCb,IAAA,CAACR,SAAS;MAAAqB,QAAA,EACPF,YAAY,CAACG,GAAG,CAAIC,QAAQ,IAAM;QACnC,oBACCf,IAAA,CAACH,YAAY;UAEZmB,IAAI,EAAGD,QAAQ,CAACC,IAAM;UACtBC,KAAK,EAAGF,QAAQ,CAACE,KAAO;UACxBC,IAAI,EAAGH,QAAQ,CAACG,IAAM;UACtBC,IAAI,EAAGJ,QAAQ,CAACK,IAAI,CAACD,IAAM;UAC3BE,QAAQ,EACP,CAAET,eAAe,IACjBG,QAAQ,CAACC,IAAI,KAAKP,UAClB;UACDC,QAAQ,EAAG;QAAO,GATZK,QAAQ,CAACC,IAUf,CAAC;MAEJ,CAAE;IAAC,CACO,CAAC,EACVM,MAAM,EAAEC,yBAAyB,iBAClCvB,IAAA,CAACF,mBAAmB;MACnBW,UAAU,EAAGA,UAAY;MACzBU,IAAI,EAAGX,QAAU;MACjBE,QAAQ;IAAA,CACR,CACD;EAAA,CACA,CAAC;AAEL","ignoreList":[]}

package/build-style/style-rtl.css

@@ -2212,6 +2212,9 @@ ul.dataviews-view-list {
   background-color: #cccccc;
   pointer-events: none;
 }
+.edit-site-editor__back-icon svg {
+  fill: currentColor;
+}
 .edit-site-editor__back-icon.has-site-icon {
   background-color: rgba(255, 255, 255, 0.6);
   -webkit-backdrop-filter: saturate(180%) blur(15px);
@@ -2538,7 +2541,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   contain: content;
 }
 
-@keyframes _hzed3_slide-from-right {
+@keyframes _anvff_slide-from-right {
   from {
     transform: translateX(-50px);
     opacity: 0;
@@ -2548,7 +2551,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
     opacity: 1;
   }
 }
-@keyframes _hzed3_slide-from-left {
+@keyframes _anvff_slide-from-left {
   from {
     transform: translateX(50px);
     opacity: 0;
@@ -2604,10 +2607,10 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   }
 }
 .edit-site-sidebar__screen-wrapper.slide-from-left {
-  animation-name: _hzed3_slide-from-left;
+  animation-name: _anvff_slide-from-left;
 }
 .edit-site-sidebar__screen-wrapper.slide-from-right {
-  animation-name: _hzed3_slide-from-right;
+  animation-name: _anvff_slide-from-right;
 }
 
 .edit-site-sidebar-button {
@@ -2871,9 +2874,6 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
 .edit-site-sidebar-dataviews-dataview-item .edit-site-sidebar-dataviews-dataview-item__dropdown-menu {
   min-width: initial;
 }
-.edit-site-sidebar-dataviews-dataview-item .edit-site-sidebar-navigation-item.with-suffix {
-  padding-left: 8px;
-}
 .edit-site-sidebar-dataviews-dataview-item:hover, .edit-site-sidebar-dataviews-dataview-item:focus, .edit-site-sidebar-dataviews-dataview-item[aria-current] {
   color: #e0e0e0;
   background: #2f2f2f;

package/build-style/style.css

@@ -2213,6 +2213,9 @@ ul.dataviews-view-list {
   background-color: #cccccc;
   pointer-events: none;
 }
+.edit-site-editor__back-icon svg {
+  fill: currentColor;
+}
 .edit-site-editor__back-icon.has-site-icon {
   background-color: rgba(255, 255, 255, 0.6);
   -webkit-backdrop-filter: saturate(180%) blur(15px);
@@ -2539,7 +2542,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   contain: content;
 }
 
-@keyframes _hzed3_slide-from-right {
+@keyframes _anvff_slide-from-right {
   from {
     transform: translateX(50px);
     opacity: 0;
@@ -2549,7 +2552,7 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
     opacity: 1;
   }
 }
-@keyframes _hzed3_slide-from-left {
+@keyframes _anvff_slide-from-left {
   from {
     transform: translateX(-50px);
     opacity: 0;
@@ -2605,10 +2608,10 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
   }
 }
 .edit-site-sidebar__screen-wrapper.slide-from-left {
-  animation-name: _hzed3_slide-from-left;
+  animation-name: _anvff_slide-from-left;
 }
 .edit-site-sidebar__screen-wrapper.slide-from-right {
-  animation-name: _hzed3_slide-from-right;
+  animation-name: _anvff_slide-from-right;
 }
 
 .edit-site-sidebar-button {
@@ -2872,9 +2875,6 @@ html.canvas-mode-edit-transition::view-transition-group(toggle) {
 .edit-site-sidebar-dataviews-dataview-item .edit-site-sidebar-dataviews-dataview-item__dropdown-menu {
   min-width: initial;
 }
-.edit-site-sidebar-dataviews-dataview-item .edit-site-sidebar-navigation-item.with-suffix {
-  padding-right: 8px;
-}
 .edit-site-sidebar-dataviews-dataview-item:hover, .edit-site-sidebar-dataviews-dataview-item:focus, .edit-site-sidebar-dataviews-dataview-item[aria-current] {
   color: #e0e0e0;
   background: #2f2f2f;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "6.8.4",
+	"version": "6.8.5",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -29,44 +29,44 @@
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
 		"@react-spring/web": "^9.4.5",
-		"@wordpress/a11y": "^4.8.1",
-		"@wordpress/api-fetch": "^7.8.1",
+		"@wordpress/a11y": "^4.8.2",
+		"@wordpress/api-fetch": "^7.8.2",
 		"@wordpress/blob": "^4.8.1",
-		"@wordpress/block-editor": "^14.3.2",
-		"@wordpress/block-library": "^9.8.3",
-		"@wordpress/blocks": "^13.8.2",
-		"@wordpress/commands": "^1.8.2",
-		"@wordpress/components": "^28.8.2",
-		"@wordpress/compose": "^7.8.2",
-		"@wordpress/core-commands": "^1.8.2",
-		"@wordpress/core-data": "^7.8.2",
-		"@wordpress/data": "^10.8.2",
-		"@wordpress/dataviews": "^4.4.2",
-		"@wordpress/date": "^5.8.1",
-		"@wordpress/deprecated": "^4.8.1",
-		"@wordpress/dom": "^4.8.1",
-		"@wordpress/editor": "^14.8.4",
+		"@wordpress/block-editor": "^14.3.3",
+		"@wordpress/block-library": "^9.8.4",
+		"@wordpress/blocks": "^13.8.3",
+		"@wordpress/commands": "^1.8.3",
+		"@wordpress/components": "^28.8.3",
+		"@wordpress/compose": "^7.8.3",
+		"@wordpress/core-commands": "^1.8.3",
+		"@wordpress/core-data": "^7.8.3",
+		"@wordpress/data": "^10.8.3",
+		"@wordpress/dataviews": "^4.4.3",
+		"@wordpress/date": "^5.8.2",
+		"@wordpress/deprecated": "^4.8.2",
+		"@wordpress/dom": "^4.8.2",
+		"@wordpress/editor": "^14.8.5",
 		"@wordpress/element": "^6.8.1",
 		"@wordpress/escape-html": "^3.8.1",
-		"@wordpress/hooks": "^4.8.1",
+		"@wordpress/hooks": "^4.8.2",
 		"@wordpress/html-entities": "^4.8.1",
-		"@wordpress/i18n": "^5.8.1",
-		"@wordpress/icons": "^10.8.1",
-		"@wordpress/keyboard-shortcuts": "^5.8.2",
-		"@wordpress/keycodes": "^4.8.1",
-		"@wordpress/notices": "^5.8.2",
-		"@wordpress/patterns": "^2.8.2",
-		"@wordpress/plugins": "^7.8.2",
-		"@wordpress/preferences": "^4.8.2",
+		"@wordpress/i18n": "^5.8.2",
+		"@wordpress/icons": "^10.8.2",
+		"@wordpress/keyboard-shortcuts": "^5.8.3",
+		"@wordpress/keycodes": "^4.8.2",
+		"@wordpress/notices": "^5.8.3",
+		"@wordpress/patterns": "^2.8.3",
+		"@wordpress/plugins": "^7.8.3",
+		"@wordpress/preferences": "^4.8.3",
 		"@wordpress/primitives": "^4.8.1",
 		"@wordpress/priority-queue": "^3.8.1",
 		"@wordpress/private-apis": "^1.8.1",
-		"@wordpress/reusable-blocks": "^5.8.2",
+		"@wordpress/reusable-blocks": "^5.8.3",
 		"@wordpress/router": "^1.8.1",
 		"@wordpress/style-engine": "^2.8.1",
 		"@wordpress/url": "^4.8.1",
-		"@wordpress/viewport": "^6.8.2",
-		"@wordpress/widgets": "^4.8.2",
+		"@wordpress/viewport": "^6.8.3",
+		"@wordpress/widgets": "^4.8.3",
 		"@wordpress/wordcount": "^4.8.1",
 		"change-case": "^4.1.2",
 		"clsx": "^2.1.1",
@@ -82,5 +82,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "51204ac9382d0551d8fdebd3c8d4623dabfa9f3c"
+	"gitHead": "6187079697e13c3292eb098d6338523a6676c6e8"
 }

package/src/components/editor/index.js

@@ -22,7 +22,7 @@ import { store as noticesStore } from '@wordpress/notices';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { store as preferencesStore } from '@wordpress/preferences';
 import { decodeEntities } from '@wordpress/html-entities';
-import { Icon, homeButton } from '@wordpress/icons';
+import { Icon, arrowUpLeft } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -291,7 +291,7 @@ export default function EditSiteEditor( { isPostsList = false } ) {
 											) }
 											variants={ toggleHomeIconVariants }
 										>
-											<Icon icon={ homeButton } />
+											<Icon icon={ arrowUpLeft } />
 										</motion.div>
 									</motion.div>
 								)

package/src/components/editor/style.scss

@@ -69,6 +69,10 @@
 	background-color: hsla(0, 0%, 80%);
 	pointer-events: none;
 
+	svg {
+		fill: currentColor;
+	}
+
 	&.has-site-icon {
 		background-color: hsla(0, 0%, 100%, 0.6);
 		-webkit-backdrop-filter: saturate(180%) blur(15px);

package/src/components/global-styles/font-families.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { __, _x } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 import {
 	__experimentalText as Text,
 	__experimentalItemGroup as ItemGroup,
@@ -61,14 +61,9 @@ function FontFamilies() {
 			) }
 
 			<VStack spacing={ 4 }>
-				{ themeFonts.length > 0 && (
-					<VStack>
-						<Subtitle level={ 3 }>
-							{
-								/* translators: Heading for a list of fonts provided by the theme. */
-								_x( 'Theme', 'font source' )
-							}
-						</Subtitle>
+				{ [ ...themeFonts, ...customFonts ].length > 0 && (
+					<>
+						<Subtitle level={ 3 }>{ __( 'Fonts' ) }</Subtitle>
 						<ItemGroup size="large" isBordered isSeparated>
 							{ themeFonts.map( ( font ) => (
 								<FontFamilyItem
@@ -77,25 +72,7 @@ function FontFamilies() {
 								/>
 							) ) }
 						</ItemGroup>
-					</VStack>
-				) }
-				{ customFonts.length > 0 && (
-					<VStack>
-						<Subtitle level={ 3 }>
-							{
-								/* translators: Heading for a list of fonts installed by the user. */
-								_x( 'Custom', 'font source' )
-							}
-						</Subtitle>
-						<ItemGroup size="large" isBordered isSeparated>
-							{ customFonts.map( ( font ) => (
-								<FontFamilyItem
-									key={ font.slug }
-									font={ font }
-								/>
-							) ) }
-						</ItemGroup>
-					</VStack>
+					</>
 				) }
 				{ ! hasFonts && (
 					<VStack>

package/src/components/global-styles/screen-typography.js

@@ -11,8 +11,8 @@ import { store as editorStore } from '@wordpress/editor';
  */
 import TypographyElements from './typography-elements';
 import ScreenHeader from './header';
+import TypographyVariations from './variations/variations-typography';
 import FontSizesCount from './font-sizes/font-sizes-count';
-import TypesetButton from './typeset-button';
 import FontFamilies from './font-families';
 
 function ScreenTypography() {
@@ -27,12 +27,12 @@ function ScreenTypography() {
 			<ScreenHeader
 				title={ __( 'Typography' ) }
 				description={ __(
-					'Typography styles and the application of those styles on site elements.'
+					'Available fonts, typographic styles, and the application of those styles.'
 				) }
 			/>
 			<div className="edit-site-global-styles-screen">
 				<VStack spacing={ 7 }>
-					<TypesetButton />
+					<TypographyVariations title={ __( 'Typesets' ) } />
 					{ fontLibraryEnabled && <FontFamilies /> }
 					<TypographyElements />
 					<FontSizesCount />

package/src/components/global-styles/ui.js

@@ -32,7 +32,6 @@ import {
 } from './screen-block-list';
 import ScreenBlock from './screen-block';
 import ScreenTypography from './screen-typography';
-import ScreenTypeset from './screen-typeset';
 import ScreenTypographyElement from './screen-typography-element';
 import FontSize from './font-sizes/font-size';
 import FontSizes from './font-sizes/font-sizes';
@@ -325,10 +324,6 @@ function GlobalStylesUI() {
 				<FontSize />
 			</GlobalStylesNavigationScreen>
 
-			<GlobalStylesNavigationScreen path="/typography/typeset">
-				<ScreenTypeset />
-			</GlobalStylesNavigationScreen>
-
 			<GlobalStylesNavigationScreen path="/typography/text">
 				<ScreenTypographyElement element="text" />
 			</GlobalStylesNavigationScreen>

package/src/components/sidebar-dataviews/dataview-item.js

@@ -27,7 +27,6 @@ export default function DataViewItem( {
 	isActive,
 	isCustom,
 	suffix,
-	navigationItemSuffix,
 } ) {
 	const {
 		params: { postType },
@@ -56,7 +55,6 @@ export default function DataViewItem( {
 			<SidebarNavigationItem
 				icon={ iconToUse }
 				{ ...linkInfo }
-				suffix={ navigationItemSuffix }
 				aria-current={ isActive ? 'true' : undefined }
 			>
 				{ title }

package/src/components/sidebar-dataviews/default-views.js

@@ -13,7 +13,7 @@ import {
 	notAllowed,
 } from '@wordpress/icons';
 import { useSelect } from '@wordpress/data';
-import { store as coreStore, useEntityRecords } from '@wordpress/core-data';
+import { store as coreStore } from '@wordpress/core-data';
 import { useMemo } from '@wordpress/element';
 
 /**
@@ -68,50 +68,6 @@ const DEFAULT_POST_BASE = {
 	layout: defaultLayouts[ LAYOUT_LIST ].layout,
 };
 
-export function useDefaultViewsWithItemCounts( { postType } ) {
-	const defaultViews = useDefaultViews( { postType } );
-	const { records, totalItems } = useEntityRecords( 'postType', postType, {
-		per_page: -1,
-		status: [ 'any', 'trash' ],
-	} );
-
-	return useMemo( () => {
-		if ( ! defaultViews ) {
-			return [];
-		}
-
-		// If there are no records, return the default views with no counts.
-		if ( ! records ) {
-			return defaultViews;
-		}
-
-		const counts = {
-			drafts: records.filter( ( record ) => record.status === 'draft' )
-				.length,
-			future: records.filter( ( record ) => record.status === 'future' )
-				.length,
-			pending: records.filter( ( record ) => record.status === 'pending' )
-				.length,
-			private: records.filter( ( record ) => record.status === 'private' )
-				.length,
-			published: records.filter(
-				( record ) => record.status === 'publish'
-			).length,
-			trash: records.filter( ( record ) => record.status === 'trash' )
-				.length,
-		};
-
-		// All items excluding trashed items as per the default "all" status query.
-		counts.all = totalItems ? totalItems - counts.trash : 0;
-
-		// Filter out views with > 0 item counts.
-		return defaultViews.map( ( _view ) => {
-			_view.count = counts[ _view.slug ];
-			return _view;
-		} );
-	}, [ defaultViews, records, totalItems ] );
-}
-
 export function useDefaultViews( { postType } ) {
 	const labels = useSelect(
 		( select ) => {

package/src/components/sidebar-dataviews/index.js

@@ -7,7 +7,7 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
 /**
  * Internal dependencies
  */
-import { useDefaultViewsWithItemCounts } from './default-views';
+import { useDefaultViews } from './default-views';
 import { unlock } from '../../lock-unlock';
 import DataViewItem from './dataview-item';
 import CustomDataViewsList from './custom-dataviews-list';
@@ -18,9 +18,7 @@ export default function DataViewsSidebarContent() {
 	const {
 		params: { postType, activeView = 'all', isCustom = 'false' },
 	} = useLocation();
-
-	const defaultViews = useDefaultViewsWithItemCounts( { postType } );
-
+	const defaultViews = useDefaultViews( { postType } );
 	if ( ! postType ) {
 		return null;
 	}
@@ -36,9 +34,6 @@ export default function DataViewsSidebarContent() {
 							slug={ dataview.slug }
 							title={ dataview.title }
 							icon={ dataview.icon }
-							navigationItemSuffix={
-								<span>{ dataview.count }</span>
-							}
 							type={ dataview.view.type }
 							isActive={
 								! isCustomBoolean &&

package/src/components/sidebar-dataviews/style.scss

@@ -15,10 +15,6 @@
 		min-width: initial;
 	}
 
-	.edit-site-sidebar-navigation-item.with-suffix {
-		padding-right: $grid-unit-10;
-	}
-
 	&:hover,
 	&:focus,
 	&[aria-current] {

package/build/components/global-styles/screen-typeset.js

@@ -1,40 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _i18n = require("@wordpress/i18n");
-var _data = require("@wordpress/data");
-var _editor = require("@wordpress/editor");
-var _components = require("@wordpress/components");
-var _variationsTypography = _interopRequireDefault(require("./variations/variations-typography"));
-var _header = _interopRequireDefault(require("./header"));
-var _fontFamilies = _interopRequireDefault(require("./font-families"));
-var _jsxRuntime = require("react/jsx-runtime");
-/**
- * WordPress dependencies
- */
-
-/**
- * Internal dependencies
- */
-
-function ScreenTypeset() {
-  const fontLibraryEnabled = (0, _data.useSelect)(select => select(_editor.store).getEditorSettings().fontLibraryEnabled, []);
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_header.default, {
-      title: (0, _i18n.__)('Typesets'),
-      description: (0, _i18n.__)('Fonts and typographic styling applied across the site.')
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "edit-site-global-styles-screen",
-      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.__experimentalVStack, {
-        spacing: 7,
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_variationsTypography.default, {}), fontLibraryEnabled && /*#__PURE__*/(0, _jsxRuntime.jsx)(_fontFamilies.default, {})]
-      })
-    })]
-  });
-}
-var _default = exports.default = ScreenTypeset;
-//# sourceMappingURL=screen-typeset.js.map

package/build/components/global-styles/screen-typeset.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_i18n","require","_data","_editor","_components","_variationsTypography","_interopRequireDefault","_header","_fontFamilies","_jsxRuntime","ScreenTypeset","fontLibraryEnabled","useSelect","select","editorStore","getEditorSettings","jsxs","Fragment","children","jsx","default","title","__","description","className","__experimentalVStack","spacing","_default","exports"],"sources":["@wordpress/edit-site/src/components/global-styles/screen-typeset.js"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport { __ } from '@wordpress/i18n';\nimport { useSelect } from '@wordpress/data';\nimport { store as editorStore } from '@wordpress/editor';\nimport { __experimentalVStack as VStack } from '@wordpress/components';\n\n/**\n * Internal dependencies\n */\nimport TypographyVariations from './variations/variations-typography';\nimport ScreenHeader from './header';\nimport FontFamilies from './font-families';\n\nfunction ScreenTypeset() {\n\tconst fontLibraryEnabled = useSelect(\n\t\t( select ) =>\n\t\t\tselect( editorStore ).getEditorSettings().fontLibraryEnabled,\n\t\t[]\n\t);\n\n\treturn (\n\t\t<>\n\t\t\t<ScreenHeader\n\t\t\t\ttitle={ __( 'Typesets' ) }\n\t\t\t\tdescription={ __(\n\t\t\t\t\t'Fonts and typographic styling applied across the site.'\n\t\t\t\t) }\n\t\t\t/>\n\t\t\t<div className=\"edit-site-global-styles-screen\">\n\t\t\t\t<VStack spacing={ 7 }>\n\t\t\t\t\t<TypographyVariations />\n\n\t\t\t\t\t{ fontLibraryEnabled && <FontFamilies /> }\n\t\t\t\t</VStack>\n\t\t\t</div>\n\t\t</>\n\t);\n}\n\nexport default ScreenTypeset;\n"],"mappings":";;;;;;;AAGA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,WAAA,GAAAH,OAAA;AAKA,IAAAI,qBAAA,GAAAC,sBAAA,CAAAL,OAAA;AACA,IAAAM,OAAA,GAAAD,sBAAA,CAAAL,OAAA;AACA,IAAAO,aAAA,GAAAF,sBAAA,CAAAL,OAAA;AAA2C,IAAAQ,WAAA,GAAAR,OAAA;AAb3C;AACA;AACA;;AAMA;AACA;AACA;;AAKA,SAASS,aAAaA,CAAA,EAAG;EACxB,MAAMC,kBAAkB,GAAG,IAAAC,eAAS,EACjCC,MAAM,IACPA,MAAM,CAAEC,aAAY,CAAC,CAACC,iBAAiB,CAAC,CAAC,CAACJ,kBAAkB,EAC7D,EACD,CAAC;EAED,oBACC,IAAAF,WAAA,CAAAO,IAAA,EAAAP,WAAA,CAAAQ,QAAA;IAAAC,QAAA,gBACC,IAAAT,WAAA,CAAAU,GAAA,EAACZ,OAAA,CAAAa,OAAY;MACZC,KAAK,EAAG,IAAAC,QAAE,EAAE,UAAW,CAAG;MAC1BC,WAAW,EAAG,IAAAD,QAAE,EACf,wDACD;IAAG,CACH,CAAC,eACF,IAAAb,WAAA,CAAAU,GAAA;MAAKK,SAAS,EAAC,gCAAgC;MAAAN,QAAA,eAC9C,IAAAT,WAAA,CAAAO,IAAA,EAACZ,WAAA,CAAAqB,oBAAM;QAACC,OAAO,EAAG,CAAG;QAAAR,QAAA,gBACpB,IAAAT,WAAA,CAAAU,GAAA,EAACd,qBAAA,CAAAe,OAAoB,IAAE,CAAC,EAEtBT,kBAAkB,iBAAI,IAAAF,WAAA,CAAAU,GAAA,EAACX,aAAA,CAAAY,OAAY,IAAE,CAAC;MAAA,CACjC;IAAC,CACL,CAAC;EAAA,CACL,CAAC;AAEL;AAAC,IAAAO,QAAA,GAAAC,OAAA,CAAAR,OAAA,GAEcV,aAAa","ignoreList":[]}

package/build/components/global-styles/typeset-button.js

@@ -1,98 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _i18n = require("@wordpress/i18n");
-var _components = require("@wordpress/components");
-var _coreData = require("@wordpress/core-data");
-var _data = require("@wordpress/data");
-var _blockEditor = require("@wordpress/block-editor");
-var _editor = require("@wordpress/editor");
-var _element = require("@wordpress/element");
-var _icons = require("@wordpress/icons");
-var _context = _interopRequireDefault(require("./font-library-modal/context"));
-var _utils = require("./utils");
-var _navigationButton = require("./navigation-button");
-var _subtitle = _interopRequireDefault(require("./subtitle"));
-var _lockUnlock = require("../../lock-unlock");
-var _useThemeStyleVariationsByProperty = require("../../hooks/use-theme-style-variations/use-theme-style-variations-by-property");
-var _jsxRuntime = require("react/jsx-runtime");
-/**
- * WordPress dependencies
- */
-
-/**
- * Internal dependencies
- */
-
-const {
-  GlobalStylesContext
-} = (0, _lockUnlock.unlock)(_blockEditor.privateApis);
-const {
-  mergeBaseAndUserConfigs
-} = (0, _lockUnlock.unlock)(_editor.privateApis);
-function TypesetButton() {
-  const propertiesToFilter = ['typography'];
-  const typographyVariations = (0, _useThemeStyleVariationsByProperty.useCurrentMergeThemeStyleVariationsWithUserConfig)(propertiesToFilter);
-  const hasTypographyVariations = typographyVariations?.length > 1;
-  const {
-    base,
-    user: userConfig
-  } = (0, _element.useContext)(GlobalStylesContext);
-  const config = mergeBaseAndUserConfigs(base, userConfig);
-  const allFontFamilies = (0, _utils.getFontFamilies)(config);
-  const hasFonts = allFontFamilies.filter(font => font !== null).length > 0;
-  const variations = (0, _data.useSelect)(select => {
-    return select(_coreData.store).__experimentalGetCurrentThemeGlobalStylesVariations();
-  }, []);
-  const userTypographyConfig = (0, _useThemeStyleVariationsByProperty.filterObjectByProperties)(userConfig, 'typography');
-  const title = (0, _element.useMemo)(() => {
-    if (Object.keys(userTypographyConfig).length === 0) {
-      return (0, _i18n.__)('Default');
-    }
-    const activeVariation = variations?.find(variation => {
-      return JSON.stringify((0, _useThemeStyleVariationsByProperty.filterObjectByProperties)(variation, 'typography')) === JSON.stringify(userTypographyConfig);
-    });
-    if (activeVariation) {
-      return activeVariation.title;
-    }
-    return allFontFamilies.map(font => font?.name).join(', ');
-  }, [allFontFamilies, userTypographyConfig, variations]);
-  return hasTypographyVariations && hasFonts && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.__experimentalVStack, {
-    spacing: 2,
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.__experimentalHStack, {
-      justify: "space-between",
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_subtitle.default, {
-        level: 3,
-        children: (0, _i18n.__)('Typeset')
-      })
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.__experimentalItemGroup, {
-      isBordered: true,
-      isSeparated: true,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_navigationButton.NavigationButtonAsItem, {
-        path: "/typography/typeset",
-        "aria-label": (0, _i18n.__)('Typeset'),
-        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.__experimentalHStack, {
-          direction: "row",
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.FlexItem, {
-            children: title
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.Icon, {
-            icon: (0, _i18n.isRTL)() ? _icons.chevronLeft : _icons.chevronRight
-          })]
-        })
-      })
-    })]
-  });
-}
-var _default = ({
-  ...props
-}) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_context.default, {
-  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(TypesetButton, {
-    ...props
-  })
-});
-exports.default = _default;
-//# sourceMappingURL=typeset-button.js.map

package/build/components/global-styles/typeset-button.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_i18n","require","_components","_coreData","_data","_blockEditor","_editor","_element","_icons","_context","_interopRequireDefault","_utils","_navigationButton","_subtitle","_lockUnlock","_useThemeStyleVariationsByProperty","_jsxRuntime","GlobalStylesContext","unlock","blockEditorPrivateApis","mergeBaseAndUserConfigs","editorPrivateApis","TypesetButton","propertiesToFilter","typographyVariations","useCurrentMergeThemeStyleVariationsWithUserConfig","hasTypographyVariations","length","base","user","userConfig","useContext","config","allFontFamilies","getFontFamilies","hasFonts","filter","font","variations","useSelect","select","coreStore","__experimentalGetCurrentThemeGlobalStylesVariations","userTypographyConfig","filterObjectByProperties","title","useMemo","Object","keys","__","activeVariation","find","variation","JSON","stringify","map","name","join","jsxs","__experimentalVStack","spacing","children","jsx","__experimentalHStack","justify","default","level","__experimentalItemGroup","isBordered","isSeparated","NavigationButtonAsItem","path","direction","FlexItem","Icon","icon","isRTL","chevronLeft","chevronRight","_default","props","exports"],"sources":["@wordpress/edit-site/src/components/global-styles/typeset-button.js"],"sourcesContent":["/**\n * WordPress dependencies\n */\nimport { isRTL, __ } from '@wordpress/i18n';\nimport {\n\t__experimentalItemGroup as ItemGroup,\n\t__experimentalVStack as VStack,\n\t__experimentalHStack as HStack,\n\tFlexItem,\n} from '@wordpress/components';\nimport { store as coreStore } from '@wordpress/core-data';\nimport { useSelect } from '@wordpress/data';\nimport { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';\nimport { privateApis as editorPrivateApis } from '@wordpress/editor';\nimport { useMemo, useContext } from '@wordpress/element';\nimport { Icon, chevronLeft, chevronRight } from '@wordpress/icons';\n\n/**\n * Internal dependencies\n */\nimport FontLibraryProvider from './font-library-modal/context';\nimport { getFontFamilies } from './utils';\nimport { NavigationButtonAsItem } from './navigation-button';\nimport Subtitle from './subtitle';\nimport { unlock } from '../../lock-unlock';\nimport {\n\tfilterObjectByProperties,\n\tuseCurrentMergeThemeStyleVariationsWithUserConfig,\n} from '../../hooks/use-theme-style-variations/use-theme-style-variations-by-property';\n\nconst { GlobalStylesContext } = unlock( blockEditorPrivateApis );\nconst { mergeBaseAndUserConfigs } = unlock( editorPrivateApis );\n\nfunction TypesetButton() {\n\tconst propertiesToFilter = [ 'typography' ];\n\tconst typographyVariations =\n\t\tuseCurrentMergeThemeStyleVariationsWithUserConfig( propertiesToFilter );\n\tconst hasTypographyVariations = typographyVariations?.length > 1;\n\tconst { base, user: userConfig } = useContext( GlobalStylesContext );\n\tconst config = mergeBaseAndUserConfigs( base, userConfig );\n\tconst allFontFamilies = getFontFamilies( config );\n\tconst hasFonts =\n\t\tallFontFamilies.filter( ( font ) => font !== null ).length > 0;\n\tconst variations = useSelect( ( select ) => {\n\t\treturn select(\n\t\t\tcoreStore\n\t\t).__experimentalGetCurrentThemeGlobalStylesVariations();\n\t}, [] );\n\tconst userTypographyConfig = filterObjectByProperties(\n\t\tuserConfig,\n\t\t'typography'\n\t);\n\n\tconst title = useMemo( () => {\n\t\tif ( Object.keys( userTypographyConfig ).length === 0 ) {\n\t\t\treturn __( 'Default' );\n\t\t}\n\t\tconst activeVariation = variations?.find( ( variation ) => {\n\t\t\treturn (\n\t\t\t\tJSON.stringify(\n\t\t\t\t\tfilterObjectByProperties( variation, 'typography' )\n\t\t\t\t) === JSON.stringify( userTypographyConfig )\n\t\t\t);\n\t\t} );\n\t\tif ( activeVariation ) {\n\t\t\treturn activeVariation.title;\n\t\t}\n\t\treturn allFontFamilies.map( ( font ) => font?.name ).join( ', ' );\n\t}, [ allFontFamilies, userTypographyConfig, variations ] );\n\n\treturn (\n\t\thasTypographyVariations &&\n\t\thasFonts && (\n\t\t\t<VStack spacing={ 2 }>\n\t\t\t\t<HStack justify=\"space-between\">\n\t\t\t\t\t<Subtitle level={ 3 }>{ __( 'Typeset' ) }</Subtitle>\n\t\t\t\t</HStack>\n\t\t\t\t<ItemGroup isBordered isSeparated>\n\t\t\t\t\t<NavigationButtonAsItem\n\t\t\t\t\t\tpath=\"/typography/typeset\"\n\t\t\t\t\t\taria-label={ __( 'Typeset' ) }\n\t\t\t\t\t>\n\t\t\t\t\t\t<HStack direction=\"row\">\n\t\t\t\t\t\t\t<FlexItem>{ title }</FlexItem>\n\t\t\t\t\t\t\t<Icon\n\t\t\t\t\t\t\t\ticon={ isRTL() ? chevronLeft : chevronRight }\n\t\t\t\t\t\t\t/>\n\t\t\t\t\t\t</HStack>\n\t\t\t\t\t</NavigationButtonAsItem>\n\t\t\t\t</ItemGroup>\n\t\t\t</VStack>\n\t\t)\n\t);\n}\n\nexport default ( { ...props } ) => (\n\t<FontLibraryProvider>\n\t\t<TypesetButton { ...props } />\n\t</FontLibraryProvider>\n);\n"],"mappings":"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","ignoreList":[]}