From 19134466e8d7e1fed97fc1e46650e846deefd7e8 Mon Sep 17 00:00:00 2001
From: gmegidish <gil@megidish.net>
Date: Mon, 21 Sep 2026 11:54:10 +0200
Subject: [PATCH 1/2] feat(core): add progressbar, alert and combobox roles to
 getByRole

---
 docs/src/agent-cli/introduction.md            |  2 +-
 docs/src/guides/locators.md                   |  9 ++++++
 packages/cli/skills/mobilewright-cli/SKILL.md |  2 +-
 .../src/query-engine.test.ts                  | 32 +++++++++++++++++++
 .../mobilewright-core/src/query-engine.ts     |  3 ++
 5 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/docs/src/agent-cli/introduction.md b/docs/src/agent-cli/introduction.md
index 493b09a..96ca9f0 100644
--- a/docs/src/agent-cli/introduction.md
+++ b/docs/src/agent-cli/introduction.md
@@ -156,7 +156,7 @@ Used by `find` and `expect`. Combine several to narrow the match.
 | Option | Description |
 |--------|-------------|
 | `--text <text>` | Visible text. Use `/regex/i` for a pattern |
-| `--role <role>` | Semantic role: `button`, `textfield`, `text`, `image`, `switch`, `checkbox`, `radio`, `slider`, `list`, `listitem`, `tab`, `link`, `header` |
+| `--role <role>` | Semantic role: `button`, `textfield`, `text`, `image`, `switch`, `checkbox`, `radio`, `slider`, `progressbar`, `alert`, `combobox`, `list`, `listitem`, `tab`, `link`, `header` |
 | `--name <name>` | With `--role`: accessible name, plain or `/regex/` |
 | `--test-id <id>` | Accessibility identifier (iOS) or resource-id (Android) |
 | `--label <label>` | Accessibility label |
diff --git a/docs/src/guides/locators.md b/docs/src/guides/locators.md
index 884b9ca..aad2c11 100644
--- a/docs/src/guides/locators.md
+++ b/docs/src/guides/locators.md
@@ -41,6 +41,8 @@ the app uses `AppCompatEditText`).
 | `android.widget.CheckBox` | `checkbox` |
 | `android.widget.RadioButton` | `radio` |
 | `android.widget.SeekBar` | `slider` |
+| `android.widget.ProgressBar` | `progressbar` |
+| `android.widget.Spinner` | `combobox` |
 | `android.widget.ListView` | `list` |
 | `androidx.recyclerview.widget.RecyclerView` | `list` |
 | `android.widget.ScrollView` | `list` |
@@ -59,6 +61,7 @@ of the collapsed framework class above — these are also recognized:
 | `com.google.android.material.button.MaterialButton` | `button` |
 | `com.google.android.material.floatingactionbutton.FloatingActionButton` | `button` |
 | `androidx.appcompat.widget.AppCompatRadioButton` | `radio` |
+| `androidx.appcompat.widget.AppCompatSpinner` | `combobox` |
 | `androidx.appcompat.widget.AppCompatEditText` | `textfield` |
 | `com.google.android.material.textfield.TextInputEditText` | `textfield` |
 | `androidx.appcompat.widget.AppCompatTextView` | `text` |
@@ -89,6 +92,12 @@ of the collapsed framework class above — these are also recognized:
 | `XCUIElementTypeImage` | `image` |
 | `XCUIElementTypeSwitch` | `switch` |
 | `XCUIElementTypeSlider` | `slider` |
+| `XCUIElementTypeProgressIndicator` | `progressbar` |
+| `XCUIElementTypeActivityIndicator` | `progressbar` |
+| `XCUIElementTypeAlert` | `alert` |
+| `XCUIElementTypeSheet` | `alert` |
+| `XCUIElementTypePicker` | `combobox` |
+| `XCUIElementTypePickerWheel` | `combobox` |
 | `XCUIElementTypeTable` | `list` |
 | `XCUIElementTypeCollectionView` | `list` |
 | `XCUIElementTypeScrollView` | `list` |
diff --git a/packages/cli/skills/mobilewright-cli/SKILL.md b/packages/cli/skills/mobilewright-cli/SKILL.md
index 694bc96..34c093b 100644
--- a/packages/cli/skills/mobilewright-cli/SKILL.md
+++ b/packages/cli/skills/mobilewright-cli/SKILL.md
@@ -36,7 +36,7 @@ await screen.getByRole('button', { name: 'Sign in' }).tap();
 
 Read the snapshot file to learn the refs. A snapshot line looks like
 `- button "Sign in" [ref=e9] [testid="login"]`. Roles are `button`, `textfield`, `text`,
-`image`, `switch`, `checkbox`, `radio`, `slider`, `list`, `listitem`, `tab`, `link`, `header`.
+`image`, `switch`, `checkbox`, `radio`, `slider`, `progressbar`, `alert`, `combobox`, `list`, `listitem`, `tab`, `link`, `header`.
 Attributes: `testid`, `placeholder`, `value`, `hidden`, `disabled`, `checked`, `selected`, `focused`.
 
 Collect the `Ran Mobilewright code` lines to write a test: they are the exact calls
