react-pdf-highlighter-plus 1.3.0 → 1.3.1

package/dist/esm/index.js

@@ -1538,13 +1538,13 @@ var PdfHighlighter = ({
     })
   );
   const resizeObserverRef = useRef(null);
-  const lastContainerSizeRef = useRef(null);
   const renderRetryTimeoutsRef = useRef(
     []
   );
   const resumeScrollAwayTimeoutRef = useRef(
     null
   );
+  const settleScrollListenerRef = useRef(null);
   const findControllerRef = useRef(null);
   const viewerRef = useRef(null);
   const selectedHighlightCountRef = useRef(0);
@@ -1618,13 +1618,8 @@ var PdfHighlighter = ({
   }, [pdfDocument, recolorKey]);
   useLayoutEffect(() => {
     if (!containerNodeRef.current) return;
-    resizeObserverRef.current = new ResizeObserver((entries) => {
-      const rect = entries[entries.length - 1]?.contentRect;
-      if (!rect) return;
-      const last = lastContainerSizeRef.current;
-      if (last && last.w === rect.width && last.h === rect.height) return;
-      lastContainerSizeRef.current = { w: rect.width, h: rect.height };
-      if (last) handleScaleValueRef.current();
+    resizeObserverRef.current = new ResizeObserver(() => {
+      handleScaleValueRef.current();
     });
     resizeObserverRef.current.observe(containerNodeRef.current);
     const doc = containerNodeRef.current.ownerDocument;
@@ -1632,6 +1627,9 @@ var PdfHighlighter = ({
     eventBusRef.current.on("textlayerrendered", handlePageRendered);
     eventBusRef.current.on("pagerendered", handlePageRendered);
     eventBusRef.current.on("pagesinit", handleScaleValue);
+    if (scrolledToHighlightIdRef.current) {
+      resumeScrollAwayListenerAfterNavigation();
+    }
     doc.addEventListener("keydown", handleKeyDown);
     doc.addEventListener("copy", handleCopy, true);
     scheduleRenderHighlightLayers();
@@ -1648,6 +1646,13 @@ var PdfHighlighter = ({
         clearTimeout(resumeScrollAwayTimeoutRef.current);
         resumeScrollAwayTimeoutRef.current = null;
       }
+      if (settleScrollListenerRef.current) {
+        viewerRef.current?.container.removeEventListener(
+          "scroll",
+          settleScrollListenerRef.current
+        );
+        settleScrollListenerRef.current = null;
+      }
     };
   }, [selectionTip, highlights, onSelectionFinished]);
   useEffect(() => {
@@ -2097,13 +2102,27 @@ var PdfHighlighter = ({
     if (!container) return;
     if (resumeScrollAwayTimeoutRef.current) {
       clearTimeout(resumeScrollAwayTimeoutRef.current);
-    }
-    resumeScrollAwayTimeoutRef.current = setTimeout(() => {
-      container.addEventListener("scroll", handleScroll, {
-        once: true
-      });
       resumeScrollAwayTimeoutRef.current = null;
-    }, 1200);
+    }
+    if (settleScrollListenerRef.current) {
+      container.removeEventListener("scroll", settleScrollListenerRef.current);
+      settleScrollListenerRef.current = null;
+    }
+    const QUIET_MS = 150;
+    const onSettleTick = () => {
+      if (resumeScrollAwayTimeoutRef.current) {
+        clearTimeout(resumeScrollAwayTimeoutRef.current);
+      }
+      resumeScrollAwayTimeoutRef.current = setTimeout(() => {
+        container.removeEventListener("scroll", onSettleTick);
+        settleScrollListenerRef.current = null;
+        container.addEventListener("scroll", handleScroll, { once: true });
+        resumeScrollAwayTimeoutRef.current = null;
+      }, QUIET_MS);
+    };
+    settleScrollListenerRef.current = onSettleTick;
+    container.addEventListener("scroll", onSettleTick);
+    onSettleTick();
   };
   const isEditingOrHighlighting = () => {
     return Boolean(selectionRef.current) || Boolean(ghostHighlightRef.current) || isAreaSelectionInProgressRef.current || isEditInProgressRef.current;