@applitools/driver 1.8.7 → 1.8.10

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,14 @@ 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);
+            // TODO revisit
+            if ((utils.geometry.contains(contextRegion, region) || !currentContext.isMain) &&
+                !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

@@ -97,6 +97,26 @@ class Element {
             return this._spec.isEqualElements(this.context.target, this.target, element);
         }
     }
+    async contains(innerElement) {
+        const contains = await this.withRefresh(async () => {
+            innerElement = innerElement instanceof Element ? innerElement.target : innerElement;
+            if (this.driver.isWeb) {
+                this._logger.log('Checking if web element with selector', this.selector, 'contains element', innerElement);
+                return false; // TODO implement a s snipped for web
+            }
+            else {
+                this._logger.log('Checking if native element with selector', this.selector, 'contains element', innerElement);
+                // appium doesn't have a way to check if an element is contained in another element, so juristic applied
+                if (await this.equals(innerElement))
+                    return false;
+                // if inner element region is located contained in the this element region, then it is contained
+                const region = await this._spec.getElementRegion(this.driver.target, this.target);
+                const innerRegion = await this._spec.getElementRegion(this.driver.target, innerElement);
+                return utils.geometry.contains(region, innerRegion);
+            }
+        });
+        return contains;
+    }
     async init(context) {
         this._context = context;
         this._logger = context._logger;
@@ -121,8 +141,11 @@ class Element {
                 const region = await this._spec.getElementRegion(this.driver.target, this.target);
                 this._logger.log('Extracted native region', region);
                 const normalizedRegion = await this.driver.normalizeRegion(region);
-                const contextScrollingElement = await this.context.getScrollingElement();
-                return utils.geometry.offset(normalizedRegion, await contextScrollingElement.getScrollOffset());
+                // if element is a child of scrolling element, then region location should be adjusted
+                const scrollingElement = await this.context.getScrollingElement();
+                return (await (scrollingElement === null || scrollingElement === void 0 ? void 0 : scrollingElement.contains(this)))
+                    ? utils.geometry.offset(normalizedRegion, await scrollingElement.getScrollOffset())
+                    : normalizedRegion;
             }
         });
         this._logger.log('Extracted region', region);

package/dist/spec-utils.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.splitSelector = exports.transformSelector = exports.isSelector = exports.isCommonSelector = void 0;
+exports.withFastCache = exports.splitSelector = exports.transformSelector = exports.isSelector = exports.isCommonSelector = void 0;
 const utils = __importStar(require("@applitools/utils"));
 function isCommonSelector(spec, selector) {
     return (utils.types.isPlainObject(selector) &&
@@ -79,3 +79,24 @@ function splitSelector(spec, selector) {
     return { contextSelectors, elementSelector };
 }
 exports.splitSelector = splitSelector;
+function withFastCache(spec) {
+    const cache = new Map();
+    return Object.entries(spec).reduce((spec, [name, command]) => {
+        spec[name] = (...args) => {
+            const value = cache.get(command);
+            if ((value === null || value === void 0 ? void 0 : value.args.length) === args.length && value.args.every((arg, index) => arg === args[index])) {
+                return value.result;
+            }
+            else {
+                cache.delete(command);
+            }
+            const result = command(...args);
+            if (!(result instanceof Promise))
+                return result;
+            cache.set(command, { args, result });
+            return result.finally(() => setImmediate(() => cache.delete(command)));
+        };
+        return spec;
+    }, {});
+}
+exports.withFastCache = withFastCache;

package/package.json

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

package/types/element.d.ts

@@ -31,6 +31,7 @@ export declare class Element<TDriver, TContext, TElement, TSelector> {
     get driver(): import("./driver").Driver<TDriver, TContext, TElement, TSelector>;
     get isRef(): boolean;
     equals(element: Element<TDriver, TContext, TElement, TSelector> | TElement): Promise<boolean>;
+    contains(innerElement: Element<TDriver, TContext, TElement, TSelector> | TElement): Promise<boolean>;
     init(context: Context<TDriver, TContext, TElement, TSelector>): Promise<this>;
     getRegion(): Promise<types.Region>;
     getClientRegion(): Promise<types.Region>;

package/types/spec-utils.d.ts

@@ -17,4 +17,5 @@ export declare function splitSelector<TSelector>(spec: Pick<types.SpecDriver<unk
     contextSelectors: types.Selector<TSelector>[];
     elementSelector: types.Selector<TSelector>;
 };
+export declare function withFastCache<TSpecDriver extends types.SpecDriver<unknown, unknown, unknown, unknown>>(spec: TSpecDriver): TSpecDriver;
 export {};