Skip to content

fix(router): make wrapScreen public for RouterView compatibility (Closes #1928) #1940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
madhuri-perumalla wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −6
Open

fix(router): make wrapScreen public for RouterView compatibility (Closes #1928) #1940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/router/src/RouterView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function RouterView({ router }: RouterViewProps) {
progress: number;
}>({
previous: null,
current: router.current ? router._wrapScreen(router.current) : null,
current: router.current ? router.wrapScreen(router.current) : null,
direction: 'push',
progress: 1,
});
Expand Down
11 changes: 6 additions & 5 deletions packages/router/src/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ export class Router {
}
}

_wrapScreen(match: RouteMatch): VNode {
/** Wrap a route match into a VNode with layout chain and providers */
wrapScreen(match: RouteMatch): VNode {
let screen = createElement(match.route.component, match.params);

for (let i = match.chain.length - 2; i >= 0; i--) {
Expand Down Expand Up @@ -267,7 +268,7 @@ export class Router {
const notFoundMatch = this._createNotFoundMatch(resolvedPath);
this._currentMatch = notFoundMatch;
if (this.autoUnmount) unmountAll();
const screen = this._wrapScreen(notFoundMatch);
const screen = this.wrapScreen(notFoundMatch);
const emitEvent = direction === 'back' ? 'back' : 'navigate';
this.events.emit(emitEvent, { match: notFoundMatch, screen, direction });
return;
Expand Down Expand Up @@ -310,7 +311,7 @@ export class Router {

this._currentMatch = match;
if (this.autoUnmount) unmountAll();
const screen = this._wrapScreen(match);
const screen = this.wrapScreen(match);

const emitEvent = direction === 'back' ? 'back' : 'navigate';
this.events.emit(emitEvent, { match, screen, direction });
Expand Down Expand Up @@ -379,7 +380,7 @@ export class Router {

this._currentMatch = match;
if (this.autoUnmount) unmountAll();
const screen = this._wrapScreen(match);
const screen = this.wrapScreen(match);

this.events.emit('back', { match, screen, direction: 'back' });

Expand Down Expand Up @@ -414,7 +415,7 @@ export class Router {
this._history.push(nextPath);
this._currentMatch = match;
if (this.autoUnmount) unmountAll();
const screen = this._wrapScreen(match);
const screen = this.wrapScreen(match);
this.events.emit('navigate', { match, screen, direction: 'forward' });

match.route.afterEnter?.(nextPath);
Expand Down
Loading