Trim text in TextHighlight

WordPress · Feb 20, 2020 · d895cab · d895cab
1 parent ff5016b
commit d895cab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packages/block-editor/src/components/link-control/index.js b/packages/block-editor/src/components/link-control/index.js
@@ -501,7 +501,7 @@ function LinkControl( {
 								isURL={ directLinkEntryTypes.includes(
 									suggestion.type.toLowerCase()
 								) }
-								searchTerm={ inputValue.trim() }
+								searchTerm={ inputValue }
 							/>
 						);
 					} ) }

diff --git a/packages/components/src/text-highlight/index.js b/packages/components/src/text-highlight/index.js
@@ -9,11 +9,16 @@ import { escapeRegExp } from 'lodash';
 import { __experimentalCreateInterpolateElement } from '@wordpress/element';
 
 const TextHighlight = ( { text = '', highlight = '' } ) => {
-	if ( ! highlight.trim() ) {
+	const trimmedHighlightText = highlight.trim();
+
+	if ( ! trimmedHighlightText ) {
 		return text;
 	}
 
-	const regex = new RegExp( `(${ escapeRegExp( highlight ) })`, 'gi' );
+	const regex = new RegExp(
+		`(${ escapeRegExp( trimmedHighlightText ) })`,
+		'gi'
+	);
 
 	return __experimentalCreateInterpolateElement(
 		text.replace( regex, '<mark>$&</mark>' ),