chore!: remove Form

packages/core/admin/admin/src/content-manager/components/Form.tsx → packages/core/admin/admin/src/components/Form.tsx

@@ -17,9 +17,10 @@ import isEqual from 'lodash/isEqual';
 import { useIntl } from 'react-intl';
 import { useBlocker } from 'react-router-dom';
 
-import { createContext } from '../../components/Context';
 import { getIn, setIn } from '../utils/object';
 
+import { createContext } from './Context';
+
 import type { InputProps as InputPropsImpl, EnumerationProps } from './FormInputs/types';
 import type * as Yup from 'yup';
 

packages/core/admin/admin/src/content-manager/components/FormInputs/Boolean.tsx → packages/core/admin/admin/src/components/FormInputs/Boolean.tsx

@@ -4,7 +4,7 @@ import { ToggleInput } from '@strapi/design-system';
 import { useFocusInputField } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
 
-import { useComposedRefs } from '../../utils/refs';
+import { useComposedRefs } from '../../content-manager/utils/refs';
 import { useField } from '../Form';
 
 import { InputProps } from './types';

packages/core/admin/admin/src/content-manager/components/FormInputs/Date.tsx → packages/core/admin/admin/src/components/FormInputs/Date.tsx

@@ -4,7 +4,7 @@ import { DatePicker } from '@strapi/design-system';
 import { useFocusInputField } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
 
-import { useComposedRefs } from '../../utils/refs';
+import { useComposedRefs } from '../../content-manager/utils/refs';
 import { useField } from '../Form';
 
 import { InputProps } from './types';

packages/core/admin/admin/src/content-manager/components/FormInputs/DateTime.tsx → packages/core/admin/admin/src/components/FormInputs/DateTime.tsx

@@ -4,7 +4,7 @@ import { DateTimePicker } from '@strapi/design-system';
 import { useFocusInputField } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
 
-import { useComposedRefs } from '../../utils/refs';
+import { useComposedRefs } from '../../content-manager/utils/refs';
 import { useField } from '../Form';
 
 import { InputProps } from './types';

packages/core/admin/admin/src/content-manager/components/FormInputs/Email.tsx → packages/core/admin/admin/src/components/FormInputs/Email.tsx

@@ -3,7 +3,7 @@ import { forwardRef } from 'react';
 import { TextInput } from '@strapi/design-system';
 import { useFocusInputField } from '@strapi/helper-plugin';
 
-import { useComposedRefs } from '../../utils/refs';
+import { useComposedRefs } from '../../content-manager/utils/refs';
 import { useField } from '../Form';
 
 import { InputProps } from './types';

packages/core/admin/admin/src/content-manager/components/FormInputs/Enumeration.tsx → packages/core/admin/admin/src/components/FormInputs/Enumeration.tsx

@@ -3,7 +3,7 @@ import { forwardRef } from 'react';
 import { SingleSelect, SingleSelectOption } from '@strapi/design-system';
 import { useFocusInputField } from '@strapi/helper-plugin';
 
-import { useComposedRefs } from '../../utils/refs';
+import { useComposedRefs } from '../../content-manager/utils/refs';
 import { useField } from '../Form';
 
 import { EnumerationProps } from './types';

packages/core/admin/admin/src/content-manager/components/FormInputs/Json.tsx → packages/core/admin/admin/src/components/FormInputs/Json.tsx

@@ -3,7 +3,7 @@ import { forwardRef } from 'react';
 import { JSONInput as JSONInputImpl } from '@strapi/design-system';
 import { useFocusInputField } from '@strapi/helper-plugin';
 
-import { useComposedRefs } from '../../utils/refs';
+import { useComposedRefs } from '../../content-manager/utils/refs';
 import { useField } from '../Form';
 
 import { InputProps } from './types';

packages/core/admin/admin/src/content-manager/components/FormInputs/Number.tsx → packages/core/admin/admin/src/components/FormInputs/Number.tsx

