Skip to content

fix: safe parse element locators when used in flutter commands #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 9, 2025
Merged

fix: safe parse element locators when used in flutter commands #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7bbcc2
fix: safe parse element locators when used in flutter commands
sudharsan-selvaraj Oct 9, 2025
e80ab91
fix scroll till visible
sudharsan-selvaraj Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/commands/element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,15 @@ import type { AppiumFlutterDriver } from '../driver';

export const ELEMENT_CACHE = new Map();

function constructFindElementPayload(
export function constructFindElementPayload(
strategy: string,
selector: string,
context: string,
proxyDriver: XCUITestDriver | AndroidUiautomator2Driver | Mac2Driver,
context?: any,
proxyDriver?: XCUITestDriver | AndroidUiautomator2Driver | Mac2Driver,
) {
if (!strategy || !selector) {
return undefined;
}
const isFlutterLocator =
strategy.startsWith('-flutter') || FLUTTER_LOCATORS.includes(strategy);

Expand All @@ -31,6 +34,7 @@ function constructFindElementPayload(
// If user is looking for Native IOS/Mac locator
if (
!isFlutterLocator &&
proxyDriver &&
(proxyDriver instanceof XCUITestDriver ||
proxyDriver instanceof Mac2Driver)
) {
Expand Down
21 changes: 17 additions & 4 deletions src/driver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
clear,
ELEMENT_CACHE,
getElementRect,
constructFindElementPayload,
} from './commands/element';
import {
attachAppLaunchArguments,
Expand Down Expand Up @@ -362,7 +363,10 @@ export class AppiumFlutterDriver extends BaseDriver<FlutterDriverConstraints> {
'POST',
{
element,
locator,
locator: constructFindElementPayload(
locator?.using,
locator?.value,
),
timeout,
},
);
Expand All @@ -378,7 +382,10 @@ export class AppiumFlutterDriver extends BaseDriver<FlutterDriverConstraints> {
'POST',
{
element,
locator,
locator: constructFindElementPayload(
locator?.using,
locator?.value,
),
timeout,
},
);
Expand All @@ -391,7 +398,10 @@ export class AppiumFlutterDriver extends BaseDriver<FlutterDriverConstraints> {
{
origin,
offset,
locator,
locator: constructFindElementPayload(
locator?.using,
locator?.value,
),
},
);
}
Expand Down Expand Up @@ -420,7 +430,10 @@ export class AppiumFlutterDriver extends BaseDriver<FlutterDriverConstraints> {
`/session/:sessionId/appium/gestures/scroll_till_visible`,
'POST',
{
finder,
finder: constructFindElementPayload(
finder.using || finder.strategy,
finder.value || finder.selector,
),
scrollView,
delta,
maxScrolls,
Expand Down
Loading