@anaralabs/lector 3.14.0 → 3.14.2

package/dist/_tsup-dts-rollup.d.ts

@@ -147,9 +147,11 @@ declare interface AnnotationTooltipProps {
  * (policy in ./scan-invert.ts).
  *
  * Wrapping installs own properties on the context instance (the prototype is
- * never modified). Returns a cleanup that restores the pristine context.
+ * never modified). Returns a cleanup that restores the pristine context; pass
+ * finalizeRender=true only when the render completed naturally, which lets a
+ * papered-but-inkless page finalize as a genuinely blank scanned page.
  */
-export declare function applyContextRecolor(ctx: CanvasRenderingContext2D, map: RenderColorMap, options?: RecolorContextOptions): () => void;
+export declare function applyContextRecolor(ctx: CanvasRenderingContext2D, map: RenderColorMap, options?: RecolorContextOptions): (finalizeRender?: boolean) => void;
 
 /**
  * Calculates the highlight rectangles for a given text match.
@@ -342,7 +344,8 @@ export declare class LinkService {
     externalLinkEnabled: boolean;
     isInPresentationMode: boolean;
     _currentPageNumber: number;
-    _pageNavigationCallback?: (pageNumber: number) => void;
+    _pageNavigationCallbacks: Set<PageNavigationCallback>;
+    _dispatchPageNavigation(pageNumber: number, explicitDest?: unknown[]): void;
     get pdfDocumentProxy(): PDFDocumentProxy;
     get pagesCount(): number;
     get page(): number;
@@ -357,11 +360,11 @@ export declare class LinkService {
     navigateTo(dest: string | unknown[] | Promise<unknown[]>): void;
     get rotation(): number;
     set rotation(_value: number);
-    goToPage(_page_valuer: number): void;
+    goToPage(pageNumber: number): void;
     setHash(hash: string): void;
     executeSetOCGState(): void;
-    registerPageNavigationCallback(callback: (pageNumber: number) => void): void;
-    unregisterPageNavigationCallback(): void;
+    registerPageNavigationCallback(callback: PageNavigationCallback): void;
+    unregisterPageNavigationCallback(callback?: PageNavigationCallback): void;
 }
 
 export declare const loadPdfJs: () => Promise<pdfjsDist>;
@@ -396,6 +399,8 @@ children: ReactNode;
 pageNumber?: number;
 }) => JSX.Element>;
 
+declare type PageNavigationCallback = (pageNumber: number, explicitDest?: unknown[]) => void;
+
 export declare const Pages: ({ children, gap, virtualizerOptions, initialOffset, onOffsetChange, ...props }: HTMLProps<HTMLDivElement> & {
     virtualizerOptions?: {
         overscan?: number;
@@ -727,7 +732,7 @@ export declare const usePdfJump: () => {
     }) => void;
     jumpToOffset: (offset: number) => void;
     jumpToHighlightRects: (rects: HighlightRect[], type: "pixels" | "percent", align?: "start" | "center", additionalOffset?: number) => void;
-    scrollToHighlightRects: (rects: HighlightRect[], type: "pixels" | "percent", align?: "start" | "center", additionalOffset?: number) => void;
+    scrollToHighlightRects: (rects: HighlightRect[], type: "pixels" | "percent", align?: "start" | "center", additionalOffset?: number, behavior?: "auto" | "smooth") => boolean;
 };
 
 export declare const usePDFLinkService: () => LinkService;

package/dist/index.js

@@ -985,15 +985,15 @@ var usePdfJump = () => {
     [virtualizer]
   );
   const scrollToHighlightRects = useCallback(
-    (rects, type, align = "start", additionalOffset = 0) => {
-      if (!virtualizer) return;
+    (rects, type, align = "start", additionalOffset = 0, behavior = "smooth") => {
+      if (!virtualizer || rects.length === 0) return false;
       const firstPage = Math.min(...rects.map((rect) => rect.pageNumber));
       const pageOffset = virtualizer.getOffsetForIndex(firstPage - 1, "start");
-      if (pageOffset === null) return;
+      if (pageOffset === null) return false;
       const targetRect = rects.find((rect) => rect.pageNumber === firstPage);
-      if (!targetRect) return;
+      if (!targetRect) return false;
       const isNumber = pageOffset?.[0] != null;
-      if (!isNumber) return;
+      if (!isNumber) return false;
       const pageStart = pageOffset[0] ?? 0;
       let rectTop;
       let rectHeight;
@@ -1020,8 +1020,9 @@ var usePdfJump = () => {
       virtualizer.scrollToOffset(adjustedOffset, {
         align: "start",
         // Always use start when we've calculated our own centering
-        behavior: "smooth"
+        behavior
       });
+      return true;
     },
     [virtualizer]
   );
@@ -1045,7 +1046,18 @@ var LinkService = class {
   externalLinkEnabled = true;
   isInPresentationMode = false;
   _currentPageNumber = 0;
-  _pageNavigationCallback;
+  // Every mounted AnnotationLayer registers a callback here. A single slot
+  // breaks under page virtualization: any layer unmounting would wipe the
+  // callback registered by a still-mounted layer, silently killing internal
+  // link navigation. Keep them all and dispatch to the latest registrant.
+  _pageNavigationCallbacks = /* @__PURE__ */ new Set();
+  _dispatchPageNavigation(pageNumber, explicitDest) {
+    let latest;
+    for (const callback of this._pageNavigationCallbacks) {
+      latest = callback;
+    }
+    latest?.(pageNumber, explicitDest);
+  }
   get pdfDocumentProxy() {
     if (!this._pdfDocumentProxy) {
       throw new Error("pdfDocumentProxy is not set");
@@ -1060,9 +1072,7 @@ var LinkService = class {
   }
   set page(value) {
     this._currentPageNumber = value;
-    if (this._pageNavigationCallback) {
-      this._pageNavigationCallback(value);
-    }
+    this._dispatchPageNavigation(value);
   }
   // Required for link annotations to work
   setDocument(pdfDocument) {
@@ -1148,9 +1158,8 @@ var LinkService = class {
       return;
     }
     const pageNumber = pageIndex + 1;
-    if (this._pageNavigationCallback) {
-      this._pageNavigationCallback(pageNumber);
-    }
+    this._currentPageNumber = pageNumber;
+    this._dispatchPageNavigation(pageNumber, explicitDest);
   }
   executeNamedAction() {
   }
@@ -1162,7 +1171,12 @@ var LinkService = class {
   }
   set rotation(_value) {
   }
-  goToPage(_page_valuer) {
+  goToPage(pageNumber) {
+    if (!Number.isInteger(pageNumber) || pageNumber < 1 || this.pagesCount > 0 && pageNumber > this.pagesCount) {
+      return;
+    }
+    this._currentPageNumber = pageNumber;
+    this._dispatchPageNavigation(pageNumber);
   }
   setHash(hash) {
     if (hash.startsWith("#page=")) {
@@ -1174,13 +1188,20 @@ var LinkService = class {
   }
   executeSetOCGState() {
   }
-  // Method to register navigation callback
+  // Method to register navigation callback. Delete-then-add so re-registering
+  // an already-known callback still makes it the latest registrant.
   registerPageNavigationCallback(callback) {
-    this._pageNavigationCallback = callback;
-  }
-  // Method to unregister navigation callback
-  unregisterPageNavigationCallback() {
-    this._pageNavigationCallback = void 0;
+    this._pageNavigationCallbacks.delete(callback);
+    this._pageNavigationCallbacks.add(callback);
+  }
+  // Method to unregister navigation callback. Only removes the caller's own
+  // callback so one layer's cleanup can't drop another layer's registration.
+  unregisterPageNavigationCallback(callback) {
+    if (!callback) {
+      this._pageNavigationCallbacks.clear();
+    } else {
+      this._pageNavigationCallbacks.delete(callback);
+    }
   }
 };
 var useCreatePDFLinkService = (pdfDocumentProxy) => {
@@ -1218,6 +1239,48 @@ var useVisibility = ({
 };
 
 // src/hooks/layers/useAnnotationLayer.tsx
+var getDestinationScrollTop = (viewport, explicitDest) => {
+  if (!viewport || !explicitDest) return null;
+  const destType = explicitDest[1];
+  const destName = destType && typeof destType === "object" && "name" in destType ? destType.name : null;
+  if (destName === "FitR") {
+    const [x1, y1, x2, y2] = explicitDest.slice(2, 6);
+    if (typeof x1 !== "number" || typeof y1 !== "number" || typeof x2 !== "number" || typeof y2 !== "number") {
+      return null;
+    }
+    const [, t1] = viewport.convertToViewportPoint(x1, y1);
+    const [, t2] = viewport.convertToViewportPoint(x2, y2);
+    const top2 = Math.min(t1, t2);
+    if (typeof top2 !== "number" || Number.isNaN(top2)) return null;
+    return Math.min(Math.max(top2, 0), viewport.height);
+  }
+  let x = null;
+  let y = null;
+  switch (destName) {
+    case "XYZ":
+      x = explicitDest[2];
+      y = explicitDest[3];
+      break;
+    case "FitH":
+    case "FitBH":
+      y = explicitDest[2];
+      break;
+    case "FitV":
+    case "FitBV":
+      x = explicitDest[2];
+      break;
+    default:
+      return null;
+  }
+  const sideways = viewport.rotation % 180 !== 0;
+  if (typeof (sideways ? x : y) !== "number") return null;
+  const [, top] = viewport.convertToViewportPoint(
+    typeof x === "number" ? x : 0,
+    typeof y === "number" ? y : 0
+  );
+  if (typeof top !== "number" || Number.isNaN(top)) return null;
+  return Math.min(Math.max(top, 0), viewport.height);
+};
 var defaultAnnotationLayerParams = {
   renderForms: true,
   externalLinksEnabled: true,
@@ -1244,17 +1307,37 @@ var useAnnotationLayer = (params) => {
   useEffect(() => {
     linkService.externalLinkEnabled = mergedParams.externalLinksEnabled;
   }, [linkService, mergedParams.externalLinksEnabled]);
-  const { jumpToPage } = usePdfJump();
+  const { jumpToPage, scrollToHighlightRects } = usePdfJump();
+  const viewports = usePdf((state) => state.viewports);
   useEffect(() => {
     if (!jumpToPage) return;
-    const handlePageNavigation = (pageNumber2) => {
-      jumpToPage(pageNumber2, mergedParams.jumpOptions);
+    const handlePageNavigation = (targetPageNumber, explicitDest) => {
+      const top = getDestinationScrollTop(
+        viewports?.[targetPageNumber - 1],
+        explicitDest
+      );
+      const scrolled = top !== null && scrollToHighlightRects(
+        [{ pageNumber: targetPageNumber, top, left: 0, width: 0, height: 0 }],
+        "pixels",
+        mergedParams.jumpOptions?.align === "center" ? "center" : "start",
+        0,
+        mergedParams.jumpOptions?.behavior ?? "smooth"
+      );
+      if (!scrolled) {
+        jumpToPage(targetPageNumber, mergedParams.jumpOptions);
+      }
     };
     linkService.registerPageNavigationCallback(handlePageNavigation);
     return () => {
-      linkService.unregisterPageNavigationCallback();
+      linkService.unregisterPageNavigationCallback(handlePageNavigation);
     };
-  }, [jumpToPage, linkService, mergedParams.jumpOptions]);
+  }, [
+    jumpToPage,
+    scrollToHighlightRects,
+    viewports,
+    linkService,
+    mergedParams.jumpOptions
+  ]);
   useEffect(() => {
     ensureAnnotationLayerStyles();
   }, []);
@@ -1267,9 +1350,11 @@ var useAnnotationLayer = (params) => {
       const href = target.getAttribute("href") || "";
       if (href.startsWith("#page=")) {
         e.preventDefault();
-        const pageNumber2 = parseInt(href.substring(6), 10);
-        if (!Number.isNaN(pageNumber2)) {
-          linkService.goToPage(pageNumber2);
+        if (!target.closest("[data-internal-link]")) {
+          const pageNumber2 = parseInt(href.substring(6), 10);
+          if (!Number.isNaN(pageNumber2)) {
+            linkService.goToPage(pageNumber2);
+          }
         }
       }
     };
@@ -1726,8 +1811,9 @@ function applyContextRecolor(ctx, map, options) {
       );
     }
   };
-  const pendingTriggerReady = () => {
-    if (pendingTileArea < SCAN_COVERAGE_MIN || !pendingHasInk) return false;
+  const pendingTriggerReady = (requireInk = true) => {
+    if (pendingTileArea < SCAN_COVERAGE_MIN) return false;
+    if (requireInk && !pendingHasInk) return false;
     const union = [
       Math.min(...pendingTiles.map((t) => t.bounds[0])),
       Math.min(...pendingTiles.map((t) => t.bounds[1])),
@@ -1738,14 +1824,18 @@ function applyContextRecolor(ctx, map, options) {
     if (unionArea <= 0) return false;
     return pendingTileArea * (pageArea ?? 0) / unionArea >= SCAN_TILE_DENSITY_MIN;
   };
+  const prunePendingToCleanSuffix = () => {
+    if (paintSerial === pendingBaselineSerial) return;
+    const kept = pendingTiles.filter((t) => t.serial === paintSerial);
+    pendingTiles.length = 0;
+    pendingTiles.push(...kept);
+    pendingTileArea = kept.reduce((sum, t) => sum + t.area, 0);
+    pendingHasInk = kept.some((t) => t.inked);
+    pendingBaselineSerial = paintSerial;
+  };
   const flushPendingTiles = (self) => {
     if (paintSerial !== pendingBaselineSerial) {
-      const kept = pendingTiles.filter((t) => t.serial === paintSerial);
-      pendingTiles.length = 0;
-      pendingTiles.push(...kept);
-      pendingTileArea = kept.reduce((sum, t) => sum + t.area, 0);
-      pendingHasInk = kept.some((t) => t.inked);
-      pendingBaselineSerial = paintSerial;
+      prunePendingToCleanSuffix();
       if (pendingTiles.length === 0 || !pendingTriggerReady()) return;
     }
     for (const pending of pendingTiles) {
@@ -1933,8 +2023,22 @@ function applyContextRecolor(ctx, map, options) {
     clipFlags[clipFlags.length - 1] = true;
     return pristineClip.apply(this, args);
   };
-  const cleanup = () => {
+  const finalizeBlankScanPage = () => {
+    if (pendingTiles.length === 0) return;
+    prunePendingToCleanSuffix();
+    if (pendingTiles.length === 0) return;
+    if (!pendingTriggerReady(false)) return;
+    for (const pending of pendingTiles) {
+      invertTileRemainder(target, pending, coveredBounds);
+      coveredBounds.push(pending.bounds);
+    }
+    pendingTiles.length = 0;
+    pendingTileArea = 0;
+    pendingHasInk = false;
+  };
+  const cleanup = (finalizeRender = false) => {
     if (target[RECOLOR_CLEANUP] !== cleanup) return;
+    if (finalizeRender) finalizeBlankScanPage();
     for (const name of [
       ...FILL_METHODS,
       ...STROKE_METHODS,
@@ -2228,19 +2332,20 @@ var useCanvasLayer = ({ background }) => {
       releaseBuffer();
       throw error;
     }
-    renderingTask.promise.finally(() => {
-      restoreRecolor?.();
-    }).then(() => {
+    renderingTask.promise.then(() => {
       if (cancelled) {
+        restoreRecolor?.();
         releaseBuffer();
         return;
       }
       const state = store.getState();
       const currentRecolorKey = state.colorScheme === "dark" ? `dark:${state.darkModeColors.background},${state.darkModeColors.foreground}` : void 0;
       if (currentRecolorKey !== recolorKey) {
+        restoreRecolor?.();
         releaseBuffer();
         return;
       }
+      restoreRecolor?.(true);
       if (useBuffer) {
         applyBackingSize();
         context.drawImage(buffer, 0, 0);
@@ -2272,6 +2377,7 @@ var useCanvasLayer = ({ background }) => {
         releaseBuffer();
       }
     }).catch((error) => {
+      restoreRecolor?.();
       releaseBuffer();
       if (cancelled) return;
       if (error?.name === "RenderingCancelledException") return;
@@ -2584,10 +2690,9 @@ var useDetailCanvasLayer = ({
       const detailViewport = pdfPageProxy.getViewport({
         scale: effectiveScale
       });
-      if (recolor)
-        applyContextRecolor(bufferCtx, recolor, {
-          pageArea: detailViewport.width * detailViewport.height
-        });
+      const restoreRecolor = recolor ? applyContextRecolor(bufferCtx, recolor, {
+        pageArea: detailViewport.width * detailViewport.height
+      }) : null;
       const releaseBuffer = () => {
         buffer.width = 0;
         buffer.height = 0;
@@ -2615,6 +2720,7 @@ var useDetailCanvasLayer = ({
         const state = store.getState();
         const currentRecolorKey = state.colorScheme === "dark" ? `dark:${state.darkModeColors.background},${state.darkModeColors.foreground}` : "light";
         if (currentRecolorKey !== recolorKey) return;
+        restoreRecolor?.(true);
         detailCanvas.width = actualWidth;
         detailCanvas.height = actualHeight;
         detailCanvas.style.cssText = `${detailBaseStyle};display:block;opacity:1;width:${cssWidth}px;height:${cssHeight}px;transform-origin:center center;transform:translate(${rectLeft * zoom}px,${rectTop * zoom}px)`;
@@ -2686,6 +2792,7 @@ var useDetailCanvasLayer = ({
         clearTimeout(renderTimeoutId);
       }
       void renderingTask?.cancel();
+      renderingTask = null;
     };
   }, [
     pdfPageProxy,
@@ -7073,6 +7180,7 @@ var useThumbnail = (pageNumber, config = {}) => {
   useEffect(() => {
     if (!isVisible && renderedProxyRef.current !== pageProxy) return;
     renderedProxyRef.current = pageProxy;
+    let stale = false;
     const renderThumbnail = async () => {
       const canvas2 = canvasRef.current;
       if (!canvas2 || !pageProxy) return;
@@ -7107,6 +7215,7 @@ var useThumbnail = (pageNumber, config = {}) => {
           });
           renderTaskRef.current = renderTask;
           await renderTask.promise;
+          restoreRecolor?.(!stale);
         } finally {
           restoreRecolor?.();
         }
@@ -7121,6 +7230,7 @@ var useThumbnail = (pageNumber, config = {}) => {
     renderThumbnail();
     const canvas = canvasRef.current;
     return () => {
+      stale = true;
       renderTaskRef.current?.cancel();
       if (canvas) {
         canvas.width = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@anaralabs/lector",
-	"version": "3.14.0",
+	"version": "3.14.2",
 	"description": "A headless PDF viewer for React",
 	"author": "andrewdr (https://github.com/andrewdoro)",
 	"license": "MIT",