@@ -3,7 +3,7 @@ import { forwardRef } from 'react';
 import { NumberInput } from '@strapi/design-system';
 import { useFocusInputField } from '@strapi/helper-plugin';
 
-import { useComposedRefs } from '../../utils/refs';
+import { useComposedRefs } from '../../content-manager/utils/refs';
 import { useField } from '../Form';
 
 import { InputProps } from './types';

packages/core/admin/admin/src/content-manager/components/FormInputs/Password.tsx → packages/core/admin/admin/src/components/FormInputs/Password.tsx

@@ -5,7 +5,7 @@ import { useFocusInputField } from '@strapi/helper-plugin';
 import { Eye, EyeStriked } from '@strapi/icons';
 import { useIntl } from 'react-intl';
 
-import { useComposedRefs } from '../../utils/refs';
+import { useComposedRefs } from '../../content-manager/utils/refs';
 import { useField } from '../Form';
 
 import { InputProps } from './types';

packages/core/admin/admin/src/content-manager/components/FormInputs/Renderer.tsx → packages/core/admin/admin/src/components/FormInputs/Renderer.tsx

@@ -3,7 +3,7 @@ import { forwardRef, memo } from 'react';
 import { TextInput } from '@strapi/design-system';
 import { useFocusInputField } from '@strapi/helper-plugin';
 
-import { useComposedRefs } from '../../utils/refs';
+import { useComposedRefs } from '../../content-manager/utils/refs';
 import { useField } from '../Form';
 
 import { BooleanInput } from './Boolean';

packages/core/admin/admin/src/content-manager/components/FormInputs/String.tsx → packages/core/admin/admin/src/components/FormInputs/String.tsx

@@ -3,7 +3,7 @@ import { forwardRef } from 'react';
 import { TextInput } from '@strapi/design-system';
 import { useFocusInputField } from '@strapi/helper-plugin';
 
-import { useComposedRefs } from '../../utils/refs';
+import { useComposedRefs } from '../../content-manager/utils/refs';
 import { useField } from '../Form';
 
 import { InputProps } from './types';

packages/core/admin/admin/src/content-manager/components/FormInputs/Textarea.tsx → packages/core/admin/admin/src/components/FormInputs/Textarea.tsx

@@ -3,7 +3,7 @@ import { forwardRef } from 'react';
 import { Textarea } from '@strapi/design-system';
 import { useFocusInputField } from '@strapi/helper-plugin';
 
-import { useComposedRefs } from '../../utils/refs';
+import { useComposedRefs } from '../../content-manager/utils/refs';
 import { useField } from '../Form';
 
 import { InputProps } from './types';

packages/core/admin/admin/src/content-manager/components/FormInputs/Time.tsx → packages/core/admin/admin/src/components/FormInputs/Time.tsx

@@ -4,7 +4,7 @@ import { TimePicker } from '@strapi/design-system';
 import { useFocusInputField } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
 
-import { useComposedRefs } from '../../utils/refs';
+import { useComposedRefs } from '../../content-manager/utils/refs';
 import { useField } from '../Form';
 
 import { InputProps } from './types';

packages/core/admin/admin/src/content-manager/components/ConfigurationForm/EditFieldForm.tsx

@@ -15,13 +15,13 @@ import { useNotification } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
 import * as yup from 'yup';
 
+import { Form, InputProps, useField } from '../../../components/Form';
+import { InputRenderer } from '../../../components/FormInputs/Renderer';
 import { capitalise } from '../../../utils/strings';
 import { ATTRIBUTE_TYPES_THAT_CANNOT_BE_MAIN_FIELD } from '../../constants/attributes';
 import { useGetInitialDataQuery } from '../../services/init';
 import { getTranslation } from '../../utils/translations';
 import { FieldTypeIcon } from '../FieldTypeIcon';
-import { Form, InputProps, useField } from '../Form';
-import { InputRenderer } from '../FormInputs/Renderer';
 
 import { TEMP_FIELD_NAME } from './Fields';
 

packages/core/admin/admin/src/content-manager/components/ConfigurationForm/Fields.tsx

