Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Components: Query autocomplete by the term from last trigger prefix character #30540

Merged
merged 1 commit into from
Apr 7, 2021
Merged

Components: Query autocomplete by the term from last trigger prefix character #30540

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/components/src/autocomplete/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) )
Copy link
Member

@gziolo gziolo Apr 7, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, it makes a lot of sense.

It feels like we could update the RegExp to match the last occurrence (rather than using slice), but I'm afraid it would be harder to follow for those who need to google it like me:
https://frightanic.com/software-development/regex-match-last-occurrence/

.match( new RegExp( `${ safeTrigger }([\u0000-\uFFFF]*)$` ) );
const query = match && match[ 1 ];

setAutocompleter( completer );
Expand Down