@react-native-harness/ui 1.0.0-alpha.24 → 1.0.0

package/dist/types.d.ts

@@ -1,18 +1,11 @@
-/**
- * Represents the position and dimensions of a view in screen coordinates (points/dp).
- */
-export interface ViewInfo {
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-}
+import type { ViewInfo } from "./NativeHarnessUI.js";
+export type { ViewInfo, BoundingBox } from "./NativeHarnessUI.js";
 export interface HarnessUIModule {
     /**
-     * Simulates a native press at the specified screen coordinates.
+     * Simulates a native press on a view identified by nativeId, or at coordinates if nativeId is empty.
      * Returns a promise that resolves when the press action is complete.
      */
-    simulatePress(x: number, y: number): Promise<void>;
+    simulatePress(nativeId: string, x: number, y: number): Promise<void>;
     /**
      * Finds a view by its testID (accessibilityIdentifier on iOS, tag on Android).
      * Returns null if no view is found.

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnD;;;OAGG;IACH,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC;IAE/C;;;OAGG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;IAE7C;;;OAGG;IACH,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC;IAE1D;;;OAGG;IACH,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;IAExD;;;;OAIG;IACH,iBAAiB,CAAC,MAAM,EAAE,QAAQ,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEnE;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3C;;;OAGG;IACH,IAAI,CAAC,OAAO,EAAE;QAAE,aAAa,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3D"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAErD,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAElE,MAAM,WAAW,eAAe;IAC9B;;;OAGG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAErE;;;OAGG;IACH,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC;IAE/C;;;OAGG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;IAE7C;;;OAGG;IACH,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC;IAE1D;;;OAGG;IACH,4BAA4B,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;IAExD;;;;OAIG;IACH,iBAAiB,CAAC,MAAM,EAAE,QAAQ,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAEnE;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3C;;;OAGG;IACH,IAAI,CAAC,OAAO,EAAE;QAAE,aAAa,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3D"}

package/dist/userEvent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userEvent.d.ts","sourceRoot":"","sources":["../src/userEvent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAwBpD,MAAM,MAAM,SAAS,GAAG;IACtB;;;;OAIG;IACH,KAAK,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD;;;OAGG;IACH,OAAO,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;;;;;;;OAWG;IACH,IAAI,EAAE,CACJ,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QACR,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,aAAa,CAAC,EAAE,OAAO,CAAC;KACzB,KACE,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB,CAAC;AA+DF,eAAO,MAAM,SAAS,WAAoB,CAAC"}
+{"version":3,"file":"userEvent.d.ts","sourceRoot":"","sources":["../src/userEvent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAwBpD,MAAM,MAAM,SAAS,GAAG;IACtB;;;;OAIG;IACH,KAAK,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD;;;OAGG;IACH,OAAO,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;;;;;;;OAWG;IACH,IAAI,EAAE,CACJ,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QACR,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,aAAa,CAAC,EAAE,OAAO,CAAC;KACzB,KACE,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB,CAAC;AAsDF,eAAO,MAAM,SAAS,WAAoB,CAAC"}

package/dist/userEvent.js

@@ -23,35 +23,26 @@ const flushEvents = () => {
 const createUserEvent = () => {
     return {
         press: async (element) => {
-            // Calculate center point of the element
-            const centerX = element.x + element.width / 2;
-            const centerY = element.y + element.height / 2;
-            await HarnessUI.simulatePress(centerX, centerY);
+            // We pass 0, 0 as coordinates when nativeId is provided.
+            // Native side will resolve the view and calculate the center.
+            await HarnessUI.simulatePress(element.nativeId, 0, 0);
             // Flush pending events to ensure onPress and other callbacks are processed
             await flushEvents();
         },
         pressAt: async (x, y) => {
-            await HarnessUI.simulatePress(x, y);
+            await HarnessUI.simulatePress('', x, y);
             // Flush pending events to ensure onPress and other callbacks are processed
             await flushEvents();
         },
         type: async (element, text, options) => {
             // Press to focus the element (triggers pressIn/pressOut unless skipPress is true)
-            // Note: Currently we always press to focus, the skipPress option would need
-            // additional implementation in simulatePress to avoid firing press events
             if (!options?.skipPress) {
-                // Calculate center point of the element
-                const centerX = element.x + element.width / 2;
-                const centerY = element.y + element.height / 2;
-                await HarnessUI.simulatePress(centerX, centerY);
+                await HarnessUI.simulatePress(element.nativeId, 0, 0);
                 await flushEvents();
             }
             else {
-                // Still need to press to focus, but ideally without press events
-                // For now, we press anyway - future enhancement could add a focusOnly method
-                const centerX = element.x + element.width / 2;
-                const centerY = element.y + element.height / 2;
-                await HarnessUI.simulatePress(centerX, centerY);
+                // Still need to press to focus
+                await HarnessUI.simulatePress(element.nativeId, 0, 0);
                 await flushEvents();
             }
             // Type each character one by one

package/ios/HarnessUI.mm

@@ -1,5 +1,6 @@
 #import "HarnessUI.h"
 #import "ViewQueryHelper.h"
+#import "ViewRegistry.h"
 #import <QuartzCore/QuartzCore.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTLog.h>
@@ -231,17 +232,34 @@ static NSTimeInterval _lastTapTime = 0;
   [self executeTapAtPoint:point retryCount:0 completion:completion];
 }
 
-- (void)simulatePress:(double)x
-                  y:(double)y
-            resolve:(RCTPromiseResolveBlock)resolve
-             reject:(RCTPromiseRejectBlock)reject {
-  RCTLogInfo(@"[HarnessUI] simulatePress called with x:%.2f y:%.2f", x, y);
+- (void)simulatePress:(NSString *)nativeId
+                    x:(double)x
+                    y:(double)y
+              resolve:(RCTPromiseResolveBlock)resolve
+               reject:(RCTPromiseRejectBlock)reject {
+  RCTLogInfo(@"[HarnessUI] simulatePress called with nativeId:%@ x:%.2f y:%.2f", nativeId, x, y);
 
   dispatch_async(dispatch_get_main_queue(), ^{
     NSTimeInterval now = CACurrentMediaTime();
     NSTimeInterval timeSinceLastTap = now - _lastTapTime;
     CGPoint point = CGPointMake(x, y);
 
+    if (nativeId && nativeId.length > 0) {
+        UIView *view = [ViewRegistry getView:nativeId];
+        if (view) {
+             UIWindow *window = [self getActiveWindow]; // Or view.window? view.window is safer if attached.
+             if (!window) window = view.window;
+             
+             if (window) {
+                CGRect frameInWindow = [view convertRect:view.bounds toView:window];
+                point = CGPointMake(CGRectGetMidX(frameInWindow), CGRectGetMidY(frameInWindow));
+                RCTLogInfo(@"[HarnessUI] Resolved view %@ to point (%.2f, %.2f)", nativeId, point.x, point.y);
+             }
+        } else {
+             RCTLogWarn(@"[HarnessUI] View with nativeId %@ not found or collected. Using provided coordinates.", nativeId);
+        }
+    }
+
     // Completion block that actually resolves the promise
     void (^completionBlock)(void) = ^{
       // Check if tap was successful by verifying we found a window/view
@@ -402,23 +420,55 @@ static NSTimeInterval _lastTapTime = 0;
   RCTLogInfo(@"[HarnessUI] captureScreenshot called");
 
   CGRect captureRect = CGRectNull;
+  NSString *nativeId = nil;
 
   if (bounds) {
+      if (bounds->nativeId().length > 0) {
+          nativeId = bounds->nativeId();
+      }
+    
     double width = bounds->width();
     double height = bounds->height();
 
     if (width > 0 && height > 0) {
       captureRect = CGRectMake(bounds->x(), bounds->y(), width, height);
-      RCTLogInfo(@"[HarnessUI] Capturing region: x=%.2f y=%.2f w=%.2f h=%.2f",
+      RCTLogInfo(@"[HarnessUI] Capturing region: x=%.2f y=%.2f w=%.2f h=%.2f nativeId=%@",
                  captureRect.origin.x, captureRect.origin.y,
-                 captureRect.size.width, captureRect.size.height);
+                 captureRect.size.width, captureRect.size.height, nativeId);
     }
   } else {
     RCTLogInfo(@"[HarnessUI] Capturing full window");
   }
 
   dispatch_async(dispatch_get_main_queue(), ^{
-    NSData *pngData = [ViewQueryHelper captureScreenshotWithBounds:captureRect];
+    NSData *pngData = nil;
+    
+    if (nativeId) {
+        UIView *targetView = [ViewRegistry getView:nativeId];
+        if (targetView) {
+             UIWindow *window = [self getActiveWindow];
+             if (window) {
+                 CGRect frameInWindow = [targetView convertRect:targetView.bounds toView:window];
+                 BOOL isFullyOnScreen = CGRectContainsRect(window.bounds, frameInWindow);
+                 
+                 if (isFullyOnScreen) {
+                     RCTLogInfo(@"[HarnessUI] View %@ is fully on screen. Using screen-based screenshotting.", nativeId);
+                     pngData = [ViewQueryHelper captureScreenshotWithBounds:frameInWindow];
+                 } else {
+                     RCTLogInfo(@"[HarnessUI] View %@ is partially/fully off screen. Using direct view render.", nativeId);
+                     pngData = [ViewQueryHelper captureScreenshotOfView:targetView];
+                 }
+             } else {
+                 RCTLogWarn(@"[HarnessUI] No active window found for nativeId: %@. Using direct view render.", nativeId);
+                 pngData = [ViewQueryHelper captureScreenshotOfView:targetView];
+             }
+        } else {
+             RCTLogWarn(@"[HarnessUI] View with nativeId %@ not found. Falling back to window bounds capture.", nativeId);
+             pngData = [ViewQueryHelper captureScreenshotWithBounds:captureRect];
+        }
+    } else {
+        pngData = [ViewQueryHelper captureScreenshotWithBounds:captureRect];
+    }
 
     if (pngData) {
       // Return Base64 string for efficiency

package/ios/ViewQueryHelper.h

@@ -20,6 +20,7 @@ typedef NS_ENUM(NSInteger, ViewQueryType) {
 @property (nonatomic, assign) CGFloat y;
 @property (nonatomic, assign) CGFloat width;
 @property (nonatomic, assign) CGFloat height;
+@property (nonatomic, copy) NSString *nativeId;
 
 - (NSDictionary *)toDictionary;
 
@@ -59,6 +60,14 @@ typedef NS_ENUM(NSInteger, ViewQueryType) {
  */
 + (nullable NSData *)captureScreenshotWithBounds:(CGRect)bounds;
 
+/**
+ * Captures a screenshot of a specific view, rendering its layer directly.
+ * This allows capturing content that might be off-screen or larger than the window.
+ * @param view The view to capture.
+ * @return NSData containing PNG image data, or nil on failure.
+ */
++ (nullable NSData *)captureScreenshotOfView:(UIView *)view;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/ViewQueryHelper.mm

@@ -1,4 +1,5 @@
 #import "ViewQueryHelper.h"
+#import "ViewRegistry.h"
 
 // =============================================================================
 // ViewQueryResult Implementation
@@ -11,7 +12,8 @@
         @"x": @(self.x),
         @"y": @(self.y),
         @"width": @(self.width),
-        @"height": @(self.height)
+        @"height": @(self.height),
+        @"nativeId": self.nativeId ?: @""
     };
 }
 
