@applitools/driver 1.9.7 → 1.9.10

package/dist/capabilities.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCapabilities = void 0;
 function parseCapabilities(capabilities, customConfig) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     if (capabilities.capabilities)
         capabilities = capabilities.capabilities;
     if (!(customConfig === null || customConfig === void 0 ? void 0 : customConfig.keepPlatformNameAsIs)) {
@@ -35,9 +35,9 @@ function parseCapabilities(capabilities, customConfig) {
     if (info.isNative) {
         info.displaySize = extractDisplaySize(capabilities);
         info.pixelRatio = capabilities.pixelRatio;
-        info.statusBarHeight = capabilities.statBarHeight;
+        info.statusBarSize = (_o = capabilities.statBarHeight) !== null && _o !== void 0 ? _o : (_p = capabilities.viewportRect) === null || _p === void 0 ? void 0 : _p.top;
         if (info.displaySize && info.orientation && capabilities.viewportRect) {
-            info.navigationBarHeight =
+            info.navigationBarSize =
                 info.orientation === 'landscape'
                     ? info.displaySize.width - (capabilities.viewportRect.left + capabilities.viewportRect.width)
                     : info.displaySize.height - (capabilities.viewportRect.top + capabilities.viewportRect.height);

package/dist/context.js

@@ -232,12 +232,11 @@ class Context {
         }
         return {
             context,
-            shadow: root ? new element_1.Element({ spec: this._spec, context, element, logger: this._logger, root }) : null,
+            shadow: element && new element_1.Element({ spec: this._spec, context, element, logger: this._logger }),
             selector: currentSelector,
         };
     }
     async element(elementOrSelector) {
-        var _a;
         if (this._spec.isElement(elementOrSelector)) {
             return new element_1.Element({ spec: this._spec, context: this, element: elementOrSelector, logger: this._logger });
         }
@@ -249,7 +248,7 @@ class Context {
             const root = await this.root(elementOrSelector);
             if (!root)
                 return null;
-            const element = await this._spec.findElement(root.context.target, specUtils.transformSelector(this._spec, root.selector, this.driver), (_a = root.shadow) === null || _a === void 0 ? void 0 : _a.target);
+            const element = await this._spec.findElement(root.context.target, specUtils.transformSelector(this._spec, root.selector, this.driver), root.shadow && (await root.shadow.getShadowRoot()));
             // TODO root.selector is not a full selector from context root to an element, but selector inside a shadow
             return element
                 ? new element_1.Element({ spec: this._spec, context: root.context, element, selector: root.selector, logger: this._logger })
@@ -260,7 +259,6 @@ class Context {
         }
     }
     async elements(elementOrSelector) {
-        var _a;
         if (this._spec.isElement(elementOrSelector)) {
             return [new element_1.Element({ spec: this._spec, context: this, element: elementOrSelector, logger: this._logger })];
         }
@@ -272,7 +270,7 @@ class Context {
             const root = await this.root(elementOrSelector);
             if (!root)
                 return [];
-            const elements = await this._spec.findElements(root.context.target, specUtils.transformSelector(this._spec, root.selector, this.driver), (_a = root.shadow) === null || _a === void 0 ? void 0 : _a.target);
+            const elements = await this._spec.findElements(root.context.target, specUtils.transformSelector(this._spec, root.selector, this.driver), root.shadow && (await root.shadow.getShadowRoot()));
             return elements.map((element, index) => {
                 // TODO root.selector is not a full selector from context root to an element, but selector inside a shadow
                 return new element_1.Element({

package/dist/driver.js

@@ -107,13 +107,13 @@ class Driver {
         var _a;
         return (_a = this._driverInfo.viewportScale) !== null && _a !== void 0 ? _a : 1;
     }
-    get statusBarHeight() {
+    get statusBarSize() {
         var _a;
-        return (_a = this._driverInfo.statusBarHeight) !== null && _a !== void 0 ? _a : (this.isNative ? 0 : undefined);
+        return (_a = this._driverInfo.statusBarSize) !== null && _a !== void 0 ? _a : (this.isNative ? 0 : undefined);
     }
-    get navigationBarHeight() {
+    get navigationBarSize() {
         var _a;
-        return (_a = this._driverInfo.navigationBarHeight) !== null && _a !== void 0 ? _a : (this.isNative ? 0 : undefined);
+        return (_a = this._driverInfo.navigationBarSize) !== null && _a !== void 0 ? _a : (this.isNative ? 0 : undefined);
     }
     get isNative() {
         var _a, _b;
@@ -144,84 +144,92 @@ 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;
-        var _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8;
+        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;
+        var _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12;
         const capabilities = await ((_b = (_a = this._spec).getCapabilities) === null || _b === void 0 ? void 0 : _b.call(_a, this.target));
         this._logger.log('Driver capabilities', capabilities);
         const capabilitiesInfo = capabilities ? (0, capabilities_1.parseCapabilities)(capabilities, this._customConfig) : undefined;
         const driverInfo = await ((_d = (_c = this._spec).getDriverInfo) === null || _d === void 0 ? void 0 : _d.call(_c, this.target));
         this._driverInfo = { ...capabilitiesInfo, ...driverInfo };
+        if (this.isMobile) {
+            this._driverInfo.orientation =
+                (_e = (await this.getOrientation().catch(() => undefined))) !== null && _e !== void 0 ? _e : this._driverInfo.orientation;
+        }
         if (this.isWeb) {
-            (_e = (_x = this._driverInfo).pixelRatio) !== null && _e !== void 0 ? _e : (_x.pixelRatio = await this.execute(snippets.getPixelRatio));
-            (_f = (_y = this._driverInfo).viewportScale) !== null && _f !== void 0 ? _f : (_y.viewportScale = await this.execute(snippets.getViewportScale));
-            (_g = (_z = this._driverInfo).userAgent) !== null && _g !== void 0 ? _g : (_z.userAgent = await this.execute(snippets.getUserAgent));
+            (_f = (_1 = this._driverInfo).pixelRatio) !== null && _f !== void 0 ? _f : (_1.pixelRatio = await this.execute(snippets.getPixelRatio));
+            (_g = (_2 = this._driverInfo).viewportScale) !== null && _g !== void 0 ? _g : (_2.viewportScale = await this.execute(snippets.getViewportScale));
+            (_h = (_3 = this._driverInfo).userAgent) !== null && _h !== void 0 ? _h : (_3.userAgent = await this.execute(snippets.getUserAgent));
             if (this._driverInfo.userAgent) {
                 const userAgentInfo = (0, user_agent_1.parseUserAgent)(this._driverInfo.userAgent);
-                this._driverInfo.browserName = (_h = userAgentInfo.browserName) !== null && _h !== void 0 ? _h : this._driverInfo.browserName;
-                this._driverInfo.browserVersion = (_j = userAgentInfo.browserVersion) !== null && _j !== void 0 ? _j : this._driverInfo.browserVersion;
+                this._driverInfo.browserName = (_j = userAgentInfo.browserName) !== null && _j !== void 0 ? _j : this._driverInfo.browserName;
+                this._driverInfo.browserVersion = (_k = userAgentInfo.browserVersion) !== null && _k !== void 0 ? _k : this._driverInfo.browserVersion;
                 if (this._driverInfo.isMobile) {
-                    (_k = (_0 = this._driverInfo).platformName) !== null && _k !== void 0 ? _k : (_0.platformName = userAgentInfo.platformName);
-                    (_l = (_1 = this._driverInfo).platformVersion) !== null && _l !== void 0 ? _l : (_1.platformVersion = userAgentInfo.platformVersion);
+                    (_l = (_4 = this._driverInfo).platformName) !== null && _l !== void 0 ? _l : (_4.platformName = userAgentInfo.platformName);
+                    (_m = (_5 = this._driverInfo).platformVersion) !== null && _m !== void 0 ? _m : (_5.platformVersion = userAgentInfo.platformVersion);
                 }
                 else {
-                    this._driverInfo.platformName = (_m = userAgentInfo.platformName) !== null && _m !== void 0 ? _m : this._driverInfo.platformName;
-                    this._driverInfo.platformVersion = (_o = userAgentInfo.platformVersion) !== null && _o !== void 0 ? _o : this._driverInfo.platformVersion;
+                    this._driverInfo.platformName = (_o = userAgentInfo.platformName) !== null && _o !== void 0 ? _o : this._driverInfo.platformName;
+                    this._driverInfo.platformVersion = (_p = userAgentInfo.platformVersion) !== null && _p !== void 0 ? _p : this._driverInfo.platformVersion;
                 }
             }
-            (_p = (_2 = this._driverInfo).features) !== null && _p !== void 0 ? _p : (_2.features = {});
-            (_q = (_3 = this._driverInfo.features).allCookies) !== null && _q !== void 0 ? _q : (_3.allCookies = /chrome/i.test(this._driverInfo.browserName) && !this._driverInfo.isMobile);
+            (_q = (_6 = this._driverInfo).features) !== null && _q !== void 0 ? _q : (_6.features = {});
+            (_r = (_7 = this._driverInfo.features).allCookies) !== null && _r !== void 0 ? _r : (_7.allCookies = /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);
-            (_r = (_4 = this._driverInfo).displaySize) !== null && _r !== void 0 ? _r : (_4.displaySize = windowSize);
-            const orientation = await this.getOrientation();
+            (_s = (_8 = this._driverInfo).displaySize) !== null && _s !== void 0 ? _s : (_8.displaySize = windowSize);
             if (this.isAndroid) {
                 // bar sizes could be extracted only on android
-                const barsSize = await ((_t = (_s = this._spec).getBarsSize) === null || _t === void 0 ? void 0 : _t.call(_s, this.target).catch(() => undefined));
-                if (barsSize) {
-                    this._logger.log('Driver bars size', barsSize);
-                    // navigation bar height is replaced with the width in landscape orientation on android (due to the bug in appium)
-                    if (orientation === 'landscape')
-                        barsSize.navigationBarHeight = barsSize.navigationBarWidth;
+                const systemBars = await ((_u = (_t = this._spec).getSystemBars) === null || _u === void 0 ? void 0 : _u.call(_t, this.target).catch(() => null));
+                const { statusBar, navigationBar } = systemBars !== null && systemBars !== void 0 ? systemBars : {};
+                if (statusBar === null || statusBar === void 0 ? void 0 : statusBar.visible) {
+                    this._logger.log('Driver status bar', statusBar);
+                    const statusBarSize = statusBar.height;
                     // when status bar is overlapping content on android it returns status bar height equal to display height
-                    if (barsSize.statusBarHeight < this._driverInfo.displaySize.height) {
-                        this._driverInfo.statusBarHeight = Math.max((_u = this._driverInfo.statusBarHeight) !== null && _u !== void 0 ? _u : 0, barsSize.statusBarHeight);
+                    if (statusBarSize < this._driverInfo.displaySize.height) {
+                        this._driverInfo.statusBarSize = Math.max((_v = this._driverInfo.statusBarSize) !== null && _v !== void 0 ? _v : 0, statusBarSize);
                     }
-                    // when navigation bar is invisible on android it returns navigation bar height equal to display height
-                    if (barsSize.navigationBarHeight < this._driverInfo.displaySize.height) {
-                        this._driverInfo.navigationBarHeight = Math.max((_v = this._driverInfo.navigationBarHeight) !== null && _v !== void 0 ? _v : 0, barsSize.navigationBarHeight);
+                }
+                if (navigationBar === null || navigationBar === void 0 ? void 0 : navigationBar.visible) {
+                    this._logger.log('Driver navigation size', navigationBar);
+                    // if navigation bar is placed on the right side is screen the the orientation is landscape-secondary
+                    if (navigationBar.x > 0)
+                        this._driverInfo.orientation = 'landscape-secondary';
+                    // navigation bar size could be its height or width depending on screen orientation
+                    const navigationBarSize = navigationBar[((_w = this.orientation) === null || _w === void 0 ? void 0 : _w.startsWith('landscape')) ? 'width' : 'height'];
+                    // when navigation bar is invisible on android it returns navigation bar size equal to display size
+                    if (navigationBarSize <
+                        this._driverInfo.displaySize[((_x = this.orientation) === null || _x === void 0 ? void 0 : _x.startsWith('landscape')) ? 'width' : 'height']) {
+                        this._driverInfo.navigationBarSize = Math.max((_y = this._driverInfo.navigationBarSize) !== null && _y !== void 0 ? _y : 0, navigationBarSize);
                     }
                     else {
-                        this._driverInfo.navigationBarHeight = 0;
+                        this._driverInfo.navigationBarSize = 0;
                     }
-                    // bar heights have to be scaled on android
-                    (_5 = this._driverInfo).statusBarHeight && (_5.statusBarHeight = this._driverInfo.statusBarHeight / this.pixelRatio);
-                    (_6 = this._driverInfo).navigationBarHeight && (_6.navigationBarHeight = this._driverInfo.navigationBarHeight / this.pixelRatio);
                 }
-                windowSize = utils.geometry.scale(this._driverInfo.displaySize, 1 / this.pixelRatio);
-                (_7 = this._driverInfo).displaySize && (_7.displaySize = utils.geometry.scale(this._driverInfo.displaySize, 1 / this.pixelRatio));
+                // bar sizes have to be scaled on android
+                (_9 = this._driverInfo).statusBarSize && (_9.statusBarSize = this._driverInfo.statusBarSize / this.pixelRatio);
+                (_10 = this._driverInfo).navigationBarSize && (_10.navigationBarSize = this._driverInfo.navigationBarSize / this.pixelRatio);
+                windowSize = utils.geometry.scale(windowSize, 1 / this.pixelRatio);
+                (_11 = this._driverInfo).displaySize && (_11.displaySize = utils.geometry.scale(this._driverInfo.displaySize, 1 / this.pixelRatio));
             }
+            // calculate viewport location
+            (_z = (_12 = this._driverInfo).viewportLocation) !== null && _z !== void 0 ? _z : (_12.viewportLocation = {
+                x: this.orientation === 'landscape' ? this.navigationBarSize : 0,
+                y: this.statusBarSize,
+            });
             // calculate viewport size
             if (!this._driverInfo.viewportSize) {
-                if (this.navigationBarHeight > 1) {
-                    if (orientation === 'landscape') {
-                        this._driverInfo.viewportSize = {
-                            width: this._driverInfo.displaySize.height - this.navigationBarHeight,
-                            height: this._driverInfo.displaySize.width - this.statusBarHeight,
-                        };
-                    }
-                    else {
-                        this._driverInfo.viewportSize = {
-                            width: this._driverInfo.displaySize.width,
-                            height: this._driverInfo.displaySize.height - this.statusBarHeight - this.navigationBarHeight,
-                        };
-                    }
+                if ((_0 = this.orientation) === null || _0 === void 0 ? void 0 : _0.startsWith('landscape')) {
+                    this._driverInfo.viewportSize = {
+                        width: this._driverInfo.displaySize.height - this.navigationBarSize,
+                        height: this._driverInfo.displaySize.width - this.statusBarSize,
+                    };
                 }
                 else {
                     this._driverInfo.viewportSize = {
-                        width: windowSize.width,
-                        height: windowSize.height - this.statusBarHeight,
+                        width: this._driverInfo.displaySize.width,
+                        height: this._driverInfo.displaySize.height - this.statusBarSize - this.navigationBarSize,
                     };
                 }
             }
@@ -247,9 +255,6 @@ 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 });
         }
-        if (this.isMobile) {
-            (_w = (_8 = this._driverInfo).orientation) !== null && _w !== void 0 ? _w : (_8.orientation = await this.getOrientation().catch(() => undefined));
-        }
         this._logger.log('Combined driver info', this._driverInfo);
         return this;
     }
@@ -416,7 +421,7 @@ class Driver {
         return this.currentContext;
     }
     async normalizeRegion(region) {
-        if (this.isWeb || !utils.types.has(this._driverInfo, ['viewportSize', 'statusBarHeight']))
+        if (this.isWeb)
             return region;
         let normalizedRegion = region;
         if (this.isAndroid) {
@@ -425,10 +430,7 @@ class Driver {
         if (this.isIOS && utils.geometry.isIntersected(normalizedRegion, this._driverInfo.safeArea)) {
             normalizedRegion = utils.geometry.intersect(normalizedRegion, this._driverInfo.safeArea);
         }
-        normalizedRegion = utils.geometry.offsetNegative(normalizedRegion, {
-            x: this.isAndroid && this.orientation === 'landscape' && this.platformVersion > 7 ? this.navigationBarHeight : 0,
-            y: this.statusBarHeight,
-        });
+        normalizedRegion = utils.geometry.offsetNegative(normalizedRegion, this._driverInfo.viewportLocation);
         if (normalizedRegion.y < 0) {
             normalizedRegion.height += normalizedRegion.y;
             normalizedRegion.y = 0;
@@ -455,6 +457,13 @@ class Driver {
         }
         return image;
     }
+    async getViewportRegion() {
+        var _a, _b;
+        return {
+            ...((_b = (_a = this._driverInfo) === null || _a === void 0 ? void 0 : _a.viewportLocation) !== null && _b !== void 0 ? _b : { x: 0, y: 0 }),
+            ...(await this.getViewportSize()),
+        };
+    }
     async getViewportSize() {
         var _a;
         let size;
@@ -466,7 +475,7 @@ class Driver {
             else {
                 this._logger.log('Extracting viewport size from native driver');
                 size = await this.getDisplaySize();
-                size.height -= this.statusBarHeight;
+                size.height -= this.statusBarSize;
             }
             this._logger.log(`Rounding viewport size using`, this._customConfig.useCeilForViewportSize ? 'ceil' : 'round');
             if (this._customConfig.useCeilForViewportSize) {
@@ -523,7 +532,7 @@ class Driver {
         throw new Error('Failed to set viewport size!');
     }
     async getDisplaySize() {
-        var _a;
+        var _a, _b;
         if (this.isWeb && !this.isMobile)
             return;
         if ((_a = this._driverInfo) === null || _a === void 0 ? void 0 : _a.displaySize) {
@@ -531,7 +540,7 @@ class Driver {
             return this._driverInfo.displaySize;
         }
         let size = await this._spec.getWindowSize(this.target);
-        if ((await this.getOrientation()) === 'landscape' && size.height > size.width) {
+        if (((_b = (await this.getOrientation())) === null || _b === void 0 ? void 0 : _b.startsWith('landscape')) && size.height > size.width) {
             size = { width: size.height, height: size.width };
         }
         const normalizedSize = this.isAndroid ? utils.geometry.scale(size, 1 / this.pixelRatio) : size;
@@ -541,7 +550,27 @@ class Driver {
     async getOrientation() {
         if (this.isWeb && !this.isMobile)
             return;
-        const orientation = await this._spec.getOrientation(this.target);
+        let orientation;
+        if (this.isAndroid) {
+            this._logger.log('Extracting device orientation using adb command on android');
+            const rotation = await this.execute('mobile:shell', {
+                command: "dumpsys window | grep 'mCurrentRotation' | cut -d = -f2",
+            })
+                .then(r => { var _a; return (_a = r === null || r === void 0 ? void 0 : r.trim) === null || _a === void 0 ? void 0 : _a.call(r); })
+                .catch(() => null);
+            if (rotation === 'ROTATION_0')
+                orientation = 'portrait';
+            else if (rotation === 'ROTATION_90')
+                orientation = 'landscape-secondary';
+            else if (rotation === 'ROTATION_180')
+                orientation = 'portrait-secondary';
+            else if (rotation === 'ROTATION_270')
+                orientation = 'landscape';
+        }
+        if (!orientation) {
+            this._logger.log('Extracting device orientation');
+            orientation = await this._spec.getOrientation(this.target);
+        }
         this._logger.log('Extracted device orientation:', orientation);
         return orientation;
     }

package/dist/element.js

@@ -39,16 +39,9 @@ class Element {
         if (options.logger)
             this._logger = options.logger;
         if (this._spec.isElement(options.element)) {
-            let elementToUse = options.element;
-            if (options.root) {
-                elementToUse = options.root;
-                this._target = elementToUse;
-            }
-            else {
-                this._target = (_c = (_b = (_a = this._spec).transformElement) === null || _b === void 0 ? void 0 : _b.call(_a, elementToUse)) !== null && _c !== void 0 ? _c : elementToUse;
-            }
+            this._target = (_c = (_b = (_a = this._spec).transformElement) === null || _b === void 0 ? void 0 : _b.call(_a, options.element)) !== null && _c !== void 0 ? _c : options.element;
             // Some frameworks contains information about the selector inside an element
-            this._selector = (_d = options.selector) !== null && _d !== void 0 ? _d : (_f = (_e = this._spec).extractSelector) === null || _f === void 0 ? void 0 : _f.call(_e, elementToUse);
+            this._selector = (_d = options.selector) !== null && _d !== void 0 ? _d : (_f = (_e = this._spec).extractSelector) === null || _f === void 0 ? void 0 : _f.call(_e, options.element);
             this._index = options.index;
         }
         else if (specUtils.isSelector(this._spec, options.selector)) {
@@ -57,6 +50,9 @@ class Element {
         else {
             throw new TypeError('Element constructor called with argument of unknown type!');
         }
+        if (this._selector && this._spec.untransformSelector) {
+            this._commonSelector = this._spec.untransformSelector(this._spec.transformSelector(this._selector));
+        }
     }
     get target() {
         return this._target;
@@ -64,6 +60,12 @@ class Element {
     get selector() {
         return this._selector;
     }
+    get commonSelector() {
+        return this._commonSelector;
+    }
+    get index() {
+        return this._index;
+    }
     get context() {
         return this._context;
     }
@@ -218,8 +220,8 @@ class Element {
                     if (this.driver.isAndroid) {
                         this._state.contentSize = utils.geometry.scale(this._state.contentSize, 1 / this.driver.pixelRatio);
                     }
-                    if (contentRegion.y < this.driver.statusBarHeight) {
-                        this._state.contentSize.height -= this.driver.statusBarHeight - contentRegion.y;
+                    if (contentRegion.y < this.driver.statusBarSize) {
+                        this._state.contentSize.height -= this.driver.statusBarSize - contentRegion.y;
                     }
                     return this._state.contentSize;
                 }
@@ -277,6 +279,11 @@ class Element {
             }
         });
     }
+    async getShadowRoot() {
+        if (!this.driver.isWeb)
+            return null;
+        return this._spec.executeScript(this.context.target, snippets.getShadowRoot, [this.target]);
+    }
     async getTouchPadding() {
         var _a, _b;
         if (this._state.touchPadding == null) {

package/dist/fake/spec-driver.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.visit = exports.getTitle = exports.getUrl = exports.getOrientation = exports.setWindowSize = exports.getWindowSize = exports.getDriverInfo = exports.takeScreenshot = exports.childContext = exports.parentContext = exports.mainContext = exports.findElements = exports.findElement = exports.executeScript = exports.isEqualElements = exports.isStaleElementError = exports.transformSelector = exports.isSelector = exports.isElement = exports.isDriver = void 0;
+exports.visit = exports.getTitle = exports.getUrl = exports.getOrientation = exports.setWindowSize = exports.getWindowSize = exports.getDriverInfo = exports.takeScreenshot = exports.childContext = exports.parentContext = exports.mainContext = exports.findElements = exports.findElement = exports.executeScript = exports.isEqualElements = exports.isStaleElementError = exports.extractSelector = exports.untransformSelector = exports.transformSelector = exports.isSelector = exports.isElement = exports.isDriver = void 0;
 const utils = __importStar(require("@applitools/utils"));
 function isDriver(driver) {
     return driver && driver.constructor.name === 'MockDriver';
@@ -41,6 +41,24 @@ function transformSelector(selector) {
     return utils.types.has(selector, 'selector') ? selector.selector : selector;
 }
 exports.transformSelector = transformSelector;
+function untransformSelector(selector) {
+    if (utils.types.isString(selector)) {
+        return { type: 'css', selector: selector };
+    }
+    else if (utils.types.has(selector, ['using', 'value'])) {
+        return { type: selector.using === 'css selector' ? 'css' : selector.using, selector: selector.value };
+    }
+    else if (utils.types.has(selector, ['selector'])) {
+        return selector;
+    }
+}
+exports.untransformSelector = untransformSelector;
+function extractSelector(element) {
+    if (utils.types.has(element, ['selector'])) {
+        return element.selector;
+    }
+}
+exports.extractSelector = extractSelector;
 function isStaleElementError() {
     return false;
 }

package/dist/helper-android.js

@@ -28,7 +28,8 @@ const utils = __importStar(require("@applitools/utils"));
 class HelperAndroid {
     constructor(options) {
         this._spec = options.spec;
-        this._element = options.element;
+        this._input = options.input;
+        this._action = options.action;
         this._legacy = options.legacy;
         this._logger = options.logger;
         this.name = this._legacy ? 'android-legacy' : 'android';
@@ -36,18 +37,17 @@ class HelperAndroid {
     static async make(options) {
         const { spec, driver, logger } = options;
         let legacy = false;
-        let element = await driver.element({
-            type: 'xpath',
-            selector: '//*[@content-desc="EyesAppiumHelperEDT"]',
-        });
-        if (!element) {
+        let input = await driver.element({ type: 'xpath', selector: '//*[@content-desc="EyesAppiumHelperEDT"]' });
+        if (!input) {
             legacy = true;
-            element = await driver.element({
-                type: '-android uiautomator',
-                selector: 'new UiSelector().description("EyesAppiumHelper")',
-            });
+            input = await driver.element({ type: 'xpath', selector: '//*[@content-desc="EyesAppiumHelper"]' });
         }
-        return element ? new HelperAndroid({ spec, element, legacy, logger }) : null;
+        const action = !legacy
+            ? await driver.element({ type: 'xpath', selector: '//*[@content-desc="EyesAppiumHelper_Action"]' })
+            : null;
+        return input
+            ? new HelperAndroid({ spec, input, action, legacy, logger })
+            : null;
     }
     async _getElementId(element) {
         const resourceId = await element.getAttribute('resource-id');
@@ -56,21 +56,25 @@ class HelperAndroid {
         return resourceId.split('/')[1];
     }
     async getContentSize(element) {
+        console.log('getContentSize', !!this._action);
         let contentHeightString;
         if (this._legacy) {
-            await this._element.click();
-            contentHeightString = await this._element.getText();
+            await this._input.click();
+            contentHeightString = await this._input.getText();
         }
         else {
             const elementId = await this._getElementId(element);
             if (!elementId)
                 return null;
-            await this._element.type(`offset;${elementId};0;0;0`);
-            await this._element.click();
-            contentHeightString = await this._element.getText();
-            await this._element.type('');
+            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('');
         }
-        const region = await this._spec.getElementRegion(this._element.driver.target, element.target);
+        const region = await this._spec.getElementRegion(this._input.driver.target, element.target);
         const contentHeight = Number(contentHeightString);
         if (Number.isNaN(contentHeight))
             return utils.geometry.size(region);
@@ -82,10 +86,13 @@ class HelperAndroid {
         const elementId = await this._getElementId(element);
         if (!elementId)
             return null;
-        await this._element.type(`getRect;${elementId};0;0`);
-        await this._element.click();
-        const regionString = await this._element.getText();
-        await this._element.type('');
+        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 [, 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))
@@ -98,9 +105,12 @@ class HelperAndroid {
         const elementId = await this._getElementId(element);
         if (!elementId)
             return null;
-        await this._element.type(`moveToTop;${elementId};0;-1`);
-        await this._element.click();
-        await this._element.type('');
+        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('');
     }
     async scrollBy(element, offset) {
         if (this._legacy)
@@ -108,17 +118,23 @@ class HelperAndroid {
         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('');
+        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._element.type(`getTouchPadding;0;0;0;0`);
-        await this._element.click();
-        const touchPaddingString = await this._element.getText();
-        await this._element.type('');
+        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;

package/dist/spec-utils.js

@@ -40,10 +40,12 @@ function transformSelector(spec, selector, environment) {
     if ((environment === null || environment === void 0 ? void 0 : environment.isWeb) && isCommonSelector(spec, selector)) {
         if (selector.type === 'id')
             selector = { type: 'css', selector: `#${selector.selector}` };
-        if (selector.type === 'name')
+        else if (selector.type === 'name')
             selector = { type: 'css', selector: `[name="${selector.selector}"]` };
-        if (selector.type === 'class name')
+        else if (selector.type === 'class name')
             selector = { type: 'css', selector: `.${selector.selector}` };
+        else if (selector.type === 'tag name')
+            selector = { type: 'css', selector: `${selector.selector}` };
     }
     return (_b = (_a = spec.transformSelector) === null || _a === void 0 ? void 0 : _a.call(spec, selector)) !== null && _b !== void 0 ? _b : selector;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.9.7",
+  "version": "1.9.10",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",
@@ -17,7 +17,7 @@
   "repository": {
     "type": "git",
     "url": "git://github.com/applitools/eyes.sdk.javascript1.git",
-    "directory": "packages/driver"
+    "directory": "js/packages/driver"
   },
   "license": "SEE LICENSE IN LICENSE",
   "author": {
@@ -64,7 +64,9 @@
   "scripts": {
     "lint": "eslint '**/*.ts'",
     "build": "tsc",
-    "test": "mocha --no-timeouts -r ts-node/register ./test/**/*.spec.ts",
+    "test": "yarn test:unit",
+    "test:sanity": "yarn test:unit",
+    "test:unit": "mocha --no-timeouts -r ts-node/register ./test/unit/*.spec.ts",
     "deps": "bongo deps",
     "preversion": "bongo preversion",
     "version": "bongo version",
@@ -78,11 +80,11 @@
   "dependencies": {
     "@applitools/logger": "1.1.13",
     "@applitools/snippets": "2.4.3",
-    "@applitools/types": "1.5.4",
+    "@applitools/types": "1.5.5",
     "@applitools/utils": "1.3.9"
   },
   "devDependencies": {
-    "@applitools/bongo": "^2.1.5",
+    "@applitools/bongo": "^2.1.6",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.31",
     "@typescript-eslint/eslint-plugin": "^5.22.0",

package/types/driver.d.ts

@@ -34,11 +34,11 @@ export declare class Driver<TDriver, TContext, TElement, TSelector> {
     get browserName(): string;
     get browserVersion(): string | number;
     get userAgent(): string;
-    get orientation(): 'portrait' | 'landscape';
+    get orientation(): 'portrait' | 'landscape' | 'portrait-secondary' | 'landscape-secondary';
     get pixelRatio(): number;
     get viewportScale(): number;
-    get statusBarHeight(): number;
-    get navigationBarHeight(): number;
+    get statusBarSize(): number;
+    get navigationBarSize(): number;
     get isNative(): boolean;
     get isWeb(): boolean;
     get isMobile(): boolean;
@@ -59,10 +59,11 @@ export declare class Driver<TDriver, TContext, TElement, TSelector> {
     elements(selector: types.Selector<TSelector>): Promise<Element<TDriver, TContext, TElement, TSelector>[]>;
     execute(script: ((arg: any) => any) | string, arg?: any): Promise<any>;
     takeScreenshot(): Promise<Buffer>;
+    getViewportRegion(): Promise<types.Region>;
     getViewportSize(): Promise<types.Size>;
     setViewportSize(size: types.Size): Promise<void>;
     getDisplaySize(): Promise<types.Size>;
-    getOrientation(): Promise<'portrait' | 'landscape'>;
+    getOrientation(): Promise<'portrait' | 'landscape' | 'portrait-secondary' | 'landscape-secondary'>;
     setOrientation(orientation: 'portrait' | 'landscape'): Promise<void>;
     getCookies(): Promise<types.Cookie[]>;
     getTitle(): Promise<string>;

package/types/element.d.ts

@@ -13,6 +13,7 @@ export declare class Element<TDriver, TContext, TElement, TSelector> {
     private _target;
     private _context;
     private _selector;
+    private _commonSelector?;
     private _index;
     private _state;
     private _originalOverflow;
@@ -25,10 +26,11 @@ export declare class Element<TDriver, TContext, TElement, TSelector> {
         selector?: types.Selector<TSelector>;
         index?: number;
         logger?: Logger;
-        root?: TElement;
     });
     get target(): TElement;
     get selector(): types.Selector<TSelector>;
+    get commonSelector(): types.Selector<never>;
+    get index(): number;
     get context(): Context<TDriver, TContext, TElement, TSelector>;
     get driver(): import("./driver").Driver<TDriver, TContext, TElement, TSelector>;
     get isRef(): boolean;
@@ -41,6 +43,7 @@ export declare class Element<TDriver, TContext, TElement, TSelector> {
     isPager(): Promise<boolean>;
     isScrollable(): Promise<boolean>;
     isRoot(): Promise<boolean>;
+    getShadowRoot(): Promise<TElement>;
     getTouchPadding(): Promise<number>;
     getText(): Promise<string>;
     getAttribute(name: string): Promise<string>;

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

@@ -6,12 +6,18 @@ export declare type Selector = string | {
     using: string;
     value: string;
 };
+declare type CommonSelector = string | {
+    selector: Selector | string;
+    type?: string;
+};
 export declare function isDriver(driver: any): driver is Driver;
 export declare function isElement(element: any): element is Element;
 export declare function isSelector(selector: any): selector is Selector;
 export declare function transformSelector(selector: Selector | {
     selector: Selector;
 }): Selector;
+export declare function untransformSelector(selector: Selector): CommonSelector;
+export declare function extractSelector(element: Element): any;
 export declare function isStaleElementError(): boolean;
 export declare function isEqualElements(_driver: Driver, element1: Element, element2: Element): Promise<boolean>;
 export declare function executeScript(driver: Driver, script: ((arg: any) => any) | string, arg: any): Promise<any>;
@@ -28,3 +34,4 @@ export declare function getOrientation(_driver: Driver): Promise<'portrait' | 'l
 export declare function getUrl(driver: Driver): Promise<string>;
 export declare function getTitle(driver: Driver): Promise<string>;
 export declare function visit(driver: Driver, url: string): Promise<void>;
+export {};

package/types/helper-android.d.ts

@@ -9,13 +9,15 @@ export declare class HelperAndroid<TDriver, TContext, TElement, TSelector> {
         logger: Logger;
     }): Promise<HelperAndroid<TDriver, TContext, TElement, TSelector> | null>;
     private readonly _spec;
-    private readonly _element;
+    private readonly _input;
+    private readonly _action?;
     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>;
+        input: Element<TDriver, TContext, TElement, TSelector>;
+        action?: Element<TDriver, TContext, TElement, TSelector>;
         legacy: boolean;
         logger?: any;
     });