fix: Try and handle RSC race conditions

See #714.
47ng · Oct 28, 2024 · cdbe5ec · cdbe5ec
1 parent c0bb912
commit cdbe5ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/nuqs/src/useQueryState.ts b/packages/nuqs/src/useQueryState.ts
@@ -1,7 +1,7 @@
 import {
   useCallback,
-  useEffect,
   useInsertionEffect,
+  useLayoutEffect,
   useRef,
   useState
 } from 'react'
@@ -251,7 +251,7 @@ export function useQueryState<T = string>(
     initialSearchParams?.get(key) ?? null
   )
 
-  useEffect(() => {
+  useLayoutEffect(() => {
     const query = initialSearchParams.get(key) ?? null
     if (query === queryRef.current) {
       return

diff --git a/packages/nuqs/src/useQueryStates.ts b/packages/nuqs/src/useQueryStates.ts
@@ -1,7 +1,7 @@
 import {
   useCallback,
-  useEffect,
   useInsertionEffect,
+  useLayoutEffect,
   useMemo,
   useRef,
   useState
@@ -113,7 +113,7 @@ export function useQueryStates<KeyMap extends UseQueryStatesKeysMap>(
     initialSearchParams
   )
 
-  useEffect(() => {
+  useLayoutEffect(() => {
     const state = parseMap(
       keyMap,
       urlKeys,