@mirus/tiptap-editor 2.1.5 → 2.1.6

package/dist/tiptap-editor.mjs

@@ -21969,8 +21969,13 @@ function _w(t, e, n, r) {
   return t.descendants((u, f) => {
     if (u.isText) {
       let p;
-      for (; p = s.exec(u.text); )
-        c(f + p.index, f + p.index + p[0].length, p[0]);
+      for (; p = s.exec(u.text); ) {
+        const d = i.filter((v) => v.value === p[0]), h = f + p.index;
+        let m = !1;
+        d.forEach((v) => {
+          v.length && v.offset >= 0 && (m = !0, h - 1 === v.offset && c(h, h + p[0].length, p[0]));
+        }), m || c(h, h + p[0].length, p[0]);
+      }
     }
   }), { highlights: a, on: l };
 }
@@ -22281,9 +22286,6 @@ const Z6 = {
         length: t.length
       }));
     },
-    getInitialCharacterCount() {
-      return this.initialCharacterCount;
-    },
     upHandler() {
       this.navigatedOptionIndex = (this.navigatedOptionIndex + this.currentOptions.length - 1) % this.currentOptions.length;
     },
@@ -22326,7 +22328,10 @@ const Z6 = {
     warnings: function(t, e) {
       if (this.editor) {
         const n = this.editor.view.state.selection;
-        this.editor.commands.setContent(this.currentValue), this.editor.commands.setTextSelection(n.from, n.to), this.initialCharacterCount = this.currentCharacterCount;
+        this.editor.commands.setTextSelection({
+          from: n.from,
+          to: n.to
+        }), this.initialCharacterCount = this.currentCharacterCount;
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mirus/tiptap-editor",
-    "version": "2.1.5",
+    "version": "2.1.6",
     "description": "custom setup for the tiptap editor",
     "repository": "https://github.com/mirusresearch/tiptap-editor",
     "bugs": {

package/src/tiptap-editor.vue

@@ -319,9 +319,6 @@ export default {
                 length: err.length,
             }));
         },
-        getInitialCharacterCount() {
-            return this.initialCharacterCount;
-        },
         upHandler() {
             this.navigatedOptionIndex =
                 (this.navigatedOptionIndex + this.currentOptions.length - 1) %
@@ -385,8 +382,11 @@ export default {
             if (this.editor) {
                 // preserve selection after updating warnings
                 const oldSelection = this.editor.view.state.selection;
-                this.editor.commands.setContent(this.currentValue);
-                this.editor.commands.setTextSelection(oldSelection.from, oldSelection.to);
+                // this.editor.commands.setContent(this.currentValue);
+                this.editor.commands.setTextSelection({
+                    from: oldSelection.from,
+                    to: oldSelection.to,
+                });
 
                 // record length of text that was used to generate the list of warnings
                 this.initialCharacterCount = this.currentCharacterCount;

package/src/warnings.js

@@ -64,7 +64,20 @@ function lint(doc, position, prev, getErrorWords) {
             // Scan text nodes for bad words
             let m;
             while ((m = badWordsRegex.exec(node.text))) {
-                record(pos + m.index, pos + m.index + m[0].length, m[0]);
+                const matchingErrorWords = words.filter((word) => word.value === m[0]);
+                const indexOfMatchedWord = pos + m.index;
+                let errorHasOffsetData = false;
+                matchingErrorWords.forEach((word) => {
+                    if (word.length && word.offset >= 0) {
+                        errorHasOffsetData = true;
+                        if (indexOfMatchedWord - 1 === word.offset) {
+                            record(indexOfMatchedWord, indexOfMatchedWord + m[0].length, m[0]);
+                        }
+                    }
+                });
+                if (!errorHasOffsetData) {
+                    record(indexOfMatchedWord, indexOfMatchedWord + m[0].length, m[0]);
+                }
             }
         }
     });