@applitools/driver 1.11.7 → 1.11.9

package/dist/element.js

@@ -53,12 +53,12 @@ class Element {
         if (specUtils.isSimpleCommonSelector(this._selector)) {
             this._commonSelector = this._selector;
         }
-        else if (utils.types.isString(this._selector)) {
-            this._commonSelector = { selector: this._selector };
-        }
         else if (this._selector && this._spec.untransformSelector) {
             this._commonSelector = this._spec.untransformSelector(this._spec.transformSelector(this._selector));
         }
+        else if (utils.types.isString(this._selector)) {
+            this._commonSelector = { selector: this._selector };
+        }
     }
     get target() {
         return this._target;
@@ -338,7 +338,7 @@ class Element {
             }
             else {
                 this._logger.log('Extracting text of native element with selector', this.selector);
-                return this._spec.getElementText(this.driver.target, this.target);
+                return this._spec.getElementText(this.context.target, this.target);
             }
         });
         this._logger.log('Extracted element text', text);
@@ -392,6 +392,7 @@ class Element {
     async scrollTo(offset, options) {
         return this.withRefresh(async () => {
             var _a;
+            this._logger.log(`Scrolling to offset (${offset.x}, ${offset.y}) element with selector`, this.selector);
             offset = utils.geometry.round({ x: Math.max(offset.x, 0), y: Math.max(offset.y, 0) });
             if (this.driver.isWeb) {
                 let actualOffset = await this.context.execute(snippets.scrollTo, [this, offset]);
@@ -483,7 +484,7 @@ class Element {
                     xRemaining -= xRight - xLeft;
                 }
                 // vertical scrolling
-                const yPadding = Math.max(Math.floor(effectiveRegion.height * 0.05), touchPadding + 3);
+                const yPadding = Math.max(Math.floor(effectiveRegion.height * 0.08), touchPadding + 3);
                 const xTrack = Math.floor(effectiveRegion.x + 5); // a little bit off left border
                 const yBottom = effectiveRegion.y + effectiveRegion.height - yPadding;
                 const yDirection = remainingOffset.y > 0 ? 'down' : 'up';
@@ -545,7 +546,7 @@ class Element {
                     }
                 }
                 else if (actions.length > 0) {
-                    await this._spec.performAction(this.driver.target, [].concat(...actions));
+                    await this._spec.performAction(this.driver.target, actions.flat());
                 }
                 const actualScrollableRegion = await this.getClientRegion();
                 this._state.scrollOffset = utils.geometry.offsetNegative(requiredOffset, {
@@ -595,17 +596,13 @@ class Element {
     }
     async type(value) {
         this._logger.log(`Typing text "${value}" in element with selector`, this.selector);
-        await this._spec.type(this.context.target, this.target, value);
+        await this._spec.setElementText(this.context.target, this.target, value);
     }
     async preserveState() {
-        if (this.driver.isNative)
-            return;
-        // TODO create single js snippet
         const scrollOffset = await this.getScrollOffset();
-        const transforms = await this.context.execute(snippets.getElementStyleProperties, [
-            this,
-            ['transform', '-webkit-transform'],
-        ]);
+        const transforms = this.driver.isWeb
+            ? await this.context.execute(snippets.getElementStyleProperties, [this, ['transform', '-webkit-transform']])
+            : null;
         if (!utils.types.has(this._state, ['scrollOffset', 'transforms'])) {
             this._state.scrollOffset = scrollOffset;
             this._state.transforms = transforms;
@@ -613,8 +610,6 @@ class Element {
         return { scrollOffset, transforms };
     }
     async restoreState(state = this._state) {
-        if (this.driver.isNative)
-            return;
         if (state.scrollOffset)
             await this.scrollTo(state.scrollOffset);
         if (state.transforms)

package/dist/helper-android.js

@@ -75,9 +75,6 @@ class HelperAndroid {
         return resourceId.split('/')[1];
     }
     async _command(command) {
-        // clean the input before passing value there could
-        // be a left over from previous async calls
-        await this._input.type('');
         await this._input.type(command);
         await this._input.click();
         let text = await this._input.getText();
@@ -96,7 +93,6 @@ class HelperAndroid {
             this._logger.warn(`Helper library didn't provide a response for async command (${command}) during ${timeout}ms`);
             text = null;
         }
-        await this._input.type('');
         return text;
     }
     async getContentRegion(element, options) {

package/package.json

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

package/types/spec-driver.d.ts

@@ -61,6 +61,8 @@ export interface SpecDriver<TDriver, TContext, TElement, TSelector> {
     findElement(context: TContext, selector: TSelector, parent?: TElement): Promise<TElement | null>;
     findElements(context: TContext, selector: TSelector, parent?: TElement): Promise<TElement[]>;
     waitForSelector?(context: TContext, selector: TSelector, parent?: TElement, options?: WaitOptions): Promise<TElement | null>;
+    setElementText?(context: TContext, element: TElement, text: string): Promise<void>;
+    getElementText?(context: TContext, element: TElement): Promise<string>;
     setWindowSize?(driver: TDriver, size: Size): Promise<void>;
     getWindowSize?(driver: TDriver): Promise<Size>;
     setViewportSize?(driver: TDriver, size: Size): Promise<void>;
@@ -72,7 +74,6 @@ export interface SpecDriver<TDriver, TContext, TElement, TSelector> {
     getUrl(driver: TDriver): Promise<string>;
     takeScreenshot(driver: TDriver): Promise<Buffer | string>;
     click?(context: TContext, element: TElement | TSelector): Promise<void>;
-    type?(context: TContext, element: TElement, value: string): Promise<void>;
     visit?(driver: TDriver, url: string): Promise<void>;
     getOrientation?(driver: TDriver): Promise<ScreenOrientation>;
     setOrientation?(driver: TDriver, orientation: ScreenOrientation): Promise<void>;
@@ -94,7 +95,6 @@ export interface SpecDriver<TDriver, TContext, TElement, TSelector> {
     }>;
     getElementRegion?(driver: TDriver, element: TElement): Promise<Region>;
     getElementAttribute?(driver: TDriver, element: TElement, attr: string): Promise<string>;
-    getElementText?(driver: TDriver, element: TElement): Promise<string>;
     performAction?(driver: TDriver, steps: any[]): Promise<void>;
     getCurrentWorld?(driver: TDriver): Promise<string>;
     getWorlds?(driver: TDriver): Promise<string[]>;