From 47e43a8bb0881a129d4f84a4e67460f53834940c Mon Sep 17 00:00:00 2001
From: Joris <reixjoris@gmail.com>
Date: Fri, 9 Apr 2021 18:47:50 +0200
Subject: [PATCH] feat: Support React Hook Form 7 \n\n BREAKING CHANGE: require
 react-hook-form@7

---
 package.json         | 4 ++--
 src/ErrorMessage.tsx | 2 +-
 src/types.ts         | 3 ++-
 yarn.lock            | 8 ++++----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 7d8352a..b31cdf3 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "prettier": "^2.2.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-hook-form": "^6.11.4",
+    "react-hook-form": "^7.0.5",
     "rimraf": "^3.0.2",
     "ts-jest": "^26.5.4",
     "typescript": "^4.2.4"
@@ -89,7 +89,7 @@
   "peerDependencies": {
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
-    "react-hook-form": ">=6.6.0"
+    "react-hook-form": "^7.0.0"
   },
   "husky": {
     "hooks": {
diff --git a/src/ErrorMessage.tsx b/src/ErrorMessage.tsx
index 58d4c3d..0196985 100644
--- a/src/ErrorMessage.tsx
+++ b/src/ErrorMessage.tsx
@@ -18,7 +18,7 @@ const ErrorMessage = <
   ...rest
 }: Props<TFieldErrors, TAs>) => {
   const methods = useFormContext();
-  const error = get(errors || methods.errors, name);
+  const error = get(errors || methods.formState.errors, name);
 
   if (!error) {
     return null;
diff --git a/src/types.ts b/src/types.ts
index e852309..4f57c08 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,12 +1,13 @@
 import React from 'react';
 import {
-  Assign,
   FieldName,
   Message,
   MultipleFieldErrors,
   FieldErrors,
 } from 'react-hook-form';
 
+type Assign<T extends object, U extends object> = T & Omit<U, keyof T>;
+
 export type FieldValuesFromFieldErrors<
   TFieldErrors
 > = TFieldErrors extends FieldErrors<infer TFieldValues> ? TFieldValues : never;
diff --git a/yarn.lock b/yarn.lock
index fe2af70..b590f37 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5784,10 +5784,10 @@ react-dom@^17.0.2:
     object-assign "^4.1.1"
     scheduler "^0.20.2"
 
-react-hook-form@^6.11.4:
-  version "6.15.5"
-  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-6.15.5.tgz#c2578f9ce6a6df7b33015587d40cd880dc13e2db"
-  integrity sha512-so2jEPYKdVk1olMo+HQ9D9n1hVzaPPFO4wsjgSeZ964R7q7CHsYRbVF0PGBi83FcycA5482WHflasdwLIUVENg==
+react-hook-form@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.0.5.tgz#33d4a437be78ca1fe86867ed937fe94b09c4bf9c"
+  integrity sha512-NERg22pjSa8URYfNhDhefGVODMTP4DMLlkK+bpuN4GUWKYIh/qiV4YmPuH8bfMAcXKj+bpdh6n7dB5B6jBs74Q==
 
 react-is@^16.8.1:
   version "16.13.1"