@graphcommerce/react-hook-form 9.0.4-canary.12 → 9.0.4-canary.14

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 9.0.4-canary.14
+
+## 9.0.4-canary.13
+
+### Patch Changes
+
+- [`9aa9a3c`](https://github.com/graphcommerce-org/graphcommerce/commit/9aa9a3cc25c121e217f64efc0cfd19e3b90d15aa) - useFormGql and all derivivatives now get the form as an argument in onComplete for easier form resets. ([@paales](https://github.com/paales))
+
 ## 9.0.4-canary.12
 
 ## 9.0.4-canary.11

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/react-hook-form",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.0.4-canary.12",
+  "version": "9.0.4-canary.14",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -13,9 +13,9 @@
   },
   "peerDependencies": {
     "@apollo/client": "*",
-    "@graphcommerce/eslint-config-pwa": "^9.0.4-canary.12",
-    "@graphcommerce/prettier-config-pwa": "^9.0.4-canary.12",
-    "@graphcommerce/typescript-config-pwa": "^9.0.4-canary.12",
+    "@graphcommerce/eslint-config-pwa": "^9.0.4-canary.14",
+    "@graphcommerce/prettier-config-pwa": "^9.0.4-canary.14",
+    "@graphcommerce/typescript-config-pwa": "^9.0.4-canary.14",
     "@mui/utils": "^5",
     "graphql": "^16.6.0",
     "react": "^18.2.0",

package/src/useFormGql.tsx

@@ -17,12 +17,7 @@ import type { UseGqlDocumentHandler } from './useGqlDocumentHandler'
 import { useGqlDocumentHandler } from './useGqlDocumentHandler'
 import { tryAsync } from './utils/tryTuple'
 
-export type OnCompleteFn<Q, V> = (
-  data: FetchResult<MaybeMasked<Q>>,
-  variables: V,
-) => void | Promise<void>
-
-type UseFormGraphQLCallbacks<Q, V> = {
+type UseFormGraphQLCallbacks<Q, V extends FieldValues> = {
   /**
    * Allows you to modify the variablels computed by the form to make it compatible with the GraphQL
    * Mutation.
@@ -30,13 +25,17 @@ type UseFormGraphQLCallbacks<Q, V> = {
    * When returning false, it will silently stop the submission. When an error is thrown, it will be
    * set as an ApolloError
    */
-  onBeforeSubmit?: (variables: V) => V | false | Promise<V | false>
+  onBeforeSubmit?: (variables: V, form?: UseFormReturn<V>) => V | false | Promise<V | false>
   /**
    * Called after the mutation has been executed. Allows you to handle the result of the mutation.
    *
    * When an error is thrown, it will be set as an ApolloError
    */
-  onComplete?: OnCompleteFn<Q, V>
+  onComplete?: (
+    data: FetchResult<MaybeMasked<Q>>,
+    variables: V,
+    form?: UseFormReturn<V>,
+  ) => void | Promise<void>
 
   /**
    * @deprecated Not used anymore, is now the default
@@ -174,7 +173,7 @@ export function useFormGql<Q, V extends FieldValues>(
       let variables = !deprecated_useV1 ? formValues : encode({ ...defaultValues, ...formValues })
 
       // Wait for the onBeforeSubmit to complete
-      const [onBeforeSubmitResult, onBeforeSubmitError] = await beforeSubmit(variables)
+      const [onBeforeSubmitResult, onBeforeSubmitError] = await beforeSubmit(variables, form)
       if (onBeforeSubmitError) {
         if (isApolloError(onBeforeSubmitError)) {
           returnedError.current = onBeforeSubmitError
@@ -219,7 +218,7 @@ export function useFormGql<Q, V extends FieldValues>(
         return
       }
 
-      const [, onCompleteError] = await complete(result, variables)
+      const [, onCompleteError] = await complete(result, variables, form)
       if (onCompleteError) {
         if (isApolloError(onCompleteError)) {
           returnedError.current = onCompleteError