@@ -17,7 +17,9 @@ import type {
1717} from 'reactant-router' ;
1818import type { LocationState } from 'history' ;
1919import {
20+ routerModuleName ,
2021 SharedAppOptions ,
22+ storageModuleName ,
2123 syncRouterName ,
2224 syncWorkerRouterName ,
2325} from './constants' ;
@@ -40,7 +42,7 @@ export interface IRouterOptions extends IBaseRouterOptions {
4042}
4143
4244@injectable ( {
43- name : 'Router' ,
45+ name : routerModuleName ,
4446} )
4547class ReactantRouter extends BaseReactantRouter {
4648 constructor (
@@ -191,9 +193,10 @@ class ReactantRouter extends BaseReactantRouter {
191193 if ( rehydrated ) {
192194 stopWatching ( ) ;
193195 const router = this . _routers [ this . portDetector . name ] ;
194- if ( router ) {
195- this . _changeRoutingOnSever ( this . portDetector . name , router ) ;
196- }
196+ this . _changeRoutingOnSever (
197+ this . portDetector . name ,
198+ router ?? this . defaultHistory
199+ ) ;
197200 }
198201 }
199202 ) ;
@@ -288,11 +291,12 @@ class ReactantRouter extends BaseReactantRouter {
288291 }
289292
290293 protected get enableCacheRouting ( ) {
291- const { Storage } = ( this as any ) [ modulesKey ] ;
294+ const Storage = ( this as any ) [ modulesKey ] [ storageModuleName ] ;
295+ const routerPersistConfig = Storage ?. persistConfig [ routerModuleName ] ;
292296 return (
293- Storage ?. persistConfig . Router &&
294- ( Storage . persistConfig . Router ! . whitelist ?. includes ( '_routers' ) ||
295- Storage . persistConfig . Router ! . blacklist ?. includes ( '_routers' ) === false )
297+ routerPersistConfig &&
298+ ( routerPersistConfig ! . whitelist ?. includes ( '_routers' ) ||
299+ routerPersistConfig ! . blacklist ?. includes ( '_routers' ) === false )
296300 ) ;
297301 }
298302
@@ -304,7 +308,7 @@ class ReactantRouter extends BaseReactantRouter {
304308 hash : '' ,
305309 state : undefined ,
306310 } ,
307- } ;
311+ } as RouterState ;
308312
309313 protected dispatchChanged ( router : RouterState ) {
310314 this . store ?. dispatch (
0 commit comments