@applitools/driver 1.9.16 → 1.9.19

package/dist/element.js

@@ -50,7 +50,10 @@ class Element {
         else {
             throw new TypeError('Element constructor called with argument of unknown type!');
         }
-        if (this._selector && this._spec.untransformSelector) {
+        if (specUtils.isSimpleCommonSelector(this._selector)) {
+            this._commonSelector = this._selector;
+        }
+        else if (this._selector && this._spec.untransformSelector) {
             this._commonSelector = this._spec.untransformSelector(this._spec.transformSelector(this._selector));
         }
     }
@@ -90,8 +93,8 @@ class Element {
     }
     async contains(innerElement) {
         const contains = await this.withRefresh(async () => {
-            var _a, _b, _c, _d;
-            var _e;
+            var _a, _b, _c, _d, _e;
+            var _f;
             innerElement = innerElement instanceof Element ? innerElement.target : innerElement;
             if (this.driver.isWeb) {
                 this._logger.log('Checking if web element with selector', this.selector, 'contains element', innerElement);
@@ -105,25 +108,34 @@ class Element {
                 if (await this.equals(innerElement))
                     return false;
                 // if the inner element region is contained in this element region, then it then could be assumed that the inner element is contained in this element
-                const contentRegion = (_c = (await ((_b = this.driver.helper) === null || _b === void 0 ? void 0 : _b.getContentRegion(this)))) !== null && _c !== void 0 ? _c : (await this.getAttribute('contentSize')
-                    .then(data => {
-                    const contentSize = JSON.parse(data);
-                    return {
-                        x: contentSize.left,
-                        y: contentSize.top,
-                        width: contentSize.width,
-                        height: this.driver.isIOS
-                            ? Math.max(contentSize.height, contentSize.scrollableOffset)
-                            : contentSize.height + contentSize.scrollableOffset,
+                let contentRegion = await ((_b = this.driver.helper) === null || _b === void 0 ? void 0 : _b.getContentRegion(this));
+                if (!contentRegion || !this.driver.isAndroid) {
+                    const nativeContentRegion = await this.getAttribute('contentSize')
+                        .then(data => {
+                        const contentSize = JSON.parse(data);
+                        return {
+                            x: contentSize.left,
+                            y: contentSize.top,
+                            width: contentSize.width,
+                            height: this.driver.isIOS
+                                ? Math.max(contentSize.height, contentSize.scrollableOffset)
+                                : contentSize.height + contentSize.scrollableOffset,
+                        };
+                    })
+                        .catch(err => {
+                        this._logger.warn(`Unable to get the attribute 'contentSize' due to the following error: '${err.message}'`);
+                        return this._spec.getElementRegion(this.driver.target, this.target);
+                    });
+                    contentRegion = {
+                        x: nativeContentRegion.x,
+                        y: nativeContentRegion.y,
+                        width: Math.max((_c = contentRegion === null || contentRegion === void 0 ? void 0 : contentRegion.width) !== null && _c !== void 0 ? _c : 0, nativeContentRegion.width),
+                        height: Math.max((_d = contentRegion === null || contentRegion === void 0 ? void 0 : contentRegion.height) !== null && _d !== void 0 ? _d : 0, nativeContentRegion.height),
                     };
-                })
-                    .catch(err => {
-                    this._logger.warn(`Unable to get the attribute 'contentSize' due to the following error: '${err.message}'`);
-                    return this._spec.getElementRegion(this.driver.target, this.target);
-                }));
+                }
                 const innerRegion = await this._spec.getElementRegion(this.driver.target, innerElement);
                 const contains = utils.geometry.contains(contentRegion, innerRegion);
-                (_d = (_e = this._state).containedElements) !== null && _d !== void 0 ? _d : (_e.containedElements = new Map());
+                (_e = (_f = this._state).containedElements) !== null && _e !== void 0 ? _e : (_f.containedElements = new Map());
                 this._state.containedElements.set(innerElement, contains);
                 return contains;
             }
@@ -182,7 +194,7 @@ class Element {
         if (this._state.contentSize)
             return this._state.contentSize;
         const size = await this.withRefresh(async () => {
-            var _a, _b;
+            var _a, _b, _c;
             if (this.driver.isWeb) {
                 this._logger.log('Extracting content size of web element with selector', this.selector);
                 return this.context.execute(snippets.getElementContentSize, [this]);
@@ -190,23 +202,34 @@ class Element {
             else {
                 this._logger.log('Extracting content size of native element with selector', this.selector);
                 try {
-                    const contentRegion = (_b = (await ((_a = this.driver.helper) === null || _a === void 0 ? void 0 : _a.getContentRegion(this)))) !== null && _b !== void 0 ? _b : (await this.getAttribute('contentSize')
-                        .then(data => {
-                        const contentSize = JSON.parse(data);
-                        return {
-                            x: contentSize.left,
-                            y: contentSize.top,
-                            width: contentSize.width,
-                            height: this.driver.isIOS
-                                ? Math.max(contentSize.height, contentSize.scrollableOffset)
-                                : contentSize.height + contentSize.scrollableOffset,
+                    let contentRegion = await ((_a = this.driver.helper) === null || _a === void 0 ? void 0 : _a.getContentRegion(this));
+                    this._logger.log('Extracted native content region using helper library', contentRegion);
+                    // on android extraction of this argument will perform non-deterministic touch action, so it is better to avoid it
+                    if (!contentRegion || !this.driver.isAndroid) {
+                        const attrContentRegion = await this.getAttribute('contentSize')
+                            .then(data => {
+                            const contentSize = JSON.parse(data);
+                            return {
+                                x: contentSize.left,
+                                y: contentSize.top,
+                                width: contentSize.width,
+                                height: this.driver.isIOS
+                                    ? Math.max(contentSize.height, contentSize.scrollableOffset)
+                                    : contentSize.height + contentSize.scrollableOffset,
+                            };
+                        })
+                            .catch(err => {
+                            this._logger.warn(`Unable to get the attribute 'contentSize' due to the following error: '${err.message}'`);
+                            return this._spec.getElementRegion(this.driver.target, this.target);
+                        });
+                        this._logger.log('Extracted native content region using attribute', attrContentRegion);
+                        contentRegion = {
+                            x: attrContentRegion.x,
+                            y: attrContentRegion.y,
+                            width: Math.max((_b = contentRegion === null || contentRegion === void 0 ? void 0 : contentRegion.width) !== null && _b !== void 0 ? _b : 0, attrContentRegion.width),
+                            height: Math.max((_c = contentRegion === null || contentRegion === void 0 ? void 0 : contentRegion.height) !== null && _c !== void 0 ? _c : 0, attrContentRegion.height),
                         };
-                    })
-                        .catch(err => {
-                        this._logger.warn(`Unable to get the attribute 'contentSize' due to the following error: '${err.message}'`);
-                        return this._spec.getElementRegion(this.driver.target, this.target);
-                    }));
-                    this._logger.log('Extracted native content region', contentRegion);
+                    }
                     this._state.contentSize = utils.geometry.size(contentRegion);
                     if (this.driver.isAndroid) {
                         this._state.contentSize = utils.geometry.scale(this._state.contentSize, 1 / this.driver.pixelRatio);
@@ -277,6 +300,7 @@ class Element {
     }
     async getTouchPadding() {
         var _a, _b;
+        var _c;
         if (this._state.touchPadding == null) {
             if (this.driver.isWeb)
                 this._state.touchPadding = 0;
@@ -284,16 +308,18 @@ class Element {
                 this._state.touchPadding = 10;
             else if (this.driver.isAndroid) {
                 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())) || 20;
+                    this._state.touchPadding = await this.driver.helper.getTouchPadding();
+                    this._logger.log('Touch padding extracted using helper library', this._state.touchPadding);
                 }
-                else {
-                    const touchPadding = await this.getAttribute('contentSize')
+                if (!this._state.touchPadding) {
+                    this._state.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 || 20;
+                    this._logger.log('Touch padding extracted using attribute', this._state.touchPadding);
                 }
+                (_b = (_c = this._state).touchPadding) !== null && _b !== void 0 ? _b : (_c.touchPadding = 20);
                 this._logger.log('Touch padding set:', this._state.touchPadding);
             }
         }

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 (Number.isNaN(touchPadding))
-            return null;
-        return touchPadding;
+        await this._command(`scroll;${elementId};${offset.y};0;0`);
     }
 }
 exports.HelperAndroid = HelperAndroid;

package/dist/spec-utils.js

@@ -23,8 +23,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withFastCache = exports.splitSelector = exports.transformSelector = exports.isSelector = exports.isCommonSelector = void 0;
+exports.withFastCache = exports.splitSelector = exports.transformSelector = exports.isSelector = exports.isCommonSelector = exports.isSimpleCommonSelector = void 0;
 const utils = __importStar(require("@applitools/utils"));
+function isSimpleCommonSelector(selector) {
+    return (utils.types.isPlainObject(selector) &&
+        utils.types.has(selector, 'selector') &&
+        utils.types.isString(selector.selector));
+}
+exports.isSimpleCommonSelector = isSimpleCommonSelector;
 function isCommonSelector(spec, selector) {
     return (utils.types.isPlainObject(selector) &&
         utils.types.has(selector, 'selector') &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.9.16",
+  "version": "1.9.19",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",
@@ -79,8 +79,8 @@
   },
   "dependencies": {
     "@applitools/logger": "1.1.15",
-    "@applitools/snippets": "2.4.4",
-    "@applitools/types": "1.5.6",
+    "@applitools/snippets": "2.4.5",
+    "@applitools/types": "1.5.7",
     "@applitools/utils": "1.3.10"
   },
   "devDependencies": {

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>;
 }

package/types/spec-utils.d.ts

@@ -5,6 +5,7 @@ declare type CommonSelector<TSelector = never> = {
     shadow?: CommonSelector<TSelector> | TSelector | string;
     frame?: CommonSelector<TSelector> | TSelector | string;
 };
+export declare function isSimpleCommonSelector(selector: any): selector is CommonSelector;
 export declare function isCommonSelector<TSelector>(spec: Pick<types.SpecDriver<unknown, unknown, unknown, TSelector>, 'isSelector'>, selector: any): selector is CommonSelector<TSelector>;
 export declare function isSelector<TSelector>(spec: Pick<types.SpecDriver<unknown, unknown, unknown, TSelector>, 'isSelector'>, selector: any): selector is types.Selector<TSelector>;
 export declare function transformSelector<TSelector>(spec: Pick<types.SpecDriver<unknown, unknown, unknown, TSelector>, 'isSelector' | 'transformSelector'>, selector: types.Selector<TSelector>, environment?: {