diff --git a/packages/mobilewright-core/src/query-engine.test.ts b/packages/mobilewright-core/src/query-engine.test.ts
index 1edfb34..ecd1faa 100644
--- a/packages/mobilewright-core/src/query-engine.test.ts
+++ b/packages/mobilewright-core/src/query-engine.test.ts
@@ -397,6 +397,38 @@ test.describe('material and appcompat widget aliases', () => {
   });
 });
 
+test.describe('progressbar, alert and combobox roles', () => {
+  test('progressbar matches iOS indicators and Android ProgressBar', () => {
+    const tree = [
+      node({ type: 'ProgressIndicator' }),
+      node({ type: 'ActivityIndicator' }),
+      node({ type: 'android.widget.ProgressBar' }),
+      node({ type: 'Button' }),
+    ];
+    expect(queryAll(tree, { kind: 'role', value: 'progressbar' })).toHaveLength(3);
+  });
+
+  test('alert matches iOS Alert and Sheet', () => {
+    const tree = [
+      node({ type: 'Alert', label: 'Delete photo?' }),
+      node({ type: 'Sheet' }),
+      node({ type: 'StaticText', text: 'Delete photo?' }),
+    ];
+    expect(queryAll(tree, { kind: 'role', value: 'alert' })).toHaveLength(2);
+  });
+
+  test('combobox matches iOS pickers and Android spinners', () => {
+    const tree = [
+      node({ type: 'Picker' }),
+      node({ type: 'PickerWheel' }),
+      node({ type: 'android.widget.Spinner' }),
+      node({ type: 'androidx.appcompat.widget.AppCompatSpinner' }),
+      node({ type: 'android.widget.EditText' }),
+    ];
+    expect(queryAll(tree, { kind: 'role', value: 'combobox' })).toHaveLength(4);
+  });
+});
+
 test.describe('placeholder strategy', () => {
   const tree: ViewNode[] = [
     node({ type: 'TextField', placeholder: 'Enter email' }),
diff --git a/packages/mobilewright-core/src/query-engine.ts b/packages/mobilewright-core/src/query-engine.ts
index 97e65af..34e9460 100644
--- a/packages/mobilewright-core/src/query-engine.ts
+++ b/packages/mobilewright-core/src/query-engine.ts
@@ -191,6 +191,9 @@ export const ROLE_TYPE_MAP = {
   checkbox: ['checkbox'],
   radio: ['radio', 'radiobutton', 'appcompatradiobutton'],
   slider: ['slider', 'seekbar'],
+  progressbar: ['progressindicator', 'activityindicator', 'progressbar'],
+  alert: ['alert', 'sheet'],
+  combobox: ['picker', 'pickerwheel', 'spinner', 'appcompatspinner'],
   list: ['table', 'collectionview', 'listview', 'recyclerview', 'scrollview', 'reactscrollview'],
   listitem: ['cell', 'linearlayout', 'relativelayout', 'other'],
   tab: ['tab', 'tabbar'],

From f31a8ac5bf8588bbe1279bf26a2c6f8ea85c77ab Mon Sep 17 00:00:00 2001
From: gmegidish <gil@megidish.net>
Date: Mon, 21 Sep 2026 12:03:08 +0200
Subject: [PATCH 2/2] docs: list new iOS role types under mobilecli source
 filtering gap

---
 docs/src/guides/locators.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/src/guides/locators.md b/docs/src/guides/locators.md
index aad2c11..e4e5b19 100644
--- a/docs/src/guides/locators.md
+++ b/docs/src/guides/locators.md
@@ -112,13 +112,14 @@ of the collapsed framework class above — these are also recognized:
 
 - **Classes with no role.** Anything not listed above has no role mapping —
   `getByRole()` won't find it. Target it with `getByType('<raw.native.Class>')`,
-  `getByLabel()`, or `getByTestId()`. Examples: Android `Spinner`, `RadioGroup`,
-  `CheckedTextView`; iOS `Picker`, `DatePicker`.
+  `getByLabel()`, or `getByTestId()`. Examples: Android `RadioGroup`,
+  `CheckedTextView`; iOS `DatePicker`.
 
 - **iOS source filtering.** mobilecli currently surfaces only a subset of iOS
   classes — `Button`, `TextField`, `SecureTextField`, `SearchField`, `Switch`,
   `StaticText`, `Image`, `Icon`, `WebView`, `TextView`. Other rows in the iOS table
-  (`Slider`, `Table`, `CollectionView`, `Cell`, `Tab`, `NavigationBar`, `Link`)
+  (`Slider`, `ProgressIndicator`, `ActivityIndicator`, `Alert`, `Sheet`, `Picker`,
+  `PickerWheel`, `Table`, `CollectionView`, `Cell`, `Tab`, `NavigationBar`, `Link`)
   are filtered out before they reach the query engine, so `getByRole()`
   cannot match them yet even though the mapping exists.