From 4e1ef7518aae95fc4b4d9706465a4dc4718572bb Mon Sep 17 00:00:00 2001
From: Alexander Nanberg <alex.nanberg@hotmail.com>
Date: Wed, 26 Apr 2023 19:27:27 +0200
Subject: [PATCH 1/2] Avoid unnecessary router subscribes

---
 packages/react-router/lib/components.tsx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx
index 9d9a40c10c..81575e36bb 100644
--- a/packages/react-router/lib/components.tsx
+++ b/packages/react-router/lib/components.tsx
@@ -63,11 +63,14 @@ export function RouterProvider({
   // pick up on any render-driven redirects/navigations (useEffect/<Navigate>)
   React.useLayoutEffect(() => {
     return router.subscribe((newState) => {
-      if (newState !== state) {
-        setState(newState);
-      }
+      setState((prevState) => {
+        if (prevState !== newState) {
+          return newState;
+        }
+        return prevState;
+      });
     });
-  }, [router, state]);
+  }, [router]);
 
   let navigator = React.useMemo((): Navigator => {
     return {

From f71ba512cfd90fd2de2916a727448352ca3645b2 Mon Sep 17 00:00:00 2001
From: Alexander Nanberg <alex.nanberg@hotmail.com>
Date: Wed, 26 Apr 2023 19:29:49 +0200
Subject: [PATCH 2/2] Add myself to contributors

---
 contributors.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contributors.yml b/contributors.yml
index ed121f6523..646e46ebf9 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -9,6 +9,7 @@
 - akamfoad
 - alany411
 - alberto
+- alexandernanberg
 - alexlbr
 - AmRo045
 - amsal