@letsrunit/playwright 0.21.1 → 0.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@letsrunit/playwright",
-  "version": "0.21.1",
+  "version": "0.22.0",
   "description": "Playwright extensions and utilities for letsrunit",
   "keywords": [
     "testing",
@@ -42,7 +42,7 @@
   },
   "packageManager": "yarn@4.10.3",
   "dependencies": {
-    "@letsrunit/utils": "0.21.1",
+    "@letsrunit/utils": "0.22.0",
     "@playwright/test": "1.58.2",
     "case": "^1.6.3",
     "diff": "^8.0.3",

package/src/fallback-locator.ts

@@ -2,6 +2,7 @@ import { Locator } from '@playwright/test';
 
 type LocatorMethod = (...args: any[]) => any;
 type ProxyProperty = string | symbol;
+export const FALLBACK_LOCATOR_CANDIDATES = Symbol('letsrunit.playwright.fallback-locator-candidates');
 
 const ACTION_METHODS = new Set([
   'blur',
@@ -158,6 +159,7 @@ export function createFallbackLocator(candidates: Locator[]): Locator {
 
   const proxy = new Proxy(primary as unknown as object, {
     get(_target, prop: ProxyProperty) {
+      if (prop === FALLBACK_LOCATOR_CANDIDATES) return candidates;
       if (typeof prop !== 'string') return (primary as any)[prop];
       if (passthroughMetaProperties.has(prop)) return (primary as any)[prop];
 
@@ -195,3 +197,7 @@ export function createFallbackLocator(candidates: Locator[]): Locator {
 
   return proxy as Locator;
 }
+
+export function getFallbackLocatorCandidates(locator: Locator): Locator[] | null {
+  return ((locator as any)[FALLBACK_LOCATOR_CANDIDATES] as Locator[] | undefined) ?? null;
+}

package/src/field/index.ts

@@ -55,9 +55,7 @@ export async function setFieldValue(el: Locator, value: Value, options?: SetOpti
     setFallback,
   );
 
-  if ((await el.count()) > 1) {
-    el = await pickFieldElement(el);
-  }
+  el = await pickFieldElement(el);
 
   const tag = await el.evaluate((e) => e.tagName.toLowerCase(), options);
   const type = (

package/src/utils/pick-field-element.ts

@@ -1,8 +1,24 @@
 import type { Locator } from '@playwright/test';
+import { getFallbackLocatorCandidates } from '../fallback-locator';
+
+async function resolveConcreteFieldLocator(elements: Locator): Promise<Locator> {
+  const fallbackCandidates = getFallbackLocatorCandidates(elements);
+  if (!fallbackCandidates) return elements;
+
+  for (const candidate of fallbackCandidates) {
+    try {
+      if ((await candidate.count()) > 0) return candidate;
+    } catch {}
+  }
+
+  return elements;
+}
 
 export async function pickFieldElement(elements: Locator): Promise<Locator> {
+  elements = await resolveConcreteFieldLocator(elements);
+
   const count = await elements.count();
-  if (count === 1) return elements;
+  if (count <= 1) return elements.first();
 
   const candidates: { el: Locator; tag: string; role: string | null; isVisible: boolean }[] = [];
 
@@ -43,6 +59,5 @@ export async function pickFieldElement(elements: Locator): Promise<Locator> {
     return elements.nth(isParent);
   }
 
-  // Return both elements and let the error (on evaluate) occur.
-  return elements;
+  return elements.first();
 }