Components: Query autocomplete by the term from last trigger prefix (#…

…30540)
WordPress · Apr 7, 2021 · 5e109ca · 5e109ca
1 parent e641ec8
commit 5e109ca
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/packages/components/src/autocomplete/index.js b/packages/components/src/autocomplete/index.js
@@ -472,9 +472,9 @@ function Autocomplete( {
 		}
 
 		const safeTrigger = escapeRegExp( completer.triggerPrefix );
-		const match = text.match(
-			new RegExp( `${ safeTrigger }([\u0000-\uFFFF]*)$` )
-		);
+		const match = text
+			.slice( text.lastIndexOf( completer.triggerPrefix ) )
+			.match( new RegExp( `${ safeTrigger }([\u0000-\uFFFF]*)$` ) );
 		const query = match && match[ 1 ];
 
 		setAutocompleter( completer );