@applitools/driver 1.8.6 → 1.8.9

package/dist/context.js

@@ -470,6 +470,7 @@ class Context {
     async getRegionInViewport(region) {
         var _a, _b;
         let currentContext = this;
+        this._logger.log('Converting context region to viewport region', region);
         if (region)
             region = utils.geometry.offsetNegative(region, await currentContext.getInnerOffset());
         else
@@ -478,9 +479,12 @@ class Context {
             const contextRegion = await currentContext.getClientRegion();
             // const contextScrollingRegion = await currentContext.getScrollingRegion()
             const parentContextInnerOffset = (_b = (await ((_a = currentContext.parent) === null || _a === void 0 ? void 0 : _a.getInnerOffset()))) !== null && _b !== void 0 ? _b : { x: 0, y: 0 };
-            region = utils.geometry.intersect(contextRegion, utils.geometry.offset(region, contextRegion));
-            // region = utils.geometry.intersect(contextScrollingRegion, region)
-            region = utils.geometry.offsetNegative(region, parentContextInnerOffset);
+            if (utils.geometry.contains(contextRegion, region) && !utils.geometry.equals(contextRegion, region)) {
+                this._logger.log('Intersecting context region', region, 'with context region', contextRegion);
+                region = utils.geometry.intersect(contextRegion, utils.geometry.offset(region, contextRegion));
+                // region = utils.geometry.intersect(contextScrollingRegion, region)
+                region = utils.geometry.offsetNegative(region, parentContextInnerOffset);
+            }
             currentContext = currentContext.parent;
         }
         return region;

package/dist/driver.js

@@ -191,6 +191,10 @@ class Driver {
                     if (barsSize.navigationBarHeight / this.pixelRatio < displaySize.height) {
                         this._driverInfo.navigationBarHeight = Math.max((_u = this._driverInfo.navigationBarHeight) !== null && _u !== void 0 ? _u : 0, barsSize.navigationBarHeight);
                     }
+                    else {
+                        // if navigation bar height is bigger then display height he can use it to reset display height
+                        displaySize.height = barsSize.navigationBarHeight / this.pixelRatio;
+                    }
                     // bar heights have to be scaled on android
                     (_3 = this._driverInfo).statusBarHeight && (_3.statusBarHeight = this._driverInfo.statusBarHeight / this.pixelRatio);
                     (_4 = this._driverInfo).navigationBarHeight && (_4.navigationBarHeight = this._driverInfo.navigationBarHeight / this.pixelRatio);

package/dist/element.js

@@ -120,7 +120,16 @@ class Element {
                 this._logger.log('Extracting region of native element with selector', this.selector);
                 const region = await this._spec.getElementRegion(this.driver.target, this.target);
                 this._logger.log('Extracted native region', region);
-                return this.driver.normalizeRegion(region);
+                const normalizedRegion = await this.driver.normalizeRegion(region);
+                // if element is a child of scrolling element, then region location should be adjusted
+                const scrollingElement = await this.context.getScrollingElement();
+                if (scrollingElement) {
+                    const scrollingRegion = await this._spec.getElementRegion(this.driver.target, scrollingElement.target);
+                    if (utils.geometry.contains(scrollingRegion, region) && !(await this.equals(scrollingElement))) {
+                        return utils.geometry.offset(normalizedRegion, await scrollingElement.getScrollOffset());
+                    }
+                }
+                return normalizedRegion;
             }
         });
         this._logger.log('Extracted region', region);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/driver",
-  "version": "1.8.6",
+  "version": "1.8.9",
   "description": "Applitools universal framework wrapper",
   "keywords": [
     "applitools",