fix(range): Address comments

box · Sep 3, 2020 · 0dcb97d · 0dcb97d
1 parent ba3487f
commit 0dcb97d
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/store/highlight/actions.ts b/src/store/highlight/actions.ts
@@ -24,10 +24,10 @@ declare global {
     }
 }
 
-export const getRects = (range: Range): DOMRect[] => {
+export const getClientRects = (range: Range): DOMRect[] => {
     const iterator = document.createNodeIterator(
         range.commonAncestorContainer,
-        NodeFilter.SHOW_TEXT, // only show Text nodes
+        NodeFilter.SHOW_ALL,
         function acceptNode() {
             return NodeFilter.FILTER_ACCEPT;
         },
@@ -44,22 +44,24 @@ export const getRects = (range: Range): DOMRect[] => {
             continue;
         }
 
-        newRange.selectNodeContents(currentNode);
-        if (currentNode === range.startContainer) {
-            newRange.setStart(currentNode, range.startOffset);
+        // Only highlight Text nodes
+        if (currentNode.nodeType === Node.TEXT_NODE) {
+            newRange.selectNodeContents(currentNode);
+            if (currentNode === range.startContainer) {
+                newRange.setStart(currentNode, range.startOffset);
+            }
+            if (currentNode === range.endContainer) {
+                newRange.setEnd(currentNode, range.endOffset);
+            }
+            rects.push(newRange.getBoundingClientRect());
         }
-        if (currentNode === range.endContainer) {
-            newRange.setEnd(currentNode, range.endOffset);
-        }
-        rects.push(newRange.getBoundingClientRect());
 
         if (currentNode === range.endContainer) {
             break;
         }
 
         currentNode = iterator.nextNode();
     }
-    newRange.detach();
 
     return rects;
 };
@@ -85,7 +87,7 @@ export const setSelectionAction = createAction(
         let rects = Array.from(range.getClientRects());
         // getClientRects on IE/Edge might return 0 rects
         if (!rects.length) {
-            rects = getRects(range);
+            rects = getClientRects(range);
         }
 
         return {