set state in render instead of an effect

remix-run · Nov 13, 2023 · 3639f21 · 3639f21
1 parent 2acc01b
commit 3639f21
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/packages/react-router-dom/index.tsx b/packages/react-router-dom/index.tsx
@@ -1547,16 +1547,12 @@ export function useFetcher<TData = any>({
 
   // Fetcher key handling
   let [fetcherKey, setFetcherKey] = React.useState<string>(key || "");
-  if (!fetcherKey) {
+  if (key && key !== fetcherKey) {
+    setFetcherKey(key);
+  } else if (!fetcherKey) {
     setFetcherKey(getUniqueFetcherId());
   }
 
-  React.useEffect(() => {
-    if (key && key !== "" && key != fetcherKey) {
-      setFetcherKey(key);
-    }
-  }, [key, fetcherKey]);
-
   // Registration/cleanup
   React.useEffect(() => {
     router.getFetcher(fetcherKey);