@lolyjs/core 0.1.0-alpha.3 → 0.1.0-alpha.5

package/dist/index.js

@@ -1353,6 +1353,9 @@ function createClientConfig(projectRoot, mode) {
         filename: mode === "production" ? "client.[contenthash].css" : "client.css"
       })
     ],
+    externals: {
+      "@lolyjs/core/runtime": "@lolyjs/core/runtime"
+    },
     infrastructureLogging: {
       level: "error"
     },
@@ -5094,7 +5097,7 @@ function applyMetadata(md) {
 }
 
 // modules/runtime/client/AppShell.tsx
-import { useEffect, useState } from "react";
+import { useEffect, useState, useRef } from "react";
 
 // modules/runtime/client/RouterView.tsx
 import { jsx } from "react/jsx-runtime";
@@ -5457,29 +5460,55 @@ async function navigate(nextUrl, handlers, options) {
 }
 function createClickHandler(navigate2) {
   return function handleClick(ev) {
-    if (ev.defaultPrevented) return;
-    if (ev.button !== 0) return;
-    if (ev.metaKey || ev.ctrlKey || ev.shiftKey || ev.altKey) return;
-    const target = ev.target;
-    if (!target) return;
-    const tagName = target.tagName.toLowerCase();
-    const isInteractiveElement = tagName === "input" || tagName === "textarea" || tagName === "button" || tagName === "select" || target.isContentEditable || target.closest("input, textarea, button, select, [contenteditable]");
-    if (isInteractiveElement) return;
-    const anchor = target.closest("a[href]");
-    if (!anchor) return;
-    const href = anchor.getAttribute("href");
-    if (!href) return;
-    if (href.startsWith("#")) return;
-    const url = new URL(href, window.location.href);
-    if (url.origin !== window.location.origin) return;
-    if (anchor.target && anchor.target !== "_self") return;
-    ev.preventDefault();
-    const nextUrl = url.pathname + url.search;
-    const currentUrl = window.location.pathname + window.location.search;
-    if (nextUrl === currentUrl) return;
-    const shouldRevalidate = anchor.hasAttribute("data-revalidate") && anchor.getAttribute("data-revalidate") !== "false";
-    window.history.pushState({}, "", nextUrl);
-    navigate2(nextUrl, shouldRevalidate ? { revalidate: true } : void 0);
+    try {
+      if (ev.defaultPrevented) return;
+      if (ev.type !== "click") return;
+      if (ev.button !== 0) return;
+      if (ev.metaKey || ev.ctrlKey || ev.shiftKey || ev.altKey) return;
+      if (ev.clientX === 0 && ev.clientY === 0 && ev.detail === 0) {
+        const target2 = ev.target;
+        if (target2) {
+          const tagName2 = target2.tagName.toLowerCase();
+          if (tagName2 === "input" || tagName2 === "textarea" || tagName2 === "button" || tagName2 === "select") {
+            return;
+          }
+        }
+      }
+      const target = ev.target;
+      if (!target) return;
+      const tagName = target.tagName.toLowerCase();
+      if (tagName === "input" || tagName === "textarea" || tagName === "button" || tagName === "select" || target.isContentEditable || target.getAttribute("contenteditable") === "true") {
+        return;
+      }
+      const interactiveParent = target.closest("input, textarea, button, select, [contenteditable], label");
+      if (interactiveParent) {
+        if (interactiveParent.tagName.toLowerCase() === "label") {
+          const label = interactiveParent;
+          if (label.control) {
+            return;
+          }
+        } else {
+          return;
+        }
+      }
+      const anchor = target.closest("a[href]");
+      if (!anchor) return;
+      const href = anchor.getAttribute("href");
+      if (!href) return;
+      if (href.startsWith("#")) return;
+      const url = new URL(href, window.location.href);
+      if (url.origin !== window.location.origin) return;
+      if (anchor.target && anchor.target !== "_self") return;
+      ev.preventDefault();
+      const nextUrl = url.pathname + url.search;
+      const currentUrl = window.location.pathname + window.location.search;
+      if (nextUrl === currentUrl) return;
+      const shouldRevalidate = anchor.hasAttribute("data-revalidate") && anchor.getAttribute("data-revalidate") !== "false";
+      window.history.pushState({}, "", nextUrl);
+      navigate2(nextUrl, shouldRevalidate ? { revalidate: true } : void 0);
+    } catch (error) {
+      console.error("[navigation] Error in click handler:", error);
+    }
   };
 }
 function createPopStateHandler(navigate2) {
@@ -5498,25 +5527,36 @@ function AppShell({
   errorRoute
 }) {
   const [state, setState] = useState(initialState);
+  const handlersRef = useRef({
+    setState,
+    routes,
+    notFoundRoute,
+    errorRoute
+  });
   useEffect(() => {
-    const handlers = {
+    handlersRef.current = {
       setState,
       routes,
       notFoundRoute,
       errorRoute
     };
+  }, [routes, notFoundRoute, errorRoute]);
+  useEffect(() => {
+    let isMounted = true;
     async function handleNavigate(nextUrl, options) {
-      await navigate(nextUrl, handlers, options);
+      if (!isMounted) return;
+      await navigate(nextUrl, handlersRef.current, options);
     }
     const handleClick = createClickHandler(handleNavigate);
     const handlePopState = createPopStateHandler(handleNavigate);
-    window.addEventListener("click", handleClick);
-    window.addEventListener("popstate", handlePopState);
+    window.addEventListener("click", handleClick, false);
+    window.addEventListener("popstate", handlePopState, false);
     return () => {
-      window.removeEventListener("click", handleClick);
-      window.removeEventListener("popstate", handlePopState);
+      isMounted = false;
+      window.removeEventListener("click", handleClick, false);
+      window.removeEventListener("popstate", handlePopState, false);
     };
-  }, [routes, notFoundRoute, errorRoute]);
+  }, []);
   const isError = state.route === errorRoute;
   const isNotFound = state.route === notFoundRoute;
   const routeType = isError ? "error" : isNotFound ? "notfound" : "normal";