@real-router/react 0.19.0 → 0.20.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 +2 -2
- package/dist/cjs/index.d.ts +18 -2
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +1 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/esm/index.d.mts +18 -2
- package/dist/esm/index.d.mts.map +1 -1
- package/dist/esm/index.mjs +1 -1
- package/dist/esm/index.mjs.map +1 -1
- package/package.json +3 -3
- package/src/components/modern/RouteView/RouteView.tsx +7 -2
- package/src/components/modern/RouteView/components.tsx +7 -1
- package/src/components/modern/RouteView/helpers.tsx +141 -52
- package/src/components/modern/RouteView/index.ts +1 -0
- package/src/components/modern/RouteView/types.ts +13 -1
- package/src/index.ts +1 -0
package/README.md
CHANGED
|
@@ -310,9 +310,9 @@ Full documentation: [Wiki](https://github.com/greydragon888/real-router/wiki)
|
|
|
310
310
|
|
|
311
311
|
## Examples
|
|
312
312
|
|
|
313
|
-
14 runnable examples — each is a standalone Vite app. Run: `cd examples/react/basic && pnpm dev`
|
|
313
|
+
14 runnable examples — each is a standalone Vite app. Run: `cd examples/web/react/basic && pnpm dev`
|
|
314
314
|
|
|
315
|
-
[basic](../../examples/react/basic) · [nested-routes](../../examples/react/nested-routes) · [auth-guards](../../examples/react/auth-guards) · [data-loading](../../examples/react/data-loading) · [lazy-loading](../../examples/react/lazy-loading) · [async-guards](../../examples/react/async-guards) · [hash-routing](../../examples/react/hash-routing) · [persistent-params](../../examples/react/persistent-params) · [error-handling](../../examples/react/error-handling) · [dynamic-routes](../../examples/react/dynamic-routes) · [keep-alive](../../examples/react/keep-alive) · [legacy-entry](../../examples/react/legacy-entry) · [hmr](../../examples/react/hmr) · [combined](../../examples/react/combined)
|
|
315
|
+
[basic](../../examples/web/react/basic) · [nested-routes](../../examples/web/react/nested-routes) · [auth-guards](../../examples/web/react/auth-guards) · [data-loading](../../examples/web/react/data-loading) · [lazy-loading](../../examples/web/react/lazy-loading) · [async-guards](../../examples/web/react/async-guards) · [hash-routing](../../examples/web/react/hash-routing) · [persistent-params](../../examples/web/react/persistent-params) · [error-handling](../../examples/web/react/error-handling) · [dynamic-routes](../../examples/web/react/dynamic-routes) · [keep-alive](../../examples/web/react/keep-alive) · [legacy-entry](../../examples/web/react/legacy-entry) · [hmr](../../examples/web/react/hmr) · [combined](../../examples/web/react/combined)
|
|
316
316
|
|
|
317
317
|
## Related Packages
|
|
318
318
|
|
package/dist/cjs/index.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ import { RouterTransitionSnapshot } from "@real-router/sources";
|
|
|
8
8
|
interface RouteViewProps {
|
|
9
9
|
/** Route tree node name to subscribe to. "" for root. */
|
|
10
10
|
readonly nodeName: string;
|
|
11
|
-
/** <RouteView.Match
|
|
11
|
+
/** <RouteView.Match>, <RouteView.Self>, and <RouteView.NotFound> elements. */
|
|
12
12
|
readonly children: ReactNode;
|
|
13
13
|
}
|
|
14
14
|
interface MatchProps {
|
|
@@ -23,6 +23,17 @@ interface MatchProps {
|
|
|
23
23
|
/** Content to render when matched. */
|
|
24
24
|
readonly children: ReactNode;
|
|
25
25
|
}
|
|
26
|
+
interface SelfProps {
|
|
27
|
+
/**
|
|
28
|
+
* Fallback content to show while children are suspended.
|
|
29
|
+
*
|
|
30
|
+
* Symmetric with `<RouteView.Match fallback>` — wraps children in
|
|
31
|
+
* `<Suspense>` when defined.
|
|
32
|
+
*/
|
|
33
|
+
readonly fallback?: ReactNode;
|
|
34
|
+
/** Content to render when the active route name equals the parent RouteView's nodeName. */
|
|
35
|
+
readonly children: ReactNode;
|
|
36
|
+
}
|
|
26
37
|
interface NotFoundProps {
|
|
27
38
|
/** Content to render on UNKNOWN_ROUTE. */
|
|
28
39
|
readonly children: ReactNode;
|
|
@@ -33,6 +44,10 @@ declare function Match(_props: MatchProps): null;
|
|
|
33
44
|
declare namespace Match {
|
|
34
45
|
var displayName: string;
|
|
35
46
|
}
|
|
47
|
+
declare function Self(_props: SelfProps): null;
|
|
48
|
+
declare namespace Self {
|
|
49
|
+
var displayName: string;
|
|
50
|
+
}
|
|
36
51
|
declare function NotFound(_props: NotFoundProps): null;
|
|
37
52
|
declare namespace NotFound {
|
|
38
53
|
var displayName: string;
|
|
@@ -48,8 +63,9 @@ declare namespace RouteViewRoot {
|
|
|
48
63
|
}
|
|
49
64
|
declare const RouteView: typeof RouteViewRoot & {
|
|
50
65
|
Match: typeof Match;
|
|
66
|
+
Self: typeof Self;
|
|
51
67
|
NotFound: typeof NotFound;
|
|
52
68
|
};
|
|
53
69
|
//#endregion
|
|
54
|
-
export { Link, type LinkProps, type Navigator, RouteView, type MatchProps as RouteViewMatchProps, type NotFoundProps as RouteViewNotFoundProps, type RouteViewProps, RouterErrorBoundary, type RouterErrorBoundaryProps, RouterProvider, type RouterTransitionSnapshot, useNavigator, useRoute, useRouteNode, useRouteUtils, useRouter, useRouterTransition };
|
|
70
|
+
export { Link, type LinkProps, type Navigator, RouteView, type MatchProps as RouteViewMatchProps, type NotFoundProps as RouteViewNotFoundProps, type RouteViewProps, type SelfProps as RouteViewSelfProps, RouterErrorBoundary, type RouterErrorBoundaryProps, RouterProvider, type RouterTransitionSnapshot, useNavigator, useRoute, useRouteNode, useRouteUtils, useRouter, useRouterTransition };
|
|
55
71
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/cjs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/components/modern/RouteView/types.ts","../../src/components/modern/RouteView/components.tsx","../../src/components/modern/RouteView/RouteView.tsx"],"mappings":";;;;;;;UAEiB,cAAA;;WAEN,QAAA;;WAEA,QAAA,EAAU,SAAA;AAAA;AAAA,UAGJ,UAAA;EAPc;EAAA,SASpB,OAAA;EALmB;EAAA,SAOnB,KAAA;EAPA;EAAA,SASA,SAAA;EATmB;EAAA,SAWnB,QAAA,GAAW,SAAA;EARL;EAAA,SAUN,QAAA,EAAU,SAAA;AAAA;AAAA,UAGJ,
|
|
1
|
+
{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/components/modern/RouteView/types.ts","../../src/components/modern/RouteView/components.tsx","../../src/components/modern/RouteView/RouteView.tsx"],"mappings":";;;;;;;UAEiB,cAAA;;WAEN,QAAA;;WAEA,QAAA,EAAU,SAAA;AAAA;AAAA,UAGJ,UAAA;EAPc;EAAA,SASpB,OAAA;EALmB;EAAA,SAOnB,KAAA;EAPA;EAAA,SASA,SAAA;EATmB;EAAA,SAWnB,QAAA,GAAW,SAAA;EARL;EAAA,SAUN,QAAA,EAAU,SAAA;AAAA;AAAA,UAGJ,SAAA;EAXN;;;;;;EAAA,SAkBA,QAAA,GAAW,SAAA;EAVQ;EAAA,SAYnB,QAAA,EAAU,SAAA;AAAA;AAAA,UAGJ,aAAA;;WAEN,QAAA,EAAU,SAAA;AAAA;;;iBClCL,KAAA,CAAM,MAAA,EAAQ,UAAA;AAAA,kBAAd,KAAA;EAAA,IAAK,WAAA;AAAA;AAAA,iBAML,IAAA,CAAK,MAAA,EAAQ,SAAA;AAAA,kBAAb,IAAA;EAAA,IAAI,WAAA;AAAA;AAAA,iBAMJ,QAAA,CAAS,MAAA,EAAQ,aAAA;AAAA,kBAAjB,QAAA;EAAA,IAAQ,WAAA;AAAA;;;iBCLf,aAAA,CAAA;EACP,QAAA;EACA;AAAA,GACC,QAAA,CAAS,cAAA,IAAkB,YAAA;AAAA,kBAHrB,aAAA;EAAA,IAAa,WAAA;AAAA;AAAA,cA0CT,SAAA,SAAS,aAAA"}
|
package/dist/cjs/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require(`./RouterProvider-BOWw6Z_i.js`),t=require(`./Link-CFGcNhCQ.js`);let n=require(`react`),r=require(`@real-router/core`),i=require(`@real-router/route-utils`),a=require(`react/jsx-runtime`);function o(e){return null}o.displayName=`RouteView.Match`;function s(e){return null}s.displayName=`RouteView.
|
|
1
|
+
Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require(`./RouterProvider-BOWw6Z_i.js`),t=require(`./Link-CFGcNhCQ.js`);let n=require(`react`),r=require(`@real-router/core`),i=require(`@real-router/route-utils`),a=require(`react/jsx-runtime`);function o(e){return null}o.displayName=`RouteView.Match`;function s(e){return null}s.displayName=`RouteView.Self`;function c(e){return null}c.displayName=`RouteView.NotFound`;function l(e,t,n){return t===``?!1:n?e===t:(0,i.startsWithSegment)(e,t)}function u(e,t){for(let r of n.Children.toArray(e))(0,n.isValidElement)(r)&&(r.type===o||r.type===s||r.type===c?t.push(r):u(r.props.children,t))}function d(e,t,r,i,o){let s=o===void 0?e:(0,a.jsx)(n.Suspense,{fallback:o,children:e});return r?(0,a.jsx)(n.Activity,{mode:i,children:s},t):(0,a.jsx)(n.Fragment,{children:s},t)}function f(e,t){return e.type===c?(t.notFoundChildren=e.props.children,!0):e.type===s?(t.selfFound||=(t.selfChildren=e.props.children,t.selfFallback=e.props.fallback,!0),!0):!1}function p(e,t,n,r,i){let{segment:a,exact:o=!1,keepAlive:s=!1,fallback:c}=e.props,u=n?`${n}.${a}`:a;return!i&&l(t,u,o)?(r.add(u),{rendered:d(e.props.children,u,s,`visible`,c),matched:!0}):s&&r.has(u)?{rendered:d(e.props.children,u,s,`hidden`,c),matched:!1}:{rendered:null,matched:!1}}function m(e,t,i,o){if(o.selfFound&&t===i){e.push(d(o.selfChildren,`__route-view-self__`,!1,`visible`,o.selfFallback));return}t===r.UNKNOWN_ROUTE&&o.notFoundChildren!==null&&e.push((0,a.jsx)(n.Fragment,{children:o.notFoundChildren},`__route-view-not-found__`))}function h(e,t,n,r){let i={selfChildren:null,selfFallback:void 0,selfFound:!1,notFoundChildren:null},a=!1,o=[];for(let s of e){if(f(s,i))continue;let e=p(s,t,n,r,a);e.matched&&(a=!0),e.rendered!==null&&o.push(e.rendered)}return a||m(o,t,n,i),{rendered:o,activeMatchFound:a}}function g({nodeName:t,children:r}){let{route:i}=e.m(t),o=(0,n.useRef)(null);o.current??=new Set;let s=(0,n.useMemo)(()=>{let e=[];return u(r,e),e},[r]);if(!i)return null;let{rendered:c}=h(s,i.name,t,o.current);return c.length>0?(0,a.jsx)(a.Fragment,{children:c}):null}g.displayName=`RouteView`;const _=Object.assign(g,{Match:o,Self:s,NotFound:c});exports.Link=t.t,exports.RouteView=_,exports.RouterErrorBoundary=e.o,exports.RouterProvider=e.t,exports.useNavigator=e.a,exports.useRoute=e.r,exports.useRouteNode=e.m,exports.useRouteUtils=e.i,exports.useRouter=e.h,exports.useRouterTransition=e.n;
|
|
2
2
|
//# sourceMappingURL=index.js.map
|
package/dist/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["Children","Suspense","Activity","Fragment","UNKNOWN_ROUTE","useRouteNode"],"sources":["../../src/components/modern/RouteView/components.tsx","../../src/components/modern/RouteView/helpers.tsx","../../src/components/modern/RouteView/RouteView.tsx"],"sourcesContent":["import type { MatchProps, NotFoundProps } from \"./types\";\n\nexport function Match(_props: MatchProps): null {\n return null;\n}\n\nMatch.displayName = \"RouteView.Match\";\n\nexport function NotFound(_props: NotFoundProps): null {\n return null;\n}\n\nNotFound.displayName = \"RouteView.NotFound\";\n","import { UNKNOWN_ROUTE } from \"@real-router/core\";\nimport { startsWithSegment } from \"@real-router/route-utils\";\nimport { Activity, Children, Fragment, Suspense, isValidElement } from \"react\";\n\nimport { Match, NotFound } from \"./components\";\n\nimport type { MatchProps, NotFoundProps } from \"./types\";\nimport type { ReactElement, ReactNode } from \"react\";\n\nfunction isSegmentMatch(\n routeName: string,\n fullSegmentName: string,\n exact: boolean,\n): boolean {\n if (fullSegmentName === \"\") {\n return false;\n }\n\n if (exact) {\n return routeName === fullSegmentName;\n }\n\n return startsWithSegment(routeName, fullSegmentName);\n}\n\nexport function collectElements(\n children: ReactNode,\n result: ReactElement[],\n): void {\n // eslint-disable-next-line @eslint-react/no-children-to-array\n for (const child of Children.toArray(children)) {\n if (!isValidElement(child)) {\n continue;\n }\n\n if (child.type === Match || child.type === NotFound) {\n result.push(child);\n } else {\n collectElements(\n (child.props as { readonly children: ReactNode }).children,\n result,\n );\n }\n }\n}\n\nfunction renderMatchElement(\n matchChildren: ReactNode,\n fullSegmentName: string,\n keepAlive: boolean,\n mode: \"visible\" | \"hidden\",\n fallback?: ReactNode,\n): ReactElement {\n const content =\n fallback === undefined ? (\n matchChildren\n ) : (\n <Suspense fallback={fallback}>{matchChildren}</Suspense>\n );\n\n if (keepAlive) {\n return (\n <Activity mode={mode} key={fullSegmentName}>\n {content}\n </Activity>\n );\n }\n\n return <Fragment key={fullSegmentName}>{content}</Fragment>;\n}\n\nexport function buildRenderList(\n elements: ReactElement[],\n routeName: string,\n nodeName: string,\n hasBeenActivated: Set<string>,\n): { rendered: ReactElement[]; activeMatchFound: boolean } {\n let notFoundChildren: ReactNode = null;\n let activeMatchFound = false;\n const rendered: ReactElement[] = [];\n\n for (const child of elements) {\n if (child.type === NotFound) {\n notFoundChildren = (child.props as NotFoundProps).children;\n continue;\n }\n\n const {\n segment,\n exact = false,\n keepAlive = false,\n fallback,\n } = child.props as MatchProps;\n const fullSegmentName = nodeName ? `${nodeName}.${segment}` : segment;\n const isActive =\n !activeMatchFound && isSegmentMatch(routeName, fullSegmentName, exact);\n\n if (isActive) {\n activeMatchFound = true;\n hasBeenActivated.add(fullSegmentName);\n rendered.push(\n renderMatchElement(\n (child.props as MatchProps).children,\n fullSegmentName,\n keepAlive,\n \"visible\",\n fallback,\n ),\n );\n } else if (keepAlive && hasBeenActivated.has(fullSegmentName)) {\n rendered.push(\n renderMatchElement(\n (child.props as MatchProps).children,\n fullSegmentName,\n keepAlive,\n \"hidden\",\n fallback,\n ),\n );\n }\n }\n\n if (\n !activeMatchFound &&\n routeName === UNKNOWN_ROUTE &&\n notFoundChildren !== null\n ) {\n rendered.push(\n <Fragment key=\"__route-view-not-found__\">{notFoundChildren}</Fragment>,\n );\n }\n\n return { rendered, activeMatchFound };\n}\n","import { useMemo, useRef } from \"react\";\n\nimport { Match, NotFound } from \"./components\";\nimport { buildRenderList, collectElements } from \"./helpers\";\nimport { useRouteNode } from \"../../../hooks/useRouteNode\";\n\nimport type { RouteViewProps } from \"./types\";\nimport type { ReactElement } from \"react\";\n\nfunction RouteViewRoot({\n nodeName,\n children,\n}: Readonly<RouteViewProps>): ReactElement | null {\n const { route } = useRouteNode(nodeName);\n const hasBeenActivatedRef = useRef<Set<string> | null>(null);\n\n // eslint-disable-next-line @eslint-react/refs -- lazy init: assign once when null to avoid `new Set()` allocation on every render\n hasBeenActivatedRef.current ??= new Set();\n\n // Skip the Children.toArray + collectElements traversal when children\n // reference is unchanged. children only changes when the parent re-renders\n // with a new ReactNode, so this caches the steady-state.\n const elements = useMemo(() => {\n const collected: ReactElement[] = [];\n\n collectElements(children, collected);\n\n return collected;\n }, [children]);\n\n if (!route) {\n return null;\n }\n\n const { rendered } = buildRenderList(\n elements,\n route.name,\n nodeName,\n // eslint-disable-next-line @eslint-react/refs -- stable Set ref read for keepAlive tracking (never reassigned)\n hasBeenActivatedRef.current,\n );\n\n if (rendered.length > 0) {\n return <>{rendered}</>;\n }\n\n return null;\n}\n\nRouteViewRoot.displayName = \"RouteView\";\n\nexport const RouteView = Object.assign(RouteViewRoot, { Match, NotFound });\n\nexport type {\n RouteViewProps,\n MatchProps as RouteViewMatchProps,\n NotFoundProps as RouteViewNotFoundProps,\n} from \"./types\";\n"],"mappings":"8QAEA,SAAgB,EAAM,EAA0B,CAC9C,OAAO,KAGT,EAAM,YAAc,kBAEpB,SAAgB,EAAS,EAA6B,CACpD,OAAO,KAGT,EAAS,YAAc,qBCHvB,SAAS,EACP,EACA,EACA,EACS,CAST,OARI,IAAoB,GACf,GAGL,EACK,IAAc,GAGvB,EAAA,EAAA,mBAAyB,EAAW,EAAgB,CAGtD,SAAgB,EACd,EACA,EACM,CAEN,IAAK,IAAM,KAASA,EAAAA,SAAS,QAAQ,EAAS,EACxC,EAAA,EAAA,gBAAgB,EAAM,GAItB,EAAM,OAAS,GAAS,EAAM,OAAS,EACzC,EAAO,KAAK,EAAM,CAElB,EACG,EAAM,MAA2C,SAClD,EACD,EAKP,SAAS,EACP,EACA,EACA,EACA,EACA,EACc,CACd,IAAM,EACJ,IAAa,IAAA,GACX,GAEA,EAAA,EAAA,KAACC,EAAAA,SAAD,CAAoB,oBAAW,EAAyB,CAAA,CAW5D,OARI,GAEA,EAAA,EAAA,KAACC,EAAAA,SAAD,CAAgB,gBACb,EACQ,CAFgB,EAEhB,EAIR,EAAA,EAAA,KAACC,EAAAA,SAAD,CAAA,SAAiC,EAAmB,CAArC,EAAqC,CAG7D,SAAgB,EACd,EACA,EACA,EACA,EACyD,CACzD,IAAI,EAA8B,KAC9B,EAAmB,GACjB,EAA2B,EAAE,CAEnC,IAAK,IAAM,KAAS,EAAU,CAC5B,GAAI,EAAM,OAAS,EAAU,CAC3B,EAAoB,EAAM,MAAwB,SAClD,SAGF,GAAM,CACJ,UACA,QAAQ,GACR,YAAY,GACZ,YACE,EAAM,MACJ,EAAkB,EAAW,GAAG,EAAS,GAAG,IAAY,EAE5D,CAAC,GAAoB,EAAe,EAAW,EAAiB,EAAM,EAGtE,EAAmB,GACnB,EAAiB,IAAI,EAAgB,CACrC,EAAS,KACP,EACG,EAAM,MAAqB,SAC5B,EACA,EACA,UACA,EACD,CACF,EACQ,GAAa,EAAiB,IAAI,EAAgB,EAC3D,EAAS,KACP,EACG,EAAM,MAAqB,SAC5B,EACA,EACA,SACA,EACD,CACF,CAcL,MATE,CAAC,GACD,IAAcC,EAAAA,eACd,IAAqB,MAErB,EAAS,MACP,EAAA,EAAA,KAACD,EAAAA,SAAD,CAAA,SAA0C,EAA4B,CAAxD,2BAAwD,CACvE,CAGI,CAAE,WAAU,mBAAkB,CC3HvC,SAAS,EAAc,CACrB,WACA,YACgD,CAChD,GAAM,CAAE,SAAUE,EAAAA,EAAa,EAAS,CAClC,GAAA,EAAA,EAAA,QAAiD,KAAK,CAG5D,EAAoB,UAAY,IAAI,IAKpC,IAAM,GAAA,EAAA,EAAA,aAAyB,CAC7B,IAAM,EAA4B,EAAE,CAIpC,OAFA,EAAgB,EAAU,EAAU,CAE7B,GACN,CAAC,EAAS,CAAC,CAEd,GAAI,CAAC,EACH,OAAO,KAGT,GAAM,CAAE,YAAa,EACnB,EACA,EAAM,KACN,EAEA,EAAoB,QACrB,CAMD,OAJI,EAAS,OAAS,GACb,EAAA,EAAA,KAAA,EAAA,SAAA,CAAA,SAAG,EAAY,CAAA,CAGjB,KAGT,EAAc,YAAc,YAE5B,MAAa,EAAY,OAAO,OAAO,EAAe,CAAE,QAAO,WAAU,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","names":["Children","Suspense","Activity","Fragment","UNKNOWN_ROUTE","useRouteNode"],"sources":["../../src/components/modern/RouteView/components.tsx","../../src/components/modern/RouteView/helpers.tsx","../../src/components/modern/RouteView/RouteView.tsx"],"sourcesContent":["import type { MatchProps, NotFoundProps, SelfProps } from \"./types\";\n\nexport function Match(_props: MatchProps): null {\n return null;\n}\n\nMatch.displayName = \"RouteView.Match\";\n\nexport function Self(_props: SelfProps): null {\n return null;\n}\n\nSelf.displayName = \"RouteView.Self\";\n\nexport function NotFound(_props: NotFoundProps): null {\n return null;\n}\n\nNotFound.displayName = \"RouteView.NotFound\";\n","import { UNKNOWN_ROUTE } from \"@real-router/core\";\nimport { startsWithSegment } from \"@real-router/route-utils\";\nimport { Activity, Children, Fragment, Suspense, isValidElement } from \"react\";\n\nimport { Match, NotFound, Self } from \"./components\";\n\nimport type { MatchProps, NotFoundProps, SelfProps } from \"./types\";\nimport type { ReactElement, ReactNode } from \"react\";\n\ninterface FallbackSlots {\n selfChildren: ReactNode;\n selfFallback: ReactNode | undefined;\n selfFound: boolean;\n notFoundChildren: ReactNode;\n}\n\nfunction isSegmentMatch(\n routeName: string,\n fullSegmentName: string,\n exact: boolean,\n): boolean {\n if (fullSegmentName === \"\") {\n return false;\n }\n\n if (exact) {\n return routeName === fullSegmentName;\n }\n\n return startsWithSegment(routeName, fullSegmentName);\n}\n\nexport function collectElements(\n children: ReactNode,\n result: ReactElement[],\n): void {\n // eslint-disable-next-line @eslint-react/no-children-to-array\n for (const child of Children.toArray(children)) {\n if (!isValidElement(child)) {\n continue;\n }\n\n if (\n child.type === Match ||\n child.type === Self ||\n child.type === NotFound\n ) {\n result.push(child);\n } else {\n collectElements(\n (child.props as { readonly children: ReactNode }).children,\n result,\n );\n }\n }\n}\n\nfunction renderSlotElement(\n slotChildren: ReactNode,\n key: string,\n keepAlive: boolean,\n mode: \"visible\" | \"hidden\",\n fallback?: ReactNode,\n): ReactElement {\n const content =\n fallback === undefined ? (\n slotChildren\n ) : (\n <Suspense fallback={fallback}>{slotChildren}</Suspense>\n );\n\n if (keepAlive) {\n return (\n <Activity mode={mode} key={key}>\n {content}\n </Activity>\n );\n }\n\n return <Fragment key={key}>{content}</Fragment>;\n}\n\nfunction recordFallback(child: ReactElement, slots: FallbackSlots): boolean {\n if (child.type === NotFound) {\n slots.notFoundChildren = (child.props as NotFoundProps).children;\n\n return true;\n }\n\n if (child.type === Self) {\n // First-wins: subsequent <Self> elements are ignored, mirroring NotFound.\n if (!slots.selfFound) {\n slots.selfChildren = (child.props as SelfProps).children;\n slots.selfFallback = (child.props as SelfProps).fallback;\n slots.selfFound = true;\n }\n\n return true;\n }\n\n return false;\n}\n\nfunction processMatch(\n child: ReactElement,\n routeName: string,\n nodeName: string,\n hasBeenActivated: Set<string>,\n alreadyActive: boolean,\n): { rendered: ReactElement | null; matched: boolean } {\n const {\n segment,\n exact = false,\n keepAlive = false,\n fallback,\n } = child.props as MatchProps;\n const fullSegmentName = nodeName ? `${nodeName}.${segment}` : segment;\n const isActive =\n !alreadyActive && isSegmentMatch(routeName, fullSegmentName, exact);\n\n if (isActive) {\n hasBeenActivated.add(fullSegmentName);\n\n return {\n rendered: renderSlotElement(\n (child.props as MatchProps).children,\n fullSegmentName,\n keepAlive,\n \"visible\",\n fallback,\n ),\n matched: true,\n };\n }\n\n if (keepAlive && hasBeenActivated.has(fullSegmentName)) {\n return {\n rendered: renderSlotElement(\n (child.props as MatchProps).children,\n fullSegmentName,\n keepAlive,\n \"hidden\",\n fallback,\n ),\n matched: false,\n };\n }\n\n return { rendered: null, matched: false };\n}\n\nfunction appendFallback(\n rendered: ReactElement[],\n routeName: string,\n nodeName: string,\n slots: FallbackSlots,\n): void {\n if (slots.selfFound && routeName === nodeName) {\n rendered.push(\n renderSlotElement(\n slots.selfChildren,\n \"__route-view-self__\",\n false,\n \"visible\",\n slots.selfFallback,\n ),\n );\n\n return;\n }\n\n if (routeName === UNKNOWN_ROUTE && slots.notFoundChildren !== null) {\n rendered.push(\n <Fragment key=\"__route-view-not-found__\">\n {slots.notFoundChildren}\n </Fragment>,\n );\n }\n}\n\nexport function buildRenderList(\n elements: ReactElement[],\n routeName: string,\n nodeName: string,\n hasBeenActivated: Set<string>,\n): { rendered: ReactElement[]; activeMatchFound: boolean } {\n const slots: FallbackSlots = {\n selfChildren: null,\n selfFallback: undefined,\n selfFound: false,\n notFoundChildren: null,\n };\n let activeMatchFound = false;\n const rendered: ReactElement[] = [];\n\n for (const child of elements) {\n if (recordFallback(child, slots)) {\n continue;\n }\n\n const result = processMatch(\n child,\n routeName,\n nodeName,\n hasBeenActivated,\n activeMatchFound,\n );\n\n if (result.matched) {\n activeMatchFound = true;\n }\n\n if (result.rendered !== null) {\n rendered.push(result.rendered);\n }\n }\n\n if (!activeMatchFound) {\n appendFallback(rendered, routeName, nodeName, slots);\n }\n\n return { rendered, activeMatchFound };\n}\n","import { useMemo, useRef } from \"react\";\n\nimport { Match, NotFound, Self } from \"./components\";\nimport { buildRenderList, collectElements } from \"./helpers\";\nimport { useRouteNode } from \"../../../hooks/useRouteNode\";\n\nimport type { RouteViewProps } from \"./types\";\nimport type { ReactElement } from \"react\";\n\nfunction RouteViewRoot({\n nodeName,\n children,\n}: Readonly<RouteViewProps>): ReactElement | null {\n const { route } = useRouteNode(nodeName);\n const hasBeenActivatedRef = useRef<Set<string> | null>(null);\n\n // eslint-disable-next-line @eslint-react/refs -- lazy init: assign once when null to avoid `new Set()` allocation on every render\n hasBeenActivatedRef.current ??= new Set();\n\n // Skip the Children.toArray + collectElements traversal when children\n // reference is unchanged. children only changes when the parent re-renders\n // with a new ReactNode, so this caches the steady-state.\n const elements = useMemo(() => {\n const collected: ReactElement[] = [];\n\n collectElements(children, collected);\n\n return collected;\n }, [children]);\n\n if (!route) {\n return null;\n }\n\n const { rendered } = buildRenderList(\n elements,\n route.name,\n nodeName,\n // eslint-disable-next-line @eslint-react/refs -- stable Set ref read for keepAlive tracking (never reassigned)\n hasBeenActivatedRef.current,\n );\n\n if (rendered.length > 0) {\n return <>{rendered}</>;\n }\n\n return null;\n}\n\nRouteViewRoot.displayName = \"RouteView\";\n\nexport const RouteView = Object.assign(RouteViewRoot, {\n Match,\n Self,\n NotFound,\n});\n\nexport type {\n RouteViewProps,\n MatchProps as RouteViewMatchProps,\n SelfProps as RouteViewSelfProps,\n NotFoundProps as RouteViewNotFoundProps,\n} from \"./types\";\n"],"mappings":"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"}
|
package/dist/esm/index.d.mts
CHANGED
|
@@ -8,7 +8,7 @@ import { RouterTransitionSnapshot } from "@real-router/sources";
|
|
|
8
8
|
interface RouteViewProps {
|
|
9
9
|
/** Route tree node name to subscribe to. "" for root. */
|
|
10
10
|
readonly nodeName: string;
|
|
11
|
-
/** <RouteView.Match
|
|
11
|
+
/** <RouteView.Match>, <RouteView.Self>, and <RouteView.NotFound> elements. */
|
|
12
12
|
readonly children: ReactNode;
|
|
13
13
|
}
|
|
14
14
|
interface MatchProps {
|
|
@@ -23,6 +23,17 @@ interface MatchProps {
|
|
|
23
23
|
/** Content to render when matched. */
|
|
24
24
|
readonly children: ReactNode;
|
|
25
25
|
}
|
|
26
|
+
interface SelfProps {
|
|
27
|
+
/**
|
|
28
|
+
* Fallback content to show while children are suspended.
|
|
29
|
+
*
|
|
30
|
+
* Symmetric with `<RouteView.Match fallback>` — wraps children in
|
|
31
|
+
* `<Suspense>` when defined.
|
|
32
|
+
*/
|
|
33
|
+
readonly fallback?: ReactNode;
|
|
34
|
+
/** Content to render when the active route name equals the parent RouteView's nodeName. */
|
|
35
|
+
readonly children: ReactNode;
|
|
36
|
+
}
|
|
26
37
|
interface NotFoundProps {
|
|
27
38
|
/** Content to render on UNKNOWN_ROUTE. */
|
|
28
39
|
readonly children: ReactNode;
|
|
@@ -33,6 +44,10 @@ declare function Match(_props: MatchProps): null;
|
|
|
33
44
|
declare namespace Match {
|
|
34
45
|
var displayName: string;
|
|
35
46
|
}
|
|
47
|
+
declare function Self(_props: SelfProps): null;
|
|
48
|
+
declare namespace Self {
|
|
49
|
+
var displayName: string;
|
|
50
|
+
}
|
|
36
51
|
declare function NotFound(_props: NotFoundProps): null;
|
|
37
52
|
declare namespace NotFound {
|
|
38
53
|
var displayName: string;
|
|
@@ -48,8 +63,9 @@ declare namespace RouteViewRoot {
|
|
|
48
63
|
}
|
|
49
64
|
declare const RouteView: typeof RouteViewRoot & {
|
|
50
65
|
Match: typeof Match;
|
|
66
|
+
Self: typeof Self;
|
|
51
67
|
NotFound: typeof NotFound;
|
|
52
68
|
};
|
|
53
69
|
//#endregion
|
|
54
|
-
export { Link, type LinkProps, type Navigator, RouteView, type MatchProps as RouteViewMatchProps, type NotFoundProps as RouteViewNotFoundProps, type RouteViewProps, RouterErrorBoundary, type RouterErrorBoundaryProps, RouterProvider, type RouterTransitionSnapshot, useNavigator, useRoute, useRouteNode, useRouteUtils, useRouter, useRouterTransition };
|
|
70
|
+
export { Link, type LinkProps, type Navigator, RouteView, type MatchProps as RouteViewMatchProps, type NotFoundProps as RouteViewNotFoundProps, type RouteViewProps, type SelfProps as RouteViewSelfProps, RouterErrorBoundary, type RouterErrorBoundaryProps, RouterProvider, type RouterTransitionSnapshot, useNavigator, useRoute, useRouteNode, useRouteUtils, useRouter, useRouterTransition };
|
|
55
71
|
//# sourceMappingURL=index.d.mts.map
|
package/dist/esm/index.d.mts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/components/modern/RouteView/types.ts","../../src/components/modern/RouteView/components.tsx","../../src/components/modern/RouteView/RouteView.tsx"],"mappings":";;;;;;;UAEiB,cAAA;;WAEN,QAAA;;WAEA,QAAA,EAAU,SAAA;AAAA;AAAA,UAGJ,UAAA;EAPc;EAAA,SASpB,OAAA;EALmB;EAAA,SAOnB,KAAA;EAPA;EAAA,SASA,SAAA;EATmB;EAAA,SAWnB,QAAA,GAAW,SAAA;EARL;EAAA,SAUN,QAAA,EAAU,SAAA;AAAA;AAAA,UAGJ,
|
|
1
|
+
{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/components/modern/RouteView/types.ts","../../src/components/modern/RouteView/components.tsx","../../src/components/modern/RouteView/RouteView.tsx"],"mappings":";;;;;;;UAEiB,cAAA;;WAEN,QAAA;;WAEA,QAAA,EAAU,SAAA;AAAA;AAAA,UAGJ,UAAA;EAPc;EAAA,SASpB,OAAA;EALmB;EAAA,SAOnB,KAAA;EAPA;EAAA,SASA,SAAA;EATmB;EAAA,SAWnB,QAAA,GAAW,SAAA;EARL;EAAA,SAUN,QAAA,EAAU,SAAA;AAAA;AAAA,UAGJ,SAAA;EAXN;;;;;;EAAA,SAkBA,QAAA,GAAW,SAAA;EAVQ;EAAA,SAYnB,QAAA,EAAU,SAAA;AAAA;AAAA,UAGJ,aAAA;;WAEN,QAAA,EAAU,SAAA;AAAA;;;iBClCL,KAAA,CAAM,MAAA,EAAQ,UAAA;AAAA,kBAAd,KAAA;EAAA,IAAK,WAAA;AAAA;AAAA,iBAML,IAAA,CAAK,MAAA,EAAQ,SAAA;AAAA,kBAAb,IAAA;EAAA,IAAI,WAAA;AAAA;AAAA,iBAMJ,QAAA,CAAS,MAAA,EAAQ,aAAA;AAAA,kBAAjB,QAAA;EAAA,IAAQ,WAAA;AAAA;;;iBCLf,aAAA,CAAA;EACP,QAAA;EACA;AAAA,GACC,QAAA,CAAS,cAAA,IAAkB,YAAA;AAAA,kBAHrB,aAAA;EAAA,IAAa,WAAA;AAAA;AAAA,cA0CT,SAAA,SAAS,aAAA"}
|
package/dist/esm/index.mjs
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import{a as e,h as t,i as n,m as r,n as i,o as a,r as o,t as s}from"./RouterProvider-Cx0t2IIF.mjs";import{t as c}from"./Link-coFvvMgW.mjs";import{Activity as l,Children as u,Fragment as d,Suspense as f,isValidElement as p,useMemo as m,useRef as h}from"react";import{UNKNOWN_ROUTE as g}from"@real-router/core";import{startsWithSegment as _}from"@real-router/route-utils";import{Fragment as v,jsx as y}from"react/jsx-runtime";function b(e){return null}b.displayName=`RouteView.Match`;function x(e){return null}x.displayName=`RouteView.
|
|
1
|
+
import{a as e,h as t,i as n,m as r,n as i,o as a,r as o,t as s}from"./RouterProvider-Cx0t2IIF.mjs";import{t as c}from"./Link-coFvvMgW.mjs";import{Activity as l,Children as u,Fragment as d,Suspense as f,isValidElement as p,useMemo as m,useRef as h}from"react";import{UNKNOWN_ROUTE as g}from"@real-router/core";import{startsWithSegment as _}from"@real-router/route-utils";import{Fragment as v,jsx as y}from"react/jsx-runtime";function b(e){return null}b.displayName=`RouteView.Match`;function x(e){return null}x.displayName=`RouteView.Self`;function S(e){return null}S.displayName=`RouteView.NotFound`;function C(e,t,n){return t===``?!1:n?e===t:_(e,t)}function w(e,t){for(let n of u.toArray(e))p(n)&&(n.type===b||n.type===x||n.type===S?t.push(n):w(n.props.children,t))}function T(e,t,n,r,i){let a=i===void 0?e:y(f,{fallback:i,children:e});return n?y(l,{mode:r,children:a},t):y(d,{children:a},t)}function E(e,t){return e.type===S?(t.notFoundChildren=e.props.children,!0):e.type===x?(t.selfFound||=(t.selfChildren=e.props.children,t.selfFallback=e.props.fallback,!0),!0):!1}function D(e,t,n,r,i){let{segment:a,exact:o=!1,keepAlive:s=!1,fallback:c}=e.props,l=n?`${n}.${a}`:a;return!i&&C(t,l,o)?(r.add(l),{rendered:T(e.props.children,l,s,`visible`,c),matched:!0}):s&&r.has(l)?{rendered:T(e.props.children,l,s,`hidden`,c),matched:!1}:{rendered:null,matched:!1}}function O(e,t,n,r){if(r.selfFound&&t===n){e.push(T(r.selfChildren,`__route-view-self__`,!1,`visible`,r.selfFallback));return}t===g&&r.notFoundChildren!==null&&e.push(y(d,{children:r.notFoundChildren},`__route-view-not-found__`))}function k(e,t,n,r){let i={selfChildren:null,selfFallback:void 0,selfFound:!1,notFoundChildren:null},a=!1,o=[];for(let s of e){if(E(s,i))continue;let e=D(s,t,n,r,a);e.matched&&(a=!0),e.rendered!==null&&o.push(e.rendered)}return a||O(o,t,n,i),{rendered:o,activeMatchFound:a}}function A({nodeName:e,children:t}){let{route:n}=r(e),i=h(null);i.current??=new Set;let a=m(()=>{let e=[];return w(t,e),e},[t]);if(!n)return null;let{rendered:o}=k(a,n.name,e,i.current);return o.length>0?y(v,{children:o}):null}A.displayName=`RouteView`;const j=Object.assign(A,{Match:b,Self:x,NotFound:S});export{c as Link,j as RouteView,a as RouterErrorBoundary,s as RouterProvider,e as useNavigator,o as useRoute,r as useRouteNode,n as useRouteUtils,t as useRouter,i as useRouterTransition};
|
|
2
2
|
//# sourceMappingURL=index.mjs.map
|
package/dist/esm/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mjs","names":[],"sources":["../../src/components/modern/RouteView/components.tsx","../../src/components/modern/RouteView/helpers.tsx","../../src/components/modern/RouteView/RouteView.tsx"],"sourcesContent":["import type { MatchProps, NotFoundProps } from \"./types\";\n\nexport function Match(_props: MatchProps): null {\n return null;\n}\n\nMatch.displayName = \"RouteView.Match\";\n\nexport function NotFound(_props: NotFoundProps): null {\n return null;\n}\n\nNotFound.displayName = \"RouteView.NotFound\";\n","import { UNKNOWN_ROUTE } from \"@real-router/core\";\nimport { startsWithSegment } from \"@real-router/route-utils\";\nimport { Activity, Children, Fragment, Suspense, isValidElement } from \"react\";\n\nimport { Match, NotFound } from \"./components\";\n\nimport type { MatchProps, NotFoundProps } from \"./types\";\nimport type { ReactElement, ReactNode } from \"react\";\n\nfunction isSegmentMatch(\n routeName: string,\n fullSegmentName: string,\n exact: boolean,\n): boolean {\n if (fullSegmentName === \"\") {\n return false;\n }\n\n if (exact) {\n return routeName === fullSegmentName;\n }\n\n return startsWithSegment(routeName, fullSegmentName);\n}\n\nexport function collectElements(\n children: ReactNode,\n result: ReactElement[],\n): void {\n // eslint-disable-next-line @eslint-react/no-children-to-array\n for (const child of Children.toArray(children)) {\n if (!isValidElement(child)) {\n continue;\n }\n\n if (child.type === Match
|
|
1
|
+
{"version":3,"file":"index.mjs","names":[],"sources":["../../src/components/modern/RouteView/components.tsx","../../src/components/modern/RouteView/helpers.tsx","../../src/components/modern/RouteView/RouteView.tsx"],"sourcesContent":["import type { MatchProps, NotFoundProps, SelfProps } from \"./types\";\n\nexport function Match(_props: MatchProps): null {\n return null;\n}\n\nMatch.displayName = \"RouteView.Match\";\n\nexport function Self(_props: SelfProps): null {\n return null;\n}\n\nSelf.displayName = \"RouteView.Self\";\n\nexport function NotFound(_props: NotFoundProps): null {\n return null;\n}\n\nNotFound.displayName = \"RouteView.NotFound\";\n","import { UNKNOWN_ROUTE } from \"@real-router/core\";\nimport { startsWithSegment } from \"@real-router/route-utils\";\nimport { Activity, Children, Fragment, Suspense, isValidElement } from \"react\";\n\nimport { Match, NotFound, Self } from \"./components\";\n\nimport type { MatchProps, NotFoundProps, SelfProps } from \"./types\";\nimport type { ReactElement, ReactNode } from \"react\";\n\ninterface FallbackSlots {\n selfChildren: ReactNode;\n selfFallback: ReactNode | undefined;\n selfFound: boolean;\n notFoundChildren: ReactNode;\n}\n\nfunction isSegmentMatch(\n routeName: string,\n fullSegmentName: string,\n exact: boolean,\n): boolean {\n if (fullSegmentName === \"\") {\n return false;\n }\n\n if (exact) {\n return routeName === fullSegmentName;\n }\n\n return startsWithSegment(routeName, fullSegmentName);\n}\n\nexport function collectElements(\n children: ReactNode,\n result: ReactElement[],\n): void {\n // eslint-disable-next-line @eslint-react/no-children-to-array\n for (const child of Children.toArray(children)) {\n if (!isValidElement(child)) {\n continue;\n }\n\n if (\n child.type === Match ||\n child.type === Self ||\n child.type === NotFound\n ) {\n result.push(child);\n } else {\n collectElements(\n (child.props as { readonly children: ReactNode }).children,\n result,\n );\n }\n }\n}\n\nfunction renderSlotElement(\n slotChildren: ReactNode,\n key: string,\n keepAlive: boolean,\n mode: \"visible\" | \"hidden\",\n fallback?: ReactNode,\n): ReactElement {\n const content =\n fallback === undefined ? (\n slotChildren\n ) : (\n <Suspense fallback={fallback}>{slotChildren}</Suspense>\n );\n\n if (keepAlive) {\n return (\n <Activity mode={mode} key={key}>\n {content}\n </Activity>\n );\n }\n\n return <Fragment key={key}>{content}</Fragment>;\n}\n\nfunction recordFallback(child: ReactElement, slots: FallbackSlots): boolean {\n if (child.type === NotFound) {\n slots.notFoundChildren = (child.props as NotFoundProps).children;\n\n return true;\n }\n\n if (child.type === Self) {\n // First-wins: subsequent <Self> elements are ignored, mirroring NotFound.\n if (!slots.selfFound) {\n slots.selfChildren = (child.props as SelfProps).children;\n slots.selfFallback = (child.props as SelfProps).fallback;\n slots.selfFound = true;\n }\n\n return true;\n }\n\n return false;\n}\n\nfunction processMatch(\n child: ReactElement,\n routeName: string,\n nodeName: string,\n hasBeenActivated: Set<string>,\n alreadyActive: boolean,\n): { rendered: ReactElement | null; matched: boolean } {\n const {\n segment,\n exact = false,\n keepAlive = false,\n fallback,\n } = child.props as MatchProps;\n const fullSegmentName = nodeName ? `${nodeName}.${segment}` : segment;\n const isActive =\n !alreadyActive && isSegmentMatch(routeName, fullSegmentName, exact);\n\n if (isActive) {\n hasBeenActivated.add(fullSegmentName);\n\n return {\n rendered: renderSlotElement(\n (child.props as MatchProps).children,\n fullSegmentName,\n keepAlive,\n \"visible\",\n fallback,\n ),\n matched: true,\n };\n }\n\n if (keepAlive && hasBeenActivated.has(fullSegmentName)) {\n return {\n rendered: renderSlotElement(\n (child.props as MatchProps).children,\n fullSegmentName,\n keepAlive,\n \"hidden\",\n fallback,\n ),\n matched: false,\n };\n }\n\n return { rendered: null, matched: false };\n}\n\nfunction appendFallback(\n rendered: ReactElement[],\n routeName: string,\n nodeName: string,\n slots: FallbackSlots,\n): void {\n if (slots.selfFound && routeName === nodeName) {\n rendered.push(\n renderSlotElement(\n slots.selfChildren,\n \"__route-view-self__\",\n false,\n \"visible\",\n slots.selfFallback,\n ),\n );\n\n return;\n }\n\n if (routeName === UNKNOWN_ROUTE && slots.notFoundChildren !== null) {\n rendered.push(\n <Fragment key=\"__route-view-not-found__\">\n {slots.notFoundChildren}\n </Fragment>,\n );\n }\n}\n\nexport function buildRenderList(\n elements: ReactElement[],\n routeName: string,\n nodeName: string,\n hasBeenActivated: Set<string>,\n): { rendered: ReactElement[]; activeMatchFound: boolean } {\n const slots: FallbackSlots = {\n selfChildren: null,\n selfFallback: undefined,\n selfFound: false,\n notFoundChildren: null,\n };\n let activeMatchFound = false;\n const rendered: ReactElement[] = [];\n\n for (const child of elements) {\n if (recordFallback(child, slots)) {\n continue;\n }\n\n const result = processMatch(\n child,\n routeName,\n nodeName,\n hasBeenActivated,\n activeMatchFound,\n );\n\n if (result.matched) {\n activeMatchFound = true;\n }\n\n if (result.rendered !== null) {\n rendered.push(result.rendered);\n }\n }\n\n if (!activeMatchFound) {\n appendFallback(rendered, routeName, nodeName, slots);\n }\n\n return { rendered, activeMatchFound };\n}\n","import { useMemo, useRef } from \"react\";\n\nimport { Match, NotFound, Self } from \"./components\";\nimport { buildRenderList, collectElements } from \"./helpers\";\nimport { useRouteNode } from \"../../../hooks/useRouteNode\";\n\nimport type { RouteViewProps } from \"./types\";\nimport type { ReactElement } from \"react\";\n\nfunction RouteViewRoot({\n nodeName,\n children,\n}: Readonly<RouteViewProps>): ReactElement | null {\n const { route } = useRouteNode(nodeName);\n const hasBeenActivatedRef = useRef<Set<string> | null>(null);\n\n // eslint-disable-next-line @eslint-react/refs -- lazy init: assign once when null to avoid `new Set()` allocation on every render\n hasBeenActivatedRef.current ??= new Set();\n\n // Skip the Children.toArray + collectElements traversal when children\n // reference is unchanged. children only changes when the parent re-renders\n // with a new ReactNode, so this caches the steady-state.\n const elements = useMemo(() => {\n const collected: ReactElement[] = [];\n\n collectElements(children, collected);\n\n return collected;\n }, [children]);\n\n if (!route) {\n return null;\n }\n\n const { rendered } = buildRenderList(\n elements,\n route.name,\n nodeName,\n // eslint-disable-next-line @eslint-react/refs -- stable Set ref read for keepAlive tracking (never reassigned)\n hasBeenActivatedRef.current,\n );\n\n if (rendered.length > 0) {\n return <>{rendered}</>;\n }\n\n return null;\n}\n\nRouteViewRoot.displayName = \"RouteView\";\n\nexport const RouteView = Object.assign(RouteViewRoot, {\n Match,\n Self,\n NotFound,\n});\n\nexport type {\n RouteViewProps,\n MatchProps as RouteViewMatchProps,\n SelfProps as RouteViewSelfProps,\n NotFoundProps as RouteViewNotFoundProps,\n} from \"./types\";\n"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@real-router/react",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.20.0",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"description": "React integration for Real-Router",
|
|
6
6
|
"main": "./dist/cjs/index.js",
|
|
@@ -76,7 +76,7 @@
|
|
|
76
76
|
"license": "MIT",
|
|
77
77
|
"sideEffects": false,
|
|
78
78
|
"dependencies": {
|
|
79
|
-
"@real-router/core": "^0.50.
|
|
79
|
+
"@real-router/core": "^0.50.1",
|
|
80
80
|
"@real-router/route-utils": "^0.2.1",
|
|
81
81
|
"@real-router/sources": "^0.7.2"
|
|
82
82
|
},
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
"ink": "7.0.1",
|
|
89
89
|
"ink-testing-library": "4.0.0",
|
|
90
90
|
"vitest-react-profiler": "1.12.0",
|
|
91
|
-
"@real-router/browser-plugin": "^0.
|
|
91
|
+
"@real-router/browser-plugin": "^0.15.1"
|
|
92
92
|
},
|
|
93
93
|
"peerDependencies": {
|
|
94
94
|
"@types/react": ">=18.0.0",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { useMemo, useRef } from "react";
|
|
2
2
|
|
|
3
|
-
import { Match, NotFound } from "./components";
|
|
3
|
+
import { Match, NotFound, Self } from "./components";
|
|
4
4
|
import { buildRenderList, collectElements } from "./helpers";
|
|
5
5
|
import { useRouteNode } from "../../../hooks/useRouteNode";
|
|
6
6
|
|
|
@@ -49,10 +49,15 @@ function RouteViewRoot({
|
|
|
49
49
|
|
|
50
50
|
RouteViewRoot.displayName = "RouteView";
|
|
51
51
|
|
|
52
|
-
export const RouteView = Object.assign(RouteViewRoot, {
|
|
52
|
+
export const RouteView = Object.assign(RouteViewRoot, {
|
|
53
|
+
Match,
|
|
54
|
+
Self,
|
|
55
|
+
NotFound,
|
|
56
|
+
});
|
|
53
57
|
|
|
54
58
|
export type {
|
|
55
59
|
RouteViewProps,
|
|
56
60
|
MatchProps as RouteViewMatchProps,
|
|
61
|
+
SelfProps as RouteViewSelfProps,
|
|
57
62
|
NotFoundProps as RouteViewNotFoundProps,
|
|
58
63
|
} from "./types";
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { MatchProps, NotFoundProps } from "./types";
|
|
1
|
+
import type { MatchProps, NotFoundProps, SelfProps } from "./types";
|
|
2
2
|
|
|
3
3
|
export function Match(_props: MatchProps): null {
|
|
4
4
|
return null;
|
|
@@ -6,6 +6,12 @@ export function Match(_props: MatchProps): null {
|
|
|
6
6
|
|
|
7
7
|
Match.displayName = "RouteView.Match";
|
|
8
8
|
|
|
9
|
+
export function Self(_props: SelfProps): null {
|
|
10
|
+
return null;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
Self.displayName = "RouteView.Self";
|
|
14
|
+
|
|
9
15
|
export function NotFound(_props: NotFoundProps): null {
|
|
10
16
|
return null;
|
|
11
17
|
}
|
|
@@ -2,11 +2,18 @@ import { UNKNOWN_ROUTE } from "@real-router/core";
|
|
|
2
2
|
import { startsWithSegment } from "@real-router/route-utils";
|
|
3
3
|
import { Activity, Children, Fragment, Suspense, isValidElement } from "react";
|
|
4
4
|
|
|
5
|
-
import { Match, NotFound } from "./components";
|
|
5
|
+
import { Match, NotFound, Self } from "./components";
|
|
6
6
|
|
|
7
|
-
import type { MatchProps, NotFoundProps } from "./types";
|
|
7
|
+
import type { MatchProps, NotFoundProps, SelfProps } from "./types";
|
|
8
8
|
import type { ReactElement, ReactNode } from "react";
|
|
9
9
|
|
|
10
|
+
interface FallbackSlots {
|
|
11
|
+
selfChildren: ReactNode;
|
|
12
|
+
selfFallback: ReactNode | undefined;
|
|
13
|
+
selfFound: boolean;
|
|
14
|
+
notFoundChildren: ReactNode;
|
|
15
|
+
}
|
|
16
|
+
|
|
10
17
|
function isSegmentMatch(
|
|
11
18
|
routeName: string,
|
|
12
19
|
fullSegmentName: string,
|
|
@@ -33,7 +40,11 @@ export function collectElements(
|
|
|
33
40
|
continue;
|
|
34
41
|
}
|
|
35
42
|
|
|
36
|
-
if (
|
|
43
|
+
if (
|
|
44
|
+
child.type === Match ||
|
|
45
|
+
child.type === Self ||
|
|
46
|
+
child.type === NotFound
|
|
47
|
+
) {
|
|
37
48
|
result.push(child);
|
|
38
49
|
} else {
|
|
39
50
|
collectElements(
|
|
@@ -44,29 +55,127 @@ export function collectElements(
|
|
|
44
55
|
}
|
|
45
56
|
}
|
|
46
57
|
|
|
47
|
-
function
|
|
48
|
-
|
|
49
|
-
|
|
58
|
+
function renderSlotElement(
|
|
59
|
+
slotChildren: ReactNode,
|
|
60
|
+
key: string,
|
|
50
61
|
keepAlive: boolean,
|
|
51
62
|
mode: "visible" | "hidden",
|
|
52
63
|
fallback?: ReactNode,
|
|
53
64
|
): ReactElement {
|
|
54
65
|
const content =
|
|
55
66
|
fallback === undefined ? (
|
|
56
|
-
|
|
67
|
+
slotChildren
|
|
57
68
|
) : (
|
|
58
|
-
<Suspense fallback={fallback}>{
|
|
69
|
+
<Suspense fallback={fallback}>{slotChildren}</Suspense>
|
|
59
70
|
);
|
|
60
71
|
|
|
61
72
|
if (keepAlive) {
|
|
62
73
|
return (
|
|
63
|
-
<Activity mode={mode} key={
|
|
74
|
+
<Activity mode={mode} key={key}>
|
|
64
75
|
{content}
|
|
65
76
|
</Activity>
|
|
66
77
|
);
|
|
67
78
|
}
|
|
68
79
|
|
|
69
|
-
return <Fragment key={
|
|
80
|
+
return <Fragment key={key}>{content}</Fragment>;
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
function recordFallback(child: ReactElement, slots: FallbackSlots): boolean {
|
|
84
|
+
if (child.type === NotFound) {
|
|
85
|
+
slots.notFoundChildren = (child.props as NotFoundProps).children;
|
|
86
|
+
|
|
87
|
+
return true;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
if (child.type === Self) {
|
|
91
|
+
// First-wins: subsequent <Self> elements are ignored, mirroring NotFound.
|
|
92
|
+
if (!slots.selfFound) {
|
|
93
|
+
slots.selfChildren = (child.props as SelfProps).children;
|
|
94
|
+
slots.selfFallback = (child.props as SelfProps).fallback;
|
|
95
|
+
slots.selfFound = true;
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
return true;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
return false;
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
function processMatch(
|
|
105
|
+
child: ReactElement,
|
|
106
|
+
routeName: string,
|
|
107
|
+
nodeName: string,
|
|
108
|
+
hasBeenActivated: Set<string>,
|
|
109
|
+
alreadyActive: boolean,
|
|
110
|
+
): { rendered: ReactElement | null; matched: boolean } {
|
|
111
|
+
const {
|
|
112
|
+
segment,
|
|
113
|
+
exact = false,
|
|
114
|
+
keepAlive = false,
|
|
115
|
+
fallback,
|
|
116
|
+
} = child.props as MatchProps;
|
|
117
|
+
const fullSegmentName = nodeName ? `${nodeName}.${segment}` : segment;
|
|
118
|
+
const isActive =
|
|
119
|
+
!alreadyActive && isSegmentMatch(routeName, fullSegmentName, exact);
|
|
120
|
+
|
|
121
|
+
if (isActive) {
|
|
122
|
+
hasBeenActivated.add(fullSegmentName);
|
|
123
|
+
|
|
124
|
+
return {
|
|
125
|
+
rendered: renderSlotElement(
|
|
126
|
+
(child.props as MatchProps).children,
|
|
127
|
+
fullSegmentName,
|
|
128
|
+
keepAlive,
|
|
129
|
+
"visible",
|
|
130
|
+
fallback,
|
|
131
|
+
),
|
|
132
|
+
matched: true,
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
if (keepAlive && hasBeenActivated.has(fullSegmentName)) {
|
|
137
|
+
return {
|
|
138
|
+
rendered: renderSlotElement(
|
|
139
|
+
(child.props as MatchProps).children,
|
|
140
|
+
fullSegmentName,
|
|
141
|
+
keepAlive,
|
|
142
|
+
"hidden",
|
|
143
|
+
fallback,
|
|
144
|
+
),
|
|
145
|
+
matched: false,
|
|
146
|
+
};
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
return { rendered: null, matched: false };
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
function appendFallback(
|
|
153
|
+
rendered: ReactElement[],
|
|
154
|
+
routeName: string,
|
|
155
|
+
nodeName: string,
|
|
156
|
+
slots: FallbackSlots,
|
|
157
|
+
): void {
|
|
158
|
+
if (slots.selfFound && routeName === nodeName) {
|
|
159
|
+
rendered.push(
|
|
160
|
+
renderSlotElement(
|
|
161
|
+
slots.selfChildren,
|
|
162
|
+
"__route-view-self__",
|
|
163
|
+
false,
|
|
164
|
+
"visible",
|
|
165
|
+
slots.selfFallback,
|
|
166
|
+
),
|
|
167
|
+
);
|
|
168
|
+
|
|
169
|
+
return;
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
if (routeName === UNKNOWN_ROUTE && slots.notFoundChildren !== null) {
|
|
173
|
+
rendered.push(
|
|
174
|
+
<Fragment key="__route-view-not-found__">
|
|
175
|
+
{slots.notFoundChildren}
|
|
176
|
+
</Fragment>,
|
|
177
|
+
);
|
|
178
|
+
}
|
|
70
179
|
}
|
|
71
180
|
|
|
72
181
|
export function buildRenderList(
|
|
@@ -75,59 +184,39 @@ export function buildRenderList(
|
|
|
75
184
|
nodeName: string,
|
|
76
185
|
hasBeenActivated: Set<string>,
|
|
77
186
|
): { rendered: ReactElement[]; activeMatchFound: boolean } {
|
|
78
|
-
|
|
187
|
+
const slots: FallbackSlots = {
|
|
188
|
+
selfChildren: null,
|
|
189
|
+
selfFallback: undefined,
|
|
190
|
+
selfFound: false,
|
|
191
|
+
notFoundChildren: null,
|
|
192
|
+
};
|
|
79
193
|
let activeMatchFound = false;
|
|
80
194
|
const rendered: ReactElement[] = [];
|
|
81
195
|
|
|
82
196
|
for (const child of elements) {
|
|
83
|
-
if (child
|
|
84
|
-
notFoundChildren = (child.props as NotFoundProps).children;
|
|
197
|
+
if (recordFallback(child, slots)) {
|
|
85
198
|
continue;
|
|
86
199
|
}
|
|
87
200
|
|
|
88
|
-
const
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
if (isActive) {
|
|
201
|
+
const result = processMatch(
|
|
202
|
+
child,
|
|
203
|
+
routeName,
|
|
204
|
+
nodeName,
|
|
205
|
+
hasBeenActivated,
|
|
206
|
+
activeMatchFound,
|
|
207
|
+
);
|
|
208
|
+
|
|
209
|
+
if (result.matched) {
|
|
99
210
|
activeMatchFound = true;
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
fullSegmentName,
|
|
105
|
-
keepAlive,
|
|
106
|
-
"visible",
|
|
107
|
-
fallback,
|
|
108
|
-
),
|
|
109
|
-
);
|
|
110
|
-
} else if (keepAlive && hasBeenActivated.has(fullSegmentName)) {
|
|
111
|
-
rendered.push(
|
|
112
|
-
renderMatchElement(
|
|
113
|
-
(child.props as MatchProps).children,
|
|
114
|
-
fullSegmentName,
|
|
115
|
-
keepAlive,
|
|
116
|
-
"hidden",
|
|
117
|
-
fallback,
|
|
118
|
-
),
|
|
119
|
-
);
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
if (result.rendered !== null) {
|
|
214
|
+
rendered.push(result.rendered);
|
|
120
215
|
}
|
|
121
216
|
}
|
|
122
217
|
|
|
123
|
-
if (
|
|
124
|
-
|
|
125
|
-
routeName === UNKNOWN_ROUTE &&
|
|
126
|
-
notFoundChildren !== null
|
|
127
|
-
) {
|
|
128
|
-
rendered.push(
|
|
129
|
-
<Fragment key="__route-view-not-found__">{notFoundChildren}</Fragment>,
|
|
130
|
-
);
|
|
218
|
+
if (!activeMatchFound) {
|
|
219
|
+
appendFallback(rendered, routeName, nodeName, slots);
|
|
131
220
|
}
|
|
132
221
|
|
|
133
222
|
return { rendered, activeMatchFound };
|
|
@@ -3,7 +3,7 @@ import type { ReactNode } from "react";
|
|
|
3
3
|
export interface RouteViewProps {
|
|
4
4
|
/** Route tree node name to subscribe to. "" for root. */
|
|
5
5
|
readonly nodeName: string;
|
|
6
|
-
/** <RouteView.Match
|
|
6
|
+
/** <RouteView.Match>, <RouteView.Self>, and <RouteView.NotFound> elements. */
|
|
7
7
|
readonly children: ReactNode;
|
|
8
8
|
}
|
|
9
9
|
|
|
@@ -20,6 +20,18 @@ export interface MatchProps {
|
|
|
20
20
|
readonly children: ReactNode;
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
+
export interface SelfProps {
|
|
24
|
+
/**
|
|
25
|
+
* Fallback content to show while children are suspended.
|
|
26
|
+
*
|
|
27
|
+
* Symmetric with `<RouteView.Match fallback>` — wraps children in
|
|
28
|
+
* `<Suspense>` when defined.
|
|
29
|
+
*/
|
|
30
|
+
readonly fallback?: ReactNode;
|
|
31
|
+
/** Content to render when the active route name equals the parent RouteView's nodeName. */
|
|
32
|
+
readonly children: ReactNode;
|
|
33
|
+
}
|
|
34
|
+
|
|
23
35
|
export interface NotFoundProps {
|
|
24
36
|
/** Content to render on UNKNOWN_ROUTE. */
|
|
25
37
|
readonly children: ReactNode;
|