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

* fix: safe parse element locators when used in flutter commands

* fix scroll till visible

Author: sudharsan-selvaraj

src/commands/element.ts

@@ -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);
 
@@ -31,6 +34,7 @@ function constructFindElementPayload(
    // If user is looking for Native IOS/Mac locator
    if (
       !isFlutterLocator &&
+      proxyDriver &&
       (proxyDriver instanceof XCUITestDriver ||
          proxyDriver instanceof Mac2Driver)
    ) {

src/driver.ts

@@ -24,6 +24,7 @@ import {
    clear,
    ELEMENT_CACHE,
    getElementRect,
+   constructFindElementPayload,
 } from './commands/element';
 import {
    attachAppLaunchArguments,
@@ -362,7 +363,10 @@ export class AppiumFlutterDriver extends BaseDriver<FlutterDriverConstraints> {
          'POST',
          {
             element,
-            locator,
+            locator: constructFindElementPayload(
+               locator?.using,
+               locator?.value,
+            ),
             timeout,
          },
       );
@@ -378,7 +382,10 @@ export class AppiumFlutterDriver extends BaseDriver<FlutterDriverConstraints> {
          'POST',
          {
             element,
-            locator,
+            locator: constructFindElementPayload(
+               locator?.using,
+               locator?.value,
+            ),
             timeout,
          },
       );
@@ -391,7 +398,10 @@ export class AppiumFlutterDriver extends BaseDriver<FlutterDriverConstraints> {
          {
             origin,
             offset,
-            locator,
+            locator: constructFindElementPayload(
+               locator?.using,
+               locator?.value,
+            ),
          },
       );
    }
@@ -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,