Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"@babel/preset-env": "^7.28.5",
"@babel/preset-react": "^7.28.5",
"@babel/preset-typescript": "^7.28.5",
"@eslint/compat": "^1.4.1",
"@eslint/compat": "^2.0.0",
"@eslint/js": "^9.39.1",
"@rollup/plugin-babel": "^6.1.0",
"@rollup/plugin-commonjs": "^29.0.0",
Expand All @@ -79,8 +79,8 @@
"@types/eslint": "^9.6.1",
"@types/jest": "^30.0.0",
"@types/jest-axe": "^3.5.9",
"@types/lodash": "^4.17.20",
"@types/node": "^24.10.0",
"@types/lodash": "^4.17.21",
"@types/node": "^24.10.1",
"@types/react": "^19.2.2",
"@types/react-dom": "^19.2.2",
"babel-jest": "^30.2.0",
Expand All @@ -101,7 +101,7 @@
"lodash": "^4.17.21",
"nhsuk-frontend": "^10.1.0",
"outdent": "^0.8.0",
"prettier": "^3.6.2",
"prettier": "^3.7.3",
"react": "^19.2.0",
"react-dom": "^19.2.0",
"rollup": "^4.52.5",
Expand All @@ -110,7 +110,7 @@
"storybook": "^10.1.2",
"tslib": "^2.8.1",
"typescript": "^5.9.3",
"typescript-eslint": "^8.46.3",
"typescript-eslint": "^8.48.1",
"vite": "^7.2.6",
"vite-tsconfig-paths": "^5.1.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import { DoAndDontListItem } from './components/index.js';
import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingLevel.js';

