revert: Revert "fix: Fix click count in TestBenchElement#click() (#2120) (#2125) (#2130)

* revert: Revert "fix: Fix click count in TestBenchElement#click() (#2120) (#2125)"

This reverts commit 7ec04dc.

* update workflow for mainteannce branch

---------

Co-authored-by: Zhe Sun <31067185+ZheSun88@users.noreply.github.com>

Author: mcollovati

.github/workflows/validation.yml

@@ -1,9 +1,9 @@
 name: TestBench Validation
 
 on:
-  pull_request_target:
+  pull_request:
     branches:
-      - main
+      - 10.0
     types: [opened, synchronize, reopened, edited]
   workflow_dispatch:
 

vaadin-testbench-integration-tests/src/main/java/com/vaadin/testUI/ButtonView.java

@@ -191,9 +191,23 @@ public boolean isFocused() {
 
     @Override
     public void click() {
-        autoScrollIntoView();
-        waitForVaadin();
-        new Actions(getDriver()).click(wrappedElement).build().perform();
+        // JS call to click does not focus element, hence ensure focus
+        focus();
+        try {
+            // Avoid strange "element not clickable at point" problems
+            callFunction("click");
+        } catch (Exception e) {
+            if (e.getMessage()
+                    .contains("Inspected target navigated or closed")) {
+                // This happens with chromedriver although e.g. navigation
+                // succeeds
+                return;
+            }
+            // SVG elements and maybe others do not have a 'click' method
+            autoScrollIntoView();
+            waitForVaadin();
+            wrappedElement.click();
+        }
     }
 
     @Override
@@ -349,20 +363,12 @@ public void click(int x, int y, Keys... modifiers) {
         actions.build().perform();
     }
 
-    /**
-     * Performs a double-click action on this element.
-     *
-     * @see click()
-     */
     public void doubleClick() {
         autoScrollIntoView();
         waitForVaadin();
         new Actions(getDriver()).doubleClick(wrappedElement).build().perform();
     }
 
-    /**
-     * Performs a context-click (right click) action on this element.
-     */
     public void contextClick() {
         autoScrollIntoView();
         waitForVaadin();
@@ -514,20 +520,7 @@ public boolean compareScreen(BufferedImage reference, String referenceName)
                 (TakesScreenshot) this, (HasCapabilities) getDriver());
     }
 
-    /**
-     * Scrolls the element into the visible area of the browser window with the
-     * given options. Check
-     * https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollIntoView
-     * for more information on the options.
-     *
-     * @param options
-     *            the parameters for scrolling into view
-     */
-    public void scrollIntoView(Map<String, Object> options) {
-        callFunction("scrollIntoView", options);
-    }
-
-    /**
+    /***
      * Scrolls the element into the visible area of the browser window
      */
     public void scrollIntoView() {
@@ -541,65 +534,15 @@ public void scrollIntoView() {
      */
     private void autoScrollIntoView() {
         try {
-            if (getCommandExecutor().isAutoScrollIntoView()
-                    && !isElementInViewport()) {
-                var params = Map.<String, Object> of("block", "end", "inline",
-                        "end");
-                scrollIntoView(params);
+            if (getCommandExecutor().isAutoScrollIntoView()) {
+                if (!wrappedElement.isDisplayed()) {
+                    scrollIntoView();
+                }
             }
         } catch (Exception e) {
         }
     }
 
-    private boolean isElementInViewport() {
-        try {
-            Boolean result = (Boolean) executeScript(
-                    """
-                            function isVisible(elem) {
-                              // Check if element has zero dimensions (truly hidden)
-                              if (!elem.offsetParent && elem.offsetWidth === 0 && elem.offsetHeight === 0) {
-                                return false;
-                              }
-
-                              var rect = elem.getBoundingClientRect();
-                              if (rect.width === 0 || rect.height === 0) {
-                                return false;
-                              }
-
-                              // Check if element intersects with viewport
-                              var windowHeight = window.innerHeight || document.documentElement.clientHeight;
-                              var windowWidth = window.innerWidth || document.documentElement.clientWidth;
-                              if (rect.bottom < 0 || rect.top > windowHeight || rect.right < 0 || rect.left > windowWidth) {
-                                return false;
-                              }
-
-                              // Check if clipped by any scrollable ancestor
-                              var parent = elem.parentElement;
-                              while (parent && parent !== document.body) {
-                                var style = window.getComputedStyle(parent);
-                                var overflow = style.overflow + style.overflowX + style.overflowY;
-
-                                if (overflow.includes('hidden') || overflow.includes('scroll') || overflow.includes('auto')) {
-                                  var parentRect = parent.getBoundingClientRect();
-                                  // Check if element is outside parent's visible area
-                                  if (rect.bottom < parentRect.top || rect.top > parentRect.bottom ||
-                                      rect.right < parentRect.left || rect.left > parentRect.right) {
-                                    return false;
-                                  }
-                                }
-                                parent = parent.parentElement;
-                              }
-                              return true;
-                            }
-                            return isVisible(arguments[0]);
-                            """,
-                    this);
-            return result != null && result;
-        } catch (Exception e) {
-            return true; // Assume visible on error
-        }
-    }
-
     /**
      * Waits the given number of seconds for the given condition to become
      * neither null nor false. {@link NotFoundException}s are ignored by