@ultraviolet/form 2.0.0-next.0 → 2.0.0-next.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -1,7 +1,6 @@
1
- export { FieldArray, useFieldArray } from 'react-final-form-arrays';
2
- export { FORM_ERROR } from 'final-form';
3
- export { Field, FormSpy, useField, useForm, useFormState } from 'react-final-form';
1
+ export { FORM_ERROR } from './constants.js';
4
2
  export { ErrorProvider, useErrors } from './providers/ErrorContext/index.js';
3
+ export * from 'react-hook-form';
5
4
  export { CheckboxField } from './components/CheckboxField/index.js';
6
5
  export { CheckboxGroupField } from './components/CheckboxGroupField/index.js';
7
6
  export { DateField } from './components/DateField/index.js';
@@ -17,6 +16,9 @@ export { TextInputField } from './components/TextInputField/index.js';
17
16
  export { TimeField } from './components/TimeField/index.js';
18
17
  export { ToggleField } from './components/ToggleField/index.js';
19
18
  export { RadioGroupField } from './components/RadioGroupField/index.js';
20
- export { useValidation } from './hooks/useValidation.js';
19
+ export { FormSpy } from './components/FormSpy/index.js';
20
+ export { useFormStateDeprecated } from './hooks/useFormState.js';
21
+ export { useFieldDeprecated } from './hooks/useField.js';
22
+ export { useFormDeprecated } from './hooks/useForm.js';
23
+ export { useFieldArrayDeprecated } from './hooks/useFieldArray.js';
21
24
  export { useOnFieldChange } from './hooks/useOnFieldChange.js';
22
- export { pickValidators } from './helpers/pickValidators.js';
@@ -1,5 +1,4 @@
1
1
  import { useCallback, useMemo, useContext, createContext } from 'react';
2
- import { useFormState } from 'react-final-form';
3
2
  import { jsx } from '@emotion/react/jsx-runtime';
4
3
 
5
4
  const ErrorContext = /*#__PURE__*/createContext(undefined);
@@ -8,52 +7,15 @@ const ErrorProvider = _ref => {
8
7
  children,
9
8
  errors
10
9
  } = _ref;
11
- const {
12
- values
13
- } = useFormState();
14
- const getFirstError = useCallback(_ref2 => {
15
- let {
16
- label,
17
- name,
18
- value,
19
- meta,
20
- ...additionalParams
21
- } = _ref2;
22
- if (meta?.error && Array.isArray(meta.error)) {
23
- return meta.error.map(untypedKey => {
24
- const key = untypedKey;
25
- if (typeof errors[key] === 'function') {
26
- return errors[key]({
27
- label,
28
- meta,
29
- name,
30
- value,
31
- values,
32
- ...additionalParams
33
- });
34
- }
35
- return errors[key];
36
- }).filter(errorString => !!errorString)[0] ?? '';
10
+ const getError = useCallback((meta, error) => {
11
+ if (!error) {
12
+ return undefined;
37
13
  }
38
- // With a custom validate function the user may return a string directly
39
- if (meta?.error && typeof meta?.error === 'string') return meta?.error;
40
- return '';
41
- }, [errors, values]);
42
- const getError = useCallback(_ref3 => {
43
- let {
44
- meta,
45
- errorProp,
46
- value,
47
- ...props
48
- } = _ref3;
49
- if (errorProp) return errorProp;
50
- const hasInitialValueAndNotTouched = value !== undefined && value !== null && value !== '' && value !== false && meta?.dirty === false;
51
- return meta?.error && (hasInitialValueAndNotTouched || meta.touched) ? getFirstError({
52
- meta,
53
- value,
54
- ...props
55
- }) : undefined;
56
- }, [getFirstError]);
14
+ if (error.message) {
15
+ return error.message;
16
+ }
17
+ return errors?.[error.type]?.(meta);
18
+ }, [errors]);
57
19
  const value = useMemo(() => ({
58
20
  errors,
59
21
  getError
@@ -1,6 +1,3 @@
1
- const maxDateValidator = maxDate => ({
2
- error: 'MAX_DATE',
3
- validate: value => value === undefined || value <= maxDate
4
- });
1
+ const maxDateValidator = maxDate => value => value === undefined || maxDate === undefined || value <= maxDate;
5
2
 
6
3
  export { maxDateValidator };
@@ -1,6 +1,3 @@
1
- const minDateValidator = minDate => ({
2
- error: 'MIN_DATE',
3
- validate: value => value === undefined || value >= minDate
4
- });
1
+ const minDateValidator = minDate => value => value === undefined || minDate === undefined || value >= minDate;
5
2
 
6
3
  export { minDateValidator };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ultraviolet/form",
3
- "version": "2.0.0-next.0",
3
+ "version": "2.0.0-next.2",
4
4
  "description": "Ultraviolet Form",
5
5
  "homepage": "https://github.com/scaleway/ultraviolet#readme",
6
6
  "repository": {