@applitools/screenshoter 3.7.1 → 3.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/screenshoter",
-  "version": "3.7.1",
+  "version": "3.7.3",
   "description": "Applitools universal screenshoter for web and native applications",
   "keywords": [
     "applitools",
@@ -72,18 +72,18 @@
     }
   },
   "dependencies": {
-    "@applitools/image": "1.0.4",
-    "@applitools/logger": "1.1.27",
+    "@applitools/image": "1.0.6",
+    "@applitools/logger": "1.1.28",
     "@applitools/snippets": "2.4.6",
-    "@applitools/utils": "1.3.13",
+    "@applitools/utils": "1.3.14",
     "jpeg-js": "0.4.4",
     "png-async": "0.9.4"
   },
   "devDependencies": {
     "@applitools/bongo": "^2.2.0",
-    "@applitools/driver": "^1.11.1",
+    "@applitools/driver": "^1.11.2",
     "@applitools/scripts": "^1.2.0",
-    "@applitools/spec-driver-webdriverio": "^1.4.2",
+    "@applitools/spec-driver-webdriverio": "^1.4.3",
     "@applitools/test-utils": "^1.5.2",
     "appium": "^1.22.3",
     "chromedriver": "^101.0.0",

package/src/calculate-screenshot-region.js

@@ -3,15 +3,8 @@ const utils = require('@applitools/utils')
 function calculateScreenshotRegion({cropRegion, stitchedImage, preMoveOffset, postMoveOffset} = {}) {
   cropRegion = !!cropRegion ? cropRegion : {x: 0, y: 0}
   const screenshotRegion = utils.geometry.region(cropRegion, stitchedImage.size)
-
-  if (JSON.stringify(preMoveOffset) === JSON.stringify(postMoveOffset)) return screenshotRegion
   const moveOffset = utils.geometry.offsetNegative(postMoveOffset, preMoveOffset)
-  const compensatedScreenshotRegion = utils.geometry.offset(screenshotRegion, moveOffset)
-
-  if (preMoveOffset.y === postMoveOffset.y && preMoveOffset.x !== postMoveOffset.x)
-    compensatedScreenshotRegion.x = preMoveOffset.x
-
-  return compensatedScreenshotRegion
+  return utils.geometry.offset(screenshotRegion, moveOffset)
 }
 
 module.exports = calculateScreenshotRegion

package/src/{extract-coodinates-for-selectors-and-elements.js → extract-coordinates-for-selectors-and-elements.js}

@@ -1,7 +1,13 @@
 const utils = require('@applitools/utils')
 
-async function extractCoodinatesForSelectorsAndElements({regionsToCalculate, screenshot, context}) {
+async function extractCoordinatesForSelectorsAndElements({regionsToCalculate, screenshot, context, logger}) {
   const codedRegionsByCoordinates = []
+  if (!regionsToCalculate.length) {
+    logger.log('no coded regions to calculate, done')
+    return codedRegionsByCoordinates
+  }
+  logger.log('calculating coordinates for coded regions that need them')
+  logger.log('regions to calculate', regionsToCalculate)
   for (const codedRegion of regionsToCalculate) {
     if (codedRegion) {
       const {region} = codedRegion.region ? codedRegion : {region: codedRegion}
@@ -21,15 +27,20 @@ async function extractCoodinatesForSelectorsAndElements({regionsToCalculate, scr
             },
             context.driver.viewportScale,
           )
-          scaledRegions.push({region: scaledRegion})
+          logger.log('scaled region', scaledRegion)
+          scaledRegions.push(scaledRegion)
         }
-        codedRegionsByCoordinates.push({regions: scaledRegions, commonSelector: elements[0].commonSelector})
+        codedRegionsByCoordinates.push({
+          regions: scaledRegions,
+          selector: elements[0].commonSelector,
+        })
       } else {
         codedRegionsByCoordinates.push({regions: []})
       }
     }
   }
+  logger.log('calculated coordinates for coded regions done', codedRegionsByCoordinates)
   return codedRegionsByCoordinates
 }
 
-module.exports = extractCoodinatesForSelectorsAndElements
+module.exports = extractCoordinatesForSelectorsAndElements

package/src/take-screenshot.js

@@ -3,7 +3,7 @@ const getTarget = require('./get-target')
 const scrollIntoViewport = require('./scroll-into-viewport')
 const takeStitchedScreenshot = require('./take-stitched-screenshot')
 const takeSimpleScreenshot = require('./take-simple-screenshot')
-const extractCoodinatesForSelectorsAndElements = require('./extract-coodinates-for-selectors-and-elements')
+const extractCoordinatesForSelectorsAndElements = require('./extract-coordinates-for-selectors-and-elements')
 
 async function takeScreenshot({
   driver,
@@ -92,7 +92,12 @@ async function takeScreenshot({
 
   screenshot.image.scale(driver.viewportScale)
 
-  const calculatedRegions = await extractCoodinatesForSelectorsAndElements({regionsToCalculate, screenshot, context})
+  const calculatedRegions = await extractCoordinatesForSelectorsAndElements({
+    regionsToCalculate,
+    screenshot,
+    context,
+    logger,
+  })
 
   if (hooks && hooks.afterScreenshot) {
     await hooks.afterScreenshot({driver, scroller: target.scroller, screenshot})

package/src/take-stitched-screenshot.js

@@ -145,6 +145,7 @@ async function takeStitchedScreenshot({
     stitchedImage.copy(image, pasteOffset)
   }
 
+  logger.verbose('restoring scroller state', scrollerState)
   await scroller.restoreState(scrollerState)
 
   await stitchedImage.debug({...debug, name: 'stitched'})