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

Fix error on parentheses in Resource View search #832

Merged
merged 1 commit into from
Oct 20, 2021
Merged

Fix error on parentheses in Resource View search #832

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: 5 additions & 1 deletion src/components/common/SearchBarLogic.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ export const highlightMatches = (prop: string, r: RowData, searchText): JSX.Elem
return highlightMatchesStr(textToSearchIn, searchText);
};

// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions
function escapeRegExp(s: string): string {
return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
}

export const highlightMatchesStr = (textToSearchIn: string, searchText): JSX.Element => {
const lowercasedTextToSearchIn = textToSearchIn.trim().toLowerCase();
Expand All @@ -26,7 +30,7 @@ export const highlightMatchesStr = (textToSearchIn: string, searchText): JSX.Ele
return divWith(cache[key]);
}

const searchTextExpression = new RegExp(searchText, 'i');
const searchTextExpression = new RegExp(escapeRegExp(searchText), 'i');
const highlightedText =
'<span>' +
textToSearchIn.replace(searchTextExpression,
Expand Down