@applitools/driver 1.9.18 → 1.9.19

package/dist/element.js

@@ -311,7 +311,7 @@ class Element {
                     this._state.touchPadding = await this.driver.helper.getTouchPadding();
                     this._logger.log('Touch padding extracted using helper library', this._state.touchPadding);
                 }
-                else {
+                if (!this._state.touchPadding) {
                     this._state.touchPadding = await this.getAttribute('contentSize')
                         .then(data => JSON.parse(data).touchPadding)
                         .catch(err => {

package/dist/helper-android.js

@@ -31,6 +31,17 @@ class HelperAndroid {
             return null;
         return resourceId.split('/')[1];
     }
+    async _command(command) {
+        await this._input.type(command);
+        await this._input.click();
+        let text = await this._input.getText();
+        if (this._action && text === command) {
+            await this._action.type('1').catch(() => null);
+            text = await this._input.getText();
+        }
+        await this._input.type('');
+        return text;
+    }
     async getContentRegion(element) {
         let contentHeightString;
         if (this._legacy) {
@@ -41,13 +52,7 @@ class HelperAndroid {
             const elementId = await this._getElementId(element);
             if (!elementId)
                 return null;
-            await this._input.type(`offset;${elementId};0;0;0`);
-            if (this._action)
-                await this._action.type('1');
-            else
-                await this._input.click();
-            contentHeightString = await this._input.getText();
-            await this._input.type('');
+            contentHeightString = await this._command(`offset;${elementId};0;0;0`);
         }
         const region = await this._spec.getElementRegion(this._input.driver.target, element.target);
         const contentHeight = Number(contentHeightString);
@@ -55,19 +60,24 @@ class HelperAndroid {
             ? { x: region.x, y: region.y, width: region.width, height: contentHeight }
             : null;
     }
+    async getTouchPadding() {
+        if (this._legacy)
+            return null;
+        const touchPaddingString = await this._command(`getTouchPadding;0;0;0;0`);
+        const touchPadding = Number(touchPaddingString);
+        if (!touchPadding || Number.isNaN(touchPadding))
+            return null;
+        return touchPadding;
+    }
     async getRegion(element) {
         if (this._legacy)
             return null;
         const elementId = await this._getElementId(element);
         if (!elementId)
             return null;
-        await this._input.type(`getRect;${elementId};0;0`);
-        if (this._action)
-            await this._action.type('1');
-        else
-            await this._input.click();
-        const regionString = await this._input.getText();
-        await this._input.type('');
+        const regionString = await this._command(`getRect;${elementId};0;0`);
+        if (!regionString)
+            return null;
         const [, x, y, height, width] = regionString.match(/\[(-?\d+(?:\.\d+)?);(-?\d+(?:\.\d+)?);(-?\d+(?:\.\d+)?);(-?\d+(?:\.\d+)?)\]/);
         const region = { x: Number(x), y: Number(y), width: Number(width), height: Number(height) };
         if (Number.isNaN(region.x + region.y + region.width + region.height))
@@ -80,12 +90,7 @@ class HelperAndroid {
         const elementId = await this._getElementId(element);
         if (!elementId)
             return null;
-        await this._input.type(`moveToTop;${elementId};0;-1`);
-        if (this._action)
-            await this._action.type('1');
-        else
-            await this._input.click();
-        await this._input.type('');
+        await this._command(`moveToTop;${elementId};0;-1`);
     }
     async scrollBy(element, offset) {
         if (this._legacy)
@@ -93,27 +98,7 @@ class HelperAndroid {
         const elementId = await this._getElementId(element);
         if (!elementId)
             return null;
-        await this._input.type(`scroll;${elementId};${offset.y};0;0`);
-        if (this._action)
-            await this._action.type('1');
-        else
-            await this._input.click();
-        await this._input.type('');
-    }
-    async getTouchPadding() {
-        if (this._legacy)
-            return null;
-        await this._input.type(`getTouchPadding;0;0;0;0`);
-        if (this._action)
-            await this._action.type('1');
-        else
-            await this._input.click();
-        const touchPaddingString = await this._input.getText();
-        await this._input.type('');
-        const touchPadding = Number(touchPaddingString);
-        if (!touchPadding || Number.isNaN(touchPadding))
-            return null;
-        return touchPadding;
+        await this._command(`scroll;${elementId};${offset.y};0;0`);
     }
 }
 exports.HelperAndroid = HelperAndroid;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.9.18",
+  "version": "1.9.19",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",

package/types/helper-android.d.ts

@@ -21,10 +21,11 @@ export declare class HelperAndroid<TDriver, TContext, TElement, TSelector> {
         legacy: boolean;
         logger?: any;
     });
-    _getElementId(element: Element<TDriver, TContext, TElement, TSelector>): Promise<string>;
+    private _getElementId;
+    private _command;
     getContentRegion(element: Element<TDriver, TContext, TElement, TSelector>): Promise<types.Region>;
+    getTouchPadding(): Promise<number>;
     getRegion(element: Element<TDriver, TContext, TElement, TSelector>): Promise<types.Region>;
     scrollToTop(element: Element<TDriver, TContext, TElement, TSelector>): Promise<void>;
     scrollBy(element: Element<TDriver, TContext, TElement, TSelector>, offset: types.Location): Promise<void>;
-    getTouchPadding(): Promise<number>;
 }