@@ -119,6 +121,7 @@
     result.y = frameInWindow.origin.y;
     result.width = frameInWindow.size.width;
     result.height = frameInWindow.size.height;
+    result.nativeId = [ViewRegistry registerView:view];
     return result;
 }
 
@@ -184,4 +187,24 @@
     return UIImagePNGRepresentation(image);
 }
 
++ (nullable NSData *)captureScreenshotOfView:(UIView *)view {
+    if (!view) {
+        return nil;
+    }
+
+    // Use UIGraphicsImageRenderer to render the view's layer
+    UIGraphicsImageRendererFormat *format = [[UIGraphicsImageRendererFormat alloc] init];
+    format.scale = [UIScreen mainScreen].scale;
+    format.opaque = NO; // Allow transparency if the view has it
+
+    UIGraphicsImageRenderer *renderer = [[UIGraphicsImageRenderer alloc] initWithSize:view.bounds.size format:format];
+
+    UIImage *image = [renderer imageWithActions:^(UIGraphicsImageRendererContext *context) {
+        // Render the view's layer directly into the context
+        [view.layer renderInContext:context.CGContext];
+    }];
+
+    return UIImagePNGRepresentation(image);
+}
+
 @end

package/ios/ViewRegistry.h

@@ -0,0 +1,8 @@
+#import <UIKit/UIKit.h>
+
+@interface ViewRegistry : NSObject
+
++ (NSString *)registerView:(UIView *)view;
++ (UIView *)getView:(NSString *)nativeId;
+
+@end

