@applitools/screenshoter 3.3.13 → 3.3.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/screenshoter",
-  "version": "3.3.13",
+  "version": "3.3.16",
   "description": "Applitools universal screenshoter for web and native applications",
   "keywords": [
     "applitools",
@@ -35,7 +35,7 @@
     "test": "yarn test:it && yarn test:e2e",
     "test:unit": "mocha ./test/unit/*.spec.js --no-timeouts",
     "test:it": "mocha ./test/it/*.spec.js --no-timeouts",
-    "test:e2e": "mocha ./test/e2e/**/*.spec.js --no-timeouts --parallel --jobs ${MOCHA_JOBS:-1}",
+    "test:e2e": "yarn test:e2e:web && yarn && test:e2e:android && yarn test:e2e:ios",
     "test:e2e:web": "APPLITOOLS_SHOW_LOGS=true mocha ./test/e2e/web/*.spec.js --no-timeouts -r @applitools/test-utils/mocha-hooks/docker",
     "test:e2e:android": "APPLITOOLS_TEST_REMOTE=sauce mocha ./test/e2e/android*/*.spec.js --no-timeouts --parallel --jobs ${MOCHA_JOBS:-2}",
     "test:e2e:ios": "APPLITOOLS_TEST_REMOTE=sauce mocha ./test/e2e/ios*/*.spec.js --no-timeouts --parallel --jobs ${MOCHA_JOBS:-2}",
@@ -61,15 +61,15 @@
   },
   "dependencies": {
     "@applitools/snippets": "2.2.2",
-    "@applitools/utils": "1.2.13",
+    "@applitools/utils": "1.2.14",
     "png-async": "0.9.4"
   },
   "devDependencies": {
-    "@applitools/driver": "1.5.5",
+    "@applitools/bongo": "^2.0.3",
+    "@applitools/driver": "1.7.0",
     "@applitools/scripts": "1.1.0",
-    "@applitools/sdk-release-kit": "1.0.4",
     "@applitools/spec-driver-webdriverio": "1.2.8",
-    "@applitools/test-utils": "1.1.5",
+    "@applitools/test-utils": "1.3.1",
     "appium": "^1.22.2",
     "chromedriver": "^95.0.0",
     "eslint": "^7.9.0",

package/src/getTarget.js

@@ -2,6 +2,28 @@
 
 const utils = require('@applitools/utils')
 
+function isNavigationBar(region) {
+  if (
+    (region.value && region.value.includes(`type == "XCUIElementTypeNavigationBar"`)) ||
+    (region.selector && region.selector.includes(`type == "XCUIElementTypeNavigationBar"`))
+  ) {
+    return true
+  } else {
+    return false
+  }
+}
+
+function isTabBar(region) {
+  if (
+    (region.value && region.value.includes('type == "XCUIElementTypeTabBar"')) ||
+    (region.selector && region.selector.includes(`type == "XCUIElementTypeTabBar"`))
+  ) {
+    return true
+  } else {
+    return false
+  }
+}
+
 async function getTarget({window, context, region, fully, scrollingMode}) {
   if (window) {
     // window/app
@@ -41,9 +63,11 @@ async function getTarget({window, context, region, fully, scrollingMode}) {
         }
       } else {
         const scrollingElement = await context.getScrollingElement()
+        const navBar = isNavigationBar(region)
+        const tabBar = isTabBar(region)
         return {
           context: elementContext,
-          region: await element.getRegion(),
+          region: await element.getRegion(navBar || tabBar),
           scrollingElement,
         }
       }

package/src/take-viewport-screenshot.js

@@ -163,7 +163,18 @@ function makeTakeNativeScreenshot({driver, stabilization = {}, debug, logger}) {
       const viewportSize = await driver.getViewportSize()
       const cropRegion = withStatusBar
         ? {x: 0, y: 0, width: viewportSize.width, height: viewportSize.height + driver.statusBarHeight}
-        : {top: driver.statusBarHeight, bottom: driver.navigationBarHeight, left: 0, right: 0}
+        : {
+            top: driver.statusBarHeight,
+            bottom: driver.orientation === 'landscape' ? 0 : driver.navigationBarHeight,
+            left:
+              driver.isAndroid && driver.orientation === 'landscape' && driver.platformVersion > 7
+                ? driver.navigationBarHeight
+                : 0,
+            right:
+              driver.isAndroid && driver.orientation === 'landscape' && driver.platformVersion < 8
+                ? driver.navigationBarHeight
+                : 0,
+          }
       image.crop(cropRegion)
     }