fix(reValidate):

Fixes revalidate not working properly with server actions
atomic-state · May 19, 2024 · 5edc30f · 5edc30f
1 parent 7e0fa31
commit 5edc30f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/hooks/others.ts b/src/hooks/others.ts
@@ -696,7 +696,7 @@ export function useServerAction<T extends (args: any) => any>(
 ) {
   let mockServerActionId = config?.id ?? getMockServerActionId(action)
 
-  const $action = useFetch(action.name, {
+  const $action = useFetch(mockServerActionId, {
     fetcher: async function proxied(_, config) {
       const actionParam = actionForms.get(mockServerActionId) ?? config?.params
 

diff --git a/src/hooks/use-fetch.ts b/src/hooks/use-fetch.ts
@@ -1004,7 +1004,7 @@ export function useFetch<FetchDataType = any, BodyType = any>(
 
   const reValidate = useCallback(
     async function reValidate() {
-      if (!isPending(resolvedKey) && !loading) {
+      if (!isPending(resolvedKey)) {
         revalidate(id)
       }
     },
@@ -1476,6 +1476,10 @@ export function useFetch<FetchDataType = any, BodyType = any>(
     })
   }
 
+  const refreshRequest = () => {
+    revalidate(id)
+  }
+
   return {
     get resetError() {
       thisDeps.error = true
@@ -1555,6 +1559,7 @@ export function useFetch<FetchDataType = any, BodyType = any>(
       thisDeps.loading = true
       return statusCodes.get(resolvedKey)
     },
+    refresh: refreshRequest,
     get reFetch() {
       thisDeps.loading = true
       return reValidate
@@ -1595,6 +1600,7 @@ export function useFetch<FetchDataType = any, BodyType = any>(
      */
     key: resolvedKey
   } as unknown as {
+    refresh(): void
     resetError(): void
     formProps: {
       action: (form: FormData) => Promise<void>