@solidjs/router 0.4.2 → 0.4.3

package/README.md

@@ -2,9 +2,6 @@
   <img src="https://assets.solidjs.com/banner?project=Router&type=core" alt="Solid Router" />
 </p>
 
-> 0.3.x only works with Solid v1.3.5 or later.
-> `useData` has been renamed to `useRouteData` and no longer takes arguments. Refer to documentation below.
-
 # Solid Router [![npm Version](https://img.shields.io/npm/v/@solidjs/router.svg?style=flat-square)](https://www.npmjs.org/package/@solidjs/router)
 
 A router lets you change your view based on the URL in the browser. This allows your "single-page" application to simulate a traditional multipage site. To use Solid Router, you specify components called Routes that depend on the value of the URL (the "path"), and the router handles the mechanism of swapping them in and out.

package/dist/index.js

@@ -1,4 +1,4 @@
-import { isServer, createComponent as createComponent$1, mergeProps as mergeProps$1, spread, insert, effect, setAttribute, template } from 'solid-js/web';
+import { isServer, delegateEvents, createComponent as createComponent$1, mergeProps as mergeProps$1, spread, insert, effect, setAttribute, template } from 'solid-js/web';
 import { createSignal, onCleanup, runWithOwner, createMemo, getOwner, createContext, useContext, untrack, useTransition, on, resetErrorBoundaries, createRenderEffect, createComponent, children, createRoot, Show, mergeProps, splitProps } from 'solid-js';
 
 function bindEvent(target, type, handler) {
@@ -650,8 +650,10 @@ function createRouterContext(integration, base = "", data, out) {
         scroll: !a.hasAttribute("noscroll"),
         state: state && JSON.parse(state)
       });
-    }
+    } // ensure delegated events run first
+
 
+    delegateEvents(["click"]);
     document.addEventListener("click", handleAnchorClick);
     onCleanup(() => document.removeEventListener("click", handleAnchorClick));
   }

package/dist/routing.js

@@ -1,5 +1,5 @@
 import { createComponent, createContext, createMemo, createRenderEffect, createSignal, on, onCleanup, untrack, useContext, useTransition, resetErrorBoundaries } from "solid-js";
-import { isServer } from "solid-js/web";
+import { isServer, delegateEvents } from "solid-js/web";
 import { normalizeIntegration } from "./integration";
 import { createMemoObject, extractSearchParams, invariant, resolvePath, createMatcher, joinPaths, scoreRoute, mergeSearchString, urlDecode, expandOptionals } from "./utils";
 const MAX_REDIRECTS = 100;
@@ -331,6 +331,8 @@ export function createRouterContext(integration, base = "", data, out) {
                 state: state && JSON.parse(state)
             });
         }
+        // ensure delegated events run first
+        delegateEvents(["click"]);
         document.addEventListener("click", handleAnchorClick);
         onCleanup(() => document.removeEventListener("click", handleAnchorClick));
     }

package/dist/types.d.ts

@@ -33,13 +33,13 @@ export interface RouterIntegration {
     signal: LocationChangeSignal;
     utils?: Partial<RouterUtils>;
 }
-export interface RouteDataFuncArgs {
-    data: unknown;
+export interface RouteDataFuncArgs<T = unknown> {
+    data: T extends RouteDataFunc ? ReturnType<T> : T;
     params: Params;
     location: Location;
     navigate: Navigator;
 }
-export declare type RouteDataFunc<T = unknown> = (args: RouteDataFuncArgs) => T;
+export declare type RouteDataFunc<T = unknown, R = unknown> = (args: RouteDataFuncArgs<T>) => R;
 export declare type RouteDefinition = {
     path: string | string[];
     data?: RouteDataFunc;

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",