@applitools/driver 1.10.5 → 1.10.7

package/dist/driver.js

@@ -152,8 +152,8 @@ class Driver {
         this._currentContext = context;
     }
     async init() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
-        var _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
+        var _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18;
         // NOTE: this is here because saucelabs does not provide right capabilities for the first call
         await ((_b = (_a = this._spec).getCapabilities) === null || _b === void 0 ? void 0 : _b.call(_a, this.target));
         const capabilities = await ((_d = (_c = this._spec).getCapabilities) === null || _d === void 0 ? void 0 : _d.call(_c, this.target));
@@ -168,16 +168,16 @@ class Driver {
             this._driverInfo.isWebView = !!(world === null || world === void 0 ? void 0 : world.isWebView);
         }
         if (this.isWeb) {
-            (_h = (_6 = this._driverInfo).pixelRatio) !== null && _h !== void 0 ? _h : (_6.pixelRatio = await this.execute(snippets.getPixelRatio));
-            (_j = (_7 = this._driverInfo).viewportScale) !== null && _j !== void 0 ? _j : (_7.viewportScale = await this.execute(snippets.getViewportScale));
-            (_k = (_8 = this._driverInfo).userAgent) !== null && _k !== void 0 ? _k : (_8.userAgent = await this.execute(snippets.getUserAgent));
+            (_h = (_7 = this._driverInfo).pixelRatio) !== null && _h !== void 0 ? _h : (_7.pixelRatio = await this.execute(snippets.getPixelRatio));
+            (_j = (_8 = this._driverInfo).viewportScale) !== null && _j !== void 0 ? _j : (_8.viewportScale = await this.execute(snippets.getViewportScale));
+            (_k = (_9 = this._driverInfo).userAgent) !== null && _k !== void 0 ? _k : (_9.userAgent = await this.execute(snippets.getUserAgent));
             if (this._driverInfo.userAgent) {
                 const userAgentInfo = (0, user_agent_1.parseUserAgent)(this._driverInfo.userAgent);
                 this._driverInfo.browserName = (_l = userAgentInfo.browserName) !== null && _l !== void 0 ? _l : this._driverInfo.browserName;
                 this._driverInfo.browserVersion = (_m = userAgentInfo.browserVersion) !== null && _m !== void 0 ? _m : this._driverInfo.browserVersion;
                 if (this._driverInfo.isMobile) {
-                    (_o = (_9 = this._driverInfo).platformName) !== null && _o !== void 0 ? _o : (_9.platformName = userAgentInfo.platformName);
-                    (_p = (_10 = this._driverInfo).platformVersion) !== null && _p !== void 0 ? _p : (_10.platformVersion = userAgentInfo.platformVersion);
+                    (_o = (_10 = this._driverInfo).platformName) !== null && _o !== void 0 ? _o : (_10.platformName = userAgentInfo.platformName);
+                    (_p = (_11 = this._driverInfo).platformVersion) !== null && _p !== void 0 ? _p : (_11.platformVersion = userAgentInfo.platformVersion);
                 }
                 else {
                     this._driverInfo.platformName = (_q = userAgentInfo.platformName) !== null && _q !== void 0 ? _q : this._driverInfo.platformName;
@@ -188,13 +188,13 @@ class Driver {
                 this._driverInfo.isMobile = true;
                 this._driverInfo.isEmulation = this._driverInfo.isChrome;
             }
-            (_s = (_11 = this._driverInfo).features) !== null && _s !== void 0 ? _s : (_11.features = {});
-            (_t = (_12 = this._driverInfo.features).allCookies) !== null && _t !== void 0 ? _t : (_12.allCookies = this._driverInfo.isChrome || (/chrome/i.test(this._driverInfo.browserName) && !this._driverInfo.isMobile));
+            (_s = (_12 = this._driverInfo).features) !== null && _s !== void 0 ? _s : (_12.features = {});
+            (_t = (_13 = this._driverInfo.features).allCookies) !== null && _t !== void 0 ? _t : (_13.allCookies = this._driverInfo.isChrome || (/chrome/i.test(this._driverInfo.browserName) && !this._driverInfo.isMobile));
         }
         else {
             // this value always excludes the height of the navigation bar, and sometimes it also excludes the height of the status bar
             let windowSize = await this._spec.getWindowSize(this.target);
-            (_u = (_13 = this._driverInfo).displaySize) !== null && _u !== void 0 ? _u : (_13.displaySize = windowSize);
+            (_u = (_14 = this._driverInfo).displaySize) !== null && _u !== void 0 ? _u : (_14.displaySize = windowSize);
             if (((_v = this.orientation) === null || _v === void 0 ? void 0 : _v.startsWith('landscape')) &&
                 this._driverInfo.displaySize.height > this._driverInfo.displaySize.width) {
                 this._driverInfo.displaySize = {
@@ -231,17 +231,17 @@ class Driver {
                     }
                 }
                 // bar sizes have to be scaled on android
-                (_14 = this._driverInfo).statusBarSize && (_14.statusBarSize = this._driverInfo.statusBarSize / this.pixelRatio);
-                (_15 = this._driverInfo).navigationBarSize && (_15.navigationBarSize = this._driverInfo.navigationBarSize / this.pixelRatio);
+                (_15 = this._driverInfo).statusBarSize && (_15.statusBarSize = this._driverInfo.statusBarSize / this.pixelRatio);
+                (_16 = this._driverInfo).navigationBarSize && (_16.navigationBarSize = this._driverInfo.navigationBarSize / this.pixelRatio);
                 windowSize = utils.geometry.scale(windowSize, 1 / this.pixelRatio);
-                (_16 = this._driverInfo).displaySize && (_16.displaySize = utils.geometry.scale(this._driverInfo.displaySize, 1 / this.pixelRatio));
+                (_17 = this._driverInfo).displaySize && (_17.displaySize = utils.geometry.scale(this._driverInfo.displaySize, 1 / this.pixelRatio));
             }
             if (this.isIOS) {
                 if ((_2 = this.orientation) === null || _2 === void 0 ? void 0 : _2.startsWith('landscape'))
                     this._driverInfo.statusBarSize = 0;
             }
             // calculate viewport location
-            (_3 = (_17 = this._driverInfo).viewportLocation) !== null && _3 !== void 0 ? _3 : (_17.viewportLocation = {
+            (_3 = (_18 = this._driverInfo).viewportLocation) !== null && _3 !== void 0 ? _3 : (_18.viewportLocation = {
                 x: this.orientation === 'landscape' ? this.navigationBarSize : 0,
                 y: this.statusBarSize,
             });
@@ -278,6 +278,7 @@ class Driver {
                     ? await helper_ios_1.HelperIOS.make({ spec: this._spec, driver: this, logger: this._logger })
                     : await helper_android_1.HelperAndroid.make({ spec: this._spec, driver: this, logger: this._logger });
             }
+            this._logger.log(`Helper set to ${(_6 = this._helper) === null || _6 === void 0 ? void 0 : _6.name}`);
         }
         this._logger.log('Combined driver info', this._driverInfo);
         return this;

package/dist/element.js

@@ -110,22 +110,7 @@ class Element {
                 // 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
                 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);
-                    });
+                    const nativeContentRegion = await this.getContentSizeFromAttribute();
                     contentRegion = {
                         x: nativeContentRegion.x,
                         y: nativeContentRegion.y,
@@ -190,6 +175,38 @@ class Element {
         this._logger.log('Extracted client region', region);
         return region;
     }
+    async getContentSizeFromAttribute() {
+        try {
+            const data = await this.getAttribute('contentSize');
+            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}'`);
+        }
+        const type = await this.getAttribute('type');
+        if (type === 'XCUIElementTypeScrollView') {
+            const elementRegion = await this._spec.getElementRegion(this.driver.target, this.target);
+            const [childElement] = await this.driver.elements({
+                type: 'xpath',
+                selector: '//XCUIElementTypeScrollView[1]/*', // We cannot be sure that our element is the first one
+            });
+            const childElementRegion = await this._spec.getElementRegion(this.driver.target, childElement.target);
+            return {
+                ...elementRegion,
+                height: childElementRegion.y + childElementRegion.height - elementRegion.y,
+            };
+        }
+        else
+            return this._spec.getElementRegion(this.driver.target, this.target);
+    }
     async getContentSize(options = {}) {
         if (this._state.contentSize)
             return this._state.contentSize;
@@ -206,22 +223,7 @@ class Element {
                     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);
-                        });
+                        const attrContentRegion = await this.getContentSizeFromAttribute();
                         this._logger.log('Extracted native content region using attribute', attrContentRegion);
                         contentRegion = {
                             x: attrContentRegion.x,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.10.5",
+  "version": "1.10.7",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",
@@ -87,9 +87,9 @@
     }
   },
   "dependencies": {
-    "@applitools/logger": "1.1.26",
+    "@applitools/logger": "1.1.27",
     "@applitools/snippets": "2.4.5",
-    "@applitools/utils": "1.3.12",
+    "@applitools/utils": "1.3.13",
     "semver": "7.3.7"
   },
   "devDependencies": {

package/types/context.d.ts

@@ -1,4 +1,5 @@
-import type { Location, Size, Region, Cookie } from './types';
+import type { Location, Size, Region } from '@applitools/utils';
+import type { Cookie } from './types';
 import { type SpecDriver, type WaitOptions } from './spec-driver';
 import { type Driver } from './driver';
 import { type Selector } from './selector';

package/types/driver.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
-import type { Size, Region, ScreenOrientation, Cookie } from './types';
+import type { Size, Region } from '@applitools/utils';
+import type { ScreenOrientation, Cookie } from './types';
 import { type Selector } from './selector';
 import { type SpecDriver } from './spec-driver';
 import { type Element } from './element';

package/types/element.d.ts

@@ -1,4 +1,4 @@
-import type { Location, Size, Region } from './types';
+import type { Location, Size, Region } from '@applitools/utils';
 import { type SpecDriver } from './spec-driver';
 import { type Context } from './context';
 import { type Selector } from './selector';
@@ -41,6 +41,12 @@ export declare class Element<TDriver, TContext, TElement, TSelector> {
     init(context: Context<TDriver, TContext, TElement, TSelector>): Promise<this>;
     getRegion(): Promise<Region>;
     getClientRegion(): Promise<Region>;
+    getContentSizeFromAttribute(): Promise<{
+        x: any;
+        y: any;
+        width: any;
+        height: any;
+    }>;
     getContentSize(options?: {
         lazyLoad?: {
             scrollLength?: number;

package/types/fake/spec-driver.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { type Size } from '../types';
+import type { Size } from '@applitools/utils';
 import { type DriverInfo } from '../spec-driver';
 export declare type Driver = any;
 export declare type Element = any;

package/types/helper-android.d.ts

@@ -1,4 +1,4 @@
-import type { Location, Region } from './types';
+import type { Location, Region } from '@applitools/utils';
 import { type SpecDriver } from './spec-driver';
 import { type Driver } from './driver';
 import { type Element } from './element';

package/types/helper-ios.d.ts

@@ -1,4 +1,4 @@
-import type { Region } from './types';
+import type { Region } from '@applitools/utils';
 import { type SpecDriver } from './spec-driver';
 import { type Driver } from './driver';
 import { type Element } from './element';

package/types/spec-driver.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
-import type { Location, Size, Region, ScreenOrientation, Cookie } from './types';
+import type { Location, Size, Region } from '@applitools/utils';
+import type { ScreenOrientation, Cookie } from './types';
 import { type Selector } from './selector';
 export declare type DriverInfo = {
     sessionId?: string;

package/types/types.d.ts

@@ -1,12 +1,3 @@
-export declare type Location = {
-    x: number;
-    y: number;
-};
-export declare type Size = {
-    width: number;
-    height: number;
-};
-export declare type Region = Location & Size;
 export declare type ScreenOrientation = 'portrait' | 'landscape' | 'portrait-secondary' | 'landscape-secondary';
 export declare type Cookie = {
     name: string;