@ultraviolet/form 2.0.0-next.3 → 2.0.0-next.4

package/dist/providers/ErrorContext/index.js

@@ -1,4 +1,5 @@
 import { useCallback, useMemo, useContext, createContext } from 'react';
+import { useFormState } from 'react-final-form';
 import { jsx } from '@emotion/react/jsx-runtime';
 
 const ErrorContext = /*#__PURE__*/createContext(undefined);
@@ -7,15 +8,52 @@ const ErrorProvider = _ref => {
     children,
     errors
   } = _ref;
-  const getError = useCallback((meta, error) => {
-    if (!error) {
-      return undefined;
+  const {
+    values
+  } = useFormState();
+  const getFirstError = useCallback(_ref2 => {
+    let {
+      label,
+      name,
+      value,
+      meta,
+      ...additionalParams
+    } = _ref2;
+    if (meta?.error && Array.isArray(meta.error)) {
+      return meta.error.map(untypedKey => {
+        const key = untypedKey;
+        if (typeof errors[key] === 'function') {
+          return errors[key]({
+            label,
+            meta,
+            name,
+            value,
+            values,
+            ...additionalParams
+          });
+        }
+        return errors[key];
+      }).filter(errorString => !!errorString)[0] ?? '';
     }
-    if (error.message) {
-      return error.message;
-    }
-    return errors?.[error.type]?.(meta);
-  }, [errors]);
+    // With a custom validate function the user may return a string directly
+    if (meta?.error && typeof meta?.error === 'string') return meta?.error;
+    return '';
+  }, [errors, values]);
+  const getError = useCallback(_ref3 => {
+    let {
+      meta,
+      errorProp,
+      value,
+      ...props
+    } = _ref3;
+    if (errorProp) return errorProp;
+    const hasInitialValueAndNotTouched = value !== undefined && value !== null && value !== '' && value !== false && meta?.dirty === false;
+    return meta?.error && (hasInitialValueAndNotTouched || meta.touched) ? getFirstError({
+      meta,
+      value,
+      ...props
+    }) : undefined;
+  }, [getFirstError]);
   const value = useMemo(() => ({
     errors,
     getError

package/dist/validators/maxDate.js

@@ -1,3 +1,6 @@
-const maxDateValidator = maxDate => value => value === undefined || maxDate === undefined || value <= maxDate;
+const maxDateValidator = maxDate => ({
+  error: 'MAX_DATE',
+  validate: value => value === undefined || value <= maxDate
+});
 
 export { maxDateValidator };

package/dist/validators/minDate.js

@@ -1,3 +1,6 @@
-const minDateValidator = minDate => value => value === undefined || minDate === undefined || value >= minDate;
+const minDateValidator = minDate => ({
+  error: 'MIN_DATE',
+  validate: value => value === undefined || value >= minDate
+});
 
 export { minDateValidator };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ultraviolet/form",
-  "version": "2.0.0-next.3",
+  "version": "2.0.0-next.4",
   "description": "Ultraviolet Form",
   "homepage": "https://github.com/scaleway/ultraviolet#readme",
   "repository": {
@@ -53,7 +53,7 @@
     "@emotion/styled": "11.11.0",
     "react-select": "5.8.0",
     "react-hook-form": "^7.47.0",
-    "@ultraviolet/ui": "1.26.1"
+    "@ultraviolet/ui": "1.27.1"
   },
   "scripts": {
     "build": "rollup -c ../../rollup.config.mjs"