Address review feedback.

WordPress · Aug 17, 2020 · 84f2a24 · 84f2a24
1 parent a136134
commit 84f2a24
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/block-library/src/heading/heading-level-dropdown.js b/packages/block-library/src/heading/heading-level-dropdown.js
@@ -51,7 +51,10 @@ export default function HeadingLevelDropdown( {
 	selectedLevel,
 	onChange,
 } ) {
-	const instanceId = useInstanceId( HeadingLevelDropdown );
+	const helpTextId = useInstanceId(
+		HeadingLevelDropdown,
+		'block-library-heading__heading-level-dropdown__help'
+	);
 
 	const getLevelValidity = useHeadingLevelValidator( clientId );
 
@@ -127,11 +130,11 @@ export default function HeadingLevelDropdown( {
 									},
 								};
 							} ) }
-							aria-describedby={ `block-library-heading__heading-level-dropdown__help-${ instanceId }` }
+							aria-describedby={ helpTextId }
 						/>
 					</Toolbar>
 					<p
-						id={ `block-library-heading__heading-level-dropdown__help-${ instanceId }` }
+						id={ helpTextId }
 						className="block-library-heading__heading-level-dropdown__help"
 					>
 						<ExternalLink href="https://www.w3.org/WAI/tutorials/page-structure/headings/">

diff --git a/packages/block-library/src/heading/use-heading-level-validator.js b/packages/block-library/src/heading/use-heading-level-validator.js
@@ -78,7 +78,7 @@ export default function useHeadingLevelValidator( currentBlockClientId ) {
 	)[ 0 ];
 	const hasTitle = isTitleSupported && titleIsNotEmpty && titleNode;
 	const hasMultipleH1 = useMemo(
-		() => headings.filter( ( { level } ) => level === 1 ).length > 1,
+		() => headings.some( ( { level } ) => level === 1 ),
 		[ headings ]
 	);