Remove empty descriptions

WordPress · Jul 8, 2024 · 1680214 · 1680214
1 parent 4287bd8
commit 1680214
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 30 deletions.
diff --git a/packages/dataviews/src/view-table.tsx b/packages/dataviews/src/view-table.tsx
@@ -360,17 +360,23 @@ function TableColumnField< Item >( {
 	item,
 	field,
 }: TableColumnFieldProps< Item > ) {
+	const value = field.render( {
+		item,
+	} );
 	return (
-		<div
-			className={ clsx( 'dataviews-view-table__cell-content-wrapper', {
-				'dataviews-view-table__primary-field':
-					primaryField?.id === field.id,
-			} ) }
-		>
-			{ field.render( {
-				item,
-			} ) }
-		</div>
+		!! value && (
+			<div
+				className={ clsx(
+					'dataviews-view-table__cell-content-wrapper',
+					{
+						'dataviews-view-table__primary-field':
+							primaryField?.id === field.id,
+					}
+				) }
+			>
+				{ value }
+			</div>
+		)
 	);
 }
 

diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
@@ -6,12 +6,7 @@ import clsx from 'clsx';
 /**
  * WordPress dependencies
  */
-import {
-	Icon,
-	__experimentalText as Text,
-	__experimentalHStack as HStack,
-	VisuallyHidden,
-} from '@wordpress/components';
+import { Icon, __experimentalHStack as HStack } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useState, useMemo, useCallback, useEffect } from '@wordpress/element';
 import { useEntityRecords } from '@wordpress/core-data';
@@ -301,20 +296,11 @@ export default function PageTemplates() {
 				header: __( 'Description' ),
 				id: 'description',
 				render: ( { item } ) => {
-					return item.description ? (
-						<span className="page-templates-description">
-							{ decodeEntities( item.description ) }
-						</span>
-					) : (
-						view.type === LAYOUT_TABLE && (
-							<>
-								<Text variant="muted" aria-hidden="true">
-									&#8212;
-								</Text>
-								<VisuallyHidden>
-									{ __( 'No description.' ) }
-								</VisuallyHidden>
-							</>
+					return (
+						item.description && (
+							<span className="page-templates-description">
+								{ decodeEntities( item.description ) }
+							</span>
 						)
 					);
 				},