@graphcommerce/react-hook-form 9.1.0-canary.54 → 9.1.0-canary.55

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 9.1.0-canary.55
+
+### Patch Changes
+
+- [#2539](https://github.com/graphcommerce-org/graphcommerce/pull/2539) [`5036171`](https://github.com/graphcommerce-org/graphcommerce/commit/5036171618492d7587cc02c557a4e9343e8240cd) - Fix typescript infer ([@paales](https://github.com/paales))
+
+- [#2539](https://github.com/graphcommerce-org/graphcommerce/pull/2539) [`31ef9c5`](https://github.com/graphcommerce-org/graphcommerce/commit/31ef9c59b18dd58fbb3625abf586f0a53f3d63cb) - Solve an issue where the false value of the useFormGql was incorrectly interpreted as an error while it was a SKIP. Fixes an issue where the CustomerAddressForm is not submitting properly when the user is adding a new address. ([@paales](https://github.com/paales))
+
+- [#2539](https://github.com/graphcommerce-org/graphcommerce/pull/2539) [`9bf02b6`](https://github.com/graphcommerce-org/graphcommerce/commit/9bf02b6dd20c086db0c93fe9efea140b673bc4a2) - Solve issue with react-hook-form causing ts errors, now version is fixed and the ts error is solved ([@paales](https://github.com/paales))
+
 ## 9.1.0-canary.54
 
 ## 9.1.0-canary.53

package/package.json

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

package/src/useFormAutoSubmit.tsx

@@ -6,9 +6,10 @@ import { cloneDeep } from '@apollo/client/utilities'
 import { debounce } from '@mui/material'
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import type {
-  DeepPartialSkipArrayKey,
   FieldPath,
   FieldValues,
+  Path,
+  PathValue,
   UseFormHandleSubmit,
   UseFormReturn,
   UseWatchProps,
@@ -125,7 +126,8 @@ export type FormAutoSubmitProps<TFieldValues extends FieldValues = FieldValues>
    * @deprecated Please use leading instead
    */
   initialWait?: number
-} & Omit<UseWatchProps<TFieldValues>, 'defaultValue'> &
+  name?: readonly [...FieldPath<TFieldValues>[]]
+} & Omit<UseWatchProps<TFieldValues>, 'defaultValue' | 'compute'> &
   DebounceSettings
 
 function useAutoSubmitBase<TFieldValues extends FieldValues = FieldValues>(
@@ -141,12 +143,13 @@ function useAutoSubmitBase<TFieldValues extends FieldValues = FieldValues>(
     submit,
     parallel,
     noValidate,
+    name = [],
     ...watchOptions
   } = props
 
   // We create a stable object from the values, so that we can compare them later
-  const values = useMemoObject(cloneDeep(useWatch(watchOptions)))
-  const oldValues = useRef<DeepPartialSkipArrayKey<TFieldValues>>(values)
+  const values = useMemoObject(cloneDeep(useWatch({ ...watchOptions, name })))
+  const oldValues = useRef<PathValue<TFieldValues, Path<TFieldValues>>[]>(values)
   const { isValidating, isSubmitting, isValid } = useFormState(watchOptions)
 
   const submitDebounced = useDebounce(

package/src/useFormGql.tsx

@@ -22,8 +22,8 @@ type UseFormGraphQLCallbacks<Q, V extends FieldValues> = {
    * Allows you to modify the variablels computed by the form to make it compatible with the GraphQL
    * Mutation.
    *
-   * When returning false, it will silently stop the submission. When an error is thrown, it will be
-   * set as an ApolloError
+   * When returning false, it will SKIP the submission. When an Error is thrown, it will be set as
+   * an ApolloError.
    */
   onBeforeSubmit?: (variables: V, form?: UseFormReturn<V>) => V | false | Promise<V | false>
   /**
@@ -32,7 +32,7 @@ type UseFormGraphQLCallbacks<Q, V extends FieldValues> = {
    * When an error is thrown, it will be set as an ApolloError
    */
   onComplete?: (
-    data: FetchResult<MaybeMasked<Q>>,
+    result: FetchResult<MaybeMasked<Q>>,
     variables: V,
     form?: UseFormReturn<V>,
   ) => void | Promise<void>
@@ -189,10 +189,7 @@ export function useFormGql<Q, V extends FieldValues>(
         return
       }
 
-      if (onBeforeSubmitResult === false) {
-        form.setError('root', { message: 'Form submission cancelled' })
-        return
-      }
+      if (onBeforeSubmitResult === false) return
 
       variables = onBeforeSubmitResult
 

package/src/useFormGqlMutation.tsx

@@ -41,7 +41,7 @@ export function assertFormGqlOperation<
 /** Bindings between react-hook-form's useForm and Apollo Client's useMutation hook. */
 export function useFormGqlMutation<Q extends Record<string, unknown>, V extends FieldValues>(
   document: TypedDocumentNode<Q, V>,
-  options: UseFormGraphQlOptions<Q, V> = {},
+  options: NoInfer<UseFormGraphQlOptions<Q, V>> = {},
   operationOptions?: MutationHookOptions<Q, V>,
 ): UseFormGqlMutationReturn<Q, V> {
   const form = useForm<V>(options)