From 784ece7fa6d902507d47fdf163f5f4747a136a7f Mon Sep 17 00:00:00 2001
From: Richard Willis <willis.rh@gmail.com>
Date: Thu, 16 Jun 2022 08:28:20 +0100
Subject: [PATCH] fix: render errorElement when route loader is rejected

---
 packages/react-location/src/index.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/react-location/src/index.tsx b/packages/react-location/src/index.tsx
index abd41f132ad..f8ea5cca8a9 100644
--- a/packages/react-location/src/index.tsx
+++ b/packages/react-location/src/index.tsx
@@ -942,8 +942,8 @@ export class RouteMatch<TGenerics extends PartialGenerics = DefaultGenerics> {
 
               const loaderReady = (status: 'resolved' | 'rejected') => {
                 this.updatedAt = Date.now()
-                resolveLoader(this.ownData)
                 this.status = status
+                resolveLoader(this.ownData)
               }
 
               const resolve = (data: any) => {
@@ -985,7 +985,9 @@ export class RouteMatch<TGenerics extends PartialGenerics = DefaultGenerics> {
 
         return Promise.all([...elementPromises, dataPromise])
           .then(() => {
-            this.status = 'resolved'
+            if (!loader) {
+              this.status = 'resolved'
+            }
             this.isLoading = false
             this.startPending = undefined
           })