@@ -9,12 +9,12 @@ import { useIntl } from 'react-intl';
 import { NavLink } from 'react-router-dom';
 import styled from 'styled-components';
 
+import { useField, useForm } from '../../../components/Form';
 import { ItemTypes } from '../../constants/dragAndDrop';
 import { type UseDragAndDropOptions, useDragAndDrop } from '../../hooks/useDragAndDrop';
 import { useComposedRefs } from '../../utils/refs';
 import { getTranslation } from '../../utils/translations';
 import { ComponentIcon } from '../ComponentIcon';
-import { useField, useForm } from '../Form';
 
 import { EditFieldForm, EditFieldFormProps } from './EditFieldForm';
 

packages/core/admin/admin/src/content-manager/components/ConfigurationForm/Form.tsx

@@ -19,11 +19,11 @@ import pipe from 'lodash/fp/pipe';
 import { useIntl } from 'react-intl';
 import { NavLink } from 'react-router-dom';
 
+import { Form, FormProps, useForm } from '../../../components/Form';
+import { InputRenderer } from '../../../components/FormInputs/Renderer';
 import { capitalise } from '../../../utils/strings';
 import { ATTRIBUTE_TYPES_THAT_CANNOT_BE_MAIN_FIELD } from '../../constants/attributes';
 import { getTranslation } from '../../utils/translations';
-import { Form, FormProps, useForm } from '../Form';
-import { InputRenderer } from '../FormInputs/Renderer';
 
 import { Fields, FieldsProps, TEMP_FIELD_NAME } from './Fields';
 

packages/core/admin/admin/src/content-manager/components/ConfigurationForm/tests/EditFieldForm.test.tsx

@@ -1,6 +1,6 @@
 import { fireEvent, render as renderRTL, screen } from '@tests/utils';
 
-import { Form } from '../../Form';
+import { Form } from '../../../../components/Form';
 import { EditFieldForm, EditFieldFormProps } from '../EditFieldForm';
 import { ConfigurationFormData } from '../Form';
 

packages/core/admin/admin/src/content-manager/exports.ts

@@ -14,5 +14,3 @@ export type {
   ListLayout,
 } from './hooks/useDocumentLayout';
 export * from './features/DocumentRBAC';
-export * from './components/Form';
-export * from './components/FormInputs/Renderer';

packages/core/admin/admin/src/content-manager/hooks/useDocumentLayout.ts

@@ -20,7 +20,7 @@ import {
   useDocument,
 } from './useDocument';
 
-import type { InputProps } from '../components/FormInputs/types';
+import type { InputProps } from '../../components/FormInputs/types';
 import type { Contracts } from '@strapi/plugin-content-manager/_internal/shared';
 import type { Attribute } from '@strapi/types';
 import type { MessageDescriptor } from 'react-intl';

packages/core/admin/admin/src/content-manager/pages/ComponentConfigurationPage.tsx

