fix: Added support for descendant within scroll (AppiumTestDistribution#141)

* Added support for descendant within scroll

Co-authored-by: SrinivasanTarget <[email protected]>

* Updated flutter-finder version

Co-authored-by: SrinivasanTarget <[email protected]>

---------

Co-authored-by: SrinivasanTarget <[email protected]>

Author: saikrishna321

flutter-finder/wdio-flutter-by-service/build/tsconfig.tsbuildinfo

@@ -1,6 +1,6 @@
 {
   "name": "wdio-flutter-by-service",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "",
   "scripts": {
     "build": "rimraf build && tsc -b"

flutter-finder/wdio-flutter-by-service/package-lock.json

@@ -141,7 +141,8 @@ declare global {
     // @ts-ignore
     type Locator = {
       using: string;
-      value: string;
+      value?: string;
+      selector?: any;
     };
 
     // @ts-ignore

flutter-finder/wdio-flutter-by-service/package.json

@@ -52,7 +52,7 @@ export async function flutterLongPress(
 export async function flutterScrollTillVisible(
   this: WebdriverIO.Browser,
   options: {
-    finder: WebdriverIO.Element;
+    finder: WebdriverIO.Element | Flutter.Locator;
     scrollView?: WebdriverIO.Element;
     scrollDirection?: 'up' | 'right' | 'down' | 'left';
     delta?: number;
@@ -61,8 +61,23 @@ export async function flutterScrollTillVisible(
     dragDuration?: number;
   },
 ): Promise<WebdriverIO.Element | null> {
+  // Convert the finder to the proper format for the server
+  let finderForServer;
+  if (options.finder && typeof options.finder === 'object' && 'using' in options.finder) {
+    // It's a locator object (like from flutterByDescendant)
+    finderForServer = options.finder;
+  } else {
+    // It's an element, extract the locator
+    finderForServer = options.finder;
+  }
+  
+  const serverOptions = {
+    ...options,
+    finder: finderForServer,
+  };
+  
   const response = await browser.executeScript('flutter: scrollTillVisible', [
-    options,
+    serverOptions,
   ]);
   return await w3cElementToWdioElement(this, response);
 }

flutter-finder/wdio-flutter-by-service/src/index.ts

@@ -121,10 +121,19 @@ export function registerLocators(locatorConfig: Array<LocatorConfig>) {
     registerCustomMethod(
       `${methodName}`,
       (value: any) => {
-        return {
-          using: config.stategy,
-          value: typeof value !== 'string' ? JSON.stringify(value) : value,
-        };
+        // For complex finders (descendant, ancestor), use 'selector' property
+        // For simple finders, use 'value' property
+        if (config.name === 'flutterByDescendant' || config.name === 'flutterByAncestor') {
+          return {
+            using: config.stategy,
+            selector: typeof value !== 'string' ? value : JSON.parse(value),
+          };
+        } else {
+          return {
+            using: config.stategy,
+            value: typeof value !== 'string' ? JSON.stringify(value) : value,
+          };
+        }
       },
       {
         attachToBrowser: true,

flutter-finder/wdio-flutter-by-service/src/methods.ts

@@ -127,7 +127,7 @@ describe('My Login application', () => {
       expect(await childElement.getText()).toEqual('Child 2');
    });
 
-   it.skip('Scroll until visible with Descendant', async () => {
+   it('Scroll until visible with Descendant', async () => {
       await performLogin();
       await openScreen('Nested Scroll');
       const childElement = await browser.flutterScrollTillVisible({