diff --git a/src/CheckboxGroup/CheckboxGroup.tsx b/src/CheckboxGroup/CheckboxGroup.tsx index 6d1cda9a5ee..5eb6fd615b1 100644 --- a/src/CheckboxGroup/CheckboxGroup.tsx +++ b/src/CheckboxGroup/CheckboxGroup.tsx @@ -1,8 +1,8 @@ import React, {ChangeEvent, ChangeEventHandler, FC} from 'react' -import CheckboxOrRadioGroup, {CheckboxOrRadioGroupProps} from '../_CheckboxOrRadioGroup' -import CheckboxOrRadioGroupCaption from '../_CheckboxOrRadioGroup/_CheckboxOrRadioGroupCaption' -import CheckboxOrRadioGroupLabel from '../_CheckboxOrRadioGroup/_CheckboxOrRadioGroupLabel' -import CheckboxOrRadioGroupValidation from '../_CheckboxOrRadioGroup/_CheckboxOrRadioGroupValidation' +import CheckboxOrRadioGroup, {CheckboxOrRadioGroupProps} from '../internal/components/CheckboxOrRadioGroup' +import CheckboxOrRadioGroupCaption from '../internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupCaption' +import CheckboxOrRadioGroupLabel from '../internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupLabel' +import CheckboxOrRadioGroupValidation from '../internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupValidation' import {useRenderForcingRef} from '../hooks' import {SxProp} from '../sx' import FormControl from '../FormControl' diff --git a/src/FormControl/FormControl.tsx b/src/FormControl/FormControl.tsx index 99bb5409d74..69fb5c411fc 100644 --- a/src/FormControl/FormControl.tsx +++ b/src/FormControl/FormControl.tsx @@ -7,7 +7,7 @@ import Select from '../Select' import TextInput from '../TextInput' import TextInputWithTokens from '../TextInputWithTokens' import Textarea from '../Textarea' -import {CheckboxOrRadioGroupContext} from '../_CheckboxOrRadioGroup' +import {CheckboxOrRadioGroupContext} from '../internal/components/CheckboxOrRadioGroup' import ValidationAnimationContainer from '../_ValidationAnimationContainer' import {get} from '../constants' import InlineAutocomplete from '../drafts/InlineAutocomplete' diff --git a/src/RadioGroup/RadioGroup.tsx b/src/RadioGroup/RadioGroup.tsx index 297a4e28b36..3d89fc26338 100644 --- a/src/RadioGroup/RadioGroup.tsx +++ b/src/RadioGroup/RadioGroup.tsx @@ -1,8 +1,8 @@ import React, {ChangeEvent, ChangeEventHandler, createContext, FC} from 'react' -import CheckboxOrRadioGroup, {CheckboxOrRadioGroupProps} from '../_CheckboxOrRadioGroup' -import CheckboxOrRadioGroupCaption from '../_CheckboxOrRadioGroup/_CheckboxOrRadioGroupCaption' -import CheckboxOrRadioGroupLabel from '../_CheckboxOrRadioGroup/_CheckboxOrRadioGroupLabel' -import CheckboxOrRadioGroupValidation from '../_CheckboxOrRadioGroup/_CheckboxOrRadioGroupValidation' +import CheckboxOrRadioGroup, {CheckboxOrRadioGroupProps} from '../internal/components/CheckboxOrRadioGroup' +import CheckboxOrRadioGroupCaption from '../internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupCaption' +import CheckboxOrRadioGroupLabel from '../internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupLabel' +import CheckboxOrRadioGroupValidation from '../internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupValidation' import {useRenderForcingRef} from '../hooks' import {SxProp} from '../sx' diff --git a/src/__tests__/CheckboxOrRadioGroup.test.tsx b/src/__tests__/CheckboxOrRadioGroup.test.tsx index 80793e40300..9a9b9d7d9b3 100644 --- a/src/__tests__/CheckboxOrRadioGroup.test.tsx +++ b/src/__tests__/CheckboxOrRadioGroup.test.tsx @@ -3,7 +3,7 @@ import '@testing-library/jest-dom/extend-expect' import {render, within} from '@testing-library/react' import {Checkbox, FormControl, Radio, SSRProvider, TextInput} from '..' import {behavesAsComponent, checkExports} from '../utils/testing' -import CheckboxOrRadioGroup, {CheckboxOrRadioGroupContext} from '../_CheckboxOrRadioGroup' +import CheckboxOrRadioGroup, {CheckboxOrRadioGroupContext} from '../internal/components/CheckboxOrRadioGroup' const INPUT_GROUP_LABEL = 'Choices' @@ -39,7 +39,7 @@ describe('CheckboxOrRadioGroup', () => { ), }) - checkExports('_CheckboxOrRadioGroup', { + checkExports('internal/components/CheckboxOrRadioGroup', { default: CheckboxOrRadioGroup, CheckboxOrRadioGroupContext, }) diff --git a/src/_CheckboxOrRadioGroup/CheckboxOrRadioGroup.tsx b/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroup.tsx similarity index 88% rename from src/_CheckboxOrRadioGroup/CheckboxOrRadioGroup.tsx rename to src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroup.tsx index b63812e920a..4a31e104f66 100644 --- a/src/_CheckboxOrRadioGroup/CheckboxOrRadioGroup.tsx +++ b/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroup.tsx @@ -1,15 +1,15 @@ import React from 'react' import styled from 'styled-components' -import Box from '../Box' -import ValidationAnimationContainer from '../_ValidationAnimationContainer' -import {get} from '../constants' -import {useSSRSafeId} from '../utils/ssr' -import CheckboxOrRadioGroupCaption from './_CheckboxOrRadioGroupCaption' -import CheckboxOrRadioGroupLabel from './_CheckboxOrRadioGroupLabel' -import CheckboxOrRadioGroupValidation from './_CheckboxOrRadioGroupValidation' -import VisuallyHidden from '../_VisuallyHidden' -import {useSlots} from '../hooks/useSlots' -import {SxProp} from '../sx' +import Box from '../../../Box' +import ValidationAnimationContainer from '../../../_ValidationAnimationContainer' +import {get} from '../../../constants' +import {useSSRSafeId} from '../../../utils/ssr' +import CheckboxOrRadioGroupCaption from './CheckboxOrRadioGroupCaption' +import CheckboxOrRadioGroupLabel from './CheckboxOrRadioGroupLabel' +import CheckboxOrRadioGroupValidation from './CheckboxOrRadioGroupValidation' +import VisuallyHidden from '../../../_VisuallyHidden' +import {useSlots} from '../../../hooks/useSlots' +import {SxProp} from '../../../sx' export type CheckboxOrRadioGroupProps = { /** @@ -153,7 +153,7 @@ const CheckboxOrRadioGroup: React.FC> = ({children, sx}) => { diff --git a/src/_CheckboxOrRadioGroup/_CheckboxOrRadioGroupLabel.tsx b/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupLabel.tsx similarity index 89% rename from src/_CheckboxOrRadioGroup/_CheckboxOrRadioGroupLabel.tsx rename to src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupLabel.tsx index 40e54cec14e..6d2067a4385 100644 --- a/src/_CheckboxOrRadioGroup/_CheckboxOrRadioGroupLabel.tsx +++ b/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupLabel.tsx @@ -1,7 +1,7 @@ import React from 'react' -import Box from '../Box' -import VisuallyHidden from '../_VisuallyHidden' -import {SxProp} from '../sx' +import Box from '../../../Box' +import VisuallyHidden from '../../../_VisuallyHidden' +import {SxProp} from '../../../sx' import {CheckboxOrRadioGroupContext} from './CheckboxOrRadioGroup' export type CheckboxOrRadioGroupLabelProps = { diff --git a/src/_CheckboxOrRadioGroup/_CheckboxOrRadioGroupValidation.tsx b/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupValidation.tsx similarity index 79% rename from src/_CheckboxOrRadioGroup/_CheckboxOrRadioGroupValidation.tsx rename to src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupValidation.tsx index f213e5c3c94..5a25a33387e 100644 --- a/src/_CheckboxOrRadioGroup/_CheckboxOrRadioGroupValidation.tsx +++ b/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupValidation.tsx @@ -1,7 +1,7 @@ import React from 'react' -import InputValidation from '../_InputValidation' -import {SxProp} from '../sx' -import {FormValidationStatus} from '../utils/types/FormValidationStatus' +import InputValidation from '../../../_InputValidation' +import {SxProp} from '../../../sx' +import {FormValidationStatus} from '../../../utils/types/FormValidationStatus' import {CheckboxOrRadioGroupContext} from './CheckboxOrRadioGroup' export type CheckboxOrRadioGroupValidationProps = { diff --git a/src/_CheckboxOrRadioGroup/index.ts b/src/internal/components/CheckboxOrRadioGroup/index.ts similarity index 100% rename from src/_CheckboxOrRadioGroup/index.ts rename to src/internal/components/CheckboxOrRadioGroup/index.ts