Avoid circular dependencies

colinrotherham · colinrotherham · commit 0f37f7a669b6 · 2025-10-03T17:32:16.000+01:00
diff --git a/src/components/content-presentation/do-and-dont-list/DoAndDontList.tsx b/src/components/content-presentation/do-and-dont-list/DoAndDontList.tsx
@@ -7,8 +7,8 @@ import {
   type FC,
   type ReactNode,
 } from 'react';
-import { CrossIcon, TickIcon } from '#components/content-presentation';
-import { HeadingLevel, type HeadingLevelProps } from '#components/utils';
+import { CrossIcon, TickIcon } from '../icons';
+import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel';
 
 type ListType = 'do' | 'dont';
 
diff --git a/src/components/content-presentation/hero/Hero.tsx b/src/components/content-presentation/hero/Hero.tsx
@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import { forwardRef, type ComponentPropsWithoutRef, type FC } from 'react';
 import { Col, Container, Row } from '#components/layout';
-import { HeadingLevel, type HeadingLevelProps } from '#components/utils';
+import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel';
 
 export interface HeroContentProps extends ComponentPropsWithoutRef<'div'> {
   hasImage: boolean;
diff --git a/src/components/content-presentation/icons/individual/ArrowLeftIcon.tsx b/src/components/content-presentation/icons/individual/ArrowLeftIcon.tsx
@@ -1,5 +1,5 @@
 import { type FC } from 'react';
-import { Icon, type IconProps } from '..';
+import { Icon, type IconProps } from '../Icon';
 
 export const ArrowLeftIcon: FC<IconProps> = (props) => (
   <Icon modifier="arrow-left" {...props}>
diff --git a/src/components/content-presentation/icons/individual/ArrowRightCircleIcon.tsx b/src/components/content-presentation/icons/individual/ArrowRightCircleIcon.tsx
@@ -1,5 +1,5 @@
 import { type FC } from 'react';
-import { Icon, type IconProps } from '..';
+import { Icon, type IconProps } from '../Icon';
 
 export const ArrowRightCircleIcon: FC<IconProps> = (props) => (
   <Icon modifier="arrow-right-circle" {...props}>
diff --git a/src/components/content-presentation/icons/individual/ArrowRightIcon.tsx b/src/components/content-presentation/icons/individual/ArrowRightIcon.tsx
@@ -1,5 +1,5 @@
 import { type FC } from 'react';
-import { Icon, type IconProps } from '..';
+import { Icon, type IconProps } from '../Icon';
 
 export const ArrowRightIcon: FC<IconProps> = (props) => (
   <Icon modifier="arrow-right" {...props}>
diff --git a/src/components/content-presentation/icons/individual/ChevronRightCircleIcon.tsx b/src/components/content-presentation/icons/individual/ChevronRightCircleIcon.tsx
@@ -1,5 +1,5 @@
 import { type FC } from 'react';
-import { Icon, type IconProps } from '..';
+import { Icon, type IconProps } from '../Icon';
 
 export const ChevronRightCircleIcon: FC<IconProps> = (props) => (
   <Icon modifier="chevron-right-circle" {...props}>
diff --git a/src/components/content-presentation/icons/individual/CrossIcon.tsx b/src/components/content-presentation/icons/individual/CrossIcon.tsx
@@ -1,5 +1,5 @@
 import { type FC } from 'react';
-import { Icon, type IconProps } from '..';
+import { Icon, type IconProps } from '../Icon';
 
 export const CrossIcon: FC<IconProps> = (props) => (
   <Icon modifier="cross" {...props}>
diff --git a/src/components/content-presentation/icons/individual/SearchIcon.tsx b/src/components/content-presentation/icons/individual/SearchIcon.tsx
@@ -1,5 +1,5 @@
 import { type FC } from 'react';
-import { Icon, type IconProps } from '..';
+import { Icon, type IconProps } from '../Icon';
 
 export const SearchIcon: FC<IconProps> = (props) => (
   <Icon modifier="search" {...props}>
diff --git a/src/components/content-presentation/icons/individual/TickIcon.tsx b/src/components/content-presentation/icons/individual/TickIcon.tsx
@@ -1,5 +1,5 @@
 import { type FC } from 'react';
-import { Icon, type IconProps } from '..';
+import { Icon, type IconProps } from '../Icon';
 
 export const TickIcon: FC<IconProps> = (props) => (
   <Icon modifier="tick" {...props}>
diff --git a/src/components/content-presentation/icons/individual/UserIcon.tsx b/src/components/content-presentation/icons/individual/UserIcon.tsx
@@ -1,5 +1,5 @@
 import { type FC } from 'react';
-import { Icon, type IconProps } from '..';
+import { Icon, type IconProps } from '../Icon';
 
 export const UserIcon: FC<IconProps> = (props) => (
   <Icon modifier="user" {...props}>
diff --git a/src/components/content-presentation/table/Table.tsx b/src/components/content-presentation/table/Table.tsx
@@ -16,7 +16,7 @@ import {
   TableRow,
   type TableCaptionProps,
 } from './components';
-import { TableContext, type ITableContext } from '.';
+import { TableContext, type ITableContext } from './TableContext';
 
 export interface TableProps extends ComponentPropsWithoutRef<'table'> {
   firstCellIsHeader?: boolean;
diff --git a/src/components/content-presentation/table/TableHelpers.ts b/src/components/content-presentation/table/TableHelpers.ts
@@ -1,5 +1,5 @@
 import { Children, isValidElement, type ReactElement, type ReactNode } from 'react';
-import { TableCell, type TableCellProps } from './components';
+import { TableCell, type TableCellProps } from './components/TableCell';
 
 export const isTableCell = (
   child: ReactNode,
diff --git a/src/components/content-presentation/table/components/TableBody.tsx b/src/components/content-presentation/table/components/TableBody.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import { type ComponentPropsWithoutRef, type FC } from 'react';
-import { TableSection, TableSectionContext } from '..';
+import { TableSection, TableSectionContext } from '../TableSectionContext';
 
 export type TableBodyProps = ComponentPropsWithoutRef<'tbody'>;
 
diff --git a/src/components/content-presentation/table/components/TableCell.tsx b/src/components/content-presentation/table/components/TableCell.tsx
@@ -1,6 +1,7 @@
 import classNames from 'classnames';
 import { useContext, type ComponentPropsWithoutRef, type FC } from 'react';
-import { TableContext, TableSection, TableSectionContext, type ITableContext } from '..';
+import { TableContext, type ITableContext } from '../TableContext';
+import { TableSection, TableSectionContext } from '../TableSectionContext';
 import { useDevWarning } from '#util/hooks';
 
 const CellOutsideOfSectionWarning =
diff --git a/src/components/content-presentation/table/components/TableHead.tsx b/src/components/content-presentation/table/components/TableHead.tsx
@@ -1,6 +1,7 @@
 import classNames from 'classnames';
 import { useContext, type ComponentPropsWithoutRef, type FC } from 'react';
-import { TableContext, TableSection, TableSectionContext, type ITableContext } from '..';
+import { TableContext, type ITableContext } from '../TableContext';
+import { TableSection, TableSectionContext } from '../TableSectionContext';
 
 export type TableHeadProps = ComponentPropsWithoutRef<'thead'>;
 
diff --git a/src/components/content-presentation/table/components/TablePanel.tsx b/src/components/content-presentation/table/components/TablePanel.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import { type ComponentPropsWithoutRef, type FC } from 'react';
-import { HeadingLevel, type HeadingLevelProps } from '#components/utils';
+import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel';
 
 export interface TablePanelProps extends ComponentPropsWithoutRef<'div'> {
   heading?: string;
diff --git a/src/components/content-presentation/table/components/TableRow.tsx b/src/components/content-presentation/table/components/TableRow.tsx
@@ -7,7 +7,8 @@ import {
   type ComponentPropsWithoutRef,
   type FC,
 } from 'react';
-import { TableContext, TableSection, TableSectionContext } from '..';
+import { TableContext } from '../TableContext';
+import { TableSection, TableSectionContext } from '../TableSectionContext';
 import { getHeadingsFromChildren, isTableCell } from '../TableHelpers';
 
 export const TableRow: FC<ComponentPropsWithoutRef<'tr'>> = ({ children, className, ...rest }) => {
diff --git a/src/components/content-presentation/tabs/Tabs.tsx b/src/components/content-presentation/tabs/Tabs.tsx
@@ -8,7 +8,7 @@ import {
   type ComponentPropsWithoutRef,
   type FC,
 } from 'react';
-import { HeadingLevel, type HeadingLevelProps } from '#components/utils';
+import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel';
 
 export type TabsProps = ComponentPropsWithoutRef<'div'>;
 
diff --git a/src/components/content-presentation/warning-callout/WarningCallout.tsx b/src/components/content-presentation/warning-callout/WarningCallout.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import { forwardRef, type ComponentPropsWithoutRef, type FC } from 'react';
-import { HeadingLevel, type HeadingLevelProps } from '#components/utils';
+import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel';
 
 const WarningCalloutHeading: FC<HeadingLevelProps> = ({ children, className, ...rest }) => (
   <HeadingLevel className={classNames('nhsuk-warning-callout__label', className)} {...rest}>
diff --git a/src/components/form-elements/checkboxes/Checkboxes.tsx b/src/components/form-elements/checkboxes/Checkboxes.tsx
@@ -2,7 +2,7 @@ import classNames from 'classnames';
 import { type Checkboxes as CheckboxesModule } from 'nhsuk-frontend';
 import { createRef, forwardRef, useEffect, useState, type ComponentPropsWithoutRef } from 'react';
 import { CheckboxesDivider, CheckboxesItem } from './components';
-import { CheckboxesContext, type ICheckboxesContext } from '.';
+import { CheckboxesContext, type ICheckboxesContext } from './CheckboxesContext';
 import { FormGroup } from '#components/utils';
 import { generateRandomName } from '#util/tools';
 import { type FormElementProps } from '#util/types';
diff --git a/src/components/form-elements/checkboxes/components/Item.tsx b/src/components/form-elements/checkboxes/components/Item.tsx
@@ -8,8 +8,9 @@ import {
   type ComponentPropsWithoutRef,
   type ReactNode,
 } from 'react';
-import { CheckboxesContext, type ICheckboxesContext } from '..';
-import { HintText, Label } from '#components/form-elements';
+import { CheckboxesContext, type ICheckboxesContext } from '../CheckboxesContext';
+import { HintText } from '#components/form-elements/hint-text';
+import { Label } from '#components/form-elements/label';
 import { type FormElementProps, type HTMLAttributesWithData } from '#util/types';
 
 export interface CheckboxesItemProps
diff --git a/src/components/form-elements/date-input/DateInput.tsx b/src/components/form-elements/date-input/DateInput.tsx
@@ -9,7 +9,7 @@ import {
   type EventHandler,
 } from 'react';
 import { DayInput, MonthInput, YearInput } from './components';
-import { DateInputContext, type IDateInputContext } from '.';
+import { DateInputContext, type IDateInputContext } from './DateInputContext';
 import { FormGroup } from '#components/utils';
 import { type FormElementProps } from '#util/types';
 
diff --git a/src/components/form-elements/date-input/components/IndividualDateInputs.tsx b/src/components/form-elements/date-input/components/IndividualDateInputs.tsx
@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import { forwardRef, useContext, type ChangeEvent, type ComponentPropsWithoutRef } from 'react';
-import { DateInputContext, type IDateInputContext } from '..';
-import { Label } from '#components/form-elements';
+import { DateInputContext, type IDateInputContext } from '../DateInputContext';
+import { Label } from '#components/form-elements/label';
 import { type FormElementProps } from '#util/types';
 
 export interface IndividualDateInputProps
diff --git a/src/components/form-elements/fieldset/Fieldset.tsx b/src/components/form-elements/fieldset/Fieldset.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import { type ComponentPropsWithoutRef, type FC } from 'react';
-import { Legend } from '..';
+import { Legend } from '#components/form-elements/legend';
 
 export type FieldsetProps = ComponentPropsWithoutRef<'fieldset'>;
 
diff --git a/src/components/form-elements/form/Form.tsx b/src/components/form-elements/form/Form.tsx
@@ -1,5 +1,5 @@
 import { type ComponentPropsWithoutRef, type FC } from 'react';
-import { FormContext } from '.';
+import { FormContext } from './FormContext';
 
 export type FormProps = ComponentPropsWithoutRef<'form'> & {
   disableErrorFromComponents?: boolean;
diff --git a/src/components/form-elements/legend/Legend.tsx b/src/components/form-elements/legend/Legend.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import { type ComponentPropsWithoutRef, type FC } from 'react';
-import { HeadingLevel, type HeadingLevelProps } from '#components/utils';
+import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel';
 import { type NHSUKSize } from '#util/types';
 
 export interface LegendProps
diff --git a/src/components/form-elements/radios/Radios.tsx b/src/components/form-elements/radios/Radios.tsx
@@ -2,7 +2,7 @@ import classNames from 'classnames';
 import { type Radios as RadiosModule } from 'nhsuk-frontend';
 import { createRef, forwardRef, useEffect, useState, type ComponentPropsWithoutRef } from 'react';
 import { RadiosDivider, RadiosItem } from './components';
-import { RadiosContext, type IRadiosContext } from '.';
+import { RadiosContext, type IRadiosContext } from './RadiosContext';
 import { FormGroup } from '#components/utils';
 import { generateRandomName } from '#util/tools';
 import { type FormElementProps } from '#util/types';
diff --git a/src/components/form-elements/radios/components/Item.tsx b/src/components/form-elements/radios/components/Item.tsx
@@ -8,8 +8,9 @@ import {
   type ComponentPropsWithoutRef,
   type ReactNode,
 } from 'react';
-import { RadiosContext, type IRadiosContext } from '..';
-import { HintText, Label } from '#components/form-elements';
+import { RadiosContext, type IRadiosContext } from '../RadiosContext';
+import { HintText } from '#components/form-elements/hint-text';
+import { Label } from '#components/form-elements/label';
 import { type FormElementProps } from '#util/types';
 
 export interface RadiosItemProps
diff --git a/src/components/navigation/breadcrumb/Breadcrumb.tsx b/src/components/navigation/breadcrumb/Breadcrumb.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import { Children, forwardRef, type ComponentPropsWithoutRef, type ReactNode } from 'react';
-import { BackLink } from '..';
+import { BackLink } from '#components/navigation/back-link';
 import { AsElementLink, childIsOfComponentType } from '#util/types';
 
 export type ItemProps = AsElementLink<HTMLAnchorElement>;
diff --git a/src/components/navigation/card/Card.tsx b/src/components/navigation/card/Card.tsx
@@ -9,7 +9,7 @@ import {
   CardImage,
   CardLink,
 } from './components';
-import { CardContext } from '.';
+import { CardContext } from './CardContext';
 import { CardType, cardTypeIsCareCard } from '#util/types';
 
 export interface CardProps extends ComponentPropsWithoutRef<'div'> {
diff --git a/src/components/navigation/card/components/CardContent.tsx b/src/components/navigation/card/components/CardContent.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import { forwardRef, useContext, type ComponentPropsWithoutRef } from 'react';
-import { CardContext } from '..';
+import { CardContext } from '../CardContext';
 
 export type CardContentProps = ComponentPropsWithoutRef<'div'>;
 
diff --git a/src/components/navigation/card/components/CardHeading.tsx b/src/components/navigation/card/components/CardHeading.tsx
@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import { forwardRef, useContext } from 'react';
-import { CardContext } from '..';
-import { HeadingLevel, type HeadingLevelProps } from '#components/utils';
+import { CardContext } from '../CardContext';
+import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel';
 import { CareCardType, cardTypeIsCareCard } from '#util/types';
 
 const genHiddenText = (cardType: CareCardType): string => {
diff --git a/src/components/navigation/header/Header.tsx b/src/components/navigation/header/Header.tsx
@@ -18,7 +18,7 @@ import {
   Search,
   ServiceName,
 } from './components';
-import { HeaderContext, type IHeaderContext } from '.';
+import { HeaderContext, type IHeaderContext } from './HeaderContext';
 import { Container } from '#components/layout';
 import { childIsOfComponentType } from '#util/types';
 
diff --git a/src/components/navigation/header/components/Logo.tsx b/src/components/navigation/header/components/Logo.tsx
@@ -1,5 +1,5 @@
 import { FC, useContext, useEffect } from 'react';
-import { HeaderContext, type IHeaderContext } from '..';
+import { HeaderContext, type IHeaderContext } from '../HeaderContext';
 
 export type LogoProps = NonNullable<IHeaderContext['logoProps']>;
 
diff --git a/src/components/navigation/header/components/Navigation.tsx b/src/components/navigation/header/components/Navigation.tsx
@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import { useContext, useEffect, type ComponentPropsWithoutRef, type FC } from 'react';
-import { HeaderContext, type IHeaderContext } from '..';
-import { MenuToggle } from '.';
+import { HeaderContext, type IHeaderContext } from '../HeaderContext';
+import { MenuToggle } from './MenuToggle';
 import { Container } from '#components/layout';
 
 export interface NavigationProps extends ComponentPropsWithoutRef<'nav'> {
diff --git a/src/components/navigation/header/components/ServiceName.tsx b/src/components/navigation/header/components/ServiceName.tsx
@@ -1,5 +1,5 @@
 import { useContext, type ComponentPropsWithoutRef, type FC } from 'react';
-import { HeaderContext, type IHeaderContext } from '..';
+import { HeaderContext, type IHeaderContext } from '../HeaderContext';
 
 export type ServiceNameInnerProps = NonNullable<IHeaderContext['serviceProps']>;
 export type ServiceNameProps = Pick<ComponentPropsWithoutRef<'div'>, 'children'>;
diff --git a/src/components/utils/FormGroup.tsx b/src/components/utils/FormGroup.tsx
@@ -6,15 +6,13 @@ import {
   type ComponentPropsWithoutRef,
   type ReactNode,
 } from 'react';
-import { FormGroupContext, type IFormGroupContext } from '.';
-import {
-  ErrorMessage,
-  Fieldset,
-  HintText,
-  Label,
-  Legend,
-  useFormContext,
-} from '#components/form-elements';
+import { FormGroupContext, type IFormGroupContext } from './FormGroupContext';
+import { ErrorMessage } from '#components/form-elements/error-message';
+import { Fieldset } from '#components/form-elements/fieldset';
+import { useFormContext } from '#components/form-elements/form';
+import { HintText } from '#components/form-elements/hint-text';
+import { Label } from '#components/form-elements/label';
+import { Legend } from '#components/form-elements/legend';
 import { generateRandomID } from '#util/tools';
 import { type FormElementProps } from '#util/types';
 
