Skip to content

Commit ee8a8a4

Browse files
authored
fix: render errorElement when route loader is rejected (#290)
1 parent 41d55db commit ee8a8a4

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

packages/react-location/src/index.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -942,8 +942,8 @@ export class RouteMatch<TGenerics extends PartialGenerics = DefaultGenerics> {
942942

943943
const loaderReady = (status: 'resolved' | 'rejected') => {
944944
this.updatedAt = Date.now()
945-
resolveLoader(this.ownData)
946945
this.status = status
946+
resolveLoader(this.ownData)
947947
}
948948

949949
const resolve = (data: any) => {
@@ -985,7 +985,9 @@ export class RouteMatch<TGenerics extends PartialGenerics = DefaultGenerics> {
985985

986986
return Promise.all([...elementPromises, dataPromise])
987987
.then(() => {
988-
this.status = 'resolved'
988+
if (!loader) {
989+
this.status = 'resolved'
990+
}
989991
this.isLoading = false
990992
this.startPending = undefined
991993
})

0 commit comments

Comments
 (0)