additional logging

Author: SvetoslavTsenov

lib/direction.d.ts

@@ -1,4 +1,4 @@
-export declare const enum Direction {
+export declare enum Direction {
     down = 0,
     up = 1,
     left = 2,

lib/direction.ts

@@ -1,4 +1,4 @@
-export const enum Direction {
+export enum Direction {
     down,
     up,
     left,

lib/ui-element.d.ts

@@ -166,15 +166,15 @@ export declare class UIElement {
     * Swipe element left/right
     * @param direction
     */
-    swipe(direction: "up" | "down" | "left" | "right"): Promise<void>;
+    swipe(direction: Direction): Promise<void>;
     /**
     * Drag element with specific offset
     * @experimental
     * @param direction
     * @param yOffset
     * @param xOffset - default value 0
     */
-    drag(direction: Direction, yOffset: number, xOffset?: number): Promise<void>;
+    drag(direction: Direction, yOffset: number, xOffset?: number, duration?: number): Promise<void>;
     /**
     *@experimental
     * Pan element with specific offset

lib/ui-element.ts

@@ -452,26 +452,17 @@ export class UIElement {
     * Swipe element left/right
     * @param direction
     */
-    public async swipe(direction: "up" | "down" | "left" | "right") {
-        logInfo(`Swipe direction: `, direction);
+    public async swipe(direction: Direction) {
+        logInfo(`Swipe direction: `, Direction[direction]);
         if (this._args.isIOS) {
             await this._driver
                 .execute('mobile: scroll', {
                     element: <any>this._element.value,
-                    direction: direction
+                    direction: Direction[direction]
                 });
         } else {
             try {
-                let scrollDirection = Direction.up;
-                switch (direction) {
-                    case "down": scrollDirection = Direction.down;
-                        break;
-                    case "left": scrollDirection = Direction.left;
-                        break;
-                    case "right": scrollDirection = Direction.right;
-                        break;
-                }
-                await this.scroll(scrollDirection);
+                await this.scroll(direction);
             } catch (error) {
                 console.log("", error);
             }
@@ -486,13 +477,16 @@ export class UIElement {
     * @param yOffset 
     * @param xOffset - default value 0
     */
-    public async drag(direction: Direction, yOffset: number, xOffset: number = 0) {
+    public async drag(direction: Direction, yOffset: number, xOffset: number = 0, duration?: number) {
+        direction = direction === Direction.up ? Direction.down : Direction.up;
+
         const location = await this.location();
 
         const x = location.x === 0 ? 10 : location.x;
         const y = location.y === 0 ? 10 : location.y;
 
         const endPoint = calculateOffset(direction, y, yOffset, x, xOffset, this._args.isIOS);
+        duration = duration || endPoint.duration;
 
         if (this._args.isAndroid) {
             let action = new this._wd.TouchAction(this._driver);

lib/utils.ts

@@ -420,10 +420,10 @@ export function calculateOffset(direction, y: number, yOffset: number, x: number
     if (yOffset < xOffset) {
         duration = Math.abs(xOffset) * speed;
     }
-    // }
-    logInfo("Start point point: ", new Point(x, y));
+
+    logInfo("Start point: ", new Point(x, y));
     logInfo("End point: ", new Point(xEnd, yEnd));
-    logInfo("Scrolling speed point: ", duration);
+    logInfo("Scrolling speed: ", duration);
 
     return {
         startPoint: new Point(x, y),