We can't perform a null ?? check on decodeEntities to verify falsy va…

…lues because decodeEntities will return an empty string if it encounters one. (WordPress#51074) Updated Untitled copy to be consistent with pages view.
pewresearch · Jul 13, 2023 · 62eb41b · 62eb41b
1 parent 15a31df
commit 62eb41b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-page/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-page/index.js
@@ -145,9 +145,9 @@ export default function SidebarNavigationScreenPage() {
 				: null;
 
 			if ( _parentTitle?.title ) {
-				_parentTitle = _parentTitle.title?.rendered
-					? decodeEntities( _parentTitle.title.rendered )
-					: __( 'Untitled' );
+				_parentTitle = decodeEntities(
+					_parentTitle.title?.rendered || __( '(no title)' )
+				);
 			} else {
 				_parentTitle = __( 'Top level' );
 			}
@@ -181,7 +181,9 @@ export default function SidebarNavigationScreenPage() {
 
 	return record ? (
 		<SidebarNavigationScreen
-			title={ decodeEntities( record?.title?.rendered ) }
+			title={ decodeEntities(
+				record?.title?.rendered || __( '(no title)' )
+			) }
 			actions={
 				<SidebarButton
 					onClick={ () => setCanvasMode( 'edit' ) }
@@ -218,8 +220,9 @@ export default function SidebarNavigationScreenPage() {
 										altText
 											? decodeEntities( altText )
 											: decodeEntities(
-													record.title?.rendered
-											  ) || __( 'Featured image' )
+													record.title?.rendered ||
+														__( 'Featured image' )
+											  )
 									}
 									src={ mediaSourceUrl }
 								/>

diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js
@@ -111,8 +111,9 @@ export default function SidebarNavigationScreenPages() {
 								>
 									<Truncate numberOfLines={ 1 }>
 										{ decodeEntities(
-											homeTemplate.title?.rendered
-										) ?? __( '(no title)' ) }
+											homeTemplate.title?.rendered ||
+												__( '(no title)' )
+										) }
 									</Truncate>
 								</PageItem>
 							) }
@@ -137,8 +138,9 @@ export default function SidebarNavigationScreenPages() {
 									>
 										<Truncate numberOfLines={ 1 }>
 											{ decodeEntities(
-												item.title?.rendered
-											) ?? __( '(no title)' ) }
+												item?.title?.rendered ||
+													__( '(no title)' )
+											) }
 										</Truncate>
 									</PageItem>
 								);
@@ -154,8 +156,9 @@ export default function SidebarNavigationScreenPages() {
 									>
 										<Truncate numberOfLines={ 1 }>
 											{ decodeEntities(
-												item.title?.rendered
-											) ?? __( '(no title)' ) }
+												item.title?.rendered ||
+													__( '(no title)' )
+											) }
 										</Truncate>
 									</PageItem>
 								) ) }