Commit ebe92e0

authored

fix(ios): apply getActualRectangle (#267)

1 parent 4cfa367 commit ebe92e0Copy full SHA for ebe92e0

File tree

3 files changed

-6

lines changed

3 files changed

-6

lines changed

`‎lib/appium-driver.ts`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ export class AppiumDriver {`
`272`	`272`	`logInfo("Current version of appium doesn't support appium settings!");`
`273`	`273`	`}`
`274`	`274`
`275`		`- await DeviceManager.applyDeviceAdditionsSettings(driver, args, appiumCapsFromConfig);`
	`275`	`+ await DeviceManager.applyDeviceAdditionsSettings(driver, args, sessionInfoDetails);`
`276`	`276`
`277`	`277`	`hasStarted = true;`
`278`	`278`	`} catch (error) {`

`‎lib/device-manager.ts`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ export class DeviceManager implements IDeviceManager {`
`202`	`202`	`args.device.config = { "density": args.device.deviceScreenDensity \|\| args.device.config.density, "offsetPixels": +sessionInfoDetails.statBarHeight \|\| args.device.config.offsetPixels };`
`203`	`203`	`} else {`
`204`	`204`	`args.device.apiLevel = sessionInfoDetails.platformVersion;`
`205`		`- args.device.deviceScreenDensity = sessionInfoDetails.pixelRatio;`
	`205`	`+ args.device.deviceScreenDensity = sessionInfoDetails.pixelRatio\|\|args.device.config.density;`
`206`	`206`	`const offsetPixels = +sessionInfoDetails.viewportRect.top - +sessionInfoDetails.statBarHeight;`
`207`	`207`	`args.device.config = { "density": sessionInfoDetails.pixelRatio \|\| args.device.config.density, "offsetPixels": isNumber(offsetPixels) ? offsetPixels : args.device.config.offsetPixels };`
`208`	`208`	`}`
`@@ -272,11 +272,11 @@ export class DeviceManager implements IDeviceManager {`
`272`	`272`	`// }`
`273`	`273`
`274`	`274`	`public static async applyDeviceAdditionsSettings(driver, args: INsCapabilities, sessionInfo: any) {`
`275`		`- if ((!args.device.viewportRect \|\| !args.device.viewportRect.x) && (!args.device.config \|\| !args.device.config.offsetPixels)) {`
	`275`	`+ if ((!args.device.viewportRect \|\| !args.device.viewportRect.x) && (!args.device.config \|\| !isNumber(args.device.config.offsetPixels))) {`
`276`	`276`	`args.device.config = {};`
`277`	`277`	`let density: number;`
`278`		`- if (sessionInfo && sessionInfo.length >= 1) {`
`279`		`- density = sessionInfo[1].deviceScreenDensity ? sessionInfo[1].deviceScreenDensity/100 : undefined;`
	`278`	`+ if (sessionInfo && Object.getOwnPropertyNames(sessionInfo).length >= 1) {`
	`279`	`+ density = sessionInfo.pixelRatio ? sessionInfo.pixelRatio : undefined;`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`if (density) {`

`‎lib/ui-element.ts`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ export class UIElement {`
`242`	`242`	`*/`
`243`	`243`	`public async getActualRectangle() {`
`244`	`244`	`const actRect = await this.getRectangle();`
`245`		`- const density = this._args.device.config.density;`
	`245`	`+ const density = this._args.device.deviceScreenDensity;`
`246`	`246`	`if (this._args.isIOS) {`
`247`	`247`	`if (density) {`
`248`	`248`	`actRect.x *= density;`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit ebe92e0

File tree

3 files changed

3 files changed

`‎lib/appium-driver.ts`

`‎lib/device-manager.ts`

`‎lib/ui-element.ts`

0 commit comments