fix: ensure selection is within containerRef

omsimos · Sep 8, 2024 · 7f5156a · 7f5156a
1 parent 0ce36aa
commit 7f5156a
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/packages/react-highlight-popover/src/HighlightPopover.tsx b/packages/react-highlight-popover/src/HighlightPopover.tsx
@@ -68,8 +68,16 @@ export function HighlightPopover({
 
   const isSelectionWithinContainer = useCallback((selection: Selection) => {
     if (!containerRef.current) return false;
-    const range = selection.getRangeAt(0);
-    return containerRef.current.contains(range.commonAncestorContainer);
+    for (let i = 0; i < selection.rangeCount; i++) {
+      const range = selection.getRangeAt(i);
+      if (
+        !containerRef.current.contains(range.startContainer) ||
+        !containerRef.current.contains(range.endContainer)
+      ) {
+        return false;
+      }
+    }
+    return true;
   }, []);
 
   const handleSelection = useCallback(() => {