merge with MontFerret/master

Author: =

CHANGELOG.md

@@ -4,7 +4,8 @@
 #### Added
 - DateTime functions.
 - ``PAGINATION`` function.
-- ``SCROLL_TOP`` and ``SCROLL_BOTTOM`` functions.
+- ``SCROLL_TOP``, ``SCROLL_BOTTOM`` and ``SCROLL_ELEMENT`` functions.
+- ``HOVER`` function.
 
 #### Fixed
 - Unable to define variables and make function calls before FILTER, SORT and etc statements.

Gopkg.lock

@@ -43,7 +43,7 @@
 
 [[constraint]]
   name = "github.com/PuerkitoBio/goquery"
-  version = "1.4.1"
+  version = "1.5.0"
 
 [[constraint]]
   name = "github.com/gofrs/uuid"
@@ -55,7 +55,7 @@
 
 [[constraint]]
   name = "github.com/rs/zerolog"
-  version = "1.10.2"
+  version = "1.10.3"
 
 [[constraint]]
   name = "github.com/natefinch/lumberjack"

Gopkg.toml

@@ -1,6 +1,7 @@
 import Layout from './layout.js';
 import IndexPage from './pages/index.js';
 import FormsPage from './pages/forms/index.js';
+import EventsPage from './pages/events/index.js';
 
 const e = React.createElement;
 const Router = ReactRouter.Router;
@@ -21,7 +22,11 @@ export default function AppComponent({ redirect = null}) {
                 e(Route, {
                     path: '/forms',
                     component: FormsPage
-                })
+                }),
+                e(Route, {
+                    path: '/events',
+                    component: EventsPage
+                }),
             ]),
             redirect ? e(Redirect, { to: redirect }) : null
         ])

e2e/pages/dynamic/components/app.js

@@ -0,0 +1,52 @@
+const e = React.createElement;
+
+export default class HoverableComponent extends React.PureComponent {
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            hovered: false
+        };
+    }
+
+    handleMouseEnter() {
+        this.setState({
+            hovered: true
+        });
+    }
+
+    handleMouseLeave() {
+        this.setState({
+            hovered: false
+        });
+    }
+
+    render() {
+        const children = [];
+        children.push(
+            e("p", null, [
+                e("a", {
+                    id: "hoverable-btn",
+                    className: "btn btn-primary",
+                    href: "#",
+                    onMouseEnter: this.handleMouseEnter.bind(this),
+                    onMouseLeave: this.handleMouseLeave.bind(this)
+                }, [
+                    "Hoverable link"
+                ]),
+            ])
+        );
+
+        if (this.state.hovered) {
+            children.push(
+                e("div", null, [
+                    e("div", { id: "hoverable-content", className: "card card-body"}, [
+                        "Lorem ipsum dolor sit amet."
+                    ])
+                ])
+            )
+        }
+
+        return e("div", null, children);
+    }
+}

e2e/pages/dynamic/components/pages/events/hoverable.js

@@ -0,0 +1,13 @@
+import Hoverable from "./hoverable.js";
+
+const e = React.createElement;
+
+export default class EventsPage extends React.Component {
+    render() {
+        return e("div", { className: "row", id: "page-events" }, [
+            e("div", { className: "col-lg-12"}, [
+                e(Hoverable)
+            ])
+        ])
+    }
+}

e2e/pages/dynamic/components/pages/events/index.js

@@ -45,7 +45,7 @@ export default class FormsPage extends React.Component {
     }
 
     render() {
-        return e("form", null, [
+        return e("form", { id: "page-form" }, [
             e("div", { className: "form-group" }, [
                 e("label", null, "Text input"),
                 e("input", {

e2e/pages/dynamic/components/pages/forms/index.js

@@ -0,0 +1,11 @@
+LET url = @dynamic + "?redirect=/events"
+LET doc = DOCUMENT(url, true)
+
+WAIT_ELEMENT(doc, "#page-events")
+
+HOVER(doc, "#hoverable-btn")
+WAIT_ELEMENT(doc, "#hoverable-content")
+
+LET output = INNER_TEXT(doc, "#hoverable-content")
+
+RETURN EXPECT(output, "Lorem ipsum dolor sit amet.")

e2e/tests/doc_hover_d.fql

@@ -0,0 +1,13 @@
+LET url = @dynamic + "?redirect=/events"
+LET doc = DOCUMENT(url, true)
+
+WAIT_ELEMENT(doc, "#page-events")
+
+LET input = ELEMENT(doc, "#hoverable-btn")
+
+HOVER(input)
+WAIT_ELEMENT(doc, "#hoverable-content")
+
+LET output = ELEMENT(doc, "#hoverable-content")
+
+RETURN EXPECT(output.innerText, "Lorem ipsum dolor sit amet.")

e2e/tests/el_hover_d.fql

@@ -3,6 +3,7 @@ package dynamic
 import (
 	"context"
 	"fmt"
+	"github.com/mafredri/cdp/protocol/dom"
 	"hash/fnv"
 	"sync"
 	"time"
@@ -531,6 +532,45 @@ func (doc *HTMLDocument) SelectBySelector(selector values.String, value *values.
 	return nil, core.TypeError(core.ArrayType, res.Type())
 }
 
+func (doc *HTMLDocument) HoverBySelector(selector values.String) error {
+	ctx, cancel := contextWithTimeout()
+	defer cancel()
+
+	err := doc.ScrollBySelector(selector)
+
+	if err != nil {
+		return err
+	}
+
+	selectorArgs := dom.NewQuerySelectorArgs(doc.element.id.nodeID, selector.String())
+	found, err := doc.client.DOM.QuerySelector(ctx, selectorArgs)
+
+	if err != nil {
+		doc.element.logError(err).
+			Str("selector", selector.String()).
+			Msg("failed to retrieve a node by selector")
+
+		return err
+	}
+
+	if found.NodeID <= 0 {
+		return errors.New("element not found")
+	}
+
+	q, err := getClickablePoint(ctx, doc.client, &HTMLElementIdentity{
+		nodeID: found.NodeID,
+	})
+
+	if err != nil {
+		return err
+	}
+
+	return doc.client.Input.DispatchMouseEvent(
+		ctx,
+		input.NewDispatchMouseEventArgs("mouseMoved", q.X, q.Y),
+	)
+}
+
 func (doc *HTMLDocument) WaitForSelector(selector values.String, timeout values.Int) error {
 	task := events.NewEvalWaitTask(
 		doc.client,
@@ -815,7 +855,7 @@ func (doc *HTMLDocument) ScrollTop() error {
 		window.scrollTo({
 			left: 0,
 			top: 0,
-    		behavior: 'smooth'
+    		behavior: 'instant'
   		});
 	`, false, false)
 
@@ -827,13 +867,32 @@ func (doc *HTMLDocument) ScrollBottom() error {
 		window.scrollTo({
 			left: 0,
 			top: window.document.body.scrollHeight,
-    		behavior: 'smooth'
+    		behavior: 'instant'
   		});
 	`, false, false)
 
 	return err
 }
 
+func (doc *HTMLDocument) ScrollBySelector(selector values.String) error {
+	_, err := eval.Eval(doc.client, fmt.Sprintf(`
+		var el = document.querySelector(%s);
+
+		if (el == null) {
+			throw new Error("element not found");
+		}
+
+		el.scrollIntoView({
+    		behavior: 'instant'
+  		});
+
+		return true;
+	`, eval.ParamString(selector.String()),
+	), false, false)
+
+	return err
+}
+
 func (doc *HTMLDocument) handlePageLoad(_ interface{}) {
 	doc.Lock()
 	defer doc.Unlock()