@applitools/driver 1.9.3 → 1.9.4

package/dist/element.js

@@ -278,18 +278,24 @@ class Element {
         });
     }
     async getTouchPadding() {
+        var _a, _b;
         if (this._state.touchPadding == null) {
             if (this.driver.isWeb)
                 this._state.touchPadding = 0;
             else if (this.driver.isIOS)
                 this._state.touchPadding = 10;
             else if (this.driver.isAndroid) {
-                const touchPadding = await this.getAttribute('contentSize')
-                    .then(data => JSON.parse(data).touchPadding)
-                    .catch(err => {
-                    this._logger.warn(`Unable to get the attribute 'contentSize' when looking up 'touchPadding' due to the following error: '${err.message}'`);
-                });
-                this._state.touchPadding = touchPadding !== null && touchPadding !== void 0 ? touchPadding : 21;
+                if (((_a = this.driver.helper) === null || _a === void 0 ? void 0 : _a.name) === 'android') {
+                    this._state.touchPadding = await ((_b = this.driver.helper) === null || _b === void 0 ? void 0 : _b.getTouchPadding());
+                }
+                else {
+                    const touchPadding = await this.getAttribute('contentSize')
+                        .then(data => JSON.parse(data).touchPadding)
+                        .catch(err => {
+                        this._logger.warn(`Unable to get the attribute 'contentSize' when looking up 'touchPadding' due to the following error: '${err.message}'`);
+                    });
+                    this._state.touchPadding = touchPadding !== null && touchPadding !== void 0 ? touchPadding : 20;
+                }
                 this._logger.log('Touch padding set:', this._state.touchPadding);
             }
         }
@@ -355,6 +361,7 @@ class Element {
     }
     async scrollTo(offset, options) {
         return this.withRefresh(async () => {
+            var _a;
             offset = utils.geometry.round({ x: Math.max(offset.x, 0), y: Math.max(offset.y, 0) });
             if (this.driver.isWeb) {
                 let actualOffset = await this.context.execute(snippets.scrollTo, [this, offset]);
@@ -374,17 +381,23 @@ class Element {
                     y: Math.round(scrollableRegion.height * (contentSize.height / scrollableRegion.height - 1)),
                 };
                 const requiredOffset = { x: Math.min(offset.x, maxOffset.x), y: Math.min(offset.y, maxOffset.y) };
+                if (((_a = this.driver.helper) === null || _a === void 0 ? void 0 : _a.name) === 'android' && utils.geometry.equals(requiredOffset, { x: 0, y: 0 })) {
+                    await this.driver.helper.scrollToTop(this);
+                    this._state.scrollOffset = requiredOffset;
+                    return this._state.scrollOffset;
+                }
                 let effectiveRegion = scrollableRegion;
                 let remainingOffset = utils.geometry.equals(requiredOffset, { x: 0, y: 0 })
                     ? { x: -maxOffset.x, y: -maxOffset.y } // if it has to be scrolled to the very beginning, then scroll maximum amount of pixels
                     : utils.geometry.offsetNegative(requiredOffset, currentScrollOffset);
                 if (this.driver.isAndroid) {
-                    remainingOffset = utils.geometry.scale(remainingOffset, this.driver.pixelRatio);
-                    effectiveRegion = utils.geometry.scale(effectiveRegion, this.driver.pixelRatio);
+                    remainingOffset = utils.geometry.round(utils.geometry.scale(remainingOffset, this.driver.pixelRatio));
+                    effectiveRegion = utils.geometry.round(utils.geometry.scale(effectiveRegion, this.driver.pixelRatio));
                 }
                 const actions = [];
-                const touchPadding = await this.getTouchPadding();
                 const isPager = await this.isPager();
+                const touchPadding = await this.getTouchPadding();
+                // horizontal scrolling
                 const xPadding = Math.max(Math.floor(effectiveRegion.width * 0.07), touchPadding);
                 const yTrack = Math.floor(effectiveRegion.y + effectiveRegion.height / 2); // center
                 const xLeft = effectiveRegion.y + xPadding;
@@ -424,6 +437,7 @@ class Element {
                     }
                     xRemaining -= xRight - xLeft;
                 }
+                // vertical scrolling
                 const yPadding = Math.max(Math.floor(effectiveRegion.height * 0.07), touchPadding);
                 const xTrack = Math.floor(effectiveRegion.x + 5); // a little bit off left border
                 const yBottom = effectiveRegion.y + effectiveRegion.height - yPadding;

package/dist/helper-android.js

@@ -7,6 +7,7 @@ class HelperAndroid {
         this._element = options.element;
         this._legacy = options.legacy;
         this._logger = options.logger;
+        this.name = this._legacy ? 'android-legacy' : 'android';
     }
     static async make(options) {
         const { spec, driver, logger } = options;
@@ -64,5 +65,34 @@ class HelperAndroid {
             return null;
         return region;
     }
+    async scrollToTop(element) {
+        if (this._legacy)
+            return null;
+        const elementId = await this._getElementId(element);
+        if (!elementId)
+            return null;
+        await this._element.type(`moveToTop;${elementId};0;0`);
+        await this._element.click();
+        await this._element.type('');
+    }
+    async scrollBy(element, offset) {
+        if (this._legacy)
+            return null;
+        const elementId = await this._getElementId(element);
+        if (!elementId)
+            return null;
+        await this._element.type(`scroll;${elementId};${offset.y};0;0`);
+        await this._element.click();
+        await this._element.type('');
+    }
+    async getTouchPadding() {
+        if (this._legacy)
+            return null;
+        await this._element.type(`getTouchPadding;0;0;0;0`);
+        await this._element.click();
+        const touchPaddingString = await this._element.getText();
+        await this._element.type('');
+        return Number(touchPaddingString);
+    }
 }
 exports.HelperAndroid = HelperAndroid;

package/dist/helper-ios.js

@@ -7,6 +7,7 @@ class HelperIOS {
         this._element = options.element;
         this._spec = options.spec;
         this._logger = options.logger;
+        this.name = 'ios';
     }
     static async make(options) {
         const { spec, driver, logger } = options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.9.3",
+  "version": "1.9.4",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",
@@ -76,10 +76,10 @@
     }
   },
   "dependencies": {
-    "@applitools/logger": "1.1.11",
-    "@applitools/snippets": "2.4.1",
-    "@applitools/types": "1.5.2",
-    "@applitools/utils": "1.3.7"
+    "@applitools/logger": "1.1.12",
+    "@applitools/snippets": "2.4.2",
+    "@applitools/types": "1.5.3",
+    "@applitools/utils": "1.3.8"
   },
   "devDependencies": {
     "@applitools/bongo": "^2.1.5",

package/types/helper-android.d.ts

@@ -12,6 +12,7 @@ export declare class HelperAndroid<TDriver, TContext, TElement, TSelector> {
     private readonly _element;
     private readonly _legacy;
     private _logger;
+    readonly name: 'android' | 'android-legacy';
     constructor(options: {
         spec: types.SpecDriver<TDriver, TContext, TElement, TSelector>;
         element: Element<TDriver, TContext, TElement, TSelector>;
@@ -21,4 +22,7 @@ export declare class HelperAndroid<TDriver, TContext, TElement, TSelector> {
     _getElementId(element: Element<TDriver, TContext, TElement, TSelector>): Promise<string>;
     getContentSize(element: Element<TDriver, TContext, TElement, TSelector>): Promise<types.Size>;
     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>;
 }

package/types/helper-ios.d.ts

@@ -12,6 +12,7 @@ export declare class HelperIOS<TDriver, TContext, TElement, TSelector> {
     private readonly _element;
     private readonly _spec;
     private _logger;
+    readonly name: 'ios';
     constructor(options: {
         driver: Driver<TDriver, TContext, TElement, TSelector>;
         element: Element<TDriver, TContext, TElement, TSelector>;