appium-webdriveragent 8.3.1 → 8.4.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [8.4.0](https://github.com/appium/WebDriverAgent/compare/v8.3.1...v8.4.0) (2024-04-01)
+
+
+### Features
+
+* add system screen size/width in the system info endpoint ([#881](https://github.com/appium/WebDriverAgent/issues/881)) ([5ebc71c](https://github.com/appium/WebDriverAgent/commit/5ebc71c6ca2b364d44a44716e794885f8d3b6d9c))
+
 ## [8.3.1](https://github.com/appium/WebDriverAgent/compare/v8.3.0...v8.3.1) (2024-03-31)
 
 

package/WebDriverAgentLib/Commands/FBCustomCommands.m

@@ -15,6 +15,7 @@
 #import "FBConfiguration.h"
 #import "FBKeyboard.h"
 #import "FBNotificationsHelper.h"
+#import "FBMathUtils.h"
 #import "FBPasteboard.h"
 #import "FBResponsePayload.h"
 #import "FBRoute.h"
@@ -48,6 +49,7 @@
     [[FBRoute GET:@"/wda/locked"].withoutSession respondWithTarget:self action:@selector(handleIsLocked:)],
     [[FBRoute GET:@"/wda/locked"] respondWithTarget:self action:@selector(handleIsLocked:)],
     [[FBRoute GET:@"/wda/screen"] respondWithTarget:self action:@selector(handleGetScreen:)],
+    [[FBRoute GET:@"/wda/screen"].withoutSession respondWithTarget:self action:@selector(handleGetScreen:)],
     [[FBRoute GET:@"/wda/activeAppInfo"] respondWithTarget:self action:@selector(handleActiveAppInfo:)],
     [[FBRoute GET:@"/wda/activeAppInfo"].withoutSession respondWithTarget:self action:@selector(handleActiveAppInfo:)],
 #if !TARGET_OS_TV // tvOS does not provide relevant APIs
@@ -134,10 +136,22 @@
 
 + (id<FBResponsePayload>)handleGetScreen:(FBRouteRequest *)request
 {
-  FBSession *session = request.session;
-  CGSize statusBarSize = [FBScreen statusBarSizeForApplication:session.activeApplication];
+  XCUIApplication *app = XCUIApplication.fb_systemApplication;
+
+  XCUIElement *mainStatusBar = app.statusBars.allElementsBoundByIndex.firstObject;
+  CGSize statusBarSize = (nil == mainStatusBar) ? CGSizeZero : mainStatusBar.frame.size;
+
+#if TARGET_OS_TV
+  CGSize screenSize = app.frame.size;
+#else
+  CGSize screenSize = FBAdjustDimensionsForApplication(app.wdFrame.size, app.interfaceOrientation);
+#endif
+
   return FBResponseWithObject(
                               @{
+    @"screenSize":@{@"width": @(screenSize.width),
+                    @"height": @(screenSize.height)
+    },
     @"statusBarSize": @{@"width": @(statusBarSize.width),
                         @"height": @(statusBarSize.height),
     },

package/WebDriverAgentLib/Info.plist

@@ -15,11 +15,11 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>8.3.1</string>
+    <string>8.4.0</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>8.3.1</string>
+    <string>8.4.0</string>
     <key>NSPrincipalClass</key>
     <string/>
   </dict>

package/WebDriverAgentLib/Utilities/FBScreen.h

@@ -18,11 +18,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (double)scale;
 
-/**
- The absolute size of application's status bar or CGSizeZero if it's hidden or does not exist
- */
-+ (CGSize)statusBarSizeForApplication:(XCUIApplication *)application;
-
 @end
 
 NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Utilities/FBScreen.m

@@ -19,17 +19,4 @@
   return [XCUIScreen.mainScreen scale];
 }
 
-+ (CGSize)statusBarSizeForApplication:(XCUIApplication *)application
-{
-  XCUIApplication *app = XCUIApplication.fb_systemApplication;
-  // Since iOS 13 the status bar is no longer part of the application, it’s part of the SpringBoard
-  XCUIElement *mainStatusBar = app.statusBars.allElementsBoundByIndex.firstObject;
-  if (nil == mainStatusBar) {
-    return CGSizeZero;
-  }
-  CGSize result = mainStatusBar.frame.size;
-  // Workaround for https://github.com/appium/appium/issues/15961
-  return CGSizeMake(MAX(result.width, result.height), MIN(result.width, result.height));
-}
-
 @end

package/WebDriverAgentTests/IntegrationTests/FBScreenTests.m

@@ -28,12 +28,5 @@
   XCTAssertTrue([FBScreen scale] >= 2);
 }
 
-- (void)testStatusBarSize
-{
-  CGSize statusBarSize = [FBScreen statusBarSizeForApplication:self.testedApplication];
-  BOOL statusBarSizeIsZero = CGSizeEqualToSize(CGSizeZero, statusBarSize);
-  XCTAssertFalse(statusBarSizeIsZero);
-}
-
 @end
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "8.3.1",
+  "version": "8.4.0",
   "description": "Package bundling WebDriverAgent",
   "main": "./build/index.js",
   "scripts": {