fix(core): add scroll event listener for AnnotationToolbarPopover ref…

…erenceBoundary
sanity-io · Dec 20, 2023 · a48f9a3 · a48f9a3
1 parent bb0377a
commit a48f9a3
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/packages/sanity/src/core/form/inputs/PortableText/object/AnnotationToolbarPopover.tsx b/packages/sanity/src/core/form/inputs/PortableText/object/AnnotationToolbarPopover.tsx
@@ -139,6 +139,19 @@ export function AnnotationToolbarPopover(props: AnnotationToolbarPopoverProps) {
   }, [])
 
   useEffect(() => {
+    const sel = window.getSelection()
+    if (sel && sel.rangeCount > 0) {
+      rangeRef.current = sel.getRangeAt(0)
+    }
+  }, [popoverOpen])
+
+  useEffect(() => {
+    //Attach and detach scroll event listener for popover to follow the current reference boundary
+    if (popoverOpen && referenceBoundary) {
+      referenceBoundary.addEventListener('scroll', handleScroll)
+      return () => referenceBoundary.removeEventListener('scroll', handleScroll)
+    }
+
     if (!popoverOpen) {
       return undefined
     }