@ivlev-dev/silent-router 0.11.4 → 0.11.6
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 +1 -1
- package/dist/router-view.d.ts.map +1 -1
- package/dist/router-view.js +54 -13
- package/dist/router-view.js.map +1 -1
- package/package.json +5 -5
package/README.md
CHANGED
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
- Runtime-схема query (`QuerySchema`) приводит `number`, `boolean` и массивы; `RouteViewProps.query` и `router.query` содержат уже распарсенные значения.
|
|
13
13
|
- `redirect`, синхронные и асинхронные `beforeEnter`, ленивый `load(context)` с кешированием.
|
|
14
14
|
- `Link` и `RouterView` получают роутер из DI-контекста синхронно, с fallback на prop и `Router.current()`.
|
|
15
|
-
- `RouterView` монтирует route-компоненты через core `component(...)`, поэтому ViewModel/DI
|
|
15
|
+
- `RouterView` монтирует route-компоненты через core `component(...)`, поэтому ViewModel/DI работают; при смене `params`/`query` view переиспользуется и сохраняет DOM/focus.
|
|
16
16
|
- `BrowserHistory` (`pushState`, `popstate`, `hashchange`) и `MemoryHistory` для тестов и SSR.
|
|
17
17
|
- Восстановление скролла: `scrollBehavior(to, from, savedPosition)`.
|
|
18
18
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-view.d.ts","sourceRoot":"","sources":["../src/router-view.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"router-view.d.ts","sourceRoot":"","sources":["../src/router-view.ts"],"names":[],"mappings":"AAYA,OAAO,EAIL,KAAK,UAAU,EAChB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,cAAc,EAAsB,MAAM,YAAY,CAAC;AACrE,OAAO,EAAU,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAEnD,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AAEvD,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,MAAM,wBAAwB,CAClC,IAAI,SAAS,MAAM,GAAG,MAAM,EAC5B,KAAK,GAAG,UAAU,IAChB,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAkFhC,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CA2EvD"}
|
package/dist/router-view.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { collectNodes, component, createMountPoint, getRuntimeOptions, isServerMode, } from "@ivlev-dev/silent-core";
|
|
2
|
-
import { createMemo, createRenderEffect,
|
|
1
|
+
import { collectNodes, component, createComponent, createMountPoint, getRuntimeOptions, isServerMode, } from "@ivlev-dev/silent-core";
|
|
2
|
+
import { createMemo, createRenderEffect, onCleanup, runWithOwner } from "@ivlev-dev/silent-reactivity";
|
|
3
3
|
import { RouterMissingError, } from "./match.js";
|
|
4
4
|
import { Router } from "./router.js";
|
|
5
5
|
export const ROUTER_VIEW_MARKER = "silent-router-view";
|
|
@@ -47,6 +47,23 @@ function renderSelection(router, props, selection) {
|
|
|
47
47
|
};
|
|
48
48
|
return component(routeComponent, viewProps);
|
|
49
49
|
}
|
|
50
|
+
function createLiveProps(router, depth) {
|
|
51
|
+
return {
|
|
52
|
+
get route() {
|
|
53
|
+
return router.state().route;
|
|
54
|
+
},
|
|
55
|
+
get params() {
|
|
56
|
+
return router.state().matched[depth]?.params ?? {};
|
|
57
|
+
},
|
|
58
|
+
get query() {
|
|
59
|
+
return router.state().query;
|
|
60
|
+
},
|
|
61
|
+
get hash() {
|
|
62
|
+
return router.state().hash;
|
|
63
|
+
},
|
|
64
|
+
router,
|
|
65
|
+
};
|
|
66
|
+
}
|
|
50
67
|
export function RouterView(props) {
|
|
51
68
|
const router = resolveRouter(props.router);
|
|
52
69
|
const depth = props.depth ?? 0;
|
|
@@ -60,24 +77,48 @@ export function RouterView(props) {
|
|
|
60
77
|
}
|
|
61
78
|
return container;
|
|
62
79
|
}
|
|
80
|
+
const runtimeOptions = getRuntimeOptions();
|
|
63
81
|
const mount = createMountPoint(container, marker);
|
|
64
82
|
const selection = createMemo(() => selectView(router, depth), { equals: sameSelection });
|
|
65
|
-
|
|
83
|
+
const liveProps = createLiveProps(router, depth);
|
|
84
|
+
let currentResult = null;
|
|
85
|
+
let currentComponent = null;
|
|
86
|
+
let fallbackShown = false;
|
|
87
|
+
const teardown = () => {
|
|
88
|
+
mount.clear();
|
|
89
|
+
currentResult?.dispose();
|
|
90
|
+
currentResult = null;
|
|
91
|
+
currentComponent = null;
|
|
92
|
+
fallbackShown = false;
|
|
93
|
+
};
|
|
66
94
|
createRenderEffect(() => {
|
|
67
95
|
const current = selection();
|
|
96
|
+
const next = current.entry?.component ?? null;
|
|
97
|
+
if (next === null) {
|
|
98
|
+
if (fallbackShown && currentComponent === null) {
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
mount.clear();
|
|
102
|
+
currentResult?.dispose();
|
|
103
|
+
currentResult = null;
|
|
104
|
+
currentComponent = null;
|
|
105
|
+
mount.render(props.fallback);
|
|
106
|
+
fallbackShown = true;
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
if (next === currentComponent && currentResult !== null) {
|
|
110
|
+
currentResult.update(liveProps);
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
68
113
|
mount.clear();
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
});
|
|
75
|
-
mount.render(output);
|
|
114
|
+
fallbackShown = false;
|
|
115
|
+
currentResult?.dispose();
|
|
116
|
+
currentComponent = next;
|
|
117
|
+
currentResult = runWithOwner(null, () => createComponent(next, liveProps, runtimeOptions));
|
|
118
|
+
mount.render(currentResult.node);
|
|
76
119
|
});
|
|
77
120
|
onCleanup(() => {
|
|
78
|
-
|
|
79
|
-
viewRootDispose?.();
|
|
80
|
-
viewRootDispose = null;
|
|
121
|
+
teardown();
|
|
81
122
|
});
|
|
82
123
|
return container;
|
|
83
124
|
}
|
package/dist/router-view.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-view.js","sourceRoot":"","sources":["../src/router-view.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,YAAY,
|
|
1
|
+
{"version":3,"file":"router-view.js","sourceRoot":"","sources":["../src/router-view.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ivlev-dev/silent-router",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.6",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -15,12 +15,12 @@
|
|
|
15
15
|
"dist"
|
|
16
16
|
],
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@ivlev-dev/silent-core": "0.11.
|
|
19
|
-
"@ivlev-dev/silent-di": "0.11.
|
|
20
|
-
"@ivlev-dev/silent-reactivity": "0.11.
|
|
18
|
+
"@ivlev-dev/silent-core": "0.11.6",
|
|
19
|
+
"@ivlev-dev/silent-di": "0.11.6",
|
|
20
|
+
"@ivlev-dev/silent-reactivity": "0.11.6"
|
|
21
21
|
},
|
|
22
22
|
"devDependencies": {
|
|
23
|
-
"@ivlev-dev/silent-swc": "0.11.
|
|
23
|
+
"@ivlev-dev/silent-swc": "0.11.6",
|
|
24
24
|
"jsdom": "^31.0.0",
|
|
25
25
|
"typescript": "^7.0.2",
|
|
26
26
|
"vitest": "^5.1.0"
|