Skip to content

Commit

Permalink
fix: use correct textContent method on html node element and remove e…
Browse files Browse the repository at this point in the history
…xtraneous set state call
  • Loading branch information
James Duffy committed Jul 30, 2021
1 parent f77c733 commit 6aa8515
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/components/JustNotSorry.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ class JustNotSorry extends Component {
const newWarnings =
email.children.length > 0
? Array.from(email.children)
.filter((node) => node.text !== '')
.flatMap((node) => findRanges(node, patterns))
.filter((node) => node.textContent !== '')
.flatMap((text) => findRanges(text, patterns))
: findRanges(email, patterns);

this.setState(({ parentNode }) =>
parentNode.id !== email.parentNode.id
? { parentNode: email.parentNode, warnings: newWarnings }
: { parentNode, warnings: newWarnings }
);
this.setState({ parentNode: email.parentNode, warnings: newWarnings });
}

handleSearch(email, patterns) {
Expand Down
8 changes: 4 additions & 4 deletions src/helpers/RangeFinder.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import * as Util from './util';

function search(email, phrase) {
return Util.match(email, phrase.regex).map((range) => ({
function search(element, phrase) {
return Util.match(element, phrase.regex).map((range) => ({
message: phrase.message,
rangeToHighlight: range,
}));
}

export function findRanges(element, patternsToFind) {
return patternsToFind.flatMap((pattern) => search(element, pattern));
export function findRanges(node, patternsToFind) {
return patternsToFind.flatMap((pattern) => search(node, pattern));
}

0 comments on commit 6aa8515

Please sign in to comment.