@real-router/solid 0.6.0 → 0.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +49 -4
- package/dist/cjs/index.d.ts +178 -2
- package/dist/cjs/index.js +407 -22
- package/dist/esm/index.d.mts +178 -2
- package/dist/esm/index.mjs +406 -23
- package/dist/types/RouterProvider.d.ts +1 -0
- package/dist/types/RouterProvider.d.ts.map +1 -1
- package/dist/types/components/RouteView/RouteView.d.ts +3 -2
- package/dist/types/components/RouteView/RouteView.d.ts.map +1 -1
- package/dist/types/components/RouteView/components.d.ts +12 -2
- package/dist/types/components/RouteView/components.d.ts.map +1 -1
- package/dist/types/components/RouteView/helpers.d.ts.map +1 -1
- package/dist/types/components/RouteView/index.d.ts +1 -1
- package/dist/types/components/RouteView/index.d.ts.map +1 -1
- package/dist/types/components/RouteView/types.d.ts +6 -0
- package/dist/types/components/RouteView/types.d.ts.map +1 -1
- package/dist/types/dom-utils/direction-tracker.d.ts +27 -0
- package/dist/types/dom-utils/direction-tracker.d.ts.map +1 -0
- package/dist/types/dom-utils/index.d.ts +4 -0
- package/dist/types/dom-utils/index.d.ts.map +1 -1
- package/dist/types/dom-utils/view-transitions.d.ts +6 -0
- package/dist/types/dom-utils/view-transitions.d.ts.map +1 -0
- package/dist/types/hooks/useRouteEnter.d.ts +76 -0
- package/dist/types/hooks/useRouteEnter.d.ts.map +1 -0
- package/dist/types/hooks/useRouteExit.d.ts +90 -0
- package/dist/types/hooks/useRouteExit.d.ts.map +1 -0
- package/dist/types/index.d.ts +5 -1
- package/dist/types/index.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/RouterProvider.tsx +18 -1
- package/src/components/RouteView/RouteView.tsx +7 -2
- package/src/components/RouteView/components.tsx +25 -2
- package/src/components/RouteView/helpers.tsx +67 -21
- package/src/components/RouteView/index.ts +1 -0
- package/src/components/RouteView/types.ts +7 -0
- package/src/hooks/useRouteEnter.tsx +129 -0
- package/src/hooks/useRouteExit.tsx +123 -0
- package/src/index.tsx +17 -0
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
import { onCleanup } from "solid-js";
|
|
2
|
+
|
|
3
|
+
import { useRouter } from "./useRouter";
|
|
4
|
+
|
|
5
|
+
import type { State } from "@real-router/core";
|
|
6
|
+
|
|
7
|
+
export interface RouteExitContext {
|
|
8
|
+
/** The route being left. */
|
|
9
|
+
route: State;
|
|
10
|
+
/** The route being navigated to. */
|
|
11
|
+
nextRoute: State;
|
|
12
|
+
/**
|
|
13
|
+
* AbortSignal that fires when this navigation is superseded by a later
|
|
14
|
+
* one (rapid clicks). Already filtered: when the handler runs,
|
|
15
|
+
* `signal.aborted` is guaranteed to be `false`. Use
|
|
16
|
+
* `signal.addEventListener("abort", cleanup, { once: true })` for
|
|
17
|
+
* cleanup that must run on cancellation.
|
|
18
|
+
*/
|
|
19
|
+
signal: AbortSignal;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
export interface UseRouteExitOptions {
|
|
23
|
+
/**
|
|
24
|
+
* Skip the handler when `route.name === nextRoute.name`
|
|
25
|
+
* (sort/filter/query-only navigations on the same route). Default:
|
|
26
|
+
* `true`.
|
|
27
|
+
*/
|
|
28
|
+
skipSameRoute?: boolean;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export type RouteExitHandler = (
|
|
32
|
+
context: RouteExitContext,
|
|
33
|
+
) => void | Promise<void>;
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* Subscribe to the router's leave-window with the universal guards baked
|
|
37
|
+
* in. Wraps `router.subscribeLeave` so consumers don't repeat the same
|
|
38
|
+
* boilerplate every time:
|
|
39
|
+
*
|
|
40
|
+
* - **Reentrant abort pre-check**: if `signal.aborted` is already `true`
|
|
41
|
+
* when the handler would run (rapid navigation superseded a slower
|
|
42
|
+
* one), the handler is skipped entirely. `signal.addEventListener(
|
|
43
|
+
* "abort", ...)` does not fire retroactively, so without this guard
|
|
44
|
+
* downstream cleanup would never trigger.
|
|
45
|
+
* - **Same-route skip**: by default, `route.name === nextRoute.name`
|
|
46
|
+
* short-circuits the handler — query-only navigations (sort, filter,
|
|
47
|
+
* pagination) skip the work. Opt out with `skipSameRoute: false`.
|
|
48
|
+
*
|
|
49
|
+
* Returns nothing — the subscription's lifecycle is bound to the
|
|
50
|
+
* component via `onCleanup`.
|
|
51
|
+
*
|
|
52
|
+
* If the handler returns a Promise, the router blocks on it. If the
|
|
53
|
+
* Promise resolves, navigation proceeds. If it rejects, the router emits
|
|
54
|
+
* `TRANSITION_CANCELLED`.
|
|
55
|
+
*
|
|
56
|
+
* **Handler reactivity (Solid)**: Solid components run **once** at mount;
|
|
57
|
+
* `handler` is captured in closure at the call site. If you need
|
|
58
|
+
* different behavior across renders, derive it from a signal inside the
|
|
59
|
+
* handler body — do not rely on swapping the handler reference.
|
|
60
|
+
*
|
|
61
|
+
* @example Animation
|
|
62
|
+
* ```tsx
|
|
63
|
+
* let ref: HTMLDivElement | undefined;
|
|
64
|
+
*
|
|
65
|
+
* useRouteExit(async ({ signal }) => {
|
|
66
|
+
* const el = ref;
|
|
67
|
+
* if (!el) return;
|
|
68
|
+
* el.classList.add("fade-out");
|
|
69
|
+
* const cleanup = () => el.classList.remove("fade-out");
|
|
70
|
+
* signal.addEventListener("abort", cleanup, { once: true });
|
|
71
|
+
* try {
|
|
72
|
+
* el.getBoundingClientRect(); // style flush
|
|
73
|
+
* await Promise.allSettled(el.getAnimations().map((a) => a.finished));
|
|
74
|
+
* } finally {
|
|
75
|
+
* cleanup();
|
|
76
|
+
* }
|
|
77
|
+
* });
|
|
78
|
+
* ```
|
|
79
|
+
*
|
|
80
|
+
* @example Auto-save form draft
|
|
81
|
+
* ```tsx
|
|
82
|
+
* useRouteExit(async ({ signal }) => {
|
|
83
|
+
* if (formState.dirty) await api.saveDraft(formState, { signal });
|
|
84
|
+
* });
|
|
85
|
+
* ```
|
|
86
|
+
*
|
|
87
|
+
* @example Reading rich transition metadata via `nextRoute.transition`
|
|
88
|
+
* ```tsx
|
|
89
|
+
* useRouteExit(({ route, nextRoute }) => {
|
|
90
|
+
* if (nextRoute.transition.segments.deactivated.includes("products")) {
|
|
91
|
+
* productCache.clear();
|
|
92
|
+
* }
|
|
93
|
+
* if (nextRoute.transition.redirected) {
|
|
94
|
+
* return;
|
|
95
|
+
* }
|
|
96
|
+
* });
|
|
97
|
+
* ```
|
|
98
|
+
*/
|
|
99
|
+
export function useRouteExit(
|
|
100
|
+
handler: RouteExitHandler,
|
|
101
|
+
options?: UseRouteExitOptions,
|
|
102
|
+
): void {
|
|
103
|
+
const router = useRouter();
|
|
104
|
+
const skipSameRoute = options?.skipSameRoute ?? true;
|
|
105
|
+
|
|
106
|
+
const off = router.subscribeLeave(({ route, nextRoute, signal }) => {
|
|
107
|
+
if (skipSameRoute && route.name === nextRoute.name) {
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
// Reentrant abort: signal is already aborted when listener fires
|
|
112
|
+
// (e.g. a newer navigate superseded this one before subscribeLeave
|
|
113
|
+
// even ran). addEventListener("abort", ...) does not fire
|
|
114
|
+
// retroactively, so we skip the handler entirely.
|
|
115
|
+
if (signal.aborted) {
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
return handler({ route, nextRoute, signal });
|
|
120
|
+
});
|
|
121
|
+
|
|
122
|
+
onCleanup(off);
|
|
123
|
+
}
|
package/src/index.tsx
CHANGED
|
@@ -22,6 +22,10 @@ export { useRouteNodeStore } from "./hooks/useRouteNodeStore";
|
|
|
22
22
|
|
|
23
23
|
export { useRouterTransition } from "./hooks/useRouterTransition";
|
|
24
24
|
|
|
25
|
+
export { useRouteExit } from "./hooks/useRouteExit";
|
|
26
|
+
|
|
27
|
+
export { useRouteEnter } from "./hooks/useRouteEnter";
|
|
28
|
+
|
|
25
29
|
export { RouterProvider } from "./RouterProvider";
|
|
26
30
|
|
|
27
31
|
export { RouterContext, RouteContext } from "./context";
|
|
@@ -39,9 +43,22 @@ export type { LinkDirectiveOptions } from "./directives/link";
|
|
|
39
43
|
export type {
|
|
40
44
|
RouteViewProps,
|
|
41
45
|
RouteViewMatchProps,
|
|
46
|
+
RouteViewSelfProps,
|
|
42
47
|
RouteViewNotFoundProps,
|
|
43
48
|
} from "./components/RouteView";
|
|
44
49
|
|
|
50
|
+
export type {
|
|
51
|
+
RouteExitContext,
|
|
52
|
+
RouteExitHandler,
|
|
53
|
+
UseRouteExitOptions,
|
|
54
|
+
} from "./hooks/useRouteExit";
|
|
55
|
+
|
|
56
|
+
export type {
|
|
57
|
+
RouteEnterContext,
|
|
58
|
+
RouteEnterHandler,
|
|
59
|
+
UseRouteEnterOptions,
|
|
60
|
+
} from "./hooks/useRouteEnter";
|
|
61
|
+
|
|
45
62
|
export type { Navigator } from "@real-router/core";
|
|
46
63
|
|
|
47
64
|
export type { RouterTransitionSnapshot } from "@real-router/sources";
|