diff --git a/package-lock.json b/package-lock.json index f96c381d3ad..9e4dcb88248 100644 --- a/package-lock.json +++ b/package-lock.json @@ -112,7 +112,7 @@ "lint-staged": "12.1.2", "lodash.isempty": "4.4.0", "lodash.isobject": "3.0.2", - "prettier": "2.3.2", + "prettier": "2.7.1", "react": "17.0.2", "react-dnd": "14.0.4", "react-dnd-html5-backend": "14.0.2", @@ -34822,15 +34822,18 @@ } }, "node_modules/prettier": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", - "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", "dev": true, "bin": { "prettier": "bin-prettier.js" }, "engines": { "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" } }, "node_modules/prettier-linter-helpers": { @@ -67591,9 +67594,9 @@ "dev": true }, "prettier": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", - "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", "dev": true }, "prettier-linter-helpers": { diff --git a/package.json b/package.json index 2d72b0ff67c..b68750e6e48 100644 --- a/package.json +++ b/package.json @@ -181,7 +181,7 @@ "lint-staged": "12.1.2", "lodash.isempty": "4.4.0", "lodash.isobject": "3.0.2", - "prettier": "2.3.2", + "prettier": "2.7.1", "react": "17.0.2", "react-dnd": "14.0.4", "react-dnd-html5-backend": "14.0.2", diff --git a/src/__tests__/deprecated/ChoiceFieldset.test.tsx b/src/__tests__/deprecated/ChoiceFieldset.test.tsx index f095165f459..dfe1af9277d 100644 --- a/src/__tests__/deprecated/ChoiceFieldset.test.tsx +++ b/src/__tests__/deprecated/ChoiceFieldset.test.tsx @@ -7,31 +7,32 @@ import userEvent from '@testing-library/user-event' import ChoiceFieldset, {Item, ChoiceFieldsetProps} from '../../deprecated/ChoiceFieldset' import {ChoiceFieldsetListProps} from '../../deprecated/ChoiceFieldset/ChoiceFieldsetList' -const SelectableChoicelistFieldset: React.FC> = - ({onSelect, selectionVariant, selected = []}) => { - const [selectionVals, setSelectionVals] = React.useState(selected) +const SelectableChoicelistFieldset: React.FC< + React.PropsWithChildren +> = ({onSelect, selectionVariant, selected = []}) => { + const [selectionVals, setSelectionVals] = React.useState(selected) - React.useEffect(() => { - onSelect && onSelect(selectionVals) - }, [onSelect, selectionVals]) + React.useEffect(() => { + onSelect && onSelect(selectionVals) + }, [onSelect, selectionVals]) - return ( - - { - setSelectionVals(selectedVals) - }} - selected={selectionVals} - > - Legend - - Label one - Label two - - - - ) - } + return ( + + { + setSelectionVals(selectedVals) + }} + selected={selectionVals} + > + Legend + + Label one + Label two + + + + ) +} describe('ChoiceFieldset', () => { it('renders default', () => { diff --git a/src/utils/types/MandateProps.ts b/src/utils/types/MandateProps.ts index 448a04ad74a..4fc0b56b052 100644 --- a/src/utils/types/MandateProps.ts +++ b/src/utils/types/MandateProps.ts @@ -13,7 +13,6 @@ where 'id' and 'label' required: type DatumWithRequiredIdAndLabel = MandateProps */ -export type MandateProps = Omit & - { - [MK in K]-?: NonNullable - } +export type MandateProps = Omit & { + [MK in K]-?: NonNullable +}