Merge pull request #8908 from marmelab/use-input-validation

Simplify useInput validation

Author: slax57

examples/simple/package.json

@@ -25,7 +25,7 @@
         "react": "^17.0.0",
         "react-admin": "^4.10.2",
         "react-dom": "^17.0.0",
-        "react-hook-form": "^7.40.0",
+        "react-hook-form": "^7.43.9",
         "react-query": "^3.32.1",
         "react-router": "^6.1.0",
         "react-router-dom": "^6.1.0"

packages/ra-core/package.json

@@ -39,7 +39,7 @@
         "ignore-styles": "~5.0.1",
         "react": "^17.0.0",
         "react-dom": "^17.0.0",
-        "react-hook-form": "^7.40.0",
+        "react-hook-form": "^7.43.9",
         "react-router": "^6.1.0",
         "react-router-dom": "^6.1.0",
         "react-test-renderer": "^16.9.0 || ^17.0.0",
@@ -51,7 +51,7 @@
         "history": "^5.1.0",
         "react": "^16.9.0 || ^17.0.0 || ^18.0.0",
         "react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0",
-        "react-hook-form": "^7.40.0",
+        "react-hook-form": "^7.43.9",
         "react-router": "^6.1.0",
         "react-router-dom": "^6.1.0"
     },

packages/ra-core/src/form/useInput.ts

@@ -5,7 +5,6 @@ import {
     useController,
     UseControllerProps,
     UseControllerReturn,
-    useFormContext,
     UseFormStateReturn,
 } from 'react-hook-form';
 import get from 'lodash/get';
@@ -45,7 +44,6 @@ export const useInput = <ValueType = any>(
     const formGroups = useFormGroups();
     const record = useRecordContext();
     const getValidationErrorMessage = useGetValidationErrorMessage();
-    const formContext = useFormContext();
 
     useEffect(() => {
         if (!formGroups || formGroupName == null) {
@@ -71,13 +69,9 @@ export const useInput = <ValueType = any>(
         name: finalName,
         defaultValue: get(record, source, defaultValue),
         rules: {
-            validate: async value => {
+            validate: async (value, values) => {
                 if (!sanitizedValidate) return true;
-                const error = await sanitizedValidate(
-                    value,
-                    formContext.getValues(),
-                    props
-                );
+                const error = await sanitizedValidate(value, values, props);
 
                 if (!error) return true;
                 return getValidationErrorMessage(error);

packages/ra-input-rich-text/package.json

@@ -55,7 +55,7 @@
         "ra-ui-materialui": "^4.10.2",
         "react": "^17.0.0",
         "react-dom": "^17.0.0",
-        "react-hook-form": "^7.40.0",
+        "react-hook-form": "^7.43.9",
         "rimraf": "^3.0.2",
         "typescript": "^4.4.0"
     },

packages/ra-ui-materialui/package.json

@@ -40,7 +40,7 @@
         "ra-language-english": "^4.10.2",
         "react": "^17.0.0",
         "react-dom": "^17.0.0",
-        "react-hook-form": "^7.40.0",
+        "react-hook-form": "^7.43.9",
         "react-router": "^6.1.0",
         "react-router-dom": "^6.1.0",
         "react-test-renderer": "~16.8.6",

packages/react-admin/package.json

@@ -45,7 +45,7 @@
         "ra-i18n-polyglot": "^4.10.2",
         "ra-language-english": "^4.10.2",
         "ra-ui-materialui": "^4.10.2",
-        "react-hook-form": "^7.40.0",
+        "react-hook-form": "^7.43.9",
         "react-router": "^6.1.0",
         "react-router-dom": "^6.1.0"
     },

yarn.lock

@@ -18911,7 +18911,7 @@ __metadata:
     query-string: ^7.1.1
     react: ^17.0.0
     react-dom: ^17.0.0
-    react-hook-form: ^7.40.0
+    react-hook-form: ^7.43.9
     react-is: ^17.0.2
     react-query: ^3.32.1
     react-router: ^6.1.0
@@ -18924,7 +18924,7 @@ __metadata:
     history: ^5.1.0
     react: ^16.9.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.9.0 || ^17.0.0 || ^18.0.0
-    react-hook-form: ^7.40.0
+    react-hook-form: ^7.43.9
     react-router: ^6.1.0
     react-router-dom: ^6.1.0
   languageName: unknown
@@ -19073,7 +19073,7 @@ __metadata:
     ra-ui-materialui: ^4.10.2
     react: ^17.0.0
     react-dom: ^17.0.0
-    react-hook-form: ^7.40.0
+    react-hook-form: ^7.43.9
     rimraf: ^3.0.2
     typescript: ^4.4.0
   peerDependencies:
@@ -19166,7 +19166,7 @@ __metadata:
     react-dom: ^17.0.0
     react-dropzone: ^12.0.4
     react-error-boundary: ^3.1.4
-    react-hook-form: ^7.40.0
+    react-hook-form: ^7.43.9
     react-query: ^3.32.1
     react-router: ^6.1.0
     react-router-dom: ^6.1.0
@@ -19361,7 +19361,7 @@ __metadata:
     ra-i18n-polyglot: ^4.10.2
     ra-language-english: ^4.10.2
     ra-ui-materialui: ^4.10.2
-    react-hook-form: ^7.40.0
+    react-hook-form: ^7.43.9
     react-router: ^6.1.0
     react-router-dom: ^6.1.0
     rimraf: ^3.0.2
@@ -19552,12 +19552,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-hook-form@npm:^7.40.0":
-  version: 7.40.0
-  resolution: "react-hook-form@npm:7.40.0"
+"react-hook-form@npm:^7.43.9":
+  version: 7.43.9
+  resolution: "react-hook-form@npm:7.43.9"
   peerDependencies:
     react: ^16.8.0 || ^17 || ^18
-  checksum: 16e071ba3a11977948d7b0cbb6a84db80823465740210d3ea58d7cb93813e8771a585e4ffb82f53b24ac5ea43a6fe37da07b42d41aecda7b160dc68d68e50781
+  checksum: 5aab031ae15b32daffb45abe32e00c9d66c511348b68589d4faa6c2309db54b9d2f738b400319b0c2ea87dfd5d85f3760393feafe2bf7a97d608aa736934151f
   languageName: node
   linkType: hard
 
@@ -21006,7 +21006,7 @@ __metadata:
     react-admin: ^4.10.2
     react-app-polyfill: ^1.0.4
     react-dom: ^17.0.0
-    react-hook-form: ^7.40.0
+    react-hook-form: ^7.43.9
     react-query: ^3.32.1
     react-router: ^6.1.0
     react-router-dom: ^6.1.0