@applitools/driver 1.9.1 → 1.9.2

package/dist/driver.js

@@ -175,13 +175,14 @@ class Driver {
             // 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();
             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 ((await this.getOrientation()) === 'landscape')
+                    if (orientation === 'landscape')
                         barsSize.navigationBarHeight = barsSize.navigationBarWidth;
                     // when status bar is overlapping content on android it returns status bar height equal to viewport height
                     if (barsSize.statusBarHeight < this._driverInfo.displaySize.height) {
@@ -201,10 +202,18 @@ class Driver {
             // calculate viewport size
             if (!this._driverInfo.viewportSize) {
                 if (this.navigationBarHeight > 1) {
-                    this._driverInfo.viewportSize = {
-                        width: this._driverInfo.displaySize.width,
-                        height: this._driverInfo.displaySize.height - this.statusBarHeight - this.navigationBarHeight,
-                    };
+                    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,
+                        };
+                    }
                 }
                 else {
                     this._driverInfo.viewportSize = {
@@ -454,12 +463,6 @@ class Driver {
             else {
                 this._logger.log('Extracting viewport size from native driver');
                 size = await this.getDisplaySize();
-                if (size.height > size.width) {
-                    const orientation = await this.getOrientation();
-                    if (orientation === 'landscape') {
-                        size = { width: size.height, height: size.width };
-                    }
-                }
                 size.height -= this.statusBarHeight;
             }
             this._logger.log(`Rounding viewport size using`, this._customConfig.useCeilForViewportSize ? 'ceil' : 'round');
@@ -520,11 +523,14 @@ class Driver {
         var _a;
         if (this.isWeb && !this.isMobile)
             return;
-        if ((_a = this._driverInfo) === null || _a === void 0 ? void 0 : _a.viewportSize) {
+        if ((_a = this._driverInfo) === null || _a === void 0 ? void 0 : _a.displaySize) {
             this._logger.log('Extracting display size from native driver using cached value');
             return this._driverInfo.displaySize;
         }
-        const size = await this._spec.getWindowSize(this.target);
+        let size = await this._spec.getWindowSize(this.target);
+        if ((await this.getOrientation()) === 'landscape' && size.height > size.width) {
+            size = { width: size.height, height: size.width };
+        }
         const normalizedSize = this.isAndroid ? utils.geometry.scale(size, 1 / this.pixelRatio) : size;
         this._logger.log('Extracted and normalized display size:', normalizedSize);
         return normalizedSize;

package/package.json

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