fix: sctollTo

Author: SvetoslavTsenov

lib/appium-driver.ts

@@ -521,13 +521,15 @@ export class AppiumDriver {
         while ((el === null || !isDisplayed) && retryCount > 0) {
             try {
                 el = await element();
-                isDisplayed = await el.isDisplayed();
+                isDisplayed = el && await el.isDisplayed();
                 if (!isDisplayed) {
-                    await scroll(this._wd, this._driver, direction, this._webio.isIOS, startPoint.y, startPoint.x, offsetPoint.x, offsetPoint.y);
+                    await scroll(this._wd, this._driver, direction, this._webio.isIOS, startPoint.y, startPoint.x, offsetPoint.y, offsetPoint.x);
                     el = null;
                 }
             } catch (error) {
                 console.log("scrollTo Error: " + error);
+                await scroll(this._wd, this._driver, direction, this._webio.isIOS, startPoint.y, startPoint.x, offsetPoint.y, offsetPoint.x);
+                el = null;
             }
 
             retryCount--;

lib/utils.ts

@@ -393,7 +393,7 @@ export function calculateOffset(direction, y: number, yOffset: number, x: number
         duration = Math.abs(yOffset) * speed;
     }
     if (direction === Direction.up) {
-        yEnd = direction * Math.abs((Math.abs(yOffset) + y));
+        yEnd = Math.abs((Math.abs(y - yOffset)));
         duration = Math.abs(yOffset) * speed;
     }