github/simple-keyboard
github/simple-keyboard
4
0
Fork 0
mirror of https://github.com/hodgef/simple-keyboard.git synced 2025-04-28 00:30:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Escape regex input for layoutCandidates check. Fixes #1645

Browse Source
This commit is contained in:
Francisco Hodge 2022-07-31 16:42:01 -07:00
parent 5c574e8226
commit f82f2c342f
11 changed files with 20362 additions and 789 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19632
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
src/lib/components/Keyboard.ts
View File

@ -332,7 +332,7 @@ class SimpleKeyboard {
const inputSubstr = const inputSubstr =
input.substring(0, this.getCaretPositionEnd() || 0) || input; input.substring(0, this.getCaretPositionEnd() || 0) || input;
const regexp = new RegExp( const regexp = new RegExp(
`${layoutCandidate}$`, `${this.utilities.escapeRegex(layoutCandidate)}$`,
layoutCandidatesCaseSensitiveMatch ? "g" : "gi" layoutCandidatesCaseSensitiveMatch ? "g" : "gi"
); );
const matches = [...inputSubstr.matchAll(regexp)]; const matches = [...inputSubstr.matchAll(regexp)];
@ -387,7 +387,7 @@ class SimpleKeyboard {
currentInput; currentInput;
const regexp = new RegExp( const regexp = new RegExp(
`${candidateKey}$`, `${this.utilities.escapeRegex(candidateKey)}$`,
layoutCandidatesCaseSensitiveMatch ? "g" : "gi" layoutCandidatesCaseSensitiveMatch ? "g" : "gi"
); );
const newInputSubstr = inputSubstr.replace( const newInputSubstr = inputSubstr.replace(

7
src/lib/services/Utilities.ts
View File

@ -532,6 +532,13 @@ class Utilities {
); );
} }
/**
* Escape regex input
*/
escapeRegex(str: string) {
return str.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
}
/** /**
* Reusable empty function * Reusable empty function
*/ */