fix #5492 with empty reset with useController setting unmount attribute

react-hook-form · Jun 4, 2021 · 3ceccf7 · 3ceccf7
1 parent 8865bac
commit 3ceccf7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/useController.ts b/src/useController.ts
@@ -68,15 +68,16 @@ export function useController<
     return () => {
       controllerSubscription.unsubscribe();
       const shouldUnmountField = shouldUnmount || shouldUnregister;
+      const field = get(fieldsRef.current, name);
 
       if (
         isFieldArray
           ? shouldUnmountField && !inFieldArrayActionRef.current
           : shouldUnmountField
       ) {
         unregister(name);
-      } else if (get(fieldsRef.current, name)) {
-        get(fieldsRef.current, name)._f.mount = false;
+      } else if (field && field._f) {
+        field._f.mount = false;
       }
     };
   }, [name]);