fix: fix remaining issues in new assertView algorithm and implement cropMargins options

src/browser/camera/index.ts

@@ -4,6 +4,7 @@ import makeDebug from "debug";
 
 import { Image } from "../../image";
 import * as utils from "./utils";
+import type { CropMargins } from "./utils";
 import * as logger from "../../utils/logger";
 import {
     getIntersection,
@@ -20,12 +21,15 @@ import { NEW_ISSUE_LINK } from "../../constants/help";
 const debug = makeDebug("testplane:screenshots:camera");
 
 export type ScreenshotMode = "fullpage" | "viewport" | "auto";
+export type { CropMargins } from "./utils";
 
 export interface CaptureViewportImageOpts {
     viewportOffset: Point<"page", "device">;
     viewportSize: Size<"device">;
     /** Delay before taking the screenshot, in milliseconds. */
     screenshotDelay?: number;
+    /** Additional raw screenshot margins to crop, in physical pixels. */
+    cropMargins?: CropMargins;
 }
 
 export class Camera {
@@ -82,15 +86,23 @@ export class Camera {
             this._calibrationScreenshotSize.height === height;
         const calibrationArea = shouldApplyCalibration ? this._calibratedArea : null;
 
-        const calibratedImageArea = this._cropAreaToCalibratedArea(imageArea, calibrationArea);
+        const calibratedImageArea = this._cropAreaToIntersection(imageArea, calibrationArea);
+        const cropMarginsArea = utils.cropMarginsToRect(imageArea, opts?.cropMargins);
+        const croppedImageArea = getIntersection(calibratedImageArea, cropMarginsArea);
+        if (croppedImageArea === null) {
+            throw new Error(
+                `Invalid cropMargins option: resulting screenshot crop area is empty. ` +
+                    `imageSize: ${prettySize(imageArea)}, cropMargins: ${JSON.stringify(opts?.cropMargins)}`,
+            );
+        }
 
         const viewportCroppedArea = this._cropAreaToViewport(
-            calibratedImageArea,
+            croppedImageArea,
             { width, height },
-            calibrationArea,
+            croppedImageArea,
             opts,
         );
-        await utils.saveViewportImageForDebugIfNeeded(image, calibratedImageArea, this._debugTmpDir);
+        await utils.saveViewportImageForDebugIfNeeded(image, croppedImageArea, this._debugTmpDir);
 
         if (viewportCroppedArea.width !== width || viewportCroppedArea.height !== height) {
             await image.crop(viewportCroppedArea);
@@ -99,19 +111,19 @@ export class Camera {
         return image;
     }
 
-    private _cropAreaToCalibratedArea(
+    private _cropAreaToIntersection(
         imageArea: Rect<"image", "device">,
-        calibrationArea: Rect<"image", "device"> | null,
+        cropArea: Rect<"image", "device"> | null,
     ): Rect<"image", "device"> {
-        if (!calibrationArea) {
+        if (!cropArea) {
             return imageArea;
         }
 
-        const intersection = getIntersection(imageArea, calibrationArea);
+        const intersection = getIntersection(imageArea, cropArea);
         if (intersection === null) {
             logger.warn(
-                `No intersection found between image area and calibrated viewport area, falling back to original image area.\n` +
-                    `imageArea: ${prettyRect(imageArea)}, calibratedViewportArea: ${prettyRect(calibrationArea)}\n` +
+                `No intersection found between image area and crop area, falling back to original image area.\n` +
+                    `imageArea: ${prettyRect(imageArea)}, cropArea: ${prettyRect(cropArea)}\n` +
                     `This likely means Testplane incorrectly determined area free of system UI elements. You can let us know at ${NEW_ISSUE_LINK}, providing this log and browser used.`,
             );
 

src/browser/camera/utils.ts

@@ -1,10 +1,19 @@
 import path from "path";
 import fs from "fs";
-import { ScreenshotMode } from ".";
+import type { ScreenshotMode } from ".";
 import { Image } from "../../image";
 import { Rect, Size, getBottom } from "../isomorphic/geometry";
 import { saveViewportImageWithDebugRects } from "../screen-shooter/composite-image/debug-utils";
 
+export interface CropMargins {
+    top?: number;
+    right?: number;
+    bottom?: number;
+    left?: number;
+}
+
+type NormalizedCropMargins = Required<CropMargins>;
+
 export const isFullPage = (
     imageSize: Rect<"image", "device">,
     viewportSize: Size<"device">,
@@ -24,6 +33,40 @@ export const isFullPage = (
     }
 };
 
+export const normalizeCropMargins = (cropMargins?: CropMargins): NormalizedCropMargins => {
+    const result = {
+        top: cropMargins?.top ?? 0,
+        right: cropMargins?.right ?? 0,
+        bottom: cropMargins?.bottom ?? 0,
+        left: cropMargins?.left ?? 0,
+    };
+
+    for (const side of ["top", "right", "bottom", "left"] as const) {
+        const value = result[side];
+        if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || Math.floor(value) !== value) {
+            throw new Error(
+                `Invalid cropMargins.${side} option: expected a non-negative integer, got ${String(value)}`,
+            );
+        }
+    }
+
+    return result;
+};
+
+export const cropMarginsToRect = (
+    imageArea: Rect<"image", "device">,
+    cropMargins?: CropMargins,
+): Rect<"image", "device"> => {
+    const margins = normalizeCropMargins(cropMargins);
+
+    return {
+        top: margins.top,
+        left: margins.left,
+        width: imageArea.width - margins.left - margins.right,
+        height: imageArea.height - margins.top - margins.bottom,
+    } as Rect<"image", "device">;
+};
+
 export async function saveViewportImageForDebugIfNeeded(
     viewportImage: Image,
     viewportCroppedArea: Rect<"image", "device">,

src/browser/client-scripts/screen-shooter/implementation.ts

@@ -24,7 +24,8 @@ import {
     ScrollFullPageResult,
     ScrollResult,
     GetCaptureStateResult,
-    TrackedElementData
+    TrackedElementData,
+    ElementPositionsProbe
 } from "./types";
 import { createDebugLogger } from "../shared/logger";
 import {
@@ -196,9 +197,7 @@ export function scrollBy(
                 : `${selectorToScroll} (not found, auto-detected ${readableAutoScrollElementDescr})`
             : `auto-detected ${readableAutoScrollElementDescr}`;
 
-        // Subtracting 1px to avoid a case when element boundary gets rounded up and it appears during screenshots stitching
-        const scrollHeightCss = (fromDeviceToCssNumber(scrollDelta as Coord<"page", "device", "y">, pixelRatio) -
-            1) as Coord<"page", "css", "y">;
+        const scrollHeightCss = fromDeviceToCssNumber(scrollDelta as Coord<"page", "device", "y">, pixelRatio);
         scrollElementBy(scrollElement, scrollHeightCss);
 
         return {
@@ -271,6 +270,7 @@ export function getCaptureState(
         const captureSpecsAfterCss = computeCaptureSpecs(selectorsToCapture, logger);
         const captureSpecs = captureSpecsAfterCss.map(spec => ({
             full: fromCssToDevice(roundCoords(spec.full), pixelRatio),
+            clip: fromCssToDevice(roundCoords(spec.clip), pixelRatio),
             visible: fromCssToDevice(roundCoords(spec.visible), pixelRatio)
         }));
         const scrollOffset = computeScrollOffset(scrollElement);
@@ -326,8 +326,9 @@ export function prepareFullPageScreenshot(
             }
         }
 
-        const elementPositionsProbe = computeElementPositionsProbe().map(rect =>
-            rect ? fromCssToDevice(roundCoords(rect), pixelRatio) : null
+        const elementPositionsProbe: ElementPositionsProbe<"device">[] = computeElementPositionsProbe().map(
+            (rect: ElementPositionsProbe<"css">): ElementPositionsProbe<"device"> =>
+                rect ? { ...fromCssToDevice(roundCoords(rect), pixelRatio), elementDescr: rect.elementDescr } : null
         );
 
         return {
@@ -354,8 +355,9 @@ export function scrollFullPage(
         scrollElementBy(document.documentElement, scrollHeightCss);
 
         const viewportOffset = computeViewportOffset();
-        const elementPositionsProbe = computeElementPositionsProbe().map(rect =>
-            rect ? fromCssToDevice(roundCoords(rect), pixelRatio) : null
+        const elementPositionsProbe: ElementPositionsProbe<"device">[] = computeElementPositionsProbe().map(
+            (rect: ElementPositionsProbe<"css">): ElementPositionsProbe<"device"> =>
+                rect ? { ...fromCssToDevice(roundCoords(rect), pixelRatio), elementDescr: rect.elementDescr } : null
         );
 
         return {
@@ -526,6 +528,7 @@ function prepareElementsScreenshotUnsafe(
         ignoreAreas: ignoreAreas.map(area => fromCssToDevice(roundCoords(area), pixelRatio)),
         captureSpecs: captureSpecs.map(s => ({
             full: fromCssToDevice(roundCoords(s.full), pixelRatio),
+            clip: fromCssToDevice(roundCoords(s.clip), pixelRatio),
             visible: fromCssToDevice(roundCoords(s.visible), pixelRatio)
         })),
         viewportSize: fromCssToDevice(viewportSize, pixelRatio),