fix: highlighting issues on outlook and gmail 117

defmethodinc · Jul 9, 2021 · ece2480 · ece2480
1 parent f44fe02
commit ece2480
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/components/JustNotSorry.js b/src/components/JustNotSorry.js
@@ -41,14 +41,24 @@ class JustNotSorry extends Component {
     this.setState({ parentNode: {}, warnings: [] });
   }
 
-  updateWarnings(elem, patterns) {
-    const newWarnings = findRanges(elem, patterns);
-    this.setState({ parentNode: elem.parentNode, warnings: newWarnings });
+  updateWarnings(email, patterns) {
+    const newWarnings =
+      email.children.size > 0
+        ? Array.from(email.children)
+            .filter((node) => node.text !== '')
+            .flatMap((node) => findRanges(node, patterns))
+        : findRanges(email, patterns);
+    this.setState(({ parentNode }) =>
+      parentNode.id !== email.parentNode.id
+        ? { parentNode: email.parentNode, warnings: newWarnings }
+        : { parentNode, warning: newWarnings }
+    );
+    this.setState({ parentNode: email.parentNode, warnings: newWarnings });
   }
 
-  handleSearch(elem, patterns) {
+  handleSearch(email, patterns) {
     return Util.debounce(
-      () => this.updateWarnings(elem, patterns),
+      () => this.updateWarnings(email, patterns),
       WAIT_TIME_BEFORE_RECALC_WARNINGS
     );
   }