[Chore] Reorganize ra-core/form directory

packages/ra-core/src/form/Form.spec.tsx

@@ -11,7 +11,7 @@ import { CoreAdminContext } from '../core';
 import { Form } from './Form';
 import { useNotificationContext } from '../notification';
 import { useInput } from './useInput';
-import { required } from './validate';
+import { required } from './validation/validate';
 import {
     FormLevelValidation,
     InputLevelValidation,

packages/ra-core/src/form/Form.stories.tsx

@@ -13,8 +13,7 @@ import { Route, Routes, useNavigate, Link, HashRouter } from 'react-router-dom';
 import { CoreAdminContext } from '../core';
 import { Form } from './Form';
 import { useInput } from './useInput';
-import { required } from './validate';
-import ValidationError from './ValidationError';
+import { required, ValidationError } from './validation';
 import { mergeTranslations } from '../i18n';
 import { I18nProvider } from '../types';
 import { SaveContextProvider, useNotificationContext } from '..';

packages/ra-core/src/form/Form.tsx

@@ -11,7 +11,7 @@ import {
     UNSAFE_DataRouterStateContext,
 } from 'react-router';
 
-import { FormGroupsProvider } from './FormGroupsProvider';
+import { FormGroupsProvider } from './groups/FormGroupsProvider';
 import { RaRecord } from '../types';
 import {
     useRecordContext,
@@ -23,7 +23,7 @@ import {
     SourceContextValue,
     useResourceContext,
 } from '../core';
-import { ValidateForm } from './getSimpleValidationResolver';
+import { ValidateForm } from './validation/getSimpleValidationResolver';
 import { WarnWhenUnsavedChanges } from './WarnWhenUnsavedChanges';
 import { useAugmentedForm } from './useAugmentedForm';
 

packages/ra-core/src/form/FormDataConsumer.spec.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { render, waitFor, screen, fireEvent } from '@testing-library/react';
 
-import FormDataConsumer, { FormDataConsumerView } from './FormDataConsumer';
+import { FormDataConsumer, FormDataConsumerView } from './FormDataConsumer';
 import { testDataProvider } from '../dataProvider';
 import {
     AdminContext,

packages/ra-core/src/form/FormDataConsumer.tsx

@@ -42,7 +42,9 @@ import { useWrappedSource } from '../core';
  *     </Edit>
  * );
  */
-const FormDataConsumer = <TFieldValues extends FieldValues = FieldValues>(
+export const FormDataConsumer = <
+    TFieldValues extends FieldValues = FieldValues,
+>(
     props: ConnectedProps<TFieldValues>
 ) => {
     const form = useFormContext<TFieldValues>();
@@ -83,8 +85,6 @@ export const FormDataConsumerView = <
     return ret === undefined ? null : ret;
 };
 
-export default FormDataConsumer;
-
 const ArraySourceRegex = new RegExp(/.+\.\d+$/);
 
 export interface FormDataConsumerRenderParams<

packages/ra-core/src/form/choices/index.ts

@@ -1,3 +1,4 @@
 export * from './ChoicesContext';
 export * from './ChoicesContextProvider';
 export * from './useChoicesContext';
+export * from './useChoices';

packages/ra-core/src/form/useChoices.spec.tsx → packages/ra-core/src/form/choices/useChoices.spec.tsx

@@ -3,8 +3,8 @@ import expect from 'expect';
 import { render, screen } from '@testing-library/react';
 
 import { useChoices } from './useChoices';
-import { TestTranslationProvider } from '../i18n';
-import { useRecordContext } from '../controller';
+import { TestTranslationProvider } from '../../i18n';
+import { useRecordContext } from '../../controller';
 
 describe('useChoices hook', () => {
     const defaultProps = {

packages/ra-core/src/form/useChoices.tsx → packages/ra-core/src/form/choices/useChoices.tsx

@@ -2,9 +2,9 @@ import * as React from 'react';
 import { ReactElement, isValidElement, useCallback } from 'react';
 import get from 'lodash/get';
 
-import { useTranslate } from '../i18n';
-import { RaRecord } from '../types';
-import { RecordContextProvider } from '../controller';
+import { useTranslate } from '../../i18n';
+import { RaRecord } from '../../types';
+import { RecordContextProvider } from '../../controller';
 
 export type OptionTextElement = ReactElement<{
     record: RaRecord;

packages/ra-core/src/form/groups/index.tsx

@@ -0,0 +1,6 @@
+export * from './FormGroupContext';
+export * from './FormGroupContextProvider';
+export * from './FormGroupsProvider';
+export * from './useFormGroup';
+export * from './useFormGroups';
+export * from './useFormGroupContext';

packages/ra-core/src/form/useFormGroup.spec.tsx → packages/ra-core/src/form/groups/useFormGroup.spec.tsx

@@ -10,8 +10,8 @@ import {
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import expect from 'expect';
 import { FormGroupContextProvider } from './FormGroupContextProvider';
-import { testDataProvider } from '../dataProvider';
-import { ResourceContextProvider } from '..';
+import { testDataProvider } from '../../dataProvider';
+import { ResourceContextProvider } from '../..';
 
 describe('useFormGroup', () => {
     test.each([

packages/ra-core/src/form/useFormGroup.ts → packages/ra-core/src/form/groups/useFormGroup.ts

@@ -3,7 +3,7 @@ import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
 import { useFormState } from 'react-hook-form';
 import { useFormGroups } from './useFormGroups';
-import { useEvent } from '../util';
+import { useEvent } from '../../util';
 
 type FieldState = {
     name: string;

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

@@ -1,50 +1,11 @@
-import FormDataConsumer, {
-    FormDataConsumerRender,
-    FormDataConsumerRenderParams,
-} from './FormDataConsumer';
-import {
-    FormGroupsContext,
-    FormGroupsContextValue,
-    FormGroupSubscriber,
-} from './FormGroupsContext';
-import ValidationError, { ValidationErrorProps } from './ValidationError';
-import {
-    getSimpleValidationResolver,
-    ValidateForm,
-} from './getSimpleValidationResolver';
-
-export type {
-    FormGroupsContextValue,
-    FormGroupSubscriber,
-    FormDataConsumerRender,
-    FormDataConsumerRenderParams,
-    ValidationErrorProps,
-    ValidateForm,
-};
-
-export {
-    FormDataConsumer,
-    FormGroupsContext,
-    ValidationError,
-    getSimpleValidationResolver,
-};
 export * from './choices';
 export * from './Form';
-export * from './validate';
-export * from './FormGroupContext';
-export * from './FormGroupContextProvider';
-export * from './FormGroupsProvider';
-export * from './setSubmissionErrors';
+export * from './FormDataConsumer';
+export * from './groups';
 export * from './useApplyInputDefaultValues';
-export * from './useChoices';
-export * from './useFormGroup';
-export * from './useFormGroups';
-export * from './useFormGroupContext';
-export * from './useGetValidationErrorMessage';
-export * from './useNotifyIsFormInvalid';
 export * from './useAugmentedForm';
 export * from './useInput';
 export * from './useSuggestions';
-export * from './useUnique';
 export * from './useWarnWhenUnsavedChanges';
+export * from './validation';
 export * from './WarnWhenUnsavedChanges';

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

@@ -13,9 +13,9 @@ import getFormInitialValues from './getFormInitialValues';
 import {
     getSimpleValidationResolver,
     ValidateForm,
-} from './getSimpleValidationResolver';
-import { setSubmissionErrors } from './setSubmissionErrors';
-import { useNotifyIsFormInvalid } from './useNotifyIsFormInvalid';
+} from './validation/getSimpleValidationResolver';
+import { setSubmissionErrors } from './validation/setSubmissionErrors';
+import { useNotifyIsFormInvalid } from './validation/useNotifyIsFormInvalid';
 import { sanitizeEmptyValues as sanitizeValues } from './sanitizeEmptyValues';
 
 /**

packages/ra-core/src/form/useInput.spec.tsx

@@ -6,7 +6,7 @@ import { CoreAdminContext, SourceContextProvider } from '../core';
 import { testDataProvider } from '../dataProvider';
 import { Form } from './Form';
 import { useInput, InputProps, UseInputValue } from './useInput';
-import { required } from './validate';
+import { required } from './validation/validate';
 
 const Input: FunctionComponent<
     {

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

@@ -10,10 +10,8 @@ import {
 import get from 'lodash/get';
 
 import { useRecordContext } from '../controller';
-import { composeValidators, Validator } from './validate';
-import isRequired from './isRequired';
-import { useFormGroupContext } from './useFormGroupContext';
-import { useFormGroups } from './useFormGroups';
+import { composeValidators, Validator, isRequired } from './validation';
+import { useFormGroupContext, useFormGroups } from './groups';
 import { useApplyInputDefaultValues } from './useApplyInputDefaultValues';
 import { useEvent } from '../util';
 import { useWrappedSource } from '../core';

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

@@ -1,6 +1,10 @@
 import { useCallback, isValidElement, ReactElement } from 'react';
 import set from 'lodash/set';
-import { useChoices, OptionText, UseChoicesOptions } from './useChoices';
+import {
+    useChoices,
+    OptionText,
+    UseChoicesOptions,
+} from './choices/useChoices';
 import { useTranslate } from '../i18n';
 
 /*

packages/ra-core/src/form/ValidationError.spec.tsx → packages/ra-core/src/form/validation/ValidationError.spec.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { render } from '@testing-library/react';
 
-import ValidationError from './ValidationError';
-import { TestTranslationProvider } from '../i18n';
+import { ValidationError } from './ValidationError';
+import { TestTranslationProvider } from '../../i18n';
 
 const translate = jest.fn(key => {
     return key;

packages/ra-core/src/form/ValidationError.tsx → packages/ra-core/src/form/validation/ValidationError.tsx

@@ -3,14 +3,14 @@ import {
     ValidationErrorMessage,
     ValidationErrorMessageWithArgs,
 } from './validate';
-import { useTranslate } from '../i18n';
+import { useTranslate } from '../../i18n';
 
 export interface ValidationErrorProps {
     error: ValidationErrorMessage;
 }
 
 const ValidationErrorSpecialFormatPrefix = '@@react-admin@@';
-const ValidationError = (props: ValidationErrorProps) => {
+export const ValidationError = (props: ValidationErrorProps) => {
     const { error } = props;
     let errorMessage = error;
     const translate = useTranslate();
@@ -35,5 +35,3 @@ const ValidationError = (props: ValidationErrorProps) => {
 
     return <>{translate(errorMessage as string, { _: errorMessage })}</>;
 };
-
-export default ValidationError;

packages/ra-core/src/form/validation/index.ts

@@ -0,0 +1,7 @@
+export * from './getSimpleValidationResolver';
+export * from './setSubmissionErrors';
+export * from './useGetValidationErrorMessage';
+export * from './useNotifyIsFormInvalid';
+export * from './useUnique';
+export * from './validate';
+export * from './ValidationError';

packages/ra-core/src/form/useGetValidationErrorMessage.ts → packages/ra-core/src/form/validation/useGetValidationErrorMessage.ts

@@ -2,7 +2,7 @@ import {
     ValidationErrorMessage,
     ValidationErrorMessageWithArgs,
 } from './validate';
-import { useTranslate } from '../i18n';
+import { useTranslate } from '../../i18n';
 
 /**
  * @deprecated

packages/ra-core/src/form/useNotifyIsFormInvalid.ts → packages/ra-core/src/form/validation/useNotifyIsFormInvalid.ts

@@ -1,6 +1,6 @@
 import { useEffect, useRef } from 'react';
 import { useFormState, Control } from 'react-hook-form';
-import { useNotify } from '../notification';
+import { useNotify } from '../../notification';
 
 /**
  * This hook display an error message on submit in Form and SaveButton.

packages/ra-core/src/form/useUnique.spec.tsx → packages/ra-core/src/form/validation/useUnique.spec.tsx

@@ -8,8 +8,8 @@ import {
     WithAdditionalFilters,
     WithMessage,
 } from './useUnique.stories';
-import { testDataProvider } from '../dataProvider';
-import { DataProvider } from '../types';
+import { testDataProvider } from '../../dataProvider';
+import { DataProvider } from '../../types';
 
 describe('useUnique', () => {
     const baseDataProvider = (overrides?: Partial<DataProvider>) =>

packages/ra-core/src/form/useUnique.stories.tsx → packages/ra-core/src/form/validation/useUnique.stories.tsx

@@ -2,8 +2,8 @@ import * as React from 'react';
 import fakerestDataProvider from 'ra-data-fakerest';
 import polyglotI18nProvider from 'ra-i18n-polyglot';
 import englishMessages from 'ra-language-english';
-import { Form } from './Form';
-import { useInput } from './useInput';
+import { Form } from '../Form';
+import { useInput } from '../useInput';
 import {
     CoreAdminContext,
     CreateBase,
@@ -13,9 +13,9 @@ import {
     ValidationError,
     mergeTranslations,
     useUnique,
-} from '..';
+} from '../..';
 import { QueryClient } from '@tanstack/react-query';
-import { TestMemoryRouter } from '../routing';
+import { TestMemoryRouter } from '../../routing';
 
 export default {
     title: 'ra-core/form/useUnique',

packages/ra-core/src/form/useUnique.ts → packages/ra-core/src/form/validation/useUnique.ts

@@ -1,12 +1,12 @@
-import merge from 'lodash/merge';
-import { useResourceContext } from '../core';
-import { useDataProvider } from '../dataProvider';
-import { useTranslate, useTranslateLabel } from '../i18n';
-import { InputProps } from './useInput';
 import { useCallback, useRef } from 'react';
+import merge from 'lodash/merge';
 import set from 'lodash/set';
-import { asyncDebounce } from '../util';
-import { useRecordContext } from '../controller';
+import { useResourceContext } from '../../core';
+import { useDataProvider } from '../../dataProvider';
+import { useTranslate, useTranslateLabel } from '../../i18n';
+import { asyncDebounce } from '../../util';
+import { useRecordContext } from '../../controller';
+import { InputProps } from '../useInput';
 import { isEmpty } from './validate';
 
 /**