Merge branch 'master' into svetoslavtsenov/gestures

Author: SvetoslavTsenov

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="6.1.2"></a>
+## [6.1.2](https://github.com/NativeScript/nativescript-dev-appium/compare/6.1.0...6.1.2) (2019-10-04)
+
+
+### Bug Fixes
+
+* **ios-13:** remove statusbar height from viewportRect ([c1a993c](https://github.com/NativeScript/nativescript-dev-appium/commit/c1a993c))
+
+
+
 <a name="6.1.0"></a>
 # [6.1.0](https://github.com/NativeScript/nativescript-dev-appium/compare/6.0.0...6.1.0) (2019-10-03)
 

lib/appium-driver.ts

@@ -272,7 +272,7 @@ export class AppiumDriver {
                     logInfo("Current version of appium doesn't support appium settings!");
                 }
 
-                await DeviceManager.applyDeviceAdditionsSettings(driver, args, appiumCapsFromConfig);
+                await DeviceManager.applyDeviceAdditionsSettings(driver, args, sessionInfoDetails);
 
                 hasStarted = true;
             } catch (error) {
@@ -322,7 +322,8 @@ export class AppiumDriver {
                 const matches = devicesInfos.filter(d => sessionInfoDetails.deviceName.includes(d.deviceType));
                 if (matches && matches.length > 0) {
                     const deviceType = matches[matches.length - 1];
-                    args.device.viewportRect.y += deviceType.actionBarHeight * deviceType.density;
+                    args.device.viewportRect.y += deviceType.actionBarHeight;
+                    args.device.viewportRect.height -= deviceType.actionBarHeight;
                 }
             } catch (error) { }
         }

lib/device-manager.ts

@@ -202,7 +202,7 @@ export class DeviceManager implements IDeviceManager {
             args.device.config = { "density": args.device.deviceScreenDensity || args.device.config.density, "offsetPixels": +sessionInfoDetails.statBarHeight || args.device.config.offsetPixels };
         } else {
             args.device.apiLevel = sessionInfoDetails.platformVersion;
-            args.device.deviceScreenDensity = sessionInfoDetails.pixelRatio;
+            args.device.deviceScreenDensity = sessionInfoDetails.pixelRatio || args.device.config.density;
             const offsetPixels = +sessionInfoDetails.viewportRect.top - +sessionInfoDetails.statBarHeight;
             args.device.config = { "density": sessionInfoDetails.pixelRatio || args.device.config.density, "offsetPixels": isNumber(offsetPixels) ? offsetPixels : args.device.config.offsetPixels };
         }
@@ -272,11 +272,11 @@ export class DeviceManager implements IDeviceManager {
     // }
 
     public static async applyDeviceAdditionsSettings(driver, args: INsCapabilities, sessionInfo: any) {
-        if ((!args.device.viewportRect || !args.device.viewportRect.x) && (!args.device.config || !args.device.config.offsetPixels)) {
+        if ((!args.device.viewportRect || !args.device.viewportRect.x) && (!args.device.config || !isNumber(args.device.config.offsetPixels))) {
             args.device.config = {};
             let density: number;
-            if (sessionInfo && sessionInfo.length >= 1) {
-                density = sessionInfo[1].deviceScreenDensity ? sessionInfo[1].deviceScreenDensity / 100 : undefined;
+            if (sessionInfo && Object.getOwnPropertyNames(sessionInfo).length >= 1) {
+                density = sessionInfo.pixelRatio ? sessionInfo.pixelRatio : undefined;
             }
 
             if (density) {

lib/ui-element.ts

@@ -268,7 +268,7 @@ export class UIElement {
      */
     public async getActualRectangle() {
         const actRect = await this.getRectangle();
-        const density = this._args.device.config.density;
+        const density = this._args.device.deviceScreenDensity;
         if (this._args.isIOS) {
             if (density) {
                 actRect.x *= density;