fix(city): nav handling

also:
- remove unused context
- listen on document for click handler, sometimes body is missing

Author: wmertens

packages/qwik-city/src/runtime/src/contexts.ts

@@ -7,7 +7,6 @@ import type {
   RouteLocation,
   RouteNavigate,
   RoutePreventNavigate,
-  RouteStateInternal,
 } from './types';
 
 export const RouteStateContext = /*#__PURE__*/ createContextId<Record<string, any>>('qc-s');
@@ -24,8 +23,5 @@ export const RouteNavigateContext = /*#__PURE__*/ createContextId<RouteNavigate>
 
 export const RouteActionContext = /*#__PURE__*/ createContextId<RouteAction>('qc-a');
 
-export const RouteInternalContext =
-  /*#__PURE__*/ createContextId<Signal<RouteStateInternal>>('qc-ir');
-
 export const RoutePreventNavigateContext =
   /*#__PURE__*/ createContextId<RoutePreventNavigate>('qc-p');

packages/qwik-city/src/runtime/src/qwik-city-component.tsx

@@ -23,7 +23,6 @@ import {
   ContentInternalContext,
   DocumentHeadContext,
   RouteActionContext,
-  RouteInternalContext,
   RouteLocationContext,
   RouteNavigateContext,
   RoutePreventNavigateContext,
@@ -229,7 +228,7 @@ export const QwikCityProvider = component$<QwikCityProps>((props) => {
     // The initial value of routeInternal is derived from the server env,
     // which in the case of SSG may not match the actual origin the site
     // is deployed on.
-    if (isBrowser && routeInternal.value.type === 'initial') {
+    if (isBrowser && type === 'link' && routeInternal.value.type === 'initial') {
       routeInternal.value.dest = new URL(window.location.href);
     }
 
@@ -320,12 +319,12 @@ export const QwikCityProvider = component$<QwikCityProps>((props) => {
   useContextProvider(RouteNavigateContext, goto);
   useContextProvider(RouteStateContext, loaderState);
   useContextProvider(RouteActionContext, actionState);
-  useContextProvider(RouteInternalContext, routeInternal);
   useContextProvider<any>(RoutePreventNavigateContext, registerPreventNav);
 
   useTask$(({ track }) => {
     async function run() {
-      const [navigation, action] = track(() => [routeInternal.value, actionState.value]);
+      const navigation = track(routeInternal);
+      const action = track(actionState);
 
       const locale = getLocale('');
       const prevUrl = routeLocation.url;
@@ -387,6 +386,7 @@ export const QwikCityProvider = component$<QwikCityProps>((props) => {
         try {
           loadedRoute = await loadRoutePromise;
         } catch (e) {
+          console.error(e);
           window.location.href = newHref;
           return;
         }
@@ -523,7 +523,7 @@ export const QwikCityProvider = component$<QwikCityProps>((props) => {
             // Firefox only does it once and no more, but will still scroll. It also sets state to null.
             // Any <a> tags w/ #hash href will break SPA state in Firefox.
             // We patch these events and direct them to Link pipeline during SPA.
-            document.body.addEventListener('click', (event) => {
+            document.addEventListener('click', (event) => {
               if (event.defaultPrevented) {
                 return;
               }
@@ -561,7 +561,7 @@ export const QwikCityProvider = component$<QwikCityProps>((props) => {
               }
             });
 
-            document.body.removeEventListener('click', win._qCityInitAnchors!);
+            document.removeEventListener('click', win._qCityInitAnchors!);
             win._qCityInitAnchors = undefined;
 
             // TODO Remove block after Navigation API PR.
@@ -678,7 +678,6 @@ export const QwikCityMockProvider = component$<QwikCityMockProps>((props) => {
   );
 
   const loaderState = useSignal({});
-  const routeInternal = useSignal<RouteStateInternal>({ type: 'initial', dest: url });
 
   const goto: RouteNavigate =
     props.goto ??
@@ -707,7 +706,6 @@ export const QwikCityMockProvider = component$<QwikCityMockProps>((props) => {
   useContextProvider(RouteNavigateContext, goto);
   useContextProvider(RouteStateContext, loaderState);
   useContextProvider(RouteActionContext, actionState);
-  useContextProvider(RouteInternalContext, routeInternal);
 
   return <Slot />;
 });

packages/qwik-city/src/runtime/src/spa-init.ts

@@ -204,7 +204,7 @@ export default event$((_: Event, el: Element) => {
     setTimeout(() => {
       win.addEventListener('popstate', win[initPopstate]!);
       win.addEventListener('scroll', win[initScroll]!, { passive: true });
-      document.body.addEventListener('click', win[initAnchors]!);
+      document.addEventListener('click', win[initAnchors]!);
 
       if (!(win as any).navigation) {
         document.addEventListener('visibilitychange', win[initVisibility]!, {