export interface DoAndDontListProps
extends ComponentPropsWithoutRef<'div'>,
Pick<HeadingLevelProps, 'headingLevel'> {
extends ComponentPropsWithoutRef<'div'>, Pick<HeadingLevelProps, 'headingLevel'> {
listType: DoAndDontListType;
heading?: string;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ const CellOutsideOfSectionWarning =
'Table.Cell used outside of a Table.Head or Table.Body component. Unable to determine section type from context.';

export interface TableCellProps
extends ComponentPropsWithoutRef<'th'>,
ComponentPropsWithoutRef<'td'> {
extends ComponentPropsWithoutRef<'th'>, ComponentPropsWithoutRef<'td'> {
index?: number;
format?: 'numeric';
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import { FormGroup } from '#components/utils/index.js';
import { type FormElementProps } from '#util/types/FormTypes.js';

export interface CharacterCountProps
extends ComponentPropsWithoutRef<'textarea'>,
extends
ComponentPropsWithoutRef<'textarea'>,
Omit<FormElementProps, 'fieldsetProps' | 'legend' | 'legendProps'> {
maxLength?: number;
maxWords?: number;
Expand Down
3 changes: 1 addition & 2 deletions src/components/form-elements/checkboxes/Checkboxes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ import { generateRandomName } from '#util/tools/index.js';
import { type FormElementProps } from '#util/types/FormTypes.js';

export interface CheckboxesProps
extends ComponentPropsWithoutRef<'div'>,
Omit<FormElementProps, 'label' | 'labelProps'> {
extends ComponentPropsWithoutRef<'div'>, Omit<FormElementProps, 'label' | 'labelProps'> {
idPrefix?: string;
small?: boolean;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import { Label } from '#components/form-elements/label/index.js';
import { type ComponentPropsWithDataAttributes, type FormElementProps } from '#util/types/index.js';

export interface CheckboxesItemProps
extends ComponentPropsWithoutRef<'input'>,
extends
ComponentPropsWithoutRef<'input'>,
Pick<FormElementProps, 'hint' | 'hintProps' | 'labelProps'> {
conditional?: ReactNode;
forceShowConditional?: boolean;
Expand Down
9 changes: 6 additions & 3 deletions src/components/form-elements/date-input/DateInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ export type DateInputValue = {
year: string;
};

export interface DateInputChangeEvent
extends Omit<ChangeEvent<DateInputElement>, 'target' | 'currentTarget'> {
export interface DateInputChangeEvent extends Omit<
ChangeEvent<DateInputElement>,
'target' | 'currentTarget'
> {
target: DateInputElement;
currentTarget: DateInputElement;
}
Expand All @@ -35,7 +37,8 @@ export interface DateInputElement extends Omit<HTMLInputElement, 'value' | 'onCh
}

export interface DateInputProps
extends Omit<ComponentPropsWithoutRef<'div'>, 'defaultValue' | 'onChange'>,
extends
Omit<ComponentPropsWithoutRef<'div'>, 'defaultValue' | 'onChange'>,
Omit<FormElementProps, 'label' | 'labelProps'> {
value?: Partial<DateInputValue>;
defaultValue?: Partial<DateInputValue>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ import { Label } from '#components/form-elements/label/index.js';
import { type FormElementProps } from '#util/types/FormTypes.js';

export interface IndividualDateInputProps
extends ComponentPropsWithoutRef<'input'>,
Pick<FormElementProps, 'label' | 'labelProps'> {
extends ComponentPropsWithoutRef<'input'>, Pick<FormElementProps, 'label' | 'labelProps'> {
error?: string | ReactElement | false;
inputType: 'day' | 'month' | 'year';
}
Expand Down
3 changes: 1 addition & 2 deletions src/components/form-elements/label/Label.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingL
import { type NHSUKSize } from '#util/types/NHSUKTypes.js';

export interface LabelProps
extends ComponentPropsWithoutRef<'label'>,
Pick<HeadingLevelProps, 'headingLevel'> {
extends ComponentPropsWithoutRef<'label'>, Pick<HeadingLevelProps, 'headingLevel'> {
isPageHeading?: boolean;
size?: NHSUKSize;
}
Expand Down
3 changes: 1 addition & 2 deletions src/components/form-elements/legend/Legend.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import { HeadingLevel, type HeadingLevelProps } from '#components/utils/HeadingL
import { type NHSUKSize } from '#util/types/NHSUKTypes.js';

export interface LegendProps
extends ComponentPropsWithoutRef<'legend'>,
Pick<HeadingLevelProps, 'headingLevel'> {
extends ComponentPropsWithoutRef<'legend'>, Pick<HeadingLevelProps, 'headingLevel'> {
isPageHeading?: boolean;
size?: NHSUKSize;
}
Expand Down
3 changes: 1 addition & 2 deletions src/components/form-elements/radios/Radios.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ import { generateRandomName } from '#util/tools/index.js';
import { type FormElementProps } from '#util/types/FormTypes.js';

export interface RadiosProps
extends ComponentPropsWithoutRef<'div'>,
Omit<FormElementProps, 'label' | 'labelProps'> {
extends ComponentPropsWithoutRef<'div'>, Omit<FormElementProps, 'label' | 'labelProps'> {
idPrefix?: string;
inline?: boolean;
small?: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import { Label } from '#components/form-elements/label/index.js';
import { type FormElementProps } from '#util/types/FormTypes.js';

export interface RadiosItemProps
extends ComponentPropsWithoutRef<'input'>,
extends
ComponentPropsWithoutRef<'input'>,
Pick<FormElementProps, 'hint' | 'hintProps' | 'labelProps'> {
conditional?: ReactNode;
forceShowConditional?: boolean;
Expand Down
3 changes: 2 additions & 1 deletion src/components/form-elements/text-input/TextInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import { type FormElementProps } from '#util/types/FormTypes.js';
import { type InputWidth } from '#util/types/NHSUKTypes.js';

export interface TextInputProps
extends ComponentPropsWithoutRef<'input'>,
extends
ComponentPropsWithoutRef<'input'>,
Omit<FormElementProps, 'fieldsetProps' | 'legend' | 'legendProps'> {
width?: InputWidth;
prefix?: string;
Expand Down
Loading