better math to handle screenshotting out of bounds (#247993)

* do better math to handle screenshotting out of bounds

* better naming

Author: justschen

src/vs/platform/native/common/native.ts

@@ -156,7 +156,7 @@ export interface ICommonNativeHostService {
 
 	// Screenshots
 	getScreenshot(rect?: IRectangle): Promise<VSBuffer | undefined>;
-	getElementData(offsetX: number, offsetY: number, token: CancellationToken, cancellationId?: number): Promise<IElementData | undefined>;
+	getElementData(rect: IRectangle, token: CancellationToken, cancellationId?: number): Promise<IElementData | undefined>;
 
 	// Process
 	getProcessId(): Promise<number | undefined>;

src/vs/platform/native/electron-main/nativeHostMainService.ts

@@ -757,7 +757,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		return buf && VSBuffer.wrap(buf);
 	}
 
-	async getElementData(windowId: number | undefined, offsetX: number = 0, offsetY: number = 0, token: CancellationToken, cancellationId?: number): Promise<IElementData | undefined> {
+	async getElementData(windowId: number | undefined, rect: IRectangle, token: CancellationToken, cancellationId?: number): Promise<IElementData | undefined> {
 		const window = this.windowById(windowId, windowId);
 		if (!window?.win) {
 			return undefined;
@@ -905,11 +905,25 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 		debuggers.detach();
 
 		const zoomFactor = simpleBrowserWebview.getZoomFactor();
+		const absoluteBounds = {
+			x: rect.x + nodeData.bounds.x,
+			y: rect.y + nodeData.bounds.y,
+			width: nodeData.bounds.width,
+			height: nodeData.bounds.height
+		};
+
+		const clippedBounds = {
+			x: Math.max(absoluteBounds.x, rect.x),
+			y: Math.max(absoluteBounds.y, rect.y),
+			width: Math.max(0, Math.min(absoluteBounds.x + absoluteBounds.width, rect.x + rect.width) - Math.max(absoluteBounds.x, rect.x)),
+			height: Math.max(0, Math.min(absoluteBounds.y + absoluteBounds.height, rect.y + rect.height) - Math.max(absoluteBounds.y, rect.y))
+		};
+
 		const scaledBounds = {
-			x: (nodeData.bounds.x + offsetX) * zoomFactor,
-			y: (nodeData.bounds.y + offsetY) * zoomFactor,
-			width: nodeData.bounds.width * zoomFactor,
-			height: nodeData.bounds.height * zoomFactor
+			x: clippedBounds.x * zoomFactor,
+			y: clippedBounds.y * zoomFactor,
+			width: clippedBounds.width * zoomFactor,
+			height: clippedBounds.height * zoomFactor
 		};
 
 		return { outerHTML: nodeData.outerHTML, computedStyle: nodeData.computedStyle, bounds: scaledBounds };

src/vs/workbench/contrib/chat/browser/chatEditing/simpleBrowserEditorOverlay.ts

@@ -183,7 +183,7 @@ class SimpleBrowserOverlayWidget {
 	async addElementToChat(cts: CancellationTokenSource) {
 		const editorContainer = this._container.querySelector('.editor-container') as HTMLDivElement;
 		const editorContainerPosition = editorContainer ? editorContainer.getBoundingClientRect() : this._container.getBoundingClientRect();
-		const elementData = await this._hostService.getElementData(editorContainerPosition.x, editorContainerPosition.y, cts.token);
+		const elementData = await this._hostService.getElementData(editorContainerPosition, cts.token);
 		if (!elementData) {
 			throw new Error('Element data not found');
 		}

src/vs/workbench/services/host/browser/host.ts

@@ -132,7 +132,7 @@ export interface IHostService {
 	 */
 	getScreenshot(rect?: IRectangle): Promise<VSBuffer | undefined>;
 
-	getElementData(offsetX: number, offsetY: number, token: CancellationToken): Promise<IElementData | undefined>;
+	getElementData(rect: IRectangle, token: CancellationToken,): Promise<IElementData | undefined>;
 
 	//#endregion
 

src/vs/workbench/services/host/electron-sandbox/nativeHostService.ts

@@ -201,14 +201,14 @@ class WorkbenchHostService extends Disposable implements IHostService {
 		return this.nativeHostService.getScreenshot(rect);
 	}
 
-	async getElementData(offsetX: number, offsetY: number, token: CancellationToken): Promise<IElementData | undefined> {
+	async getElementData(rect: IRectangle, token: CancellationToken,): Promise<IElementData | undefined> {
 		const cancelSelectionId = cancelSelectionIdPool++;
 		const onCancelChannel = `vscode:cancelElementSelection${cancelSelectionId}`;
 		const disposable = token.onCancellationRequested(() => {
 			ipcRenderer.send(onCancelChannel, cancelSelectionId);
 		});
 		try {
-			const elementData = await this.nativeHostService.getElementData(offsetX, offsetY, token, cancelSelectionId);
+			const elementData = await this.nativeHostService.getElementData(rect, token, cancelSelectionId);
 			return elementData;
 		} catch (error) {
 			disposable.dispose();

src/vs/workbench/test/browser/workbenchTestServices.ts

@@ -1579,7 +1579,7 @@ export class TestHostService implements IHostService {
 	async toggleFullScreen(): Promise<void> { }
 
 	async getScreenshot(rect?: IRectangle): Promise<VSBuffer | undefined> { return undefined; }
-	async getElementData(offsetX: number, offsetY: number, token: CancellationToken): Promise<IElementData | undefined> { return undefined; }
+	async getElementData(rect: IRectangle, token: CancellationToken,): Promise<IElementData | undefined> { return undefined; }
 
 	async getNativeWindowHandle(_windowId: number): Promise<VSBuffer | undefined> { return undefined; }
 

src/vs/workbench/test/electron-sandbox/workbenchTestServices.ts

@@ -167,7 +167,7 @@ export class TestNativeHostService implements INativeHostService {
 	async windowsGetStringRegKey(hive: 'HKEY_CURRENT_USER' | 'HKEY_LOCAL_MACHINE' | 'HKEY_CLASSES_ROOT' | 'HKEY_USERS' | 'HKEY_CURRENT_CONFIG', path: string, name: string): Promise<string | undefined> { return undefined; }
 	async profileRenderer(): Promise<any> { throw new Error(); }
 	async getScreenshot(rect?: IRectangle): Promise<VSBuffer | undefined> { return undefined; }
-	async getElementData(offsetX: number, offsetY: number, token: CancellationToken, cancellationId?: number): Promise<IElementData | undefined> { return undefined; }
+	async getElementData(rect: IRectangle, token: CancellationToken, cancellationId?: number): Promise<IElementData | undefined> { return undefined; }
 }
 
 export class TestExtensionTipsService extends AbstractNativeExtensionTipsService {