package/ios/ViewRegistry.mm

@@ -0,0 +1,33 @@
+#import "ViewRegistry.h"
+
+@implementation ViewRegistry
+
++ (NSMapTable<NSString *, UIView *> *)registry {
+    static NSMapTable *registry = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        // Key: Strong (NSString), Value: Weak (UIView)
+        // When UIView is deallocated, it is automatically removed from the map.
+        registry = [NSMapTable strongToWeakObjectsMapTable];
+    });
+    return registry;
+}
+
++ (NSString *)registerView:(UIView *)view {
+    if (!view) return nil;
+    
+    // Generate a unique ID. Using a random UUID ensures freshness for each query.
+    NSString *nativeId = [[NSUUID UUID] UUIDString];
+    
+    // Store in registry
+    [[self registry] setObject:view forKey:nativeId];
+    
+    return nativeId;
+}
+
++ (UIView *)getView:(NSString *)nativeId {
+    if (!nativeId) return nil;
+    return [[self registry] objectForKey:nativeId];
+}
+
+@end

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-native-harness/ui",
   "description": "Native UI testing module for React Native Harness.",
-  "version": "1.0.0-alpha.24",
+  "version": "1.0.0",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@react-native-harness/runtime": "1.0.0-alpha.24"
+    "@react-native-harness/runtime": "1.0.0"
   },
   "devDependencies": {
     "react-native": "*"

package/src/NativeHarnessUI.ts

@@ -1,15 +1,25 @@
 import { TurboModuleRegistry, type TurboModule } from 'react-native';
 
-// This interface needs to be there for Codegen to work.
-export interface ViewInfo {
+/**
+ * Represents a bounding box in screen coordinates (points/dp).
+ */
+export interface BoundingBox {
   x: number;
   y: number;
   width: number;
   height: number;
 }
 
+/**
+ * Internal interface used for bridge communication.
+ * This needs to be exported for TurboModule codegen.
+ */
+export interface ViewInfo extends BoundingBox {
+  nativeId: string;
+}
+
 interface Spec extends TurboModule {
-  simulatePress(x: number, y: number): Promise<void>;
+  simulatePress(nativeId: string, x: number, y: number): Promise<void>;
   queryByTestId(testId: string): ViewInfo | null;
   queryAllByTestId(testId: string): ViewInfo[];
   queryByAccessibilityLabel(label: string): ViewInfo | null;

package/src/WebHarnessUI.ts

@@ -10,22 +10,50 @@ declare global {
     __RN_HARNESS_BLUR__: (options: {
       submitEditing?: boolean;
     }) => Promise<void>;
+    __RN_HARNESS_VIEW_REGISTRY__: Map<string, Element>;
   }
 }
 
+if (!window.__RN_HARNESS_VIEW_REGISTRY__) {
+  window.__RN_HARNESS_VIEW_REGISTRY__ = new Map();
+}
+
+let nextId = 1;
+
 const getElementViewInfo = (element: Element): ViewInfo => {
   const rect = element.getBoundingClientRect();
+
+  let nativeId = (element as any).__harnessId;
+  if (!nativeId) {
+    nativeId = `view_${nextId++}`;
+    (element as any).__harnessId = nativeId;
+    window.__RN_HARNESS_VIEW_REGISTRY__.set(nativeId, element);
+  }
+
   return {
     x: rect.left,
     y: rect.top,
     width: rect.width,
     height: rect.height,
+    nativeId,
   };
 };
 
 const WebHarnessUI: HarnessUIModule = {
-  simulatePress: async (x, y) => {
-    await window.__RN_HARNESS_SIMULATE_PRESS__(x, y);
+  simulatePress: async (nativeId, x, y) => {
+    let targetX = x;
+    let targetY = y;
+
+    if (nativeId) {
+      const element = window.__RN_HARNESS_VIEW_REGISTRY__.get(nativeId);
+      if (element) {
+        const rect = element.getBoundingClientRect();
+        targetX = rect.left + rect.width / 2;
+        targetY = rect.top + rect.height / 2;
+      }
+    }
+
+    await window.__RN_HARNESS_SIMULATE_PRESS__(targetX, targetY);
   },
 
   queryByTestId: (testId) => {
@@ -49,7 +77,14 @@ const WebHarnessUI: HarnessUIModule = {
   },
 
   captureScreenshot: async (bounds) => {
-    return await window.__RN_HARNESS_CAPTURE_SCREENSHOT__(bounds);
+    let captureBounds = bounds;
+    if (bounds?.nativeId && bounds.width === 0 && bounds.height === 0) {
+      const element = window.__RN_HARNESS_VIEW_REGISTRY__.get(bounds.nativeId);
+      if (element) {
+        captureBounds = getElementViewInfo(element);
+      }
+    }
+    return await window.__RN_HARNESS_CAPTURE_SCREENSHOT__(captureBounds);
   },
 
   typeChar: async (character) => {

package/src/index.ts

@@ -15,4 +15,4 @@ export {
   type ScreenshotResult,
 } from './screen.js';
 export { userEvent, type UserEvent } from './userEvent.js';
-export type { ViewInfo } from './types.js';
+export type { ViewInfo, BoundingBox } from './types.js';

package/src/screen.ts

@@ -1,12 +1,18 @@
-import { type ViewInfo } from './types.js';
+import { type ViewInfo, type BoundingBox } from './types.js';
 import { waitFor } from '@react-native-harness/runtime';
 import HarnessUI from './harness.js';
 
 /**
- * Represents an element found on screen with its position and dimensions.
- * This can be used with userEvent.press() to interact with the element.
+ * Represents an element found on screen.
+ * This is an opaque reference that can be used with userEvent or screenshot.
  */
-export type ElementReference = ViewInfo;
+export type ElementReference = {
+  readonly nativeId: string;
+};
+
+const wrapElement = (viewInfo: ViewInfo): ElementReference => ({
+  nativeId: viewInfo.nativeId,
+});
 
 /**
  * Screenshot result containing PNG image data.
@@ -70,11 +76,13 @@ export type Screen = {
   queryAllByAccessibilityLabel: (label: string) => ElementReference[];
 
   /**
-   * Captures a screenshot of the entire app window or a specific element.
-   * @param element Optional element reference to capture. If not provided, captures the entire window.
+   * Captures a screenshot of the entire app window, a specific element, or a region.
+   * @param target Optional element reference or bounding box to capture. If not provided, captures the entire window.
    * @returns Promise resolving to ScreenshotResult with PNG data, or null if capture fails.
    */
-  screenshot: (element?: ElementReference) => Promise<ScreenshotResult | null>;
+  screenshot: (
+    target?: ElementReference | BoundingBox
+  ) => Promise<ScreenshotResult | null>;
 };
 
 const createScreen = (): Screen => {
@@ -85,7 +93,7 @@ const createScreen = (): Screen => {
         if (!result) {
           throw new Error(`Unable to find element with testID: ${testId}`);
         }
-        return result;
+        return wrapElement(result);
       });
     },
 
@@ -95,16 +103,17 @@ const createScreen = (): Screen => {
         if (results.length === 0) {
           throw new Error(`Unable to find any elements with testID: ${testId}`);
         }
-        return results;
+        return results.map(wrapElement);
       });
     },
 
     queryByTestId: (testId: string): ElementReference | null => {
-      return HarnessUI.queryByTestId(testId);
+      const result = HarnessUI.queryByTestId(testId);
+      return result ? wrapElement(result) : null;
     },
 
     queryAllByTestId: (testId: string): ElementReference[] => {
-      return HarnessUI.queryAllByTestId(testId);
+      return HarnessUI.queryAllByTestId(testId).map(wrapElement);
     },
 
     findByAccessibilityLabel: async (
@@ -117,7 +126,7 @@ const createScreen = (): Screen => {
             `Unable to find element with accessibility label: ${label}`
           );
         }
-        return result;
+        return wrapElement(result);
       });
     },
 
@@ -131,31 +140,53 @@ const createScreen = (): Screen => {
             `Unable to find any elements with accessibility label: ${label}`
           );
         }
-        return results;
+        return results.map(wrapElement);
       });
     },
 
     queryByAccessibilityLabel: (label: string): ElementReference | null => {
-      return HarnessUI.queryByAccessibilityLabel(label);
+      const result = HarnessUI.queryByAccessibilityLabel(label);
+      return result ? wrapElement(result) : null;
     },
 
     queryAllByAccessibilityLabel: (label: string): ElementReference[] => {
-      return HarnessUI.queryAllByAccessibilityLabel(label);
+      return HarnessUI.queryAllByAccessibilityLabel(label).map(wrapElement);
     },
 
     screenshot: async (
-      element?: ElementReference
+      target?: ElementReference | BoundingBox
     ): Promise<ScreenshotResult | null> => {
-      const bounds = element ?? null;
-      const base64String = await HarnessUI.captureScreenshot(bounds);
+      let captureBounds: ViewInfo | null = null;
+      let targetWidth = 0;
+      let targetHeight = 0;
+
+      if (target) {
+        if ('nativeId' in target) {
+          // ElementReference
+          captureBounds = {
+            nativeId: target.nativeId,
+            x: 0,
+            y: 0,
+            width: 0,
+            height: 0,
+          };
+        } else {
+          // BoundingBox
+          captureBounds = {
+            nativeId: '',
+            ...target,
+          };
+          targetWidth = target.width;
+          targetHeight = target.height;
+        }
+      }
+
+      const base64String = await HarnessUI.captureScreenshot(captureBounds);
 
       if (!base64String) {
         return null;
       }
 
-      const width = element?.width ?? 0;
-      const height = element?.height ?? 0;
-
       // Decode Base64 string to Uint8Array
       const binaryString = atob(base64String);
       const len = binaryString.length;
@@ -164,10 +195,15 @@ const createScreen = (): Screen => {
         bytes[i] = binaryString.charCodeAt(i);
       }
 
+      // If we captured by nativeId, we might not know the width/height beforehand in JS.
+      // But the native side returns the actual captured PNG.
+      // Ideally we'd get the size from the native side, but currently the bridge doesn't return it.
+      // For now we use the provided target size or 0.
+
       return {
         data: bytes,
-        width,
-        height,
+        width: targetWidth,
+        height: targetHeight,
       };
     },
   };

package/src/types.ts

@@ -1,19 +1,13 @@
-/**
- * Represents the position and dimensions of a view in screen coordinates (points/dp).
- */
-export interface ViewInfo {
-  x: number;
-  y: number;
-  width: number;
-  height: number;
-}
+import type { ViewInfo } from "./NativeHarnessUI.js";
+
+export type { ViewInfo, BoundingBox } from "./NativeHarnessUI.js";
 
 export interface HarnessUIModule {
   /**
-   * Simulates a native press at the specified screen coordinates.
+   * Simulates a native press on a view identified by nativeId, or at coordinates if nativeId is empty.
    * Returns a promise that resolves when the press action is complete.
    */
-  simulatePress(x: number, y: number): Promise<void>;
+  simulatePress(nativeId: string, x: number, y: number): Promise<void>;
 
   /**
    * Finds a view by its testID (accessibilityIdentifier on iOS, tag on Android).

package/src/userEvent.ts

@@ -63,16 +63,15 @@ export type UserEvent = {
 const createUserEvent = (): UserEvent => {
   return {
     press: async (element: ElementReference): Promise<void> => {
-      // Calculate center point of the element
-      const centerX = element.x + element.width / 2;
-      const centerY = element.y + element.height / 2;
-      await HarnessUI.simulatePress(centerX, centerY);
+      // We pass 0, 0 as coordinates when nativeId is provided.
+      // Native side will resolve the view and calculate the center.
+      await HarnessUI.simulatePress(element.nativeId, 0, 0);
       // Flush pending events to ensure onPress and other callbacks are processed
       await flushEvents();
     },
 
     pressAt: async (x: number, y: number): Promise<void> => {
-      await HarnessUI.simulatePress(x, y);
+      await HarnessUI.simulatePress('', x, y);
       // Flush pending events to ensure onPress and other callbacks are processed
       await flushEvents();
     },
@@ -87,20 +86,12 @@ const createUserEvent = (): UserEvent => {
       }
     ): Promise<void> => {
       // Press to focus the element (triggers pressIn/pressOut unless skipPress is true)
-      // Note: Currently we always press to focus, the skipPress option would need
-      // additional implementation in simulatePress to avoid firing press events
       if (!options?.skipPress) {
-        // Calculate center point of the element
-        const centerX = element.x + element.width / 2;
-        const centerY = element.y + element.height / 2;
-        await HarnessUI.simulatePress(centerX, centerY);
+        await HarnessUI.simulatePress(element.nativeId, 0, 0);
         await flushEvents();
       } else {
-        // Still need to press to focus, but ideally without press events
-        // For now, we press anyway - future enhancement could add a focusOnly method
-        const centerX = element.x + element.width / 2;
-        const centerY = element.y + element.height / 2;
-        await HarnessUI.simulatePress(centerX, centerY);
+        // Still need to press to focus
+        await HarnessUI.simulatePress(element.nativeId, 0, 0);
         await flushEvents();
       }