@anaralabs/lector 3.14.0 → 3.14.1

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.

package/dist/index.js

@@ -1726,8 +1726,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 +1739,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 +1938,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 +2247,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 +2292,7 @@ var useCanvasLayer = ({ background }) => {
         releaseBuffer();
       }
     }).catch((error) => {
+      restoreRecolor?.();
       releaseBuffer();
       if (cancelled) return;
       if (error?.name === "RenderingCancelledException") return;
@@ -2584,10 +2605,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 +2635,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 +2707,7 @@ var useDetailCanvasLayer = ({
         clearTimeout(renderTimeoutId);
       }
       void renderingTask?.cancel();
+      renderingTask = null;
     };
   }, [
     pdfPageProxy,
@@ -7073,6 +7095,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 +7130,7 @@ var useThumbnail = (pageNumber, config = {}) => {
           });
           renderTaskRef.current = renderTask;
           await renderTask.promise;
+          restoreRecolor?.(!stale);
         } finally {
           restoreRecolor?.();
         }
@@ -7121,6 +7145,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.1",
 	"description": "A headless PDF viewer for React",
 	"author": "andrewdr (https://github.com/andrewdoro)",
 	"license": "MIT",