@fictjs/router 0.5.0 → 0.5.2

package/dist/index.d.cts

@@ -1050,6 +1050,7 @@ declare function configureScrollRestoration(options: ScrollRestorationOptions):
  * Works with Fict's Suspense for loading states.
  */
 
+type AnyComponent = Component<any>;
 /**
  * Create a lazy-loaded component
  *
@@ -1067,18 +1068,18 @@ declare function configureScrollRestoration(options: ScrollRestorationOptions):
  * </Suspense>
  * ```
  */
-declare function lazy<T extends Component<any>>(loader: () => Promise<{
+declare function lazy<T extends AnyComponent>(loader: () => Promise<{
     default: T;
-} | T>): Component<any>;
+} | T>): AnyComponent;
 /**
  * Preload a lazy component
  * Useful for preloading on hover/focus
  */
-declare function preloadLazy(component: Component<any>): Promise<void>;
+declare function preloadLazy(component: AnyComponent): Promise<void>;
 /**
  * Check if a component is a lazy component
  */
-declare function isLazyComponent(component: unknown): boolean;
+declare function isLazyComponent(component: unknown): component is AnyComponent;
 /**
  * Create a lazy route definition
  *
@@ -1133,7 +1134,7 @@ declare function lazyRoute<P extends string = string>(config: {
  * ```
  */
 declare function createLazyRoutes(modules: Record<string, () => Promise<{
-    default: Component<any>;
+    default: AnyComponent;
 }>>, options?: {
     pathTransform?: (filePath: string) => string;
     loadingElement?: FictNode;

package/dist/index.d.ts

@@ -1050,6 +1050,7 @@ declare function configureScrollRestoration(options: ScrollRestorationOptions):
  * Works with Fict's Suspense for loading states.
  */
 
+type AnyComponent = Component<any>;
 /**
  * Create a lazy-loaded component
  *
@@ -1067,18 +1068,18 @@ declare function configureScrollRestoration(options: ScrollRestorationOptions):
  * </Suspense>
  * ```
  */
-declare function lazy<T extends Component<any>>(loader: () => Promise<{
+declare function lazy<T extends AnyComponent>(loader: () => Promise<{
     default: T;
-} | T>): Component<any>;
+} | T>): AnyComponent;
 /**
  * Preload a lazy component
  * Useful for preloading on hover/focus
  */
-declare function preloadLazy(component: Component<any>): Promise<void>;
+declare function preloadLazy(component: AnyComponent): Promise<void>;
 /**
  * Check if a component is a lazy component
  */
-declare function isLazyComponent(component: unknown): boolean;
+declare function isLazyComponent(component: unknown): component is AnyComponent;
 /**
  * Create a lazy route definition
  *
@@ -1133,7 +1134,7 @@ declare function lazyRoute<P extends string = string>(config: {
  * ```
  */
 declare function createLazyRoutes(modules: Record<string, () => Promise<{
-    default: Component<any>;
+    default: AnyComponent;
 }>>, options?: {
     pathTransform?: (filePath: string) => string;
     loadingElement?: FictNode;

package/dist/index.js

@@ -1767,14 +1767,16 @@ function Link(props) {
     if (props.prefetch === "intent" || props.prefetch === void 0) {
       triggerPreload();
     }
-    const onMouseEnter = props.onMouseEnter;
+    const propsRecord = props;
+    const onMouseEnter = propsRecord.onMouseEnter;
     if (onMouseEnter) onMouseEnter(event);
   };
   const handleFocus = (event) => {
     if (props.prefetch === "intent" || props.prefetch === void 0) {
       triggerPreload();
     }
-    const onFocus = props.onFocus;
+    const propsRecord = props;
+    const onFocus = propsRecord.onFocus;
     if (onFocus) onFocus(event);
   };
   const {
@@ -2310,13 +2312,17 @@ function cleanupDataUtilities() {
 }
 
 // src/lazy.tsx
-import "@fictjs/runtime";
+import { onCleanup as onCleanup2 } from "@fictjs/runtime";
 import { createSignal as createSignal5 } from "@fictjs/runtime/advanced";
 import { jsx as jsx4 } from "fict/jsx-runtime";
 function lazy(loader) {
   let cachedComponent = null;
   let loadPromise = null;
   const LazyComponent = (props) => {
+    let isMounted = true;
+    onCleanup2(() => {
+      isMounted = false;
+    });
     const state = createSignal5({
       component: cachedComponent,
       error: null,
@@ -2334,9 +2340,13 @@ function lazy(loader) {
       });
     }
     loadPromise.then((component) => {
-      state({ component, error: null, loading: false });
+      if (isMounted) {
+        state({ component, error: null, loading: false });
+      }
     }).catch((error) => {
-      state({ component: null, error, loading: false });
+      if (isMounted) {
+        state({ component: null, error, loading: false });
+      }
     });
     const currentState = state();
     if (currentState.error) {
@@ -2348,8 +2358,9 @@ function lazy(loader) {
     const LoadedComponent = currentState.component;
     return /* @__PURE__ */ jsx4(LoadedComponent, { ...props });
   };
-  LazyComponent.__lazy = true;
-  LazyComponent.__preload = () => {
+  const lazyComp = LazyComponent;
+  lazyComp.__lazy = true;
+  lazyComp.__preload = () => {
     if (!loadPromise) {
       loadPromise = loader().then((module) => {
         const component = "default" in module ? module.default : module;
@@ -2369,7 +2380,8 @@ function preloadLazy(component) {
   return Promise.resolve();
 }
 function isLazyComponent(component) {
-  return !!(component && typeof component === "function" && component.__lazy);
+  const comp = component;
+  return !!(comp && typeof comp === "function" && comp.__lazy);
 }
 function lazyRoute(config) {
   const LazyComponent = lazy(config.component);