@@ -10,6 +10,7 @@ import {
 import { useParams } from 'react-router-dom';
 
 import { useTypedSelector } from '../../core/store/hooks';
+import { setIn } from '../../utils/object';
 import { TEMP_FIELD_NAME } from '../components/ConfigurationForm/Fields';
 import { ConfigurationForm, ConfigurationFormProps } from '../components/ConfigurationForm/Form';
 import { ComponentsDictionary, extractContentTypeComponents } from '../hooks/useDocument';
@@ -23,7 +24,6 @@ import {
   useUpdateComponentConfigurationMutation,
 } from '../services/components';
 import { useGetInitialDataQuery } from '../services/init';
-import { setIn } from '../utils/object';
 
 import type { Contracts } from '@strapi/plugin-content-manager/_internal/shared';
 

packages/core/admin/admin/src/content-manager/pages/EditConfigurationPage.tsx

@@ -10,13 +10,13 @@ import {
 } from '@strapi/helper-plugin';
 
 import { useTypedSelector } from '../../core/store/hooks';
+import { setIn } from '../../utils/object';
 import { TEMP_FIELD_NAME } from '../components/ConfigurationForm/Fields';
 import { ConfigurationForm, ConfigurationFormProps } from '../components/ConfigurationForm/Form';
 import { useDoc } from '../hooks/useDocument';
 import { useDocLayout } from '../hooks/useDocumentLayout';
 import { useUpdateContentTypeConfigurationMutation } from '../services/contentTypes';
 import { useGetInitialDataQuery } from '../services/init';
-import { setIn } from '../utils/object';
 
 import type { Contracts } from '@strapi/plugin-content-manager/_internal/shared';
 

packages/core/admin/admin/src/content-manager/pages/EditView/EditViewPage.tsx

@@ -23,8 +23,8 @@ import { useIntl } from 'react-intl';
 import { useLocation } from 'react-router-dom';
 import styled from 'styled-components';
 
+import { Blocker, Form } from '../../../components/Form';
 import { useOnce } from '../../../hooks/useOnce';
-import { Blocker, Form } from '../../components/Form';
 import { SINGLE_TYPES } from '../../constants/collections';
 import { DocumentRBAC, useDocumentRBAC } from '../../features/DocumentRBAC';
 import { type UseDocument, useDoc } from '../../hooks/useDocument';

packages/core/admin/admin/src/content-manager/pages/EditView/components/DocumentActions.tsx

@@ -23,9 +23,9 @@ import { useIntl } from 'react-intl';
 import { useMatch, useNavigate } from 'react-router-dom';
 import styled, { DefaultTheme } from 'styled-components';
 
+import { useForm } from '../../../../components/Form';
 import { DocumentActionComponent } from '../../../../core/apis/content-manager';
 import { isBaseQueryError } from '../../../../utils/baseQuery';
-import { useForm } from '../../../components/Form';
 import { PUBLISHED_AT_ATTRIBUTE_NAME } from '../../../constants/attributes';
 import { SINGLE_TYPES } from '../../../constants/collections';
 import { useDocumentRBAC } from '../../../features/DocumentRBAC';

packages/core/admin/admin/src/content-manager/pages/EditView/components/FormInputs/BlocksInput/BlocksEditor.tsx

@@ -11,7 +11,7 @@ import { withHistory } from 'slate-history';
 import { type RenderElementProps, Slate, withReact, ReactEditor, useSlate } from 'slate-react';
 import styled, { type CSSProperties } from 'styled-components';
 
-import { FieldValue } from '../../../../../components/Form';
+import { FieldValue } from '../../../../../../components/Form';
 import { getTranslation } from '../../../../../utils/translations';
 
 import { codeBlocks } from './Blocks/Code';

packages/core/admin/admin/src/content-manager/pages/EditView/components/FormInputs/BlocksInput/BlocksInput.tsx

@@ -2,8 +2,8 @@ import * as React from 'react';
 
 import { Field, FieldError, FieldHint, FieldLabel, Flex } from '@strapi/design-system';
 
-import { useField } from '../../../../../components/Form';
-import { InputProps } from '../../../../../components/FormInputs/types';
+import { useField } from '../../../../../../components/Form';
+import { InputProps } from '../../../../../../components/FormInputs/types';
 
 import { BlocksEditor } from './BlocksEditor';
 

packages/core/admin/admin/src/content-manager/pages/EditView/components/FormInputs/BlocksInput/tests/BlocksInput.test.tsx

@@ -3,7 +3,7 @@ import * as React from 'react';
 
 import { render, screen, waitFor } from '@tests/utils';
 
-import { Form } from '../../../../../../components/Form';
+import { Form } from '../../../../../../../components/Form';
 import { BlocksInput } from '../BlocksInput';
 
 import { blocksData } from './mock-schema';

packages/core/admin/admin/src/content-manager/pages/EditView/components/FormInputs/Component/Initializer.tsx

@@ -6,7 +6,7 @@ import { PlusCircle } from '@strapi/icons';
 import { useIntl } from 'react-intl';
 import styled from 'styled-components';
 
-import { useField } from '../../../../../components/Form';
+import { useField } from '../../../../../../components/Form';
 import { getTranslation } from '../../../../../utils/translations';
 
 interface InitializerProps {

packages/core/admin/admin/src/content-manager/pages/EditView/components/FormInputs/Component/Input.tsx

@@ -2,7 +2,7 @@ import { Box, Flex, IconButton, Typography } from '@strapi/design-system';
 import { Trash } from '@strapi/icons';
 import { useIntl } from 'react-intl';
 
-import { InputProps, useField } from '../../../../../components/Form';
+import { InputProps, useField } from '../../../../../../components/Form';
 import { useDoc } from '../../../../../hooks/useDocument';
 import { EditFieldLayout } from '../../../../../hooks/useDocumentLayout';
 import { getTranslation } from '../../../../../utils/translations';

packages/core/admin/admin/src/content-manager/pages/EditView/components/FormInputs/Component/Repeatable.tsx

@@ -20,12 +20,12 @@ import { getEmptyImage } from 'react-dnd-html5-backend';
 import { useIntl } from 'react-intl';
 import styled from 'styled-components';
 
-import { useField, useForm } from '../../../../../components/Form';
+import { useField, useForm } from '../../../../../../components/Form';
+import { getIn } from '../../../../../../utils/object';
 import { ItemTypes } from '../../../../../constants/dragAndDrop';
 import { useDoc } from '../../../../../hooks/useDocument';
 import { useDocLayout } from '../../../../../hooks/useDocumentLayout';
 import { useDragAndDrop, type UseDragAndDropOptions } from '../../../../../hooks/useDragAndDrop';
-import { getIn } from '../../../../../utils/object';
 import { useComposedRefs } from '../../../../../utils/refs';
 import { getTranslation } from '../../../../../utils/translations';
 import { transformDocument } from '../../../utils/data';

packages/core/admin/admin/src/content-manager/pages/EditView/components/FormInputs/DynamicZone/DynamicComponent.tsx

@@ -17,12 +17,12 @@ import { getEmptyImage } from 'react-dnd-html5-backend';
 import { useIntl } from 'react-intl';
 import styled from 'styled-components';
 
+import { useForm } from '../../../../../../components/Form';
+import { getIn } from '../../../../../../utils/object';
 import { ComponentIcon } from '../../../../../components/ComponentIcon';
-import { useForm } from '../../../../../components/Form';
 import { ItemTypes } from '../../../../../constants/dragAndDrop';
 import { useDocLayout } from '../../../../../hooks/useDocumentLayout';
 import { type UseDragAndDropOptions, useDragAndDrop } from '../../../../../hooks/useDragAndDrop';
-import { getIn } from '../../../../../utils/object';
 import { useComposedRefs } from '../../../../../utils/refs';
 import { getTranslation } from '../../../../../utils/translations';
 import { InputRenderer } from '../../InputRenderer';

packages/core/admin/admin/src/content-manager/pages/EditView/components/FormInputs/DynamicZone/Field.tsx

@@ -6,7 +6,7 @@ import pipe from 'lodash/fp/pipe';
 import { useIntl } from 'react-intl';
 
 import { createContext } from '../../../../../../components/Context';
-import { InputProps, useField, useForm } from '../../../../../components/Form';
+import { InputProps, useField, useForm } from '../../../../../../components/Form';
 import { useDoc } from '../../../../../hooks/useDocument';
 import { type EditFieldLayout } from '../../../../../hooks/useDocumentLayout';
 import { getTranslation } from '../../../../../utils/translations';

packages/core/admin/admin/src/content-manager/pages/EditView/components/FormInputs/DynamicZone/tests/DynamicComponent.test.tsx

@@ -1,7 +1,7 @@
 import { screen, fireEvent, render as renderRTL } from '@tests/utils';
 import { Route, Routes } from 'react-router-dom';
 
-import { Form } from '../../../../../../components/Form';
+import { Form } from '../../../../../../../components/Form';
 import { DynamicComponent, DynamicComponentProps } from '../DynamicComponent';
 
 import { dynamicComponentsByCategory } from './fixtures';

packages/core/admin/admin/src/content-manager/pages/EditView/components/FormInputs/DynamicZone/tests/Field.test.tsx

@@ -1,7 +1,7 @@
 import { act, render as renderRTL, screen } from '@tests/utils';
 import { Route, Routes } from 'react-router-dom';
 
-import { Form } from '../../../../../../components/Form';
+import { Form } from '../../../../../../../components/Form';
 import { DynamicZone, DynamicZoneProps } from '../Field';
 
 const TEST_NAME = 'DynamicZoneComponent';

packages/core/admin/admin/src/content-manager/pages/EditView/components/FormInputs/UID.tsx

@@ -12,8 +12,8 @@ import { Contracts } from '@strapi/plugin-content-manager/_internal/shared';
 import { useIntl } from 'react-intl';
 import styled, { keyframes } from 'styled-components';
 
+import { type InputProps, useField, useForm } from '../../../../../components/Form';
 import { useDebounce } from '../../../../../hooks/useDebounce';
-import { type InputProps, useField, useForm } from '../../../../components/Form';
 import { useDoc } from '../../../../hooks/useDocument';
 import {
   useGenerateUIDMutation,

packages/core/admin/admin/src/content-manager/pages/EditView/components/FormInputs/Wysiwyg/Editor.tsx

@@ -6,8 +6,8 @@ import styled from 'styled-components';
 import { PreviewWysiwyg } from './PreviewWysiwyg';
 import { newlineAndIndentContinueMarkdownList } from './utils/continueList';
 
-import type { FieldValue } from '../../../../../components/Form';
-import type { InputProps } from '../../../../../components/FormInputs/types';
+import type { FieldValue } from '../../../../../../components/Form';
+import type { InputProps } from '../../../../../../components/FormInputs/types';
 
 import 'codemirror5/addon/display/placeholder';
 

packages/core/admin/admin/src/content-manager/pages/EditView/components/FormInputs/Wysiwyg/Field.tsx

@@ -4,7 +4,7 @@ import { Field, FieldError, FieldHint, FieldLabel, Flex } from '@strapi/design-s
 import { prefixFileUrlWithBackendUrl, useLibrary } from '@strapi/helper-plugin';
 import { EditorFromTextArea } from 'codemirror5';
 
-import { useField } from '../../../../../components/Form';
+import { useField } from '../../../../../../components/Form';
 
 import { Editor, EditorApi } from './Editor';
 import { EditorLayout } from './EditorLayout';
@@ -18,7 +18,7 @@ import {
 import { WysiwygFooter } from './WysiwygFooter';
 import { WysiwygNav } from './WysiwygNav';
 
-import type { InputProps } from '../../../../../components/FormInputs/types';
+import type { InputProps } from '../../../../../../components/FormInputs/types';
 import type { Attribute } from '@strapi/types';
 
 interface WysiwygProps extends Omit<InputProps, 'type'> {

packages/core/admin/admin/src/content-manager/pages/EditView/components/FormInputs/Wysiwyg/tests/Field.test.tsx

@@ -1,6 +1,6 @@
 import { render as renderRTL } from '@tests/utils';
 
-import { Form } from '../../../../../../components/Form';
+import { Form } from '../../../../../../../components/Form';
 import { Wysiwyg, WysiwygProps } from '../Field';
 
 jest.mock('@strapi/helper-plugin', () => ({

packages/core/admin/admin/src/content-manager/pages/EditView/components/FormInputs/tests/UID.test.tsx

@@ -1,7 +1,7 @@
 import { render as renderRTL, waitFor, act, screen } from '@tests/utils';
 import { Route, Routes } from 'react-router-dom';
 
-import { Form } from '../../../../../components/Form';
+import { Form } from '../../../../../../components/Form';
 import { UIDInput, UIDInputProps } from '../UID';
 
 const render = ({