@ivlev-dev/silent-router 0.11.8 → 0.11.9
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 -0
- package/dist/router-view.d.ts.map +1 -1
- package/dist/router-view.js +30 -5
- package/dist/router-view.js.map +1 -1
- package/package.json +6 -5
package/README.md
CHANGED
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
- `redirect`, синхронные и асинхронные `beforeEnter`, ленивый `load(context)` с кешированием.
|
|
14
14
|
- `Link` и `RouterView` получают роутер из DI-контекста синхронно, с fallback на prop и `Router.current()`.
|
|
15
15
|
- `RouterView` монтирует route-компоненты через core `component(...)`, поэтому ViewModel/DI работают; при смене `params`/`query` view переиспользуется и сохраняет DOM/focus.
|
|
16
|
+
- При гидрации `RouterView` адоптирует серверный маркер, удаляет старую разметку маршрута и рендерит matched-компонент заново.
|
|
16
17
|
- `BrowserHistory` (`pushState`, `popstate`, `hashchange`) и `MemoryHistory` для тестов и SSR.
|
|
17
18
|
- Повторный переход на текущий путь не дублирует историю и не перезапускает guards/loaders.
|
|
18
19
|
- Восстановление скролла: `scrollBehavior(to, from, savedPosition)`.
|
|
@@ -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":"AAoBA,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;AAoGhC,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI,CAuFvD"}
|
package/dist/router-view.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { collectNodes, component, createComponent, createMountPoint, getRuntimeOptions, isServerMode, } from "@ivlev-dev/silent-core";
|
|
2
|
-
import { createMemo, createRenderEffect, onCleanup, runWithOwner } from "@ivlev-dev/silent-reactivity";
|
|
1
|
+
import { adoptHydrationRegion, collectNodes, component, createComponent, createMountPoint, getRuntimeOptions, isServerMode, withoutHydration, } from "@ivlev-dev/silent-core";
|
|
2
|
+
import { createMemo, createRenderEffect, onCleanup, runWithOwner, untrack, } 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";
|
|
@@ -64,6 +64,23 @@ function createLiveProps(router, depth) {
|
|
|
64
64
|
router,
|
|
65
65
|
};
|
|
66
66
|
}
|
|
67
|
+
function mountNodesConnected(nodes) {
|
|
68
|
+
for (const node of nodes) {
|
|
69
|
+
if (node.isConnected === true) {
|
|
70
|
+
return true;
|
|
71
|
+
}
|
|
72
|
+
if (node.nodeType === 11) {
|
|
73
|
+
let child = node.firstChild;
|
|
74
|
+
while (child !== null) {
|
|
75
|
+
if (child.isConnected === true) {
|
|
76
|
+
return true;
|
|
77
|
+
}
|
|
78
|
+
child = child.nextSibling;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
return false;
|
|
83
|
+
}
|
|
67
84
|
export function RouterView(props) {
|
|
68
85
|
const router = resolveRouter(props.router);
|
|
69
86
|
const depth = props.depth ?? 0;
|
|
@@ -78,7 +95,12 @@ export function RouterView(props) {
|
|
|
78
95
|
return container;
|
|
79
96
|
}
|
|
80
97
|
const runtimeOptions = getRuntimeOptions();
|
|
81
|
-
const
|
|
98
|
+
const adoptedMarker = adoptHydrationRegion(ROUTER_VIEW_MARKER);
|
|
99
|
+
const mountMarker = adoptedMarker ?? marker;
|
|
100
|
+
if (adoptedMarker === null) {
|
|
101
|
+
container.appendChild(marker);
|
|
102
|
+
}
|
|
103
|
+
const mount = createMountPoint(container, mountMarker);
|
|
82
104
|
const selection = createMemo(() => selectView(router, depth), { equals: sameSelection });
|
|
83
105
|
const liveProps = createLiveProps(router, depth);
|
|
84
106
|
let currentResult = null;
|
|
@@ -106,7 +128,9 @@ export function RouterView(props) {
|
|
|
106
128
|
fallbackShown = true;
|
|
107
129
|
return;
|
|
108
130
|
}
|
|
109
|
-
if (next === currentComponent
|
|
131
|
+
if (next === currentComponent
|
|
132
|
+
&& currentResult !== null
|
|
133
|
+
&& mountNodesConnected(mount.nodes())) {
|
|
110
134
|
currentResult.update(liveProps);
|
|
111
135
|
return;
|
|
112
136
|
}
|
|
@@ -114,7 +138,8 @@ export function RouterView(props) {
|
|
|
114
138
|
fallbackShown = false;
|
|
115
139
|
currentResult?.dispose();
|
|
116
140
|
currentComponent = next;
|
|
117
|
-
|
|
141
|
+
const create = () => runWithOwner(null, () => untrack(() => createComponent(next, liveProps, runtimeOptions)));
|
|
142
|
+
currentResult = adoptedMarker === null ? create() : withoutHydration(create);
|
|
118
143
|
mount.render(currentResult.node);
|
|
119
144
|
});
|
|
120
145
|
onCleanup(() => {
|
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,eAAe,EACf,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.9",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -15,12 +15,13 @@
|
|
|
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.9",
|
|
19
|
+
"@ivlev-dev/silent-di": "0.11.9",
|
|
20
|
+
"@ivlev-dev/silent-reactivity": "0.11.9"
|
|
21
21
|
},
|
|
22
22
|
"devDependencies": {
|
|
23
|
-
"@ivlev-dev/silent-
|
|
23
|
+
"@ivlev-dev/silent-server": "0.11.9",
|
|
24
|
+
"@ivlev-dev/silent-swc": "0.11.9",
|
|
24
25
|
"jsdom": "^31.0.0",
|
|
25
26
|
"typescript": "^7.0.2",
|
|
26
27
|
"vitest": "^5.1.0"
|