npm - @progress/kendo-editor-common - Versions diffs - 1.12.3-develop.7 → 1.12.3-develop.8 - Mend

@progress/kendo-editor-common 1.12.3-develop.7 → 1.12.3-develop.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/cdn/js/kendo-editor-common.js +1 -1
package/dist/cdn/main.js +1 -1
package/dist/es/find-replace.js +4 -12
package/dist/npm/find-replace.js +4 -12
package/package.json +1 -1

package/dist/es/find-replace.js CHANGED Viewed

@@ -4,16 +4,12 @@ export const findAt = (doc, searchOptions, start, end, exit) => {
     let exec, text, from, to, childText, nextSibling;
     const nodes = [];
     const { matchCase, matchWord, useRegExp } = searchOptions;
-    let searchText = searchOptions.text;
-    if (useRegExp && (/^\\$/.test(searchText) || /[^\\]\\$/.test(searchText))) {
-        // lookbehind doesn't work in Edge -> /((?<!\\)\\)$/.test(searchText)
-        searchText = searchText.substring(0, searchText.length - 1);
-    }
+    const searchText = searchOptions.text;
     if (!searchText) {
         return result;
     }
     const flags = matchCase ? 'g' : 'gi';
-    const regExp = useRegExp ? new RegExp(searchText, flags) : createRegExp(searchText, flags);
+    const regExp = useRegExp ? new RegExp(searchText, flags) : new RegExp(escapeRegExp(searchText), flags);
     doc.nodesBetween(start, end, (node, pos) => {
         if (exit(result)) {
             return false;
@@ -110,10 +106,6 @@ const shouldMatchWord = (exec, matchWord) => {
         return matchWord(exec);
     }
 };
-const createRegExp = (inputString, flags) => {
-    const escaped = inputString
-        .replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')
-        .replace(/-/g, '\\x2d')
-        .replace(/\s/g, '\\s');
-    return new RegExp(escaped, flags);
+const escapeRegExp = (text) => {
+    return text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 };

package/dist/npm/find-replace.js CHANGED Viewed

@@ -7,16 +7,12 @@ const findAt = (doc, searchOptions, start, end, exit) => {
     let exec, text, from, to, childText, nextSibling;
     const nodes = [];
     const { matchCase, matchWord, useRegExp } = searchOptions;
-    let searchText = searchOptions.text;
-    if (useRegExp && (/^\\$/.test(searchText) || /[^\\]\\$/.test(searchText))) {
-        // lookbehind doesn't work in Edge -> /((?<!\\)\\)$/.test(searchText)
-        searchText = searchText.substring(0, searchText.length - 1);
-    }
+    const searchText = searchOptions.text;
     if (!searchText) {
         return result;
     }
     const flags = matchCase ? 'g' : 'gi';
-    const regExp = useRegExp ? new RegExp(searchText, flags) : createRegExp(searchText, flags);
+    const regExp = useRegExp ? new RegExp(searchText, flags) : new RegExp(escapeRegExp(searchText), flags);
     doc.nodesBetween(start, end, (node, pos) => {
         if (exit(result)) {
             return false;
@@ -118,10 +114,6 @@ const shouldMatchWord = (exec, matchWord) => {
         return matchWord(exec);
     }
 };
-const createRegExp = (inputString, flags) => {
-    const escaped = inputString
-        .replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')
-        .replace(/-/g, '\\x2d')
-        .replace(/\s/g, '\\s');
-    return new RegExp(escaped, flags);
+const escapeRegExp = (text) => {
+    return text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 };

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@progress/kendo-editor-common",
   "description": "Kendo UI TypeScript package exporting functions for Editor component",
-  "version": "1.12.3-develop.7",
+  "version": "1.12.3-develop.8",
   "keywords": [
     "Kendo UI"
   ],