fix: add global click handler for navigation

flow-plugins/flow-maven-plugin/src/it/flow-addon/src/main/fake-resources/com/vaadin/flow/server/frontend/Flow.tsx

@@ -15,4 +15,5 @@
  */
 
 // Resource loaded from project dependency
-export const serverSideRoutes = []
+export const serverSideRoutes = [];
+export const registerGlobalClickHandler = () => {};

flow-server/src/main/resources/com/vaadin/flow/server/frontend/Flow.tsx

@@ -29,6 +29,10 @@ const router = {
     }
 };
 
+const flowReact : { active: boolean } = {
+    active: false,
+}
+
 // ClickHandler for vaadin-router-go event is copied from vaadin/router click.js
 // @ts-ignore
 function getAnchorOrigin(anchor) {
@@ -55,7 +59,7 @@ function normalizeURL(url: URL): void | string {
     return '/' + url.href.slice(document.baseURI.length);
 }
 
-function extractPath(event: MouseEvent): void | string {
+function extractURL(event: MouseEvent): void | URL {
     // ignore the click if the default action is prevented
     if (event.defaultPrevented) {
         return;
@@ -131,9 +135,45 @@ function extractPath(event: MouseEvent): void | string {
         return;
     }
 
-    return normalizeURL(new URL(anchor.href, anchor.baseURI));
+    return new URL(anchor.href, anchor.baseURI);
 }
 
+function extractPath(event: MouseEvent): void | string {
+    const url = extractURL(event);
+    if (!url) {
+        return;
+    }
+    return normalizeURL(url);
+}
+
+export const registerGlobalClickHandler = () => {
+    window.addEventListener('click', (event: MouseEvent) => {
+        if (flowReact.active) {
+            return;
+        }
+        const url = extractURL(event);
+        if (!url) {
+            return;
+        }
+        // ignore click if baseURI does not match the document (external)
+        if (!url.href.startsWith(document.baseURI)) {
+            return;
+        }
+        if (event && event.preventDefault) {
+            event.preventDefault();
+        }
+
+        // Normalize path against baseURI
+        const path = url.pathname + url.search + url.hash;
+        const state = {...window.history.state}
+        if (state.idx !== undefined) {
+            state.idx = state.idx + 1;
+        }
+        window.history.pushState(state, '', path);
+        window.dispatchEvent(new PopStateEvent('popstate'));
+    }, { capture: false });
+};
+
 /**
  * Fire 'vaadin-navigated' event to inform components of navigation.
  * @param pathname pathname of navigation
@@ -352,7 +392,6 @@ function Flow() {
             if (event && event.preventDefault) {
                 event.preventDefault();
             }
-
             navigated.current = false;
             // When navigation is triggered by click on a link, fromAnchor is set to true
             // in order to get a server round-trip even when navigating to the same URL again
@@ -417,10 +456,15 @@ function Flow() {
     }, [vaadinRouterGoEventHandler, vaadinNavigateEventHandler]);
 
     useEffect(() => {
+        window.addEventListener('click', navigateEventHandler);
+        flowReact.active = true;
+
         return () => {
             containerRef.current?.parentNode?.removeChild(containerRef.current);
             containerRef.current?.removeEventListener('flow-portal-add', addPortalEventHandler as EventListener);
             containerRef.current = undefined;
+            window.removeEventListener('click', navigateEventHandler);
+            flowReact.active = false;
         };
     }, []);
 
@@ -533,7 +577,6 @@ function Flow() {
                 if (outlet && outlet !== container.parentNode) {
                     outlet.append(container);
                     container.addEventListener('flow-portal-add', addPortalEventHandler as EventListener);
-                    window.addEventListener('click', navigateEventHandler);
                     containerRef.current = container;
                 }
                 return container.onBeforeEnter?.call(

flow-server/src/main/resources/com/vaadin/flow/server/frontend/vaadin-react.tsx

@@ -1,7 +1,9 @@
 import { routes } from "%routesJsImportPath%";
+import { registerGlobalClickHandler } from "Frontend/generated/flow/Flow.js";
 
 (window as any).Vaadin ??= {};
 (window as any).Vaadin.routesConfig = routes;
+registerGlobalClickHandler();
 
 export { routes as